fixs webserver

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/pydantic_models.py

@@ -2,14 +2,15 @@
 import importlib
 import inspect
 import itertools
+import json
 import pkgutil
 from collections.abc import Iterator
 from contextlib import suppress
 from types import ModuleType
 from typing import Any, NamedTuple
 
 import pytest
-from pydantic import BaseModel
+from pydantic import BaseModel, ValidationError
 
 
 def is_strict_inner(outer_cls: type, inner_cls: type) -> bool:
@@ -93,6 +94,7 @@ def _is_model_cls(obj) -> bool:
     assert inspect.ismodule(module)
 
     for model_name, model_cls in inspect.getmembers(module, _is_model_cls):
+
         schema = model_cls.model_json_schema()
 
         if example := schema.get("example"):
@@ -111,6 +113,19 @@ def _is_model_cls(obj) -> bool:
                 )
 
 
+def assert_validation_model(
+    model_cls: type[BaseModel], example_name: int, example_data: Any
+):
+    try:
+        assert model_cls.model_validate(example_data) is not None
+    except ValidationError as err:
+        pytest.fail(
+            f"{example_name} is invalid {model_cls.__module__}.{model_cls.__name__}:"
+            f"\n{json.dumps(example_data, indent=1)}"
+            f"\nError: {err}"
+        )
+
+
 ## PYDANTIC MODELS & SCHEMAS -----------------------------------------------------
 
 

services/web/server/src/simcore_service_webserver/studies_dispatcher/_redirects_handlers.py

@@ -170,14 +170,7 @@ def ensure_extension_upper_and_dotless(cls, v):
 
 
 class ServiceAndFileParams(FileQueryParams, ServiceParams):
-    model_config = ConfigDict(
-        json_schema_extra={
-            "allOf": [
-                {"$ref": "#/definitions/FileParams"},
-                {"$ref": "#/definitions/ServiceParams"},
-            ]
-        }
-    )
+    ...
 
 
 class ViewerQueryParams(BaseModel):

services/web/server/tests/unit/with_dbs/04/studies_dispatcher/test_studies_dispatcher_handlers.py

@@ -5,24 +5,23 @@
 # pylint: disable=unused-variable
 
 import asyncio
+import json
 import re
 import urllib.parse
 from collections.abc import AsyncIterator
 from typing import Any
 
 import pytest
-import simcore_service_webserver.studies_dispatcher._redirects_handlers
 import sqlalchemy as sa
 from aiohttp import ClientResponse, ClientSession
 from aiohttp.test_utils import TestClient, TestServer
 from aioresponses import aioresponses
-from common_library.json_serialization import json_dumps
 from models_library.projects_state import ProjectLocked, ProjectStatus
-from pydantic import BaseModel, ByteSize, TypeAdapter
+from pydantic import BaseModel, ByteSize, TypeAdapter, ValidationError
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.webserver_login import UserInfoDict, UserRole
-from pytest_simcore.pydantic_models import iter_model_examples_in_module
+from pytest_simcore.pydantic_models import walk_model_examples_in_package
 from servicelib.aiohttp import status
 from settings_library.redis import RedisSettings
 from settings_library.utils_session import DEFAULT_SESSION_COOKIE_NAME
@@ -235,16 +234,19 @@ async def test_api_list_supported_filetypes(client: TestClient):
 
 @pytest.mark.parametrize(
     "model_cls, example_name, example_data",
-    iter_model_examples_in_module(
-        simcore_service_webserver.studies_dispatcher._redirects_handlers
-    ),
+    walk_model_examples_in_package(simcore_service_webserver.studies_dispatcher),
 )
 def test_model_examples(
     model_cls: type[BaseModel], example_name: int, example_data: Any
 ):
-    print(example_name, ":", json_dumps(example_data))
-    model = model_cls.model_validate(example_data)
-    assert model
+    try:
+        assert model_cls.model_validate(example_data) is not None
+    except ValidationError as err:
+        pytest.fail(
+            f"{example_name} is invalid {model_cls.__module__}.{model_cls.__name__}:"
+            f"\n{json.dumps(example_data, indent=1)}"
+            f"\nError: {err}"
+        )
 
 
 async def test_api_list_services(client: TestClient):