Merge branch 'master' into fix-e2e-test-tip-2

Author: matusdrobuliak66

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

@@ -67,9 +67,7 @@ class ServiceExtras(BaseModel):
         json_schema_extra={
             "examples": [
                 {"node_requirements": node_example}
-                for node_example in NodeRequirements.model_config["json_schema_extra"][
-                    "examples"
-                ]  # type: ignore[index,union-attr]
+                for node_example in NodeRequirements.model_json_schema()["examples"]
             ]
             + [
                 {
@@ -80,9 +78,7 @@ class ServiceExtras(BaseModel):
                         "vcs_url": "[email protected]:ITISFoundation/osparc-simcore.git",
                     },
                 }
-                for node_example in NodeRequirements.model_config["json_schema_extra"][
-                    "examples"
-                ]  # type: ignore[index,dict-item, union-attr]
+                for node_example in NodeRequirements.model_json_schema()["examples"]
             ]
             + [
                 {
@@ -94,9 +90,7 @@ class ServiceExtras(BaseModel):
                     },
                     "container_spec": {"Command": ["run", "subcommand"]},
                 }
-                for node_example in NodeRequirements.model_config["json_schema_extra"][
-                    "examples"
-                ]  # type: ignore[index,union-attr]
+                for node_example in NodeRequirements.model_json_schema()["examples"]
             ]
         }
     )

services/api-server/src/simcore_service_api_server/services_http/webserver.py

@@ -1,5 +1,6 @@
 # pylint: disable=too-many-public-methods
 
+import json
 import logging
 import urllib.parse
 from collections.abc import Mapping
@@ -185,14 +186,16 @@ async def _page_projects(
         limit: int,
         offset: int,
         show_hidden: bool,
-        search: str | None = None,
+        search_by_project_name: str | None = None,
     ) -> Page[ProjectGet]:
         assert 1 <= limit <= MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE  # nosec
         assert offset >= 0  # nosec
 
         optional: dict[str, Any] = {}
-        if search is not None:
-            optional["search"] = search
+        if search_by_project_name is not None:
+            filters_dict = {"search_by_project_name": search_by_project_name}
+            filters_json = json.dumps(filters_dict)
+            optional["filters"] = filters_json
 
         with service_exception_handler(
             service_name="Webserver",
@@ -353,9 +356,7 @@ async def get_projects_w_solver_page(
             limit=limit,
             offset=offset,
             show_hidden=True,
-            # WARNING: better way to match jobs with projects (Next PR if this works fine!)
-            # WARNING: search text has a limit that I needed to increase for the example!
-            search=solver_name,
+            search_by_project_name=solver_name,
         )
 
     async def get_projects_page(self, *, limit: int, offset: int):