chore: move the event handling to its own app

Signed-off-by: SdgJlbl <[email protected]>
Substra · Jul 11, 2023 · 1110ea3 · 1110ea3
1 parent 396af78
commit 1110ea3
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 5 deletions.
diff --git a/backend/backend/settings/common.py b/backend/backend/settings/common.py
@@ -50,6 +50,7 @@
     "django_celery_results",
     "rest_framework",
     "rest_framework_simplejwt.token_blacklist",
+    "events",
     "substrapp",
     "organization",
     "users",

diff --git a/backend/substrapp/events/__init__.py → backend/events/__init__.py b/backend/substrapp/events/__init__.py → backend/events/__init__.py
diff --git a/...ubstrapp/events/handler_compute_engine.py → backend/events/handler_compute_engine.py b/...ubstrapp/events/handler_compute_engine.py → backend/events/handler_compute_engine.py
diff --git a/backend/substrapp/events/health.py → backend/events/health.py b/backend/substrapp/events/health.py → backend/events/health.py
diff --git a/.../substrapp/management/commands/consume.py → ...end/events/management/commands/consume.py b/.../substrapp/management/commands/consume.py → ...end/events/management/commands/consume.py
@@ -3,8 +3,8 @@
 import structlog
 from django.core.management.base import BaseCommand
 
-from substrapp.events import health
-from substrapp.events.reactor import consume
+from events import health
+from events.reactor import consume
 
 logger = structlog.get_logger("events")
 

diff --git a/backend/substrapp/events/reactor.py → backend/events/reactor.py b/backend/substrapp/events/reactor.py → backend/events/reactor.py
@@ -9,9 +9,9 @@
 import orchestrator.common_pb2 as common_pb2
 import orchestrator.computetask_pb2 as computetask_pb2
 import orchestrator.event_pb2 as event_pb2
+from events import handler_compute_engine
+from events import health
 from orchestrator import model_pb2
-from substrapp.events import handler_compute_engine
-from substrapp.events import health
 from substrapp.models import WorkerLastEvent
 from substrapp.orchestrator import get_orchestrator_client
 from substrapp.tasks.tasks_compute_plan import queue_delete_cp_pod_and_dirs_and_optionally_images

diff --git a/backend/substrapp/events/tests/__init__.py → backend/events/tests/__init__.py b/backend/substrapp/events/tests/__init__.py → backend/events/tests/__init__.py
diff --git a/...ents/tests/test_handler_compute_engine.py → ...ents/tests/test_handler_compute_engine.py b/...ents/tests/test_handler_compute_engine.py → ...ents/tests/test_handler_compute_engine.py
@@ -3,7 +3,7 @@
 
 import orchestrator
 import orchestrator.mock as orc_mock
-from substrapp.events import handler_compute_engine
+from events import handler_compute_engine
 
 
 @pytest.mark.parametrize(