♻️ Maintenance: reduce code duplication

packages/models-library/src/models_library/api_schemas__common/errors.py

@@ -0,0 +1,26 @@
+import http
+from typing import Any
+
+from pydantic import BaseModel, Field
+
+from ..basic_types import IDStr
+from ..utils.pydantic_tools_extension import NOT_REQUIRED
+
+
+class DefaultApiError(BaseModel):
+    name: IDStr = Field(
+        ...,
+        description="Error identifier as a code or a name. Mostly for machine-machine communication.",
+    )
+    detail: Any | None = Field(NOT_REQUIRED, description="Human readable error message")
+
+    @classmethod
+    def from_status_code(
+        cls, code: int, *, detail: str | None = None
+    ) -> "DefaultApiError":
+        httplib_code = http.HTTPStatus(code)
+
+        return cls(
+            name=f"{code}",
+            detail=detail or httplib_code.description or httplib_code.phrase,
+        )

packages/models-library/src/models_library/api_schemas_directorv2/dynamic_services.py

@@ -1,8 +1,8 @@
 from typing import Any, ClassVar, TypeAlias
 
-from models_library.resource_tracker import HardwareInfo, PricingInfo
 from pydantic import BaseModel, ByteSize, Field
 
+from ..resource_tracker import HardwareInfo, PricingInfo
 from ..services import ServicePortKey
 from ..services_resources import ServiceResourcesDict, ServiceResourcesDictHelpers
 from ..wallets import WalletInfo

packages/models-library/src/models_library/api_schemas_resource_usage_tracker/credit_transactions.py

@@ -1,12 +1,11 @@
 from datetime import datetime
 from decimal import Decimal
 
-from models_library.products import ProductName
-from models_library.resource_tracker import CreditTransactionId
-from models_library.users import UserID
-from models_library.wallets import WalletID
 from pydantic import BaseModel, validator
 
+from ..products import ProductName
+from ..resource_tracker import CreditTransactionId
+from ..users import UserID
 from ..wallets import WalletID
 
 

packages/models-library/src/models_library/api_schemas_resource_usage_tracker/pricing_plans.py

@@ -2,14 +2,15 @@
 from decimal import Decimal
 from typing import Any, ClassVar
 
-from models_library.resource_tracker import (
+from pydantic import BaseModel
+
+from ..resource_tracker import (
     HardwareInfo,
     PricingPlanClassification,
     PricingPlanId,
     PricingUnitCostId,
     PricingUnitId,
 )
-from pydantic import BaseModel
 
 
 class PricingUnitGet(BaseModel):

packages/models-library/src/models_library/api_schemas_resource_usage_tracker/service_runs.py

@@ -1,18 +1,15 @@
 from datetime import datetime
 from decimal import Decimal
 
-from models_library.projects import ProjectID
-from models_library.projects_nodes_io import NodeID
-from models_library.resource_tracker import (
-    CreditTransactionStatus,
-    ServiceRunId,
-    ServiceRunStatus,
-)
-from models_library.services import ServiceKey, ServiceVersion
-from models_library.users import UserID
-from models_library.wallets import WalletID
 from pydantic import BaseModel
 
+from ..projects import ProjectID
+from ..projects_nodes_io import NodeID
+from ..resource_tracker import CreditTransactionStatus, ServiceRunId, ServiceRunStatus
+from ..services import ServiceKey, ServiceVersion
+from ..users import UserID
+from ..wallets import WalletID
+
 
 class ServiceRunGet(BaseModel):
     service_run_id: ServiceRunId

packages/models-library/src/models_library/api_schemas_storage.py

@@ -13,7 +13,6 @@
 from typing import Any, ClassVar
 from uuid import UUID
 
-from models_library.basic_types import SHA256Str
 from pydantic import (
     BaseModel,
     ByteSize,
@@ -27,6 +26,7 @@
 from pydantic.networks import AnyUrl
 
 from .basic_regex import DATCORE_DATASET_NAME_RE, S3_BUCKET_NAME_RE
+from .basic_types import SHA256Str
 from .generics import ListModel
 from .projects_nodes_io import (
     LocationID,

packages/models-library/src/models_library/api_schemas_webserver/auth.py

@@ -1,9 +1,9 @@
 from datetime import timedelta
 from typing import Any, ClassVar
 
-from models_library.emails import LowerCaseEmailStr
 from pydantic import BaseModel, Field, SecretStr
 
+from ..emails import LowerCaseEmailStr
 from ._base import InputSchema
 
 

packages/models-library/src/models_library/api_schemas_webserver/computations.py

@@ -1,6 +1,7 @@
-from models_library.clusters import ClusterID
 from pydantic import BaseModel
 
+from ..clusters import ClusterID
+
 
 class ComputationStart(BaseModel):
     force_restart: bool = False

packages/models-library/src/models_library/api_schemas_webserver/groups.py

@@ -1,9 +1,10 @@
 from contextlib import suppress
 from typing import Any, ClassVar
 
-from models_library.emails import LowerCaseEmailStr
 from pydantic import AnyUrl, BaseModel, Field, ValidationError, parse_obj_as, validator
 
+from ..emails import LowerCaseEmailStr
+
 #
 # GROUPS MODELS defined in OPENAPI specs
 #

packages/models-library/src/models_library/api_schemas_webserver/product.py

@@ -1,11 +1,11 @@
 from datetime import datetime
 from typing import Any, ClassVar
 
-from models_library.products import ProductName
 from pydantic import ConstrainedInt, Field, HttpUrl, PositiveInt
 
 from ..basic_types import IDStr, NonNegativeDecimal
 from ..emails import LowerCaseEmailStr
+from ..products import ProductName
 from ._base import InputSchema, OutputSchema
 
 

packages/models-library/src/models_library/api_schemas_webserver/resource_usage.py

@@ -1,20 +1,20 @@
 from datetime import datetime
 from decimal import Decimal
 
-from models_library.resource_tracker import (
+from pydantic import BaseModel
+
+from ..projects import ProjectID
+from ..projects_nodes_io import NodeID
+from ..resource_tracker import (
     PricingPlanClassification,
     PricingPlanId,
+    PricingUnitId,
     ServiceRunId,
     ServiceRunStatus,
 )
-from models_library.users import UserID
-from models_library.wallets import WalletID
-from pydantic import BaseModel
-
-from ..projects import ProjectID
-from ..projects_nodes_io import NodeID
-from ..resource_tracker import PricingUnitId, ServiceRunStatus
 from ..services import ServiceKey, ServiceVersion
+from ..users import UserID
+from ..wallets import WalletID
 from ._base import OutputSchema
 
 # Frontend API

services/payments/tests/unit/test_models_schemas.py → packages/models-library/tests/test_api_schemas__common.py

@@ -8,14 +8,14 @@
 import http
 
 import pytest
-from simcore_service_payments.models.schemas.errors import DefaultApiError
+from models_library.api_schemas__common.errors import DefaultApiError
 
 
 @pytest.mark.parametrize("code", [e.value for e in http.HTTPStatus if e.value >= 400])
-def test_default_api_error_model(code: int):
+def test_create_default_api_error_from_status_code(code: int):
 
     error = DefaultApiError.from_status_code(code)
-    assert error.name
+    assert error.name == f"{code}"
     assert error.detail
 
     assert DefaultApiError.from_status_code(code, detail="FOO").detail == "FOO"

packages/service-library/requirements/_fastapi.in

@@ -8,4 +8,5 @@
 
 fastapi
 httpx
+respx
 uvicorn

packages/service-library/requirements/_fastapi.txt

@@ -51,6 +51,7 @@ httpx==0.25.0
     #   -c requirements/./../../../packages/settings-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/./../../../requirements/constraints.txt
     #   -r requirements/_fastapi.in
+    #   respx
 idna==3.4
     # via
     #   anyio
@@ -84,6 +85,8 @@ referencing==0.29.3
     #   -c requirements/././constraints.txt
     #   jsonschema
     #   jsonschema-specifications
+respx==0.20.2
+    # via -r requirements/_fastapi.in
 rich==13.6.0
     # via -r requirements/./../../../packages/settings-library/requirements/_base.in
 rpds-py==0.10.6

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/api/rest/_exceptions.py → packages/service-library/src/servicelib/fastapi/exceptions_utils.py

@@ -3,8 +3,7 @@
 from fastapi import HTTPException, Request, status
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import JSONResponse
-
-from ...models.schemas.errors import DefaultApiError
+from models_library.api_schemas__common.errors import DefaultApiError
 
 _logger = logging.getLogger(__name__)
 

packages/service-library/tests/fastapi/conftest.py

@@ -3,17 +3,15 @@
 # pylint: disable=unused-variable
 
 import socket
-from datetime import datetime
-from typing import AsyncIterable, Callable, cast
+from collections.abc import AsyncIterator, Callable
+from typing import cast
 
+import arrow
 import pytest
-from fastapi import FastAPI
+from fastapi import APIRouter, FastAPI
 from fastapi.params import Query
-from fastapi.routing import APIRouter
 from httpx import AsyncClient
 from pydantic.types import PositiveFloat
-from pytest import FixtureRequest
-from servicelib.fastapi import long_running_tasks
 
 
 @pytest.fixture
@@ -23,7 +21,7 @@ def app() -> FastAPI:
 
     @api_router.get("/")
     def _get_root():
-        return {"name": __name__, "timestamp": datetime.utcnow().isoformat()}
+        return {"name": __name__, "timestamp": arrow.utcnow().datetime.isoformat()}
 
     @api_router.get("/data")
     def _get_data(x: PositiveFloat, y: int = Query(..., gt=3, lt=4)):
@@ -35,27 +33,15 @@ def _get_data(x: PositiveFloat, y: int = Query(..., gt=3, lt=4)):
     return _app
 
 
-@pytest.fixture(params=["", "/base-path", "/nested/path"])
-def router_prefix(request: FixtureRequest) -> str:
-    return request.param
-
-
 @pytest.fixture
-async def bg_task_app(router_prefix: str) -> AsyncIterable[FastAPI]:
-    app = FastAPI()
-
-    long_running_tasks.server.setup(app, router_prefix=router_prefix)
-    yield app
+async def client(app: FastAPI) -> AsyncIterator[AsyncClient]:
+    async with AsyncClient(app=app, base_url="http://test") as client:
+        yield client
 
 
-@pytest.fixture(scope="function")
-async def async_client(bg_task_app: FastAPI) -> AsyncIterable[AsyncClient]:
-    async with AsyncClient(
-        app=bg_task_app,
-        base_url="http://backgroud.testserver.io",
-        headers={"Content-Type": "application/json"},
-    ) as client:
-        yield client
+@pytest.fixture(params=["", "/base-path", "/nested/path"])
+def router_prefix(request: pytest.FixtureRequest) -> str:
+    return request.param
 
 
 @pytest.fixture

packages/service-library/tests/fastapi/long_running_tasks/conftest.py

@@ -0,0 +1,29 @@
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+# pylint: disable=too-many-arguments
+
+from collections.abc import AsyncIterable
+
+import pytest
+from fastapi import FastAPI
+from httpx import AsyncClient
+from servicelib.fastapi import long_running_tasks
+
+
+@pytest.fixture
+async def bg_task_app(router_prefix: str) -> FastAPI:
+    app = FastAPI()
+
+    long_running_tasks.server.setup(app, router_prefix=router_prefix)
+    return app
+
+
+@pytest.fixture
+async def async_client(bg_task_app: FastAPI) -> AsyncIterable[AsyncClient]:
+    async with AsyncClient(
+        app=bg_task_app,
+        base_url="http://backgroud.testserver.io",
+        headers={"Content-Type": "application/json"},
+    ) as client:
+        yield client

packages/service-library/tests/fastapi/long_running_tasks/test_long_running_tasks.py

@@ -11,7 +11,8 @@
 
 import asyncio
 import json
-from typing import AsyncIterator, Awaitable, Callable, Final
+from collections.abc import AsyncIterator, Awaitable, Callable
+from typing import Final
 
 import pytest
 from asgi_lifespan import LifespanManager
@@ -76,6 +77,7 @@ async def create_string_list_task(
 
 @pytest.fixture
 async def app(server_routes: APIRouter) -> AsyncIterator[FastAPI]:
+    # overrides fastapi/conftest.py:app
     app = FastAPI(title="test app")
     app.include_router(server_routes)
     long_running_tasks.server.setup(app)
@@ -84,12 +86,6 @@ async def app(server_routes: APIRouter) -> AsyncIterator[FastAPI]:
         yield app
 
 
-@pytest.fixture
-async def client(app: FastAPI) -> AsyncIterator[AsyncClient]:
-    async with AsyncClient(app=app, base_url="http://test") as client:
-        yield client
-
-
 @pytest.fixture
 def start_long_running_task() -> Callable[[FastAPI, AsyncClient], Awaitable[TaskId]]:
     async def _caller(app: FastAPI, client: AsyncClient, **query_kwargs) -> TaskId:
@@ -134,6 +130,7 @@ async def _waiter(
 
     return _waiter
 
+
 async def test_workflow(
     app: FastAPI,
     client: AsyncClient,
@@ -233,6 +230,7 @@ async def test_failing_task_returns_error(
     # assert task_result.error["errors"][0]["code"] == "RuntimeError"
     # assert task_result.error["errors"][0]["message"] == "We were asked to fail!!"
 
+
 async def test_get_results_before_tasks_finishes_returns_404(
     app: FastAPI,
     client: AsyncClient,