Merge branch 'master' into bugfix-use-celery-task-manager-in-function-job-service

Author: bisgaard-itis

packages/aws-library/requirements/_base.txt

@@ -118,6 +118,10 @@ jmespath==1.0.1
     #   aiobotocore
     #   boto3
     #   botocore
+jsonref==1.1.0
+    # via
+    #   -r requirements/../../../packages/models-library/requirements/_base.in
+    #   -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
 jsonschema==4.23.0
     # via
     #   -r requirements/../../../packages/models-library/requirements/_base.in

packages/celery-library/requirements/_base.txt

@@ -109,6 +109,10 @@ idna==3.10
     #   yarl
 importlib-metadata==8.6.1
     # via opentelemetry-api
+jsonref==1.1.0
+    # via
+    #   -r requirements/../../../packages/models-library/requirements/_base.in
+    #   -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
 jsonschema==4.23.0
     # via
     #   -r requirements/../../../packages/models-library/requirements/_base.in

packages/dask-task-models-library/requirements/_base.txt

@@ -40,6 +40,8 @@ jinja2==3.1.6
     #   -c requirements/../../../packages/settings-library/requirements/../../../requirements/constraints.txt
     #   -c requirements/../../../requirements/constraints.txt
     #   distributed
+jsonref==1.1.0
+    # via -r requirements/../../../packages/models-library/requirements/_base.in
 jsonschema==4.23.0
     # via -r requirements/../../../packages/models-library/requirements/_base.in
 jsonschema-specifications==2025.4.1

packages/dask-task-models-library/src/dask_task_models_library/plugins/task_life_cycle_worker_plugin.py

@@ -34,6 +34,7 @@ def transition(
     ):
         _logger.info("Task '%s' transition from %s to %s", key, start, finish)
         assert self._worker  # nosec
+        assert isinstance(self._worker, Worker)  # nosec
         self._worker.log_event(
             TASK_LIFE_CYCLE_EVENT.format(key=key),
             TaskLifeCycleState.from_worker_task_state(

packages/models-library/requirements/_base.in

@@ -5,6 +5,7 @@
 --requirement ../../../packages/common-library/requirements/_base.in
 
 arrow
+jsonref
 jsonschema
 orjson
 pydantic-extra-types

packages/models-library/requirements/_base.txt

@@ -12,6 +12,8 @@ email-validator==2.2.0
     # via pydantic
 idna==3.10
     # via email-validator
+jsonref==1.1.0
+    # via -r requirements/_base.in
 jsonschema==4.23.0
     # via -r requirements/_base.in
 jsonschema-specifications==2024.10.1

packages/models-library/src/models_library/api_schemas_webserver/users.py

@@ -1,7 +1,7 @@
 import re
 from datetime import date, datetime
 from enum import Enum
-from typing import Annotated, Any, Literal, Self
+from typing import Annotated, Any, Literal, Self, TypeAlias
 
 import annotated_types
 from common_library.basic_types import DEFAULT_FACTORY
@@ -18,6 +18,7 @@
     StringConstraints,
     ValidationInfo,
     field_validator,
+    model_validator,
 )
 from pydantic.config import JsonDict
 
@@ -83,7 +84,14 @@ class MyProfileRestGet(OutputSchemaWithoutCamelCase):
     login: LowerCaseEmailStr
     phone: str | None = None
 
-    role: Literal["ANONYMOUS", "GUEST", "USER", "TESTER", "PRODUCT_OWNER", "ADMIN"]
+    role: Literal[
+        "ANONYMOUS",
+        "GUEST",
+        "USER",
+        "TESTER",
+        "PRODUCT_OWNER",
+        "ADMIN",
+    ]
     groups: MyGroupsGet | None = None
     gravatar_id: Annotated[str | None, Field(deprecated=True)] = None
 
@@ -306,15 +314,41 @@ class UserAccountReject(InputSchema):
     email: EmailStr
 
 
+GlobString: TypeAlias = Annotated[
+    str,
+    StringConstraints(
+        min_length=3, max_length=200, strip_whitespace=True, pattern=r"^[^%]*$"
+    ),
+]
+
+
 class UserAccountSearchQueryParams(RequestParameters):
     email: Annotated[
-        str,
+        GlobString | None,
         Field(
-            min_length=3,
-            max_length=200,
             description="complete or glob pattern for an email",
         ),
-    ]
+    ] = None
+    primary_group_id: Annotated[
+        GroupID | None,
+        Field(
+            description="Filter by primary group ID",
+        ),
+    ] = None
+    user_name: Annotated[
+        GlobString | None,
+        Field(
+            description="complete or glob pattern for a username",
+        ),
+    ] = None
+
+    @model_validator(mode="after")
+    def _validate_at_least_one_filter(self) -> Self:
+        field_names = list(self.__class__.model_fields)
+        if not any(getattr(self, field_name, None) for field_name in field_names):
+            msg = f"At least one filter {field_names} must be provided"
+            raise ValueError(msg)
+        return self
 
 
 class UserAccountGet(OutputSchema):
@@ -340,9 +374,9 @@ class UserAccountGet(OutputSchema):
     # pre-registration NOTE: that some users have no pre-registartion and therefore all options here can be none
     pre_registration_id: int | None
     pre_registration_created: datetime | None
-    invited_by: str | None = None
+    invited_by: UserNameID | None = None
     account_request_status: AccountRequestStatus | None
-    account_request_reviewed_by: UserID | None = None
+    account_request_reviewed_by: UserNameID | None = None
     account_request_reviewed_at: datetime | None = None
 
     # user status

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

@@ -1,5 +1,6 @@
 from typing import Literal, TypeAlias
 
+from models_library.utils.json_schema import GenerateResolvedJsonSchema
 from pydantic import BaseModel, ConfigDict
 from pydantic.config import JsonDict
 
@@ -99,17 +100,9 @@ def composed_message(self) -> str:
                 {
                     "actual_value": 0.3,
                     "total": 1.0,
-                    "message": {
-                        "description": "downloading",
-                        "current": 2.0,
-                        "total": 5,
-                        "sub": {
-                            "description": "port 2",
-                            "current": 12.2,
-                            "total": 123,
-                            "unit": "Byte",
-                        },
-                    },
+                    "message": ProgressStructuredMessage.model_json_schema(
+                        schema_generator=GenerateResolvedJsonSchema
+                    )["examples"][2],
                 },
             ]
         },

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

@@ -2,7 +2,6 @@
 from typing import Annotated, TypeAlias
 
 from common_library.users_enums import UserRole
-from models_library.basic_types import IDStr
 from pydantic import BaseModel, ConfigDict, Field, PositiveInt, StringConstraints
 from pydantic.config import JsonDict
 from typing_extensions import (  # https://docs.pydantic.dev/latest/api/standard_library_types/#typeddict
@@ -12,8 +11,9 @@
 from .emails import LowerCaseEmailStr
 
 UserID: TypeAlias = PositiveInt
-UserNameID: TypeAlias = IDStr
-
+UserNameID: TypeAlias = Annotated[
+    str, StringConstraints(strip_whitespace=True, min_length=1, max_length=100)
+]
 
 FirstNameStr: TypeAlias = Annotated[
     str, StringConstraints(strip_whitespace=True, max_length=255)

packages/models-library/src/models_library/utils/json_schema.py

@@ -5,6 +5,7 @@
 
 See how is used to validate input/output content-schemas of service models
 """
+
 # SEE possible enhancements in https://github.com/ITISFoundation/osparc-simcore/issues/3008
 
 
@@ -13,8 +14,11 @@
 from copy import deepcopy
 from typing import Any
 
+import jsonref  # type: ignore[import-untyped]
 import jsonschema
 from jsonschema import validators
+from pydantic.json_schema import GenerateJsonSchema, JsonSchemaMode, JsonSchemaValue
+from pydantic_core import CoreSchema
 
 # ERRORS
 
@@ -92,6 +96,19 @@ def any_ref_key(obj):
     return False
 
 
+class GenerateResolvedJsonSchema(GenerateJsonSchema):
+    """Generates a json-schema with all $ref resolved
+    Usage: pydantic_base_model.model_json_schema(schema_generator=GenerateResolvedJsonSchema) returns a json schema where it is guaranteed that all json references are resolved.
+    """
+
+    def generate(
+        self, schema: CoreSchema, mode: JsonSchemaMode = "validation"
+    ) -> JsonSchemaValue:
+        schema_value = super().generate(schema=schema, mode=mode)
+        schema_value = jsonref.replace_refs(schema_value, jsonschema=True)
+        return JsonSchemaValue(schema_value)
+
+
 __all__: tuple[str, ...] = (
     "any_ref_key",
     "InvalidJsonSchema",