⬆️ Upgrade openapi generator

clients/python/Makefile

@@ -116,8 +116,8 @@ _check_venv_active:
 
 .PHONY: install-dev
 install-dev: _check_venv_active .install-dev-reqs python-client  ## installs osparc_client and osparc in edit mode
-	uv pip install -e artifacts/client
-	uv pip install -e .
+	# for some reason this command refuses to run with uv. Looks related to https://github.com/astral-sh/uv/issues/1661
+	pip install -e artifacts/client -e .
 	uv pip list
 
 .PHONY: install-unit-test

clients/python/requirements/dev.txt

@@ -1,4 +1,3 @@
 -r ../../../requirements.txt
 -r unit-test.txt
--r e2e-test.txt
 pylint

clients/python/src/osparc/_api_client.py

@@ -3,9 +3,8 @@
 from typing import Optional
 
 from osparc_client.api_client import ApiClient as _ApiClient
-from osparc_client import Configuration
+from ._configuration import Configuration
 from pydantic import ValidationError
-
 from ._settings import ConfigurationEnvVars
 
 
@@ -16,7 +15,6 @@ def __init__(
         header_name=None,
         header_value=None,
         cookie=None,
-        pool_threads=1,
     ):
         if configuration is None:
             try:
@@ -36,4 +34,4 @@ def __init__(
                     "osparc.Configuration object explicitly"
                 ) from exc
 
-        super().__init__(configuration, header_name, header_value, cookie, pool_threads)
+        super().__init__(configuration, header_name, header_value, cookie)

clients/python/src/osparc/_api_files_api.py

@@ -9,10 +9,12 @@
 import string
 from pathlib import Path
 from typing import Any, Iterator, List, Optional, Tuple, Union
+from tempfile import NamedTemporaryFile
 
 import httpx
 from httpx import Response
 from osparc_client.api.files_api import FilesApi as _FilesApi
+from osparc_client import Filesize as _Filesize
 from tqdm.asyncio import tqdm
 from tqdm.contrib.logging import logging_redirect_tqdm
 
@@ -71,7 +73,10 @@ def download_file(
             raise RuntimeError(
                 f"destination_folder: {destination_folder} must be a directory"
             )
-        downloaded_file: Path = Path(super().download_file(file_id, **kwargs))
+        with NamedTemporaryFile(delete=False) as tmp_file:
+            downloaded_file = Path(tmp_file.name)
+        data = super().download_file(file_id, **kwargs)
+        downloaded_file.write_bytes(data)
         if destination_folder is not None:
             dest_file: Path = destination_folder / downloaded_file.name
             while dest_file.is_file():
@@ -115,7 +120,7 @@ async def upload_file_async(
                 return file_result
         client_file: ClientFile = ClientFile(
             filename=file.name,
-            filesize=file.stat().st_size,
+            filesize=_Filesize(file.stat().st_size),
             sha256_checksum=checksum,
         )
         client_upload_schema: ClientFileUploadData = super().get_upload_links(

clients/python/src/osparc/_api_solvers_api.py

@@ -4,7 +4,7 @@
 
 import httpx
 from osparc_client.api.solvers_api import SolversApi as _SolversApi
-from .models import JobInputs, OnePageSolverPort, SolverPort
+from .models import JobInputs, OnePageSolverPort, SolverPort, JobOutputs
 
 from ._api_client import ApiClient
 from ._settings import ParentProjectInfo
@@ -15,8 +15,9 @@
     dev_feature,
     dev_features_enabled,
 )
-
 import warnings
+from tempfile import NamedTemporaryFile
+from pathlib import Path
 
 
 class SolversApi(_SolversApi):
@@ -102,3 +103,16 @@ def create_job(
     ):
         kwargs = {**kwargs, **ParentProjectInfo().model_dump(exclude_none=True)}
         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)
+        with NamedTemporaryFile(delete=False) as tmp_file:
+            log_file = Path(tmp_file.name)
+            log_file.write_bytes(data)
+            return log_file
+
+    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

clients/python/src/osparc/_configuration.py

@@ -0,0 +1,45 @@
+from osparc_client import Configuration as _Configuration
+from typing import Set
+from urllib3 import Retry
+
+
+class Configuration(_Configuration):
+    def __init__(
+        self,
+        host="https://api.osparc.io",
+        api_key=None,
+        api_key_prefix=None,
+        username=None,
+        password=None,
+        *,
+        retry_max_count: int = 4,
+        retry_methods: Set[str] = {
+            "DELETE",
+            "GET",
+            "HEAD",
+            "OPTIONS",
+            "PUT",
+            "TRACE",
+            "POST",
+            "PATCH",
+            "CONNECT",
+        },
+        retry_status_codes: Set[int] = {429, 503, 504},
+        retry_backoff_factor=4.0,
+    ):
+        retries = Retry(
+            total=retry_max_count,
+            backoff_factor=retry_backoff_factor,
+            status_forcelist=retry_status_codes,
+            allowed_methods=retry_methods,
+            respect_retry_after_header=True,
+            raise_on_status=True,
+        )
+        super().__init__(
+            host=host,
+            api_key=api_key,
+            api_key_prefix=api_key_prefix,
+            username=username,
+            password=password,
+            retries=retries,
+        )

clients/python/src/osparc/_models.py

@@ -0,0 +1,48 @@
+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 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 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)

clients/python/src/osparc/api.py

@@ -4,7 +4,7 @@
 # NOTE: this is an interface. Keep it clean!
 
 
-from osparc_client.configuration import Configuration as Configuration
+from ._configuration import Configuration as Configuration
 from ._api_client import ApiClient as ApiClient
 
 

clients/python/src/osparc/models.py

@@ -12,9 +12,6 @@
 from osparc_client.models.body_complete_multipart_upload_v0_files_file_id_complete_post import (
     BodyCompleteMultipartUploadV0FilesFileIdCompletePost as BodyCompleteMultipartUploadV0FilesFileIdCompletePost,
 )
-from osparc_client.models.body_upload_file_v0_files_content_put import (
-    BodyUploadFileV0FilesContentPut as BodyUploadFileV0FilesContentPut,
-)
 from osparc_client.models.client_file import ClientFile as ClientFile
 from osparc_client.models.client_file_upload_data import (
     ClientFileUploadData as ClientFileUploadData,
@@ -31,13 +28,12 @@
     HTTPValidationError as HTTPValidationError,
 )
 from osparc_client.models.job import Job as Job
-from osparc_client.models.job_inputs import JobInputs as JobInputs
 from osparc_client.models.job_logs_map import JobLogsMap as JobLogsMap
 from osparc_client.models.job_metadata import JobMetadata as JobMetadata
 from osparc_client.models.job_metadata_update import (
     JobMetadataUpdate as JobMetadataUpdate,
 )
-from osparc_client.models.job_outputs import JobOutputs as JobOutputs
+from osparc_client.models.values_value import ValuesValue as ValuesValue
 from osparc_client.models.job_status import JobStatus as JobStatus
 from osparc_client.models.links import Links as Links
 from osparc_client.models.log_link import LogLink as LogLink
@@ -75,6 +71,8 @@
 )
 from osparc_client.models.wallet_status import WalletStatus as WalletStatus
 
+from ._models import JobInputs as JobInputs
+from ._models import JobOutputs as JobOutputs
 
 # renames
 TaskStates = _RunningState

clients/python/test/e2e/_utils.py

@@ -24,20 +24,6 @@ def repo_version() -> Version:
     return Version(version_file.read_text())
 
 
-def skip_if_no_dev_features(test):
-    if (
-        Version(osparc.__version__) < repo_version()
-        or not osparc_dev_features_enabled()
-    ):
-        return pytest.mark.skip(
-            (
-                f"{osparc.__version__=}<{str(repo_version)} "
-                f"or {osparc_dev_features_enabled()=}"
-            )
-        )(test)
-    return test
-
-
 def skip_if_osparc_version(
     *,
     at_least: Optional[Version] = None,

clients/python/test/e2e/conftest.py

@@ -96,7 +96,7 @@ def pytest_configure(config):
 
 @pytest.fixture
 def api_client() -> Iterable[osparc.ApiClient]:
-    if Version(osparc.__version__) >= Version("8.0.0"):
+    if Version(osparc.__version__) >= Version("0.8.0"):
         with osparc.ApiClient() as api_client:
             yield api_client
     else:

clients/python/test/e2e/test_files_api.py

@@ -9,7 +9,6 @@
 
 import osparc
 import pytest
-from _utils import skip_if_no_dev_features
 from conftest import _KB
 
 
@@ -25,7 +24,6 @@ def _hash_file(file: Path) -> str:
         return sha256.hexdigest()
 
 
-@skip_if_no_dev_features
 def test_upload_file(tmp_file: Path, api_client: osparc.ApiClient) -> None:
     """Test that we can upload a file via the multipart upload"""
     tmp_path: Path = tmp_file.parent
@@ -43,7 +41,6 @@ def test_upload_file(tmp_file: Path, api_client: osparc.ApiClient) -> None:
     files_api.delete_file(uploaded_file1.id)
 
 
-@skip_if_no_dev_features
 @pytest.mark.parametrize("use_checksum", [True, False])
 @pytest.mark.parametrize("use_id", [True, False])
 def test_search_files(

clients/python/test/e2e/test_solvers_api.py

@@ -7,14 +7,13 @@
 import json
 
 import osparc
-from _utils import skip_if_no_dev_features, skip_if_osparc_version
+from _utils import skip_if_osparc_version
 from httpx import AsyncClient
 from packaging.version import Version
 
 DEFAULT_TIMEOUT_SECONDS = 10 * 60  # 10 min
 
 
-@skip_if_no_dev_features
 def test_jobs(api_client: osparc.ApiClient, sleeper: osparc.Solver):
     """Test the jobs method
 

scripts/common.Makefile

@@ -14,8 +14,8 @@ APP_NAME      := $(notdir $(CURDIR))
 
 # Specify which openapi generator should be used to generate the clients in this repo
 # Build from modified fork https://github.com/ITISFoundation/openapi-generator/tree/openapi-generator-v4.2.3
-OPENAPI_GENERATOR_NAME  := itisfoundation/openapi-generator-cli-openapi-generator-v4.2.3
-OPENAPI_GENERATOR_TAG   := v0
+OPENAPI_GENERATOR_NAME  := openapitools/openapi-generator-cli
+OPENAPI_GENERATOR_TAG   := latest
 OPENAPI_GENERATOR_IMAGE := $(OPENAPI_GENERATOR_NAME):$(OPENAPI_GENERATOR_TAG)
 
 # openapi specification