Fix mixed import patterns of __init__.py

.env.example

@@ -1,4 +1,4 @@
-BASE_URL_QUERY=base-url-query
+BASE_URL_QUERY=BASE_URL_QUERY
 # Comma-separated list of allowed origins for CORS (replace as needed)
 ALLOWED_ORIGINS=http://localhost:3000
 

gi_service/contract/rest/organisation_api_contract.yaml

@@ -186,6 +186,7 @@ paths:
                         - source
                         - target
                         - value
+                        - departmentIds
                       properties:
                         source:
                           type: integer
@@ -196,6 +197,11 @@ paths:
                         value:
                           type: integer
                           description: Number of departments shared between the source and target ministry nodes.
+                        departmentIds:
+                          type: array
+                          items:
+                            type: string
+                          description: IDs of the departments that moved along this link between consecutive dates.
                   dates:
                     type: array
                     items:
@@ -226,6 +232,9 @@ paths:
                   - source: 0
                     target: 1
                     value: 25
+                    departmentIds:
+                      - "2289-43_dep_1"
+                      - "2289-43_dep_2"
                 dates:
                   - date: "2024-09-23"
                     status: "ok"
@@ -402,6 +411,43 @@ paths:
         "500":
           description: Server Error
 
+  /v1/organisation/entity-names:
+    post:
+      tags:
+        - Organization
+      summary: Resolve entity IDs to display names.
+      description: Returns a dictionary mapping each entity ID to its decoded display name. IDs that cannot be resolved are omitted from the response.
+      operationId: resolveEntityNames
+      requestBody:
+        required: true
+        description: List of entity IDs to resolve.
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                type: string
+            example:
+              - "2289-43_min_1"
+              - "2289-43_dep_1"
+      responses:
+        "200":
+          description: Successfully returned
+          content:
+            application/json:
+              schema:
+                type: object
+                additionalProperties:
+                  type: string
+                description: Map of entity ID to display name.
+              example:
+                "2289-43_min_1": "Minister of Defence"
+                "2289-43_dep_1": "Ministry of Health"
+        "400":
+          description: Bad request
+        "500":
+          description: Server Error
+
   /v1/organisation/department-history/{department_id}:
     get:
       tags:

main.py

@@ -6,10 +6,10 @@
     person_router,
     document_router,
 )
-from src.core.config import settings
+from src.core import settings
 from fastapi.middleware.cors import CORSMiddleware
-from src.middleware.throttling import ThrottlingMiddleware
-from src.utils.http_client import http_client
+from src.middleware import ThrottlingMiddleware
+from src.utils import http_client
 from contextlib import asynccontextmanager
 
 @asynccontextmanager
@@ -46,4 +46,4 @@ async def lifespan(app: FastAPI):
 app.include_router(data_router)
 app.include_router(search_router)
 app.include_router(person_router)
-app.include_router(document_router)
+app.include_router(document_router)

src/__init__.py

@@ -0,0 +1,4 @@
+"""Top-level package for the GI Service application."""
+
+# Intentionally avoid re-exporting subpackages here to keep imports explicit.
+__all__: list[str] = []

src/core/__init__.py

@@ -0,0 +1,6 @@
+from .config import Settings, settings
+
+__all__ = [
+    "Settings",
+    "settings",
+]

src/enums/__init__.py

@@ -1,6 +1,6 @@
-from src.enums.kindEnum import KindMajorEnum, KindMinorEnum
-from src.enums.relationEnum import RelationNameEnum, RelationDirectionEnum
-from src.enums.idEnum import EntityIdEnum
+from .kindEnum import KindMajorEnum, KindMinorEnum
+from .relationEnum import RelationNameEnum, RelationDirectionEnum
+from .idEnum import EntityIdEnum
 
 __all__ = [
     "KindMajorEnum",

src/exception/__init__.py

@@ -0,0 +1,15 @@
+from .exceptions import (
+    BadRequestError,
+    GatewayTimeoutError,
+    InternalServerError,
+    NotFoundError,
+    ServiceUnavailableError,
+)
+
+__all__ = [
+    "BadRequestError",
+    "GatewayTimeoutError",
+    "InternalServerError",
+    "NotFoundError",
+    "ServiceUnavailableError",
+]

src/middleware/__init__.py

@@ -0,0 +1,5 @@
+from .throttling import ThrottlingMiddleware
+
+__all__ = [
+    "ThrottlingMiddleware",
+]

src/middleware/throttling.py

@@ -3,7 +3,7 @@
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.requests import Request
 from starlette.responses import JSONResponse
-from src.core.config import settings
+from src.core import settings
 
 logger = logging.getLogger(__name__)
 

src/models/__init__.py

@@ -1,6 +1,32 @@
-from .person_schemas import PersonSource, PersonResponse
+from .data_requestbody import DataCatalogRequest, DatasetYearsRequest
+from .organisation_schemas import (
+    AttributeFilterRecord,
+    AttributeFilterRecords,
+    Category,
+    Dataset,
+    Date,
+    Entity,
+    Kind,
+    Label,
+    Relation,
+)
+from .person_schemas import PersonResponse, PersonSource
+from .search_schemas import SearchResponse, SearchResult
 
 __all__ = [
+    "AttributeFilterRecord",
+    "AttributeFilterRecords",
+    "Category",
+    "DataCatalogRequest",
+    "Dataset",
+    "DatasetYearsRequest",
+    "Date",
+    "Entity",
+    "Kind",
+    "Label",
     "PersonSource",
-    "PersonResponse"
+    "PersonResponse",
+    "Relation",
+    "SearchResponse",
+    "SearchResult",
 ]

src/routers/data_router.py

@@ -1,10 +1,8 @@
-from src.models.data_requestbody import DatasetYearsRequest
-from src.models.data_requestbody import DataCatalogRequest
 from fastapi.param_functions import Depends, Query, Body, Path
-from src.services.data_service import DataService
-from src.services.opengin_service import OpenGINService
 from fastapi import APIRouter
 from pydantic import BaseModel, Field
+from src.models import DataCatalogRequest, DatasetYearsRequest
+from src.services import DataService, OpenGINService
 
 router = APIRouter(prefix="/v1/data", tags=["Data"])
 

src/routers/organisation_router.py

@@ -1,5 +1,5 @@
 from fastapi import APIRouter, Depends, Query, Body, Path
-from src.models.organisation_schemas import Date
+from src.models import Date
 from src.services import OpenGINService, OrganisationService
 from typing import Sequence
 
@@ -44,6 +44,17 @@ async def cabinet_flow(
     service_response = await service.fetch_cabinet_flow(president_id=president_id, dates=dates)
     return service_response 
 
+@router.post("/entity-names", summary="Resolve entity IDs to display names.", description="Returns a dictionary mapping each entity ID to its decoded display name.")
+async def entity_names(
+    entity_ids: list[str] = Body(
+        ...,
+        description="List of entity IDs to resolve.",
+        example=["2153-12_dep_168", "2153-12_dep_171"],
+    ),
+    service: OrganisationService = Depends(get_organisation_service),
+):
+    return await service.resolve_entity_names(entity_ids)
+
 @router.get('/department-history/{department_id}', summary="Get department history timeline.", description="Returns a timeline of a department including ministry relations and ministers.")
 async def department_history_timeline(
     department_id: str = Path(..., description="ID of the department"),

src/routers/search_router.py

@@ -1,9 +1,8 @@
 from fastapi import APIRouter, Depends, Query
 from typing import Optional, List
 from datetime import datetime
-from src.services.search_service import SearchService
-from src.services.opengin_service import OpenGINService
-from src.models.search_schemas import SearchResponse
+from src.models import SearchResponse
+from src.services import OpenGINService, SearchService
 
 router = APIRouter(prefix="/v1/search", tags=["Search"])
 

src/services/__init__.py

@@ -1,11 +1,15 @@
-from .organisation_service import OrganisationService
+from .data_service import DataService
+from .document_service import DocumentService
 from .opengin_service import OpenGINService
+from .organisation_service import OrganisationService
 from .person_service import PersonService
-from .document_service import DocumentService
+from .search_service import SearchService
 
 __all__ = [
-    "OrganisationService",
+    "DataService",
+    "DocumentService",
     "OpenGINService",
+    "OrganisationService",
     "PersonService",
-    "DocumentService"
-]
+    "SearchService",
+]

src/services/data_service.py

@@ -2,14 +2,10 @@
 import asyncio
 from typing import Dict
 from src.enums import KindMajorEnum, KindMinorEnum, RelationNameEnum, RelationDirectionEnum
-from src.exception.exceptions import InternalServerError, NotFoundError
-from src.exception.exceptions import BadRequestError
-from src.models.organisation_schemas import Relation
-from src.utils.util_functions import Util
-from src.models.organisation_schemas import Kind
-from src.models.organisation_schemas import Entity
+from src.exception import BadRequestError, InternalServerError, NotFoundError
+from src.models import Entity, Kind, Relation
 from aiohttp import ClientSession
-from src.utils import http_client
+from src.utils import Util, http_client
 
 logger = logging.getLogger(__name__)
 

src/services/document_service.py

@@ -1,13 +1,12 @@
-from src.exception.exceptions import InternalServerError
 import asyncio
-from src.utils.util_functions import Util
 from aiohttp import ClientSession
-from src.utils import http_client
-from src.models.organisation_schemas import Entity, Kind
-from src.enums.kindEnum import KindMajorEnum, KindMinorEnum
-from typing import Dict, List
 from datetime import datetime
 import logging
+from typing import Dict, List
+from src.enums import KindMajorEnum, KindMinorEnum
+from src.exception import InternalServerError
+from src.models import Entity, Kind
+from src.utils import Util, http_client
 
 logger = logging.getLogger(__name__)
 

src/services/opengin_service.py

@@ -1,17 +1,10 @@
-from asyncio import timeout
-from google.api_core.exceptions import GoogleAPICallError
-from google.api_core.retry import if_transient_error
-from src.models.organisation_schemas import AttributeFilterRecords
-from src.models.organisation_schemas import Entity, Relation
-from src.exception.exceptions import BadRequestError
-from src.exception.exceptions import InternalServerError
-from src.exception.exceptions import NotFoundError
 from google.api_core import retry_async
-from google.api_core import exceptions
 from aiohttp import ClientSession
-from src.utils.http_client import http_client
-from src.core.config import settings
 import logging
+from src.core import settings
+from src.exception import BadRequestError, InternalServerError, NotFoundError
+from src.models import AttributeFilterRecords, Entity, Relation
+from src.utils import http_client
 
 logger = logging.getLogger(__name__)
 
@@ -194,4 +187,4 @@ async def get_attributes(
             raise InternalServerError("An unexpected error occurred") from e 
 
 
-
+