Commenting Out Partial Code

🐛 Still working out issues with SQLAlchemy

Still having issues dropping and creating all within SQLAlchemy so commented out the tests and cli function that calls those capabilities.

Author: OpenDataAlex

process_tracker/cli.py

@@ -20,17 +20,17 @@ def main():
     """
 
 
-@main.command()
-@click.option('-o', '--overwrite', default=False, help='Wipe out the current data store and rebuild'
-                                                       ', starting from fresh.')
-def setup(overwrite):
-    """
-    Initialize ProcessTracker's data store with user provided input.  If already in place, do nothing unless overwrite
-    set to True.
-    :return:
-    """
-    click.echo('Attempting to initialize data store...')
-    data_store.initialize_data_store(overwrite=overwrite)
+# @main.command()
+# @click.option('-o', '--overwrite', default=False, help='Wipe out the current data store and rebuild'
+#                                                        ', starting from fresh.')
+# def setup(overwrite):
+#     """
+#     Initialize ProcessTracker's data store with user provided input.  If already in place, do nothing unless overwrite
+#     set to True.
+#     :return:
+#     """
+#     click.echo('Attempting to initialize data store...')
+#     data_store.initialize_data_store(overwrite=overwrite)
 
 
 # @main.command()

process_tracker/data_store.py

@@ -1,4 +1,3 @@
-import os
 import logging
 
 from click import ClickException
@@ -7,9 +6,9 @@
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy_utils import database_exists
 
-from process_tracker.utilities.logging import console
 from process_tracker.utilities.settings import SettingsManager
 
+from process_tracker.models.model_base import Base
 from process_tracker.models.actor import Actor
 from process_tracker.models.extract import ExtractStatus
 from process_tracker.models.process import ErrorType, ProcessType, ProcessStatus
@@ -32,14 +31,16 @@ def __init__(self, config_location=None):
         :param config_location: Location where Process Tracker configuration file is.
         :type config_location: file path
         """
+        config = SettingsManager().config
         self.logger = logging.getLogger(__name__)
+        self.logger.setLevel(config['DEFAULT']['log_level'])
 
-        self.config_location=config_location
+        self.config_location = config_location
 
         data_store = self.verify_and_connect_to_data_store()
         self.engine = data_store['engine']
-        self.session = data_store['session']
         self.meta = data_store['meta']
+        self.session = data_store['session']
         self.data_store_type = data_store['data_store_type']
         self.data_store_host = data_store['data_store_host']
         self.data_store_port = data_store['data_store_port']
@@ -87,8 +88,11 @@ def initialize_data_store(self, overwrite=False):
         self.logger.info('Attempting to initialize Process Tracker data store.')
         if overwrite:
             self.logger.warn('ALERT - DATA STORE TO BE OVERWRITTEN - ALL DATA WILL BE LOST')
-            self.meta.reflect()
-            self.meta.drop_all()
+
+            for table in Base.metadata.table_names():
+                self.logger.debug('Table will be deleted: %s' % table)
+
+            Base.metadata.drop_all(self.engine)
 
             version = None
         else:
@@ -99,7 +103,7 @@ def initialize_data_store(self, overwrite=False):
         if version is None:
 
             self.logger.info('Data store initialization beginning.  Creating data store.')
-            self.meta.create_all()
+            Base.metadata.create_all(self.engine)
 
             self.logger.info('Setting up application defaults.')
 
@@ -365,6 +369,9 @@ def verify_and_connect_to_data_store(self):
         supported_data_stores = relational_stores + nonrelational_stores
 
         if data_store_type in supported_data_stores:
+            engine = ''
+            meta = ''
+            session = ''
 
             if data_store_type in relational_stores:
                 if data_store_type == 'postgresql':
@@ -376,23 +383,24 @@ def verify_and_connect_to_data_store(self):
                                                                                         , data_store_port))
                 if database_exists(engine.url):
                     self.logger.info("Data store exists.  Continuing to work.")
+                else:
+                    self.logger.error('Data store does not exist.  Please create and try again.')
+                    raise Exception('Data store does not exist.  Please create and try again.')
 
                 session = sessionmaker(bind=engine)
 
                 session = session(expire_on_commit=False)
                 session.execute("SET search_path TO %s" % data_store_name)
 
-                meta = MetaData(engine)
+                meta = MetaData(schema='process_tracking')
 
             elif data_store_type in nonrelational_stores:
-                Session = ''
                 session = ''
-                meta = ''
 
             data_store = dict()
             data_store['engine'] = engine
-            data_store['session'] = session
             data_store['meta'] = meta
+            data_store['session'] = session
             data_store['data_store_type'] = data_store_type
             data_store['data_store_host'] = data_store_host
             data_store['data_store_port'] = data_store_port

process_tracker/extract_tracker.py

@@ -5,10 +5,10 @@
 import os
 from os.path import join
 
-from sqlalchemy.orm import Session
 
 from process_tracker.data_store import DataStore
 from process_tracker.location_tracker import LocationTracker
+from process_tracker.utilities.settings import SettingsManager
 from process_tracker.models.extract import Extract, ExtractProcess, ExtractStatus, Location
 
 
@@ -31,8 +31,10 @@ def __init__(self, process_run, filename, location=None, location_name=None, loc
         :param status: Optional if status does not need to be 'initializing', which is default.
         :type status: string
         """
+        config = SettingsManager().config
+
         self.logger = logging.getLogger(__name__)
-        self.logger.setLevel(os.environ.get('log_level', 'DEBUG'))
+        self.logger.setLevel(config['DEFAULT']['log_level'])
 
         self.data_store = DataStore()
         self.session = self.data_store.session

process_tracker/location_tracker.py

@@ -5,14 +5,18 @@
 
 from process_tracker.data_store import DataStore
 from process_tracker.utilities.logging import console
+from process_tracker.utilities.settings import SettingsManager
 
 from process_tracker.models.extract import Location, LocationType
 
 
 class LocationTracker:
 
     def __init__(self, location_path, location_name=None):
+        config = SettingsManager().config
+
         self.logger = logging.getLogger(__name__)
+        self.logger.setLevel(config['DEFAULT']['log_level'])
         self.logger.addHandler(console)
 
         self.data_store = DataStore()

process_tracker/process_tracker.py

@@ -12,6 +12,7 @@
 from process_tracker.extract_tracker import ExtractTracker
 from process_tracker.location_tracker import LocationTracker
 from process_tracker.utilities.logging import console
+from process_tracker.utilities.settings import SettingsManager
 
 from process_tracker.models.actor import Actor
 from process_tracker.models.extract import Extract, ExtractProcess, ExtractStatus, Location
@@ -35,8 +36,10 @@ def __init__(self, process_name, process_type, actor_name, tool_name, sources, t
         :param config_location: Location where Process Tracker configuration file is.
         :type config_location: file path
         """
+        config = SettingsManager().config
 
         self.logger = logging.getLogger(__name__)
+        self.logger.setLevel(config['DEFAULT']['log_level'])
         self.logger.addHandler(console)
 
         self.data_store = DataStore(config_location=config_location)

tests/test_cli.py

@@ -36,18 +36,18 @@ def setUp(self):
     #     instance = self.session.query(Actor).count()
     #
     #     self.assertEqual(0, instance)
-
-    def test_setup_already_exists(self):
-        """
-        Testing that if data store is already set up, do not attempt to initialize.
-        :return:
-        """
-
-        result = self.runner.invoke(main, ['setup'])
-
-        expected_result = 'It appears the system has already been setup.'
-
-        self.assertIn(expected_result, result.output)
+    #
+    # def test_setup_already_exists(self):
+    #     """
+    #     Testing that if data store is already set up, do not attempt to initialize.
+    #     :return:
+    #     """
+    #
+    #     result = self.runner.invoke(main, ['setup'])
+    #
+    #     expected_result = 'It appears the system has already been setup.'
+    #
+    #     self.assertIn(expected_result, result.output)
 
     def test_create_actor(self):
         """