Merge branch '201-experiment-with-upgrading-openapi-generator' of github.com:bisgaard-itis/osparc-simcore-clients into 201-experiment-with-upgrading-openapi-generator

Author: bisgaard-itis

clients/python/src/osparc/_api_solvers_api.py

@@ -29,8 +29,7 @@
 from tempfile import NamedTemporaryFile
 from pathlib import Path
 from pydantic import validate_call
-from pydantic import Field, StrictStr
-from typing import Annotated
+from pydantic import StrictStr
 
 
 class SolversApi(_SolversApi):
@@ -122,8 +121,8 @@ def create_job(
 
     def get_job_output_logfile(
         self,
-        solver_key: Annotated[str, Field(strict=True)],
-        version: Annotated[str, Field(strict=True)],
+        solver_key: str,
+        version: str,
         job_id: StrictStr,
         **kwargs,
     ):
@@ -137,8 +136,8 @@ def get_job_output_logfile(
 
     def get_job_outputs(
         self,
-        solver_key: Annotated[str, Field(strict=True)],
-        version: Annotated[str, Field(strict=True)],
+        solver_key: str,
+        version: str,
         job_id: StrictStr,
         **kwargs,
     ) -> JobOutputs:

clients/python/src/osparc/_models.py

@@ -3,7 +3,7 @@
 from osparc_client import JobMetadata as _JobMetadata
 from osparc_client import JobMetadataUpdate as _JobMetadataUpdate
 from .models import File
-from typing import Dict, Union, List
+from typing import Dict, Union, List, Optional
 from pydantic import BaseModel, StrictStr, Field
 
 
@@ -30,7 +30,7 @@ class JobOutputs(BaseModel):
 class JobMetadata(BaseModel):
     job_id: StrictStr
     metadata: Dict[str, Union[bool, float, int, str, None]]
-    url: str | None
+    url: Optional[str]
 
 
 assert set(_JobMetadata.model_fields.keys()) == set(JobMetadata.model_fields.keys())

clients/python/test/test_osparc/conftest.py

@@ -14,7 +14,7 @@
 import json
 from tempfile import NamedTemporaryFile
 from pathlib import Path
-from typing import Any, TypeVar, NamedTuple, Final, cast
+from typing import Any, TypeVar, NamedTuple, Final, cast, Dict, Type, Set
 from urllib.parse import urlparse
 from parse import parse, with_pattern
 
@@ -29,7 +29,7 @@ def cfg(faker: Faker) -> osparc.Configuration:
 
 
 @pytest.fixture
-def osparc_openapi_specs() -> Generator[dict[str, Any], None, None]:
+def osparc_openapi_specs() -> Generator[Dict[str, Any], None, None]:
     with NamedTemporaryFile(suffix=".json") as file:
         file = Path(file.name)
         file.write_text(json.dumps(osparc.openapi()))
@@ -67,7 +67,7 @@ class ServerPath(NamedTuple):
 
 
 @pytest.fixture
-def all_server_paths(osparc_openapi_specs: dict[str, Any]) -> set[ServerPath]:
+def all_server_paths(osparc_openapi_specs: Dict[str, Any]) -> Set[ServerPath]:
     server_paths = set()
     for path in osparc_openapi_specs["paths"]:
         for method in osparc_openapi_specs["paths"][path]:
@@ -89,9 +89,9 @@ def all_server_paths(osparc_openapi_specs: dict[str, Any]) -> set[ServerPath]:
 
 @pytest.fixture
 def create_osparc_response_model(
-    osparc_openapi_specs: dict[str, Any],
-) -> Callable[[type[T]], T]:
-    def _create_model(model_type: type[T]) -> T:
+    osparc_openapi_specs: Dict[str, Any],
+) -> Callable[[Type[T]], T]:
+    def _create_model(model_type: Type[T]) -> T:
         schemas = osparc_openapi_specs.get("components", {}).get("schemas", {})
         example_data = schemas.get(model_type.__name__, {}).get("example")
         error_msg = "Could not extract example data for"
@@ -105,8 +105,8 @@ def _create_model(model_type: type[T]) -> T:
 @pytest.fixture
 def create_server_mock(
     mocker: MockerFixture,
-    osparc_openapi_specs: dict[str, Any],
-    all_server_paths: set[ServerPath],
+    osparc_openapi_specs: Dict[str, Any],
+    all_server_paths: Set[ServerPath],
     create_osparc_response_model: Callable[[str], BaseModel],
 ) -> Callable[[int], None]:
     def _mock_server(_status: int) -> None: