avoid circular imports

Author: matthias_schaub

mapswipe_workers/mapswipe_workers/definitions.py

@@ -5,14 +5,6 @@
 
 import sentry_sdk
 
-from mapswipe_workers.project_types.build_area.build_area_project import (
-    BuildAreaProject,
-)
-from mapswipe_workers.project_types.change_detection.change_detection_project import (
-    ChangeDetectionProject,
-)
-from mapswipe_workers.project_types.footprint.footprint_project import FootprintProject
-
 
 class CustomError(Exception):
     pass
@@ -38,18 +30,6 @@ def load_config(CONFIG_PATH) -> dict:
 
 DATA_PATH = os.path.abspath("/var/lib/mapswipe_workers/")
 
-PROJECT_TYPE_CLASSES = {
-    1: BuildAreaProject,
-    2: FootprintProject,
-    3: ChangeDetectionProject,
-}
-
-PROJECT_TYPE_NAMES = {
-    1: BuildAreaProject.project_type_name,
-    2: FootprintProject.project_type_name,
-    3: ChangeDetectionProject.project_type_name,
-}
-
 logging.config.fileConfig(fname=LOGGING_CONFIG_PATH, disable_existing_loggers=True)
 logger = logging.getLogger("Mapswipe Workers")
 

mapswipe_workers/mapswipe_workers/mapswipe_workers.py

@@ -4,24 +4,25 @@
 import json
 import time
 
-import schedule as sched
-
 import click
+import schedule as sched
 from mapswipe_workers import auth
-from mapswipe_workers.definitions import (
-    PROJECT_TYPE_CLASSES,
-    CustomError,
-    logger,
-    sentry,
-)
+from mapswipe_workers.definitions import CustomError, logger, sentry
 from mapswipe_workers.firebase_to_postgres import (
     archive_project,
     transfer_results,
     update_data,
 )
 from mapswipe_workers.generate_stats import generate_stats
 from mapswipe_workers.project_types.build_area import build_area_tutorial
+from mapswipe_workers.project_types.build_area.build_area_project import (
+    BuildAreaProject,
+)
 from mapswipe_workers.project_types.change_detection import change_detection_tutorial
+from mapswipe_workers.project_types.change_detection.change_detection_project import (
+    ChangeDetectionProject,
+)
+from mapswipe_workers.project_types.footprint.footprint_project import FootprintProject
 from mapswipe_workers.utils import user_management
 from mapswipe_workers.utils.slack_helper import send_slack_message
 
@@ -53,6 +54,13 @@ def run_create_projects():
     Create projects with groups and tasks.
     Save created projects, groups and tasks to Firebase and Postgres.
     """
+
+    project_type_classes = {
+        1: BuildAreaProject,
+        2: FootprintProject,
+        3: ChangeDetectionProject,
+    }
+
     fb_db = auth.firebaseDB()
     ref = fb_db.reference("v2/projectDrafts/")
     project_drafts = ref.get()
@@ -66,7 +74,7 @@ def run_create_projects():
         project_name = project_draft["name"]
         try:
             # Create a project object using appropriate class (project type).
-            project = PROJECT_TYPE_CLASSES[project_type](project_draft)
+            project = project_type_classes[project_type](project_draft)
             project.geometry = project.validate_geometries()
             project.create_groups()
             project.calc_required_results()