better argument name

allenai · Sep 21, 2022 · 66d8856 · 66d8856
1 parent 6d2932b
commit 66d8856
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/pybart/api.py b/pybart/api.py
@@ -36,10 +36,10 @@ def _inner_convert_spike_sentence(spike_sentence, enhance_ud, enhanced_plus_plus
     return con()
 
 
-def convert_spike_sentence(spike_sentence, enhance_ud=True, enhanced_plus_plus=True, enhanced_extra=True, conv_iterations=math.inf, remove_eud_info=False, remove_extra_info=False, remove_node_adding_conversions=False, remove_unc=False, query_mode=False, funcs_to_cancel=None, ud_version=1, graph_to_remove="universal-enhanced"):
+def convert_spike_sentence(spike_sentence, enhance_ud=True, enhanced_plus_plus=True, enhanced_extra=True, conv_iterations=math.inf, remove_eud_info=False, remove_extra_info=False, remove_node_adding_conversions=False, remove_unc=False, query_mode=False, funcs_to_cancel=None, ud_version=1, graph_to_replace="universal-enhanced"):
     converted_sents, _ = _inner_convert_spike_sentence(spike_sentence, enhance_ud, enhanced_plus_plus, enhanced_extra, conv_iterations, remove_eud_info, remove_extra_info, remove_node_adding_conversions, remove_unc, query_mode, funcs_to_cancel, ud_version)
     # ATTENTION - overrides original json
-    return fix_spike_graph(converted_sents[0], spike_sentence, remove_eud_info, remove_extra_info, graph_to_remove)
+    return fix_spike_graph(converted_sents[0], spike_sentence, remove_eud_info, remove_extra_info, graph_to_replace)
 
 
 def convert_bart_tacred(tacred_json, enhance_ud=True, enhanced_plus_plus=True, enhanced_extra=True, conv_iterations=math.inf, remove_eud_info=False, remove_extra_info=False, remove_node_adding_conversions=False, remove_unc=False, query_mode=False, funcs_to_cancel=None, ud_version=1):

diff --git a/pybart/conllu_wrapper.py b/pybart/conllu_wrapper.py
@@ -108,12 +108,12 @@ def parse_spike_sentence(spike_sentence):
     return output
 
 
-def fix_spike_graph(conllu_sentence, spike_sentence, remove_enhanced_extra_info, remove_bart_extra_info, graph_to_remove):
+def fix_spike_graph(conllu_sentence, spike_sentence, remove_enhanced_extra_info, remove_bart_extra_info, graph_to_replace):
     # ASSUMPTION - SPIKE doesnt allow node-adding conversions, so we dont need to fix text/offsets/etc
     if 'graphs' in spike_sentence:
-        spike_sentence["graphs"][graph_to_remove] = {"edges": [], "roots": []}
+        spike_sentence["graphs"][graph_to_replace] = {"edges": [], "roots": []}
     else:
-        spike_sentence["graphs"] = {graph_to_remove: {"edges": [], "roots": []}}
+        spike_sentence["graphs"] = {graph_to_replace: {"edges": [], "roots": []}}
 
     for iid, token in enumerate(conllu_sentence):
         if token.get_conllu_field("id").major == 0:
@@ -122,9 +122,9 @@ def fix_spike_graph(conllu_sentence, spike_sentence, remove_enhanced_extra_info,
         for head, rels in token.get_new_relations():
             for rel in rels:
                 if rel.to_str(remove_enhanced_extra_info, remove_bart_extra_info).lower().startswith("root"):
-                    spike_sentence["graphs"][graph_to_remove]["roots"].append(iid)
+                    spike_sentence["graphs"][graph_to_replace]["roots"].append(iid)
                 else:
-                    spike_sentence["graphs"][graph_to_remove]["edges"].append(
+                    spike_sentence["graphs"][graph_to_replace]["edges"].append(
                         {"parent": head.get_conllu_field("id").major - 1, "child": iid, "label": rel.to_str(remove_enhanced_extra_info, remove_bart_extra_info)})
 
     return spike_sentence

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="pybart-nlp",
-    version="3.3.3",
+    version="3.3.4",
     author="Aryeh Tiktinsky",
     author_email="aryehgigi@gmail.com",
     description="python converter from UD-tree to BART-graph representations",