Merge pull request #156 from OpenDataAlex/process_tracker_python-155

process_tracker_python-155 Clean up code quality issues

Author: OpenDataAlex

process_tracker/extract_tracker.py

@@ -22,12 +22,7 @@
     ExtractSourceObject,
     ExtractStatus,
 )
-from process_tracker.models.source import (
-    Source,
-    SourceLocation,
-    SourceObjectAttribute,
-    SourceObjectLocation,
-)
+from process_tracker.models.source import SourceLocation, SourceObjectLocation
 from process_tracker.models.source import DatasetType
 
 
@@ -454,9 +449,9 @@ def get_dataset_types(self):
         """
         dataset_types = list()
 
-        for type in self.extract.extract_dataset_types:
+        for data_type in self.extract.extract_dataset_types:
             dataset_type = self.data_store.get_or_create_item(
-                model=DatasetType, dataset_type_id=type.dataset_type_id
+                model=DatasetType, dataset_type_id=data_type.dataset_type_id
             )
             dataset_types.append(dataset_type)
 
@@ -529,22 +524,22 @@ def register_extract_sources(self, sources=None, source_objects=None):
 
         if source_objects is not None:
 
-            for object in source_objects:
+            for src_object in source_objects:
                 self.logger.debug(
                     "Associating extract %s to source %s."
-                    % (self.extract.extract_id, object.source_object_id)
+                    % (self.extract.extract_id, src_object.source_object_id)
                 )
 
                 source_object = self.data_store.get_or_create_item(
                     model=ExtractSourceObject,
                     extract_id=self.extract.extract_id,
-                    source_object_id=object.source_object_id,
+                    source_object_id=src_object.source_object_id,
                 )
                 source_list.append(source_object)
 
                 self.data_store.get_or_create_item(
                     SourceObjectLocation,
-                    source_object_id=object.source_object_id,
+                    source_object_id=src_object.source_object_id,
                     location_id=self.extract.extract_location_id,
                 )
 

process_tracker/models/schedule.py

@@ -2,19 +2,9 @@
 # Models for Schedule entities
 
 
-from sqlalchemy import (
-    Boolean,
-    Column,
-    DateTime,
-    ForeignKey,
-    Integer,
-    Sequence,
-    String,
-    UniqueConstraint,
-)
-from sqlalchemy.orm import relationship
+from sqlalchemy import Column, Integer, Sequence, String
 
-from process_tracker.models.model_base import default_date, Base
+from process_tracker.models.model_base import Base
 
 
 class ScheduleFrequency(Base):

process_tracker/process_tracker.py

@@ -91,9 +91,11 @@ def __init__(
         :type source_objects: dict of lists
         :param target_objects: Finer grained list of targets, including target objects (i.e. tables). Optional.
         :type target_objects: dict of lists
-        :param source_object_attributes: Even finer grained list of sources, including source objects (i.e. tables) and their attributes.  Optional.
+        :param source_object_attributes: Even finer grained list of sources, including source objects (i.e. tables) and
+        their attributes.  Optional.
         :type source_object_attributes: dict of lists
-        :param target_object_attributes: Even finer grained list of targets, including target objects (i.e. tables) and their attributes.  Optional.
+        :param target_object_attributes: Even finer grained list of targets, including target objects (i.e. tables) and
+        their attributes.  Optional.
         :type target_object_attributes: dict of lists
         :param config_location: Location where Process Tracker configuration file is. If not set, will use local home
                                 directory.
@@ -102,7 +104,8 @@ def __init__(
         :type dataset_types: list
         :param schedule_frequency: The general scheduling frequency for the process (i.e. hourly)
         :type schedule_frequency: string
-        :param process_run_id: If trying to access an already running process, provide the process run's id.  Object will be built for that specific process run.
+        :param process_run_id: If trying to access an already running process, provide the process run's id.
+        Object will be built for that specific process run.
         :type process_run_id: int
         """
         self.config_location = config_location
@@ -393,9 +396,9 @@ def determine_process_sources(self, process_run_id):
 
         if objects.count() >= 1:
             self.logger.info("Objects were not empty.")
-            for object in objects:
-                self.logger.debug("Adding object %s " % object)
-                source_list.append(object)
+            for obj in objects:
+                self.logger.debug("Adding object %s " % obj)
+                source_list.append(obj)
 
             return source_list
 
@@ -678,15 +681,15 @@ def find_process_filters(self, process):
             )
         )
 
-        for filter in filters:
+        for data_filter in filters:
             filter_list.append(
                 {
-                    "source_name": filter.source_name,
-                    "source_object_name": filter.source_object_name,
-                    "source_object_attribute_name": filter.source_object_attribute_name,
-                    "filter_type_code": filter.filter_type_code,
-                    "filter_value_numeric": filter.filter_value_numeric,
-                    "filter_value_string": filter.filter_value_string,
+                    "source_name": data_filter.source_name,
+                    "source_object_name": data_filter.source_object_name,
+                    "source_object_attribute_name": data_filter.source_object_attribute_name,
+                    "filter_type_code": data_filter.filter_type_code,
+                    "filter_value_numeric": data_filter.filter_value_numeric,
+                    "filter_value_string": data_filter.filter_value_string,
                 }
             )