fix types

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/api/routes/programs.py

@@ -23,8 +23,9 @@
 )
 from simcore_service_api_server.services_http.webserver import AuthSession
 
+from ...models.basic_types import VersionStr
 from ...models.schemas.jobs import Job, JobInputs
-from ...models.schemas.programs import Program, ProgramKeyId, VersionStr
+from ...models.schemas.programs import Program, ProgramKeyId
 from ...services_http.catalog import CatalogApi
 from ..dependencies.authentication import get_current_user_id, get_product_name
 from ..dependencies.services import get_api_client

services/api-server/src/simcore_service_api_server/models/schemas/jobs.py

@@ -37,6 +37,7 @@
     compose_resource_name,
     split_resource_name,
 )
+from ..basic_types import VersionStr
 from ..domain.files import File as DomainFile
 from ..domain.files import FileInProgramJobData
 from ..schemas.files import UserFile
@@ -48,7 +49,7 @@
 #  - Input/outputs are defined in service metadata
 #  - custom metadata
 #
-from .programs import Program, ProgramKeyId, VersionStr
+from .programs import Program, ProgramKeyId
 from .solvers import Solver
 
 JobID: TypeAlias = UUID

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

@@ -5,7 +5,7 @@
 from dataclasses import dataclass
 from functools import partial
 from operator import attrgetter
-from typing import Final, Literal, overload
+from typing import Final, Literal, cast
 
 from fastapi import FastAPI, status
 from models_library.emails import LowerCaseEmailStr
@@ -109,26 +109,6 @@ class CatalogApi(BaseServiceClientApi):
     SEE osparc-simcore/services/catalog/openapi.json
     """
 
-    @overload
-    async def _list_services(
-        self,
-        *,
-        user_id: int,
-        product_name: str,
-        predicate: Callable[[Solver], bool] | None = None,
-        type_filter: ServiceTypes,
-    ) -> list[Solver]: ...
-
-    @overload
-    async def _list_services(
-        self,
-        *,
-        user_id: int,
-        product_name: str,
-        predicate: Callable[[Program], bool] | None = None,
-        type_filter: ServiceTypes,
-    ) -> list[Program]: ...
-
     @_exception_mapper(
         http_status_map={status.HTTP_404_NOT_FOUND: ListSolversOrStudiesError}
     )
@@ -137,9 +117,9 @@ async def _list_services(
         *,
         user_id: int,
         product_name: str,
-        predicate: Callable[[Solver | Program], bool] | None = None,
+        predicate: Callable[[Solver], bool] | Callable[[Program], bool] | None = None,
         type_filter: ServiceTypes,
-    ) -> list[Solver | Program]:
+    ) -> list[Solver] | list[Program]:
 
         response = await self.client.get(
             "/services",
@@ -156,14 +136,14 @@ async def _list_services(
             TruncatedCatalogServiceOutListAdapter,
             response,
         )
-        solvers_or_programs = []
         if type_filter == "COMPUTATIONAL":
+            solvers: list[Solver] = []
             for service in services:
                 try:
                     if service.service_type == ServiceType.COMPUTATIONAL:
                         solver = service.to_solver()
-                        if predicate is None or predicate(solver):
-                            solvers_or_programs.append(solver)
+                        if predicate is None or predicate(solver):  # type: ignore
+                            solvers.append(solver)
                 except ValidationError as err:
                     # NOTE: For the moment, this is necessary because there are no guarantees
                     #       at the image registry. Therefore we exclude and warn
@@ -173,13 +153,15 @@ async def _list_services(
                         service.model_dump_json(),
                         err,
                     )
+            return solvers
         elif type_filter == "DYNAMIC":
+            programs: list[Program] = []
             for service in services:
                 try:
                     if service.service_type == ServiceType.DYNAMIC:
                         program = service.to_program()
-                        if predicate is None or predicate(program):
-                            solvers_or_programs.append(program)
+                        if predicate is None or predicate(program):  # type: ignore
+                            programs.append(program)
                 except ValidationError as err:
                     # NOTE: For the moment, this is necessary because there are no guarantees
                     #       at the image registry. Therefore we exclude and warn
@@ -189,11 +171,10 @@ async def _list_services(
                         service.model_dump_json(),
                         err,
                     )
+            return programs
         else:
             raise ValueError(f"Invalid {type_filter=}")
 
-        return solvers_or_programs
-
     async def list_solvers(
         self,
         *,
@@ -209,7 +190,7 @@ async def list_solvers(
             type_filter="COMPUTATIONAL",
         )
         assert all(isinstance(s, Solver) for s in solvers)  # nosec
-        return solvers
+        return cast(list[Solver], solvers)
 
     async def list_programs(
         self,
@@ -218,15 +199,14 @@ async def list_programs(
         product_name: str,
         predicate: Callable[[Program], bool] | None = None,
     ) -> list[Program]:
-
         programs = await self._list_services(
             user_id=user_id,
             product_name=product_name,
             predicate=predicate,
             type_filter="DYNAMIC",
         )
         assert all(isinstance(s, Program) for s in programs)  # nosec
-        return programs
+        return cast(list[Program], programs)
 
     async def get_solver(
         self, *, user_id: int, name: SolverKeyId, version: VersionStr, product_name: str