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
 

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/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 .data_requestbody import DataCatalogRequest, DatasetYearsRequest
+from .organisation_schemas import (
+    AttributeFilterRecord,
+    AttributeFilterRecords,
+    Category,
+    Dataset,
+    Date,
+    Entity,
+    Kind,
+    Label,
+    Relation,
+)
 from .person_schemas import PersonSource, PersonResponse
+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
 

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 .data_service import DataService
 from .organisation_service import OrganisationService
 from .opengin_service import OpenGINService
 from .person_service import PersonService
 from .document_service import DocumentService
+from .search_service import SearchService
 
 __all__ = [
+    "DataService",
+    "DocumentService",
     "OrganisationService",
     "OpenGINService",
     "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 
 
 
-
+

src/services/organisation_service.py

@@ -1,16 +1,11 @@
-from src.enums.relationEnum import RelationDirectionEnum
-from src.enums.relationEnum import RelationNameEnum
-from src.exception.exceptions import BadRequestError
-from src.exception.exceptions import NotFoundError
-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, Relation
-from src.enums.idEnum import EntityIdEnum
-from typing import Optional, Sequence
 import logging
+from typing import Optional, Sequence
+from src.enums import EntityIdEnum, RelationDirectionEnum, RelationNameEnum
+from src.exception import BadRequestError, InternalServerError, NotFoundError
+from src.models import Entity, Relation
+from src.utils import Util, http_client
 
 logger = logging.getLogger(__name__)
 
@@ -800,4 +795,3 @@ async def department_history_timeline(self, department_id: str):
         except Exception as e:
             logger.error(f"Error in enrich_department_timeline: {e}")
             raise InternalServerError("An unexpected error occurred") from e
-

src/services/person_service.py

@@ -1,19 +1,12 @@
-from src.enums.relationEnum import RelationDirectionEnum
-from src.enums.relationEnum import RelationNameEnum
-from src.exception.exceptions import BadRequestError
-from src.exception.exceptions import NotFoundError
-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, Relation, Kind
-from src.enums.kindEnum import KindMajorEnum, KindMinorEnum
-from src.enums.idEnum import EntityIdEnum
-from src.models.person_schemas import PersonResponse
 from datetime import datetime
 
 import logging
+from src.enums import EntityIdEnum, KindMajorEnum, KindMinorEnum, RelationDirectionEnum, RelationNameEnum
+from src.exception import BadRequestError, InternalServerError, NotFoundError
+from src.models import Entity, Kind, PersonResponse, Relation
+from src.utils import Util, http_client
 
 logger = logging.getLogger(__name__)
 

src/services/search_service.py

@@ -2,10 +2,9 @@
 import logging
 from typing import List, Dict, Any, Optional
 from src.enums import KindMajorEnum, KindMinorEnum
-from src.exception.exceptions import BadRequestError, InternalServerError
-from src.models.organisation_schemas import Entity, Kind
-from src.models.search_schemas import SearchResult, SearchResponse
-from src.utils.util_functions import Util
+from src.exception import BadRequestError, InternalServerError
+from src.models import Entity, Kind, SearchResponse, SearchResult
+from src.utils import Util
 
 logger = logging.getLogger(__name__)
 
@@ -222,4 +221,3 @@ def _determine_entity_type(self, major: str, minor: str) -> str:
 
         return entity_type
 
-

src/utils/__init__.py

@@ -0,0 +1,8 @@
+from .http_client import HTTPClient, http_client
+from .util_functions import Util
+
+__all__ = [
+    "HTTPClient",
+    "http_client",
+    "Util",
+]

src/utils/http_client.py

@@ -1,6 +1,6 @@
 from aiohttp import ClientSession, ClientTimeout, TCPConnector
 from typing import Optional
-from src.core.config import settings
+from src.core import settings
 class HTTPClient:
     "Single HTTP client for the application"
 
@@ -48,4 +48,4 @@ def session(self) -> ClientSession:
         return self._session
 
 # Create a global instance
-http_client = HTTPClient()
+http_client = HTTPClient()

test/__init__.py

@@ -0,0 +1,6 @@
+"""Test package for GI Service.
+
+Fixtures and test helpers stay module-local to avoid creating a public API.
+"""
+
+__all__: list[str] = []

test/conftest.py

@@ -1,15 +1,9 @@
-
-from src.services.data_service import DataService
 import pytest
 from aiohttp import ClientError
 from unittest.mock import patch, PropertyMock, MagicMock
-from services.opengin_service import OpenGINService
-from src.utils.http_client import HTTPClient
-from services.organisation_service import OrganisationService
 from unittest.mock import AsyncMock
-from src.utils.util_functions import Util
-from src.services.person_service import PersonService
-from src.services.document_service import DocumentService
+from src.services import DataService, DocumentService, OpenGINService, OrganisationService, PersonService
+from src.utils import HTTPClient, Util
 
 # MockResponse class to simulate aiohttp responses
 class MockResponse:

test/test_attribute_filter_schemas.py

@@ -1,7 +1,7 @@
 import pytest
 from pydantic import ValidationError
 
-from src.models.organisation_schemas import AttributeFilterRecord, AttributeFilterRecords
+from src.models import AttributeFilterRecord, AttributeFilterRecords
 
 
 def test_attribute_filter_record_defaults_operator_to_eq():

test/test_data_service.py

@@ -1,9 +1,9 @@
 import pytest
 import asyncio
-from src.exception.exceptions import InternalServerError, BadRequestError, NotFoundError
 from unittest.mock import patch
-from src.models.organisation_schemas import Entity, Relation, Kind
 from src.enums import KindMajorEnum, KindMinorEnum, RelationNameEnum, RelationDirectionEnum
+from src.exception import BadRequestError, InternalServerError, NotFoundError
+from src.models import Entity, Kind, Relation
 
 # Tests for enrich_dataset
 @pytest.mark.asyncio

test/test_document_service.py

@@ -1,8 +1,6 @@
 import pytest
 from unittest.mock import AsyncMock, MagicMock, patch
-from src.services.document_service import DocumentService
-from src.exception.exceptions import InternalServerError, NotFoundError
-from src.models.organisation_schemas import Entity
+from src.exception import InternalServerError, NotFoundError
 
 @pytest.mark.asyncio
 async def test_get_gazette_data_points_success(document_service, mock_opengin_service):
@@ -142,4 +140,3 @@ async def test_get_gazette_data_points_robustness(document_service, mock_opengin
     assert result["data"][1]["year"] == 2024
     assert result["data"][1]["values"][4] == 1 # May
 
-

test/test_opengin_service.py

@@ -1,14 +1,13 @@
 
 import pytest
-from src.enums.relationEnum import RelationDirectionEnum
-from src.enums.relationEnum import RelationNameEnum
-from src.models.organisation_schemas import Kind
-from src.exception.exceptions import NotFoundError, BadRequestError
-from src.models.organisation_schemas import (
+from src.enums import RelationDirectionEnum, RelationNameEnum
+from src.exception import BadRequestError, NotFoundError
+from src.models import (
     AttributeFilterRecord,
     AttributeFilterRecords,
     Entity,
     Relation,
+    Kind,
 )
 from test.conftest import MockResponse
 
@@ -374,4 +373,3 @@ async def test_get_attributes_bad_request(mock_service, mock_session):
     with pytest.raises(BadRequestError, match="Bad request"):
         await mock_service.get_attributes("category_123", "dataset_abc")
 
-