Fix gh action tests

Author: wvangeit

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/functions/functions_rpc_interface.py

@@ -1,4 +1,5 @@
 import logging
+from typing import get_origin
 
 from models_library.api_schemas_webserver import (
     WEBSERVER_RPC_NAMESPACE,
@@ -37,7 +38,7 @@ async def register_function(
         TypeAdapter(RPCMethodName).validate_python("register_function"),
         function=function,
     )
-    assert isinstance(result, Function)  # nosec
+    assert isinstance(result, get_origin(Function) or Function)  # nosec
     return result
 
 
@@ -52,7 +53,7 @@ async def get_function(
         TypeAdapter(RPCMethodName).validate_python("get_function"),
         function_id=function_id,
     )
-    assert isinstance(result, Function)  # nosec
+    assert isinstance(result, get_origin(Function) or Function)  # nosec
     return result
 
 
@@ -117,8 +118,9 @@ async def list_functions(
         )
     )
     assert isinstance(result, tuple)
-    assert len(result) == 2  # nosec
     assert isinstance(result[0], list)  # nosec
+    assert isinstance(result[1], PageMetaInfoLimitOffset)  # nosec
+    return result
 
 
 @log_decorator(_logger, level=logging.DEBUG)
@@ -137,7 +139,6 @@ async def list_function_jobs(
         )
     )
     assert isinstance(result, tuple)
-    assert len(result) == 2  # nosec
     assert isinstance(result[0], list)  # nosec
     assert isinstance(result[1], PageMetaInfoLimitOffset)  # nosec
     return result
@@ -159,7 +160,6 @@ async def list_function_job_collections(
         )
     )
     assert isinstance(result, tuple)
-    assert len(result) == 2  # nosec
     assert isinstance(result[0], list)  # nosec
     assert isinstance(result[1], PageMetaInfoLimitOffset)  # nosec
     return result
@@ -178,7 +178,7 @@ async def run_function(
         function_id=function_id,
         inputs=inputs,
     )
-    assert isinstance(result, FunctionJob)  # nosec
+    assert isinstance(result, get_origin(FunctionJob) or FunctionJob)  # nosec
     return result
 
 
@@ -193,7 +193,7 @@ async def register_function_job(
         TypeAdapter(RPCMethodName).validate_python("register_function_job"),
         function_job=function_job,
     )
-    assert isinstance(result, FunctionJob)  # nosec
+    assert isinstance(result, get_origin(FunctionJob) or FunctionJob)  # nosec
     return result
 
 
@@ -208,7 +208,7 @@ async def get_function_job(
         TypeAdapter(RPCMethodName).validate_python("get_function_job"),
         function_job_id=function_job_id,
     )
-    assert isinstance(result, FunctionJob)  # nosec
+    assert isinstance(result, get_origin(FunctionJob) or FunctionJob)  # nosec
     return result
 
 
@@ -242,7 +242,7 @@ async def find_cached_function_job(
     )
     if result is None:
         return None
-    assert isinstance(result, FunctionJob)  # nosec
+    assert isinstance(result, get_origin(FunctionJob) or FunctionJob)  # nosec
     return result
 
 

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

@@ -201,10 +201,10 @@ async def validate_function_inputs(
 ):
     function = await wb_api_rpc.get_function(function_id=function_id)
 
-    if function.input_schema is None:
+    if function.input_schema is None or function.input_schema.schema_dict is None:
         return True, "No input schema defined for this function"
     try:
-        jsonschema.validate(instance=inputs, schema=function.input_schema.schema_dict)  # type: ignore
+        jsonschema.validate(instance=inputs, schema=function.input_schema.schema_dict)
     except ValidationError as err:
         return False, str(err)
     return True, "Inputs are valid"
@@ -421,7 +421,7 @@ async def function_job_status(
     ):
         job_status = await studies_jobs.inspect_study_job(
             study_id=function.project_id,
-            job_id=function_job.project_job_id,  # type: ignore
+            job_id=function_job.project_job_id,
             user_id=user_id,
             director2_api=director2_api,
         )
@@ -466,7 +466,7 @@ async def function_job_outputs(
     ):
         job_outputs = await studies_jobs.get_study_job_outputs(
             study_id=function.project_id,
-            job_id=function_job.project_job_id,  # type: ignore
+            job_id=function_job.project_job_id,
             user_id=user_id,
             webserver_api=webserver_api,
             storage_client=storage_client,
@@ -539,7 +539,11 @@ async def map_function(  # noqa: PLR0913
             uid=None,
             title="Function job collection of function map",
             description=function_job_collection_description,
-            job_ids=[function_job.uid for function_job in function_jobs],  # type: ignore
+            job_ids=[
+                function_job.uid
+                for function_job in function_jobs
+                if function_job.uid is not None
+            ],
         ),
     )