Skip to content

Commit c2f995f

Browse files
committed
chore: remove imports in init model domain
1 parent a30a8ec commit c2f995f

16 files changed

Lines changed: 26 additions & 31 deletions

File tree

api/domain/model/__init__.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
from .entities import Model, ModelCosts, ModelType
2-
from .errors import InconsistentModelMaxContextLengthError, InconsistentModelVectorSizeError
3-
4-
__all__ = ["ModelType", "Model", "ModelCosts", "InconsistentModelMaxContextLengthError", "InconsistentModelVectorSizeError"]

api/domain/provider/_providergateway.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from abc import ABC, abstractmethod
22
from dataclasses import dataclass
33

4-
from api.domain.model import ModelType as RouterType
4+
from api.domain.model.entities import ModelType as RouterType
55
from api.domain.provider.entities import ProviderType
66
from api.domain.provider.errors import ProviderNotReachableError
77

api/domain/router/_routerrepository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from abc import ABC, abstractmethod
22

3-
from api.domain.model import ModelType as RouterType
3+
from api.domain.model.entities import ModelType as RouterType
44
from api.domain.router.entities import Router, RouterLoadBalancingStrategy, RouterPage, RouterSortField, SortOrder
55
from api.domain.router.errors import RouterAliasAlreadyExistsError, RouterNameAlreadyExistsError
66

api/domain/router/entities.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from pydantic import BaseModel, Field
55

6-
from api.domain.model import ModelType as RouterType
6+
from api.domain.model.entities import ModelType as RouterType
77

88

99
class RouterLoadBalancingStrategy(str, Enum):

api/infrastructure/fastapi/endpoints/admin/providers.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from sqlalchemy.ext.asyncio import AsyncSession
88

99
from api.dependencies import create_provider_use_case_factory, delete_provider_use_case_factory, get_request_context
10-
from api.domain.model import InconsistentModelMaxContextLengthError, InconsistentModelVectorSizeError
10+
from api.domain.model.errors import InconsistentModelMaxContextLengthError, InconsistentModelVectorSizeError
1111
from api.domain.provider import InvalidProviderTypeError, ProviderNotReachableError
1212
from api.domain.provider.errors import ProviderAlreadyExistsError, ProviderNotFoundError
1313
from api.domain.router.errors import RouterNotFoundError
@@ -47,17 +47,15 @@
4747
path=EndpointRoute.ADMIN_PROVIDERS,
4848
dependencies=[Security(dependency=get_current_key)],
4949
status_code=201,
50-
responses=get_documentation_responses(
51-
[
52-
InconsistentModelMaxContextLengthHTTPException,
53-
InconsistentModelVectorSizeHTTPException,
54-
InvalidProviderTypeHTTPException,
55-
ProviderNotReachableHTTPException,
56-
ProviderAlreadyExistsHTTPException,
57-
RouterNotFoundHTTPException,
58-
NotAdminUserHTTPException,
59-
]
60-
),
50+
responses=get_documentation_responses([
51+
InconsistentModelMaxContextLengthHTTPException,
52+
InconsistentModelVectorSizeHTTPException,
53+
InvalidProviderTypeHTTPException,
54+
ProviderNotReachableHTTPException,
55+
ProviderAlreadyExistsHTTPException,
56+
RouterNotFoundHTTPException,
57+
NotAdminUserHTTPException,
58+
]),
6159
)
6260
async def create_provider(
6361
request: Request,

api/infrastructure/fastapi/schemas/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from pydantic import Field
55

6-
from api.domain.model import Model as ModelEntity
6+
from api.domain.model.entities import Model as ModelEntity
77
from api.schemas import BaseModel
88

99

api/infrastructure/model/_modelprovidergateway.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from api.clients.model import BaseModelProvider
2-
from api.domain.model import ModelType as RouterType
2+
from api.domain.model.entities import ModelType as RouterType
33
from api.domain.provider import ProviderCapabilities, ProviderGateway, ProviderNotReachableError
44

55

api/infrastructure/postgres/_postgresrouterrepository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from sqlalchemy.ext.asyncio import AsyncSession
44

55
from api.domain.key.entities import MASTER_USER_ID
6-
from api.domain.model import ModelType as RouterType
6+
from api.domain.model.entities import ModelType as RouterType
77
from api.domain.router import RouterRepository
88
from api.domain.router.entities import Router, RouterLoadBalancingStrategy, RouterPage, RouterSortField, SortOrder
99
from api.domain.router.errors import RouterAliasAlreadyExistsError, RouterNameAlreadyExistsError

api/tests/integration/postgres/test_postgresrouterrepository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from sqlalchemy import select
55

66
from api.domain.key.entities import MASTER_USER_ID
7-
from api.domain.model import ModelType as RouterType
7+
from api.domain.model.entities import ModelType as RouterType
88
from api.domain.router.entities import Router, RouterLoadBalancingStrategy, RouterSortField, SortOrder
99
from api.domain.router.errors import RouterAliasAlreadyExistsError, RouterNameAlreadyExistsError
1010
from api.infrastructure.postgres import PostgresRouterRepository

api/tests/unit/use_case/admin/providers/test_createproviderusecase.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import pytest
44

5-
from api.domain.model import ModelType as RouterType
5+
from api.domain.model.entities import ModelType as RouterType
66
from api.domain.model.errors import InconsistentModelMaxContextLengthError, InconsistentModelVectorSizeError
77
from api.domain.provider import ProviderCapabilities
88
from api.domain.provider.entities import ProviderCarbonFootprintZone, ProviderType

0 commit comments

Comments
 (0)