Initial release prep

app/services/runs/__init__.py

@@ -1,51 +1,51 @@
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     QUEUE_STATUS_DROPPED as QUEUE_STATUS_DROPPED,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     QUEUE_STATUS_QUEUED as QUEUE_STATUS_QUEUED,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     QUEUE_STATUS_RETRYING as QUEUE_STATUS_RETRYING,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     QueueClearResult as QueueClearResult,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     QueueListItem as QueueListItem,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     QueueTransitionError as QueueTransitionError,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     clear_queue_item_for_user as clear_queue_item_for_user,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     drop_queue_item_for_user as drop_queue_item_for_user,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     extract_run_summary as extract_run_summary,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     get_manual_run_by_idempotency_key as get_manual_run_by_idempotency_key,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     get_queue_item_for_user as get_queue_item_for_user,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     get_run_for_user as get_run_for_user,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     list_queue_items_for_user as list_queue_items_for_user,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     list_recent_runs_for_user as list_recent_runs_for_user,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     list_runs_for_user as list_runs_for_user,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     queue_status_counts_for_user as queue_status_counts_for_user,
 )
-from app.services.domains.runs.application import (
+from app.services.runs.application import (
     retry_queue_item_for_user as retry_queue_item_for_user,
 )

app/services/runs/application.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from app.services.domains.runs.queue_service import (
+from app.services.runs.queue_service import (
     clear_queue_item_for_user,
     drop_queue_item_for_user,
     get_queue_item_for_user,
@@ -8,14 +8,14 @@ from app.services.domains.runs.queue_service import (
     queue_status_counts_for_user,
     retry_queue_item_for_user,
 )
-from app.services.domains.runs.runs_service import (
+from app.services.runs.runs_service import (
     get_manual_run_by_idempotency_key,
     get_run_for_user,
     list_recent_runs_for_user,
     list_runs_for_user,
 )
-from app.services.domains.runs.summary import extract_run_summary
-from app.services.domains.runs.types import (
+from app.services.runs.summary import extract_run_summary
+from app.services.runs.types import (
     QUEUE_STATUS_DROPPED,
     QUEUE_STATUS_QUEUED,
     QUEUE_STATUS_RETRYING,

app/services/runs/queue_queries.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from sqlalchemy import and_, select
 
 from app.db.models import IngestionQueueItem, ScholarProfile
-from app.services.domains.runs.types import QueueListItem
+from app.services.runs.types import QueueListItem
 
 
 def queue_item_columns() -> tuple:

app/services/runs/queue_service.py

@@ -4,9 +4,9 @@ from sqlalchemy import case, func, select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.db.models import IngestionQueueItem
-from app.services.domains.ingestion import queue as queue_mutations
-from app.services.domains.runs.queue_queries import queue_item_select, queue_list_item_from_row
-from app.services.domains.runs.types import (
+from app.services.ingestion import queue as queue_mutations
+from app.services.runs.queue_queries import queue_item_select, queue_list_item_from_row
+from app.services.runs.types import (
     QUEUE_STATUS_DROPPED,
     QUEUE_STATUS_QUEUED,
     QUEUE_STATUS_RETRYING,