api-server

Author: pcrespov

services/api-server/src/simcore_service_api_server/models/schemas/files.py

@@ -11,10 +11,10 @@
 from models_library.basic_types import SHA256Str
 from models_library.projects_nodes_io import StorageFileID
 from pydantic import (
-    AnyUrl,
     BaseModel,
     ConfigDict,
     Field,
+    HttpUrl,
     NonNegativeInt,
     StringConstraints,
     TypeAdapter,
@@ -167,9 +167,7 @@ class UploadLinks(BaseModel):
 
 class FileUploadData(BaseModel):
     chunk_size: NonNegativeInt
-    urls: list[
-        Annotated[AnyUrl, StringConstraints(max_length=65536)]
-    ]  # maxlength added for backwards compatibility
+    urls: list[HttpUrl]
     links: UploadLinks
 
 

services/api-server/src/simcore_service_api_server/models/schemas/studies.py

@@ -1,14 +1,14 @@
-from typing import Annotated, TypeAlias
+from typing import TypeAlias
 
 from models_library import projects, projects_nodes_io
-from pydantic import AnyUrl, BaseModel, ConfigDict, Field, StringConstraints
+from pydantic import BaseModel, ConfigDict, Field, HttpUrl
 
 from .. import api_resources
 from . import solvers
 
 StudyID: TypeAlias = projects.ProjectID
 NodeName: TypeAlias = str
-DownloadLink: TypeAlias = AnyUrl
+DownloadLink: TypeAlias = HttpUrl
 
 
 class Study(BaseModel):
@@ -48,7 +48,7 @@ class StudyPort(solvers.SolverPort):
 
 class LogLink(BaseModel):
     node_name: NodeName
-    download_link: Annotated[DownloadLink, StringConstraints(max_length=65536)]
+    download_link: DownloadLink
 
 
 class JobLogsMap(BaseModel):

services/api-server/src/simcore_service_api_server/services/solver_job_models_converters.py

@@ -143,7 +143,7 @@ def create_new_project_for_job(
         version=solver.version,
         label=solver.title,
         inputs=solver_inputs,
-        inputsUnits={},
+        inputs_units={},
     )
 
     # Ensembles project model so it can be used as input for create_project

services/api-server/tests/unit/test__models_examples.py

@@ -4,16 +4,13 @@
 
 import pytest
 import simcore_service_api_server.models.schemas
-import simcore_service_api_server.models.schemas.meta
 from pydantic import BaseModel
 from pytest_simcore.pydantic_models import walk_model_examples_in_package
 
 
 @pytest.mark.parametrize(
     "model_cls, example_name, example_data",
-    chain(
-        walk_model_examples_in_package(simcore_service_api_server.models.schemas.meta)
-    ),
+    chain(walk_model_examples_in_package(simcore_service_api_server.models)),
 )
 def test_all_models_library_models_config_examples(
     model_cls: type[BaseModel], example_name: int, example_data: Any