fixed the quotes issue

INCATools · Mar 22, 2024 · 2405949 · 2405949
1 parent 8e4ed84
commit 2405949
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/src/data/examples/examples.yaml b/src/data/examples/examples.yaml
@@ -1,8 +1,8 @@
 Test_0:
   id: CHANGE:001
   type: NodeRename
-  old_value: '''nuclear envelope'''
-  new_value: '''foo bar'''
+  old_value: nuclear envelope
+  new_value: foo bar
   about_node: GO:0005635
   about_node_representation: curie
   command_with_curie: rename GO:0005635 from 'nuclear envelope' to 'foo bar'
@@ -11,8 +11,8 @@ Test_0:
 Test_1:
   id: CHANGE:001
   type: NodeRename
-  old_value: '''nucleus'''
-  new_value: '''bar'''
+  old_value: nucleus
+  new_value: bar
   about_node: GO:0005634
   about_node_representation: curie
   command_with_curie: rename GO:0005634 from 'nucleus' to 'bar'

diff --git a/src/kgcl_schema/grammar/parser.py b/src/kgcl_schema/grammar/parser.py
@@ -595,16 +595,25 @@ def parse_rename(tree, id):
     )
 
 
+
+
 def extract(tree, data):
     """Extract node."""
     node = get_next(tree.find_data(data))
+    # Define this list at the module level if it's static and doesn't change per function call
+    quote_strip_param_substring = ["_label", "name"]
     if node is not None:
         node_token = next(get_tokens(node))
+
+        if any(substring in data for substring in quote_strip_param_substring):
+            node_token = node_token.strip("'\"")
+
         return node_token
     else:
         return None
 
 
+
 def get_tokens(tree):
     """Get tokens."""
     return tree.scan_values(lambda v: isinstance(v, Token))

diff --git a/tests/cases.py b/tests/cases.py
@@ -65,8 +65,8 @@
         f"rename {NUCLEAR_ENVELOPE_URI} from 'nuclear envelope' to 'foo bar'",
         NodeRename(
             id=UID,
-            old_value="'nuclear envelope'",
-            new_value="'foo bar'",
+            old_value="nuclear envelope",
+            new_value="foo bar",
             about_node="GO:0005635",
             about_node_representation="curie",
         ),
@@ -77,8 +77,8 @@
         f"rename {NUCLEUS_URI} from 'nucleus' to 'bar'",
         NodeRename(
             id=UID,
-            old_value="'nucleus'",
-            new_value="'bar'",
+            old_value="nucleus",
+            new_value="bar",
             about_node=NUCLEUS,
             about_node_representation="curie",
         ),
@@ -89,8 +89,8 @@
     #    f"""rename {NUCLEUS} from 'nucleus' to 'bobby " tables'""",
     #    f"""rename {NUCLEUS_URI} from 'nucleus' to 'bobby " tables'""",
     #    NodeRename(id=UID,
-    #               old_value="'nucleus'",
-    #               new_value="'bar'",
+    #               old_value="nucleus",
+    #               new_value="bar",
     #               about_node=NUCLEUS,
     #               about_node_representation='curie'),
     #    None