Merge branch 'master' into is7563/clean-export-data-tasks-once-really-consumed

Author: giancarloromeo

packages/models-library/src/models_library/api_schemas_catalog/services_ports.py

@@ -1,6 +1,7 @@
-from typing import Any, Literal
+from typing import Annotated, Any, Literal
 
 from pydantic import BaseModel, ConfigDict, Field
+from pydantic.config import JsonDict
 
 from ..basic_regex import PUBLIC_VARIABLE_NAME_RE
 from ..services import ServiceInput, ServiceOutput
@@ -10,42 +11,65 @@
     update_schema_doc,
 )
 
-PortKindStr = Literal["input", "output"]
-
 
 class ServicePortGet(BaseModel):
-    key: str = Field(
-        ...,
-        description="port identifier name",
-        pattern=PUBLIC_VARIABLE_NAME_RE,
-        title="Key name",
-    )
-    kind: PortKindStr
+    key: Annotated[
+        str,
+        Field(
+            description="Port identifier name",
+            pattern=PUBLIC_VARIABLE_NAME_RE,
+            title="Key name",
+        ),
+    ]
+    kind: Literal["input", "output"]
     content_media_type: str | None = None
-    content_schema: dict[str, Any] | None = Field(
-        None,
-        description="jsonschema for the port's value. SEE https://json-schema.org/understanding-json-schema/",
-    )
-    model_config = ConfigDict(
-        json_schema_extra={
-            "example": {
-                "key": "input_1",
-                "kind": "input",
-                "content_schema": {
-                    "title": "Sleep interval",
-                    "type": "integer",
-                    "x_unit": "second",
-                    "minimum": 0,
-                    "maximum": 5,
-                },
-            }
+    content_schema: Annotated[
+        dict[str, Any] | None,
+        Field(
+            description="jsonschema for the port's value. SEE https://json-schema.org/understanding-json-schema/",
+        ),
+    ] = None
+
+    @staticmethod
+    def _update_json_schema_extra(schema: JsonDict) -> None:
+        example_input: dict[str, Any] = {
+            "key": "input_1",
+            "kind": "input",
+            "content_schema": {
+                "title": "Sleep interval",
+                "type": "integer",
+                "x_unit": "second",
+                "minimum": 0,
+                "maximum": 5,
+            },
         }
+        schema.update(
+            {
+                "example": example_input,
+                "examples": [
+                    example_input,
+                    {
+                        "key": "output_1",
+                        "kind": "output",
+                        "content_media_type": "text/plain",
+                        "content_schema": {
+                            "type": "string",
+                            "title": "File containing one random integer",
+                            "description": "Integer is generated in range [1-9]",
+                        },
+                    },
+                ],
+            }
+        )
+
+    model_config = ConfigDict(
+        json_schema_extra=_update_json_schema_extra,
     )
 
     @classmethod
-    def from_service_io(
+    def from_domain_model(
         cls,
-        kind: PortKindStr,
+        kind: Literal["input", "output"],
         key: str,
         port: ServiceInput | ServiceOutput,
     ) -> "ServicePortGet":

packages/models-library/src/models_library/services_io.py

@@ -30,8 +30,6 @@ class BaseServiceIOModel(BaseModel):
     Base class for service input/outputs
     """
 
-    ## management
-
     ### human readable descriptors
     display_order: float | None = Field(
         None,

packages/models-library/tests/test_api_schemas_catalog.py

@@ -21,7 +21,7 @@ def test_service_port_with_file():
         }
     )
 
-    port = ServicePortGet.from_service_io("input", "input_1", io).model_dump(
+    port = ServicePortGet.from_domain_model("input", "input_1", io).model_dump(
         exclude_unset=True
     )
 
@@ -49,7 +49,7 @@ def test_service_port_with_boolean():
         }
     )
 
-    port = ServicePortGet.from_service_io("input", "input_1", io).model_dump(
+    port = ServicePortGet.from_domain_model("input", "input_1", io).model_dump(
         exclude_unset=True
     )
 

packages/postgres-database/src/simcore_postgres_database/utils_user_preferences.py

@@ -1,17 +1,16 @@
 from typing import Any
 
 import sqlalchemy as sa
-from aiopg.sa.connection import SAConnection
 from sqlalchemy.dialects.postgresql import insert as pg_insert
+from sqlalchemy.ext.asyncio import AsyncConnection
 
 from .models.user_preferences import (
     user_preferences_frontend,
     user_preferences_user_service,
 )
 
 
-class CouldNotCreateOrUpdateUserPreferenceError(Exception):
-    ...
+class CouldNotCreateOrUpdateUserPreferenceError(Exception): ...
 
 
 class BasePreferencesRepo:
@@ -20,7 +19,7 @@ class BasePreferencesRepo:
     @classmethod
     async def save(
         cls,
-        conn: SAConnection,
+        conn: AsyncConnection,
         *,
         user_id: int,
         product_name: str,
@@ -49,7 +48,7 @@ async def save(
     @classmethod
     async def load(
         cls,
-        conn: SAConnection,
+        conn: AsyncConnection,
         *,
         user_id: int,
         product_name: str,

packages/postgres-database/tests/conftest.py

@@ -38,6 +38,7 @@
     user_to_groups,
     users,
 )
+from sqlalchemy.engine.row import Row
 from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
 
 pytest_plugins = [
@@ -324,18 +325,26 @@ async def _creator(project_uuid: uuid.UUID) -> ProjectNode:
 
 
 @pytest.fixture
-def create_fake_product(
-    connection: aiopg.sa.connection.SAConnection,
-) -> Callable[..., Awaitable[RowProxy]]:
-    async def _creator(product_name: str) -> RowProxy:
-        result = await connection.execute(
-            sa.insert(products)
-            .values(name=product_name, host_regex=".*")
-            .returning(sa.literal_column("*"))
-        )
-        assert result
-        row = await result.first()
-        assert row
+async def create_fake_product(
+    asyncpg_engine: AsyncEngine,
+) -> AsyncIterator[Callable[[str], Awaitable[Row]]]:
+    created_product_names = set()
+
+    async def _creator(product_name: str) -> Row:
+        async with asyncpg_engine.begin() as connection:
+            result = await connection.execute(
+                sa.insert(products)
+                .values(name=product_name, host_regex=".*")
+                .returning(sa.literal_column("*"))
+            )
+            assert result
+            row = result.one()
+        created_product_names.add(row.name)
         return row
 
-    return _creator
+    yield _creator
+
+    async with asyncpg_engine.begin() as conn:
+        await conn.execute(
+            products.delete().where(products.c.name.in_(created_product_names))
+        )

packages/postgres-database/tests/test_utils_groups_extra_properties.py

@@ -21,6 +21,7 @@
     GroupExtraPropertiesRepo,
 )
 from sqlalchemy import literal_column
+from sqlalchemy.engine.row import Row
 from sqlalchemy.ext.asyncio import AsyncEngine
 
 
@@ -84,7 +85,7 @@ async def test_get(
     connection: aiopg.sa.connection.SAConnection,
     registered_user: RowProxy,
     product_name: str,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
 ):
     with pytest.raises(GroupExtraPropertiesNotFoundError):
@@ -106,7 +107,7 @@ async def test_get_v2(
     asyncpg_engine: AsyncEngine,
     registered_user: RowProxy,
     product_name: str,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
 ):
     with pytest.raises(GroupExtraPropertiesNotFoundError):
@@ -157,7 +158,7 @@ async def test_get_aggregated_properties_for_user_returns_properties_in_expected
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,
@@ -227,7 +228,7 @@ async def test_get_aggregated_properties_for_user_returns_properties_in_expected
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,
@@ -274,7 +275,7 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,
@@ -385,7 +386,7 @@ async def test_get_aggregated_properties_for_user_returns_property_values_as_tru
     connection: aiopg.sa.connection.SAConnection,
     product_name: str,
     registered_user: RowProxy,
-    create_fake_product: Callable[..., Awaitable[RowProxy]],
+    create_fake_product: Callable[[str], Awaitable[Row]],
     create_fake_group: Callable[..., Awaitable[RowProxy]],
     create_fake_group_extra_properties: Callable[..., Awaitable[GroupExtraProperties]],
     everyone_group_id: int,