improve wrapper models

Author: bisgaard-itis

clients/python/src/osparc/_api_solvers_api.py

@@ -4,7 +4,8 @@
 
 import httpx
 from osparc_client.api.solvers_api import SolversApi as _SolversApi
-from .models import JobInputs, OnePageSolverPort, SolverPort, JobOutputs
+from .models import JobInputs, OnePageSolverPort, SolverPort, JobOutputs, JobMetadata
+from osparc_client import JobInputs as _JobInputs
 
 from ._api_client import ApiClient
 from ._settings import ParentProjectInfo
@@ -101,8 +102,9 @@ def jobs(self, solver_key: str, version: str, **kwargs) -> PaginationGenerator:
     def create_job(
         self, solver_key: str, version: str, job_inputs: JobInputs, **kwargs
     ):
+        _job_inputs = _JobInputs.from_json(job_inputs.model_dump_json())
         kwargs = {**kwargs, **ParentProjectInfo().model_dump(exclude_none=True)}
-        return super().create_job(solver_key, version, job_inputs, **kwargs)
+        return super().create_job(solver_key, version, _job_inputs, **kwargs)
 
     def get_job_output_logfile(self, *args, **kwargs):
         data = super().get_job_output_logfile(*args, **kwargs)
@@ -113,6 +115,8 @@ def get_job_output_logfile(self, *args, **kwargs):
 
     def get_job_outputs(self, *args, **kwargs) -> JobOutputs:
         _osparc_client_outputs = super().get_job_outputs(*args, **kwargs)
-        _outputs = JobOutputs.from_osparc_client_job_outputs(_osparc_client_outputs)
-        assert _outputs is not None
-        return _outputs
+        return JobOutputs.model_validate_json(_osparc_client_outputs.to_json())
+
+    def get_job_custom_metadata(self, *args, **kwargs) -> JobMetadata:
+        metadata = super().get_job_custom_metadata(*args, **kwargs)
+        return JobMetadata.model_validate_json(metadata.to_json())

clients/python/src/osparc/_models.py

@@ -1,48 +1,37 @@
-from osparc_client import ValuesValue
 from osparc_client import JobInputs as _JobInputs
 from osparc_client import JobOutputs as _JobOutputs
-from typing import Dict, Any
+from osparc_client import JobMetadata as _JobMetadata
+from .models import File
+from typing import Dict, Union, List
 from pydantic import BaseModel, StrictStr, Field
 
 
-def _values_dict(v: Dict[str, Any]) -> Dict[str, ValuesValue | None]:
-    result = {}
-    for k, v in v.items():
-        if v is not None:
-            result[k] = ValuesValue(v)
-        else:
-            result[k] = v
-    return result
-
-
-class JobInputs(_JobInputs):
-    def __init__(self, *args, **kwargs):
-        if len(args) == 1 and len(kwargs) == 0:
-            input = args[0]
-            assert isinstance(input, dict)
-            super().__init__(values=_values_dict(input))
-            return
-        if len(args) == 0 and len(kwargs) == 1:
-            values = kwargs.get("values")
-            if values is None:
-                raise RuntimeError("When passing a single kwarg it must be 'values'")
-            super().__init__(values=_values_dict(values))
-            return
-        else:
-            super().__init__(*args, **kwargs)
+class JobInputs(BaseModel):
+    values: Dict[str, Union[File, List[object], bool, float, int, str, None]] = Field(
+        kw_only=False
+    )
+
+    def __init__(
+        self, values: Dict[str, Union[File, List[object], bool, float, int, str, None]]
+    ):
+        super().__init__(values=values)
+
+
+assert set(_JobInputs.model_fields.keys()) == set(JobInputs.model_fields.keys())
 
 
 class JobOutputs(BaseModel):
     job_id: StrictStr = Field(description="Job that produced this output")
-    results: Dict[str, Any]
-
-    @classmethod
-    def from_osparc_client_job_outputs(cls, outputs: _JobOutputs) -> "JobOutputs":
-        _results = {}
-        for k, v in outputs.results.items():
-            if isinstance(v, ValuesValue):
-                _results[k] = v.actual_instance
-            else:
-                _results[k] = v
-
-        return cls(job_id=outputs.job_id, results=_results)
+    results: Dict[str, Union[File, List[object], bool, float, int, str, None]]
+
+
+assert set(_JobOutputs.model_fields.keys()) == set(JobOutputs.model_fields.keys())
+
+
+class JobMetadata(BaseModel):
+    job_id: StrictStr
+    metadata: Dict[str, Union[bool, float, int, str, None]]
+    url: str | None
+
+
+assert set(_JobMetadata.model_fields.keys()) == set(JobMetadata.model_fields.keys())

clients/python/test/test_osparc/test_solvers_api.py

@@ -1,6 +1,6 @@
 import pytest
 from pytest_mock import MockerFixture
-from osparc import JobMetadata, MetadataValue, ApiClient, SolversApi
+from osparc import JobMetadata, ApiClient, SolversApi
 from faker import Faker
 from urllib3 import HTTPResponse
 
@@ -11,9 +11,9 @@ def job_metadata(faker: Faker) -> JobMetadata:
     return JobMetadata(
         job_id=f"{_job_id}",
         metadata={
-            "job_id": MetadataValue(_job_id),
-            "job_name": MetadataValue(faker.text()),
-            "node_id": MetadataValue(faker.uuid4()),
+            "job_id": _job_id,
+            "job_name": faker.text(),
+            "node_id": faker.uuid4(),
         },
         url=faker.url(),
     )
@@ -34,7 +34,9 @@ def _get_job_sideeffect(
         json=None,
         **urlopen_kw,
     ) -> HTTPResponse:
-        response = HTTPResponse(status=200, body=job_metadata.to_json().encode())
+        response = HTTPResponse(
+            status=200, body=job_metadata.model_dump_json().encode()
+        )
         return response
 
     mocker.patch("urllib3.PoolManager.request", side_effect=_get_job_sideeffect)
@@ -43,4 +45,4 @@ def _get_job_sideeffect(
     metadata = _solvers_api.get_job_custom_metadata(
         solver_key="mysolver", version="1.2.3", job_id=f"{faker.uuid4()}"
     )
-    print(metadata)
+    assert metadata == job_metadata