Clean up

Author: melton-jason

main.py

@@ -5,7 +5,7 @@
 from typing import TypedDict, Literal, Optional, Dict, List, Callable
 
 from session import Session, extract_id_from_uri, construct_api_link
-from taxon_helpers import TAXON_TABLE_ID, RANK_NAME, Discipline_Record, Taxon_Record, TaxonTreeDefItem_Record, get_defitem, get_taxon, update_author
+from taxon_helpers import TAXON_TABLE_ID, RANK_NAME, Discipline_Record, Taxon_Record, TaxonTreeDefItem_Record, get_defitem, get_taxon, update_author, create_accepted_taxon
 
 LOG_FILE_NAME = "importlog.txt"
 
@@ -140,24 +140,6 @@ def proccess_row(session: Session, row: Row) -> int:
     return taxon['id']
 
 
-def create_accepted_taxon(session: Session, def_item: TaxonTreeDefItem_Record, name: str, parent: Taxon_Record, author: Optional[str] = None) -> Taxon_Record:
-    taxon_data = {
-        # fullname generated by backend when saved
-        "name": name,
-        "author": author,
-        "isaccepted": True,
-        "ishybrid": False,
-        "rankid": def_item["rankid"],
-        "version": 0,
-        "remarks": "Generated in Demo",
-        "definition": def_item["treedef"],
-        "definitionitem": def_item["resource_uri"],
-        "parent": parent["resource_uri"]
-    }
-    new_taxon = session.create_resource('taxon', taxon_data)
-    return new_taxon
-
-
 @tree_info_fetched
 def get_accepted(session: Session, row: Row) -> Optional[str]:
     """Return the resource_uri for the accepted taxon

session.py

@@ -61,7 +61,7 @@ def construct_api_link(table: str, id: int):
 
 def ensure_login(func):
     """Decorator which ensures a function which accepts a Session as the first
-    parameter is logged in before the fucntion is called 
+    parameter is logged in before the function is called 
     """
     @wraps(func)
     def wrapped(session: "Session", *args: Tuple, **kwargs: Dict[str, Any]):

taxon_helpers.py

@@ -51,6 +51,26 @@ def get_taxon(session: Session, name: str, tree_def_item_id: int, parent_name: O
     return taxons[0]
 
 
+def create_accepted_taxon(session: Session, def_item: TaxonTreeDefItem_Record, name: str, parent: Taxon_Record, author: Optional[str] = None) -> Taxon_Record:
+    """Creates a new Taxon record with taxontreedefitem <def_item>, name <name>, parent <parent>, and author <author>
+    """
+    taxon_data = {
+        # fullname generated by backend when saved
+        "name": name,
+        "author": author,
+        "isaccepted": True,
+        "ishybrid": False,
+        "rankid": def_item["rankid"],
+        "version": 0,
+        "remarks": "Generated in Demo",
+        "definition": def_item["treedef"],
+        "definitionitem": def_item["resource_uri"],
+        "parent": parent["resource_uri"]
+    }
+    new_taxon = session.create_resource('taxon', taxon_data)
+    return new_taxon
+
+
 def update_author(session: Session, taxon: Taxon_Record, author: str) -> Taxon_Record:
     """Given a serialized Taxon record <taxon>, and a string representing an 
     author, update the <taxon> record to have author <author>