refactor to facilitate testing

src/recipe_graph/db.py

@@ -9,7 +9,7 @@ from sqlalchemy import create_engine, Column, Integer, String, Boolean, \
 from sqlalchemy.types import ARRAY
 from sqlalchemy.engine import URL
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Session, sessionmaker
 
 
 Base = declarative_base()
@@ -99,6 +99,11 @@ def get_engine(use_dotenv = True, **kargs):
                          database=DB_NAME) 
     return create_engine(eng_url)
 
+def get_session(**kargs) -> Session:
+    eng = get_engine(**kargs)
+    return sessionmaker(eng)
+
+
 
 def create_tables(eng):
     logging.info(f"Createing DB Tables: {eng.url}")
@@ -210,8 +215,10 @@ def update_graph_connectivity(session = None):
                                             not_(Recipe.id.in_(graphed)))):
             session.add(RecipeGraphed(recipe_id=recipe.id, status=True))
             
+def main():
+    eng = get_engine()
+    create_tables(eng)
           
 
 if __name__ == "__main__":
-    eng = get_engine()
+    main()
-    create_tables(eng)

src/recipe_graph/insert_sites.py

@@ -1,29 +1,40 @@
+from pydoc import apropos
 from sqlalchemy.orm import sessionmaker
-import db
+from recipe_graph import db
 import json
 import argparse
 import logging
 
-parser = argparse.ArgumentParser(description='Import recipes into database')
-parser.add_argument('file', type=str,
-                    help='JSON file with recipe site information')
-parser.add_argument('-v', '--verbose', action='store_true')
 
+def load_file(f_name: str):
+    with open(f_name) as f:
+        sites = json.load(f)
+    return sites
+
+def setup_argparser() -> argparse.Namespace:
+    parser = argparse.ArgumentParser(description="Import recipes into database")
+    parser.add_argument("file", type=str, help="JSON file with recipe site information")
+    parser.add_argument("-v", "--verbose", action="store_true")
 
     args = parser.parse_args()
+    return args
+
+def setup_logging(args: argparse.Namespace):
     if args.verbose:
         logging.basicConfig(level=logging.INFO)
-    logging.getLogger('sqlalchemy.engine').setLevel(logging.INFO)
+        logging.getLogger("sqlalchemy.engine").setLevel(logging.INFO)
 
-with open(args.file) as f:
+def main():
-    sites = json.load(f)
+    args = setup_argparser()
+    setup_logging(args)
 
-eng = db.get_engine()
+    S = db.get_session()
-S = sessionmaker(eng)
+    sites = load_file(args.file)
 
     with S.begin() as session:
         for site in sites:
             logging.info(f"Adding {site}")
             session.add(db.RecipeSite(**site))
         
-    
+if __name__ == "__main__":
+    main()