Merge remote-tracking branch 'upstream/master' into pr-osparc-new-lifespan-style-for-dynamic-scheduler

Author: Andrei Neagu

packages/models-library/src/models_library/api_schemas_directorv2/services.py

@@ -1,6 +1,7 @@
 from typing import Final
 
-from pydantic import BaseModel, ConfigDict, Field, field_validator
+from pydantic import BaseModel, ConfigDict, Field, JsonValue, field_validator
+from pydantic.config import JsonDict
 from pydantic.types import ByteSize, NonNegativeInt
 
 from ..service_settings_labels import ContainerSpec
@@ -63,36 +64,43 @@ class ServiceExtras(BaseModel):
     service_build_details: ServiceBuildDetails | None = None
     container_spec: ContainerSpec | None = None
 
+    @staticmethod
+    def _update_json_schema_extra(schema: JsonDict) -> None:
+
+        node_requirements_examples = NodeRequirements.model_json_schema()["examples"]
+
+        examples: list[JsonValue] = [
+            {"node_requirements": node_example}
+            for node_example in node_requirements_examples
+        ]
+        examples += [
+            {
+                "node_requirements": node_example,
+                "service_build_details": {
+                    "build_date": "2021-08-13T12:56:28Z",
+                    "vcs_ref": "8251ade",
+                    "vcs_url": "[email protected]:ITISFoundation/osparc-simcore.git",
+                },
+            }
+            for node_example in node_requirements_examples
+        ]
+        examples += [
+            {
+                "node_requirements": node_example,
+                "service_build_details": {
+                    "build_date": "2021-08-13T12:56:28Z",
+                    "vcs_ref": "8251ade",
+                    "vcs_url": "[email protected]:ITISFoundation/osparc-simcore.git",
+                },
+                "container_spec": {"Command": ["run", "subcommand"]},
+            }
+            for node_example in node_requirements_examples
+        ]
+
+        schema.update({"examples": examples})
+
     model_config = ConfigDict(
-        json_schema_extra={
-            "examples": [
-                {"node_requirements": node_example}
-                for node_example in NodeRequirements.model_json_schema()["examples"]
-            ]
-            + [
-                {
-                    "node_requirements": node_example,
-                    "service_build_details": {
-                        "build_date": "2021-08-13T12:56:28Z",
-                        "vcs_ref": "8251ade",
-                        "vcs_url": "[email protected]:ITISFoundation/osparc-simcore.git",
-                    },
-                }
-                for node_example in NodeRequirements.model_json_schema()["examples"]
-            ]
-            + [
-                {
-                    "node_requirements": node_example,
-                    "service_build_details": {
-                        "build_date": "2021-08-13T12:56:28Z",
-                        "vcs_ref": "8251ade",
-                        "vcs_url": "[email protected]:ITISFoundation/osparc-simcore.git",
-                    },
-                    "container_spec": {"Command": ["run", "subcommand"]},
-                }
-                for node_example in NodeRequirements.model_json_schema()["examples"]
-            ]
-        }
+        json_schema_extra=_update_json_schema_extra,
     )
 
 

packages/pytest-simcore/pyproject.toml

@@ -0,0 +1,9 @@
+[project]
+name = "pytest-simcore"
+version = "0.1.0"
+requires-python = ">=3.11"
+dependencies = [
+  "fastapi[standard]>=0.115.12",
+  "python-socketio>=5.12.1",
+  "uvicorn>=0.34.0",
+]

packages/pytest-simcore/src/pytest_simcore/helpers/logging_tools.py

@@ -20,9 +20,11 @@ def _timedelta_as_minute_second_ms(delta: datetime.timedelta) -> str:
         result += f"{int(seconds)}s "
 
     if int(milliseconds * 1000) != 0:
-        result += f"{int(milliseconds*1000)}ms"
+        result += f"{int(milliseconds * 1000)}ms"
+    if not result:
+        result = "<1ms"
 
-    sign = "-" if total_seconds < 0 else "<1ms"
+    sign = "-" if total_seconds < 0 else ""
 
     return f"{sign}{result.strip()}"