Initial release prep

app/api/media.py

@@ -10,8 +10,8 @@ from app.api.deps import get_api_current_user
 from app.api.errors import ApiException
 from app.db.models import User
 from app.db.session import get_db_session
-from app.services.domains.scholars import application as scholar_service
-from app.services.domains.scholars import uploads as scholar_uploads
+from app.services.scholars import application as scholar_service
+from app.services.scholars import uploads as scholar_uploads
 from app.settings import settings
 
 router = APIRouter(tags=["media"])

app/api/routers/admin.py

@@ -21,7 +21,7 @@ from app.auth.service import AuthService
 from app.db.models import User
 from app.db.session import get_db_session
 from app.logging_utils import structured_log
-from app.services.domains.users import application as user_service
+from app.services.users import application as user_service
 
 logger = logging.getLogger(__name__)
 

app/api/routers/admin_dbops.py

@@ -22,13 +22,13 @@ from app.api.schemas import (
 from app.db.models import DataRepairJob, User
 from app.db.session import get_db_session
 from app.logging_utils import structured_log
-from app.services.domains.dbops import (
+from app.services.dbops import (
     collect_integrity_report,
     list_repair_jobs,
     run_publication_link_repair,
     run_publication_near_duplicate_repair,
 )
-from app.services.domains.publications import application as publication_service
+from app.services.publications import application as publication_service
 
 logger = logging.getLogger(__name__)
 

app/api/routers/auth.py

@@ -26,7 +26,7 @@ from app.db.models import User
 from app.db.session import get_db_session
 from app.logging_utils import structured_log
 from app.security.csrf import ensure_csrf_token
-from app.services.domains.users import application as user_service
+from app.services.users import application as user_service
 
 logger = logging.getLogger(__name__)
 

app/api/routers/publications.py

@@ -23,9 +23,9 @@ from app.api.schemas import (
 from app.db.models import User
 from app.db.session import get_db_session
 from app.logging_utils import structured_log
-from app.services.domains.publication_identifiers import application as identifier_service
-from app.services.domains.publications import application as publication_service
-from app.services.domains.scholars import application as scholar_service
+from app.services.publication_identifiers import application as identifier_service
+from app.services.publications import application as publication_service
+from app.services.scholars import application as scholar_service
 from app.settings import settings
 
 logger = logging.getLogger(__name__)

app/api/routers/runs.py

@@ -25,11 +25,11 @@ from app.api.schemas import (
 from app.db.models import RunStatus, RunTriggerType, User
 from app.db.session import get_db_session
 from app.logging_utils import structured_log
-from app.services.domains.ingestion import application as ingestion_service
-from app.services.domains.ingestion import safety as run_safety_service
-from app.services.domains.runs import application as run_service
-from app.services.domains.runs.events import event_generator
-from app.services.domains.settings import application as user_settings_service
+from app.services.ingestion import application as ingestion_service
+from app.services.ingestion import safety as run_safety_service
+from app.services.runs import application as run_service
+from app.services.runs.events import event_generator
+from app.services.settings import application as user_settings_service
 from app.settings import settings
 
 logger = logging.getLogger(__name__)

app/api/routers/scholars.py

@@ -25,12 +25,12 @@ from app.api.schemas import (
 from app.db.models import User
 from app.db.session import get_db_session
 from app.logging_utils import structured_log
-from app.services.domains.ingestion import queue as ingestion_queue_service
-from app.services.domains.portability import application as import_export_service
-from app.services.domains.scholar import rate_limit as scholar_rate_limit
-from app.services.domains.scholar.source import ScholarSource
-from app.services.domains.scholars import application as scholar_service
-from app.services.domains.scholars import search_hints as scholar_search_hints
+from app.services.ingestion import queue as ingestion_queue_service
+from app.services.portability import application as import_export_service
+from app.services.scholar import rate_limit as scholar_rate_limit
+from app.services.scholar.source import ScholarSource
+from app.services.scholars import application as scholar_service
+from app.services.scholars import search_hints as scholar_search_hints
 from app.settings import settings
 
 logger = logging.getLogger(__name__)

app/api/routers/settings.py

@@ -12,8 +12,8 @@ from app.api.schemas import SettingsEnvelope, SettingsUpdateRequest
 from app.db.models import User
 from app.db.session import get_db_session
 from app.logging_utils import structured_log
-from app.services.domains.ingestion import safety as run_safety_service
-from app.services.domains.settings import application as user_settings_service
+from app.services.ingestion import safety as run_safety_service
+from app.services.settings import application as user_settings_service
 from app.settings import settings as settings_module
 
 logger = logging.getLogger(__name__)

app/api/runtime_deps.py

@@ -2,8 +2,8 @@ from __future__ import annotations
 
 from fastapi import Depends
 
-from app.services.domains.ingestion import application as ingestion_service
-from app.services.domains.scholar import source as scholar_source_service
+from app.services.ingestion import application as ingestion_service
+from app.services.scholar import source as scholar_source_service
 
 
 def get_scholar_source() -> scholar_source_service.ScholarSource: