udpates merge

Author: pcrespov

services/api-server/src/simcore_service_api_server/api/dependencies/_utils.py

@@ -1,15 +1,11 @@
 from typing import Any
 
+from common_library.exclude import as_dict_exclude_none
 from pydantic.fields import FieldInfo
 
 
-def _get_query_params(field: FieldInfo) -> dict[str, Any]:
-    params = {}
-
-    if field.description:
-        params["description"] = field.description
-    if field.examples:
-        params["example"] = next(
-            (example for example in field.examples if "*" in example), field.examples[0]
-        )
-    return params
+def get_query_params(field: FieldInfo) -> dict[str, Any]:
+    return as_dict_exclude_none(
+        description=field.description,
+        examples=field.examples or None,
+    )

services/api-server/src/simcore_service_api_server/api/dependencies/models_schemas_function_filters.py

@@ -3,15 +3,15 @@
 from fastapi import Query
 from models_library.functions import FunctionIDString, FunctionJobCollectionsListFilters
 
-from ._utils import _get_query_params
+from ._utils import get_query_params
 
 
 def get_function_job_collections_filters(
     # pylint: disable=unsubscriptable-object
     has_function_id: Annotated[
         FunctionIDString | None,
         Query(
-            **_get_query_params(
+            **get_query_params(
                 FunctionJobCollectionsListFilters.model_fields["has_function_id"]
             )
         ),

services/api-server/src/simcore_service_api_server/api/dependencies/models_schemas_solvers_filters.py

@@ -4,18 +4,18 @@
 from models_library.basic_types import SafeQueryStr
 
 from ...models.schemas.solvers_filters import SolversListFilters
-from ._utils import _get_query_params
+from ._utils import get_query_params
 
 
 def get_solvers_filters(
     # pylint: disable=unsubscriptable-object
     solver_id: Annotated[
         SafeQueryStr | None,
-        Query(**_get_query_params(SolversListFilters.model_fields["solver_id"])),
+        Query(**get_query_params(SolversListFilters.model_fields["solver_id"])),
     ] = None,
     version_display: Annotated[
         SafeQueryStr | None,
-        Query(**_get_query_params(SolversListFilters.model_fields["version_display"])),
+        Query(**get_query_params(SolversListFilters.model_fields["version_display"])),
     ] = None,
 ) -> SolversListFilters:
     return SolversListFilters(