Pylint fixes

Author: wvangeit

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

@@ -30,6 +30,8 @@
 from . import solvers_jobs, solvers_jobs_getters, studies_jobs
 
 # pylint: disable=too-many-arguments
+# pylint: disable=cyclic-import
+
 
 function_job_router = APIRouter()
 
@@ -96,23 +98,6 @@ async def delete_function_job(
     return await wb_api_rpc.delete_function_job(function_job_id=function_job_id)
 
 
-async def get_function_from_functionjobid(
-    wb_api_rpc: WbApiRpcClient,
-    function_job_id: FunctionJobID,
-) -> tuple[Function, FunctionJob]:
-    function_job = await get_function_job(
-        wb_api_rpc=wb_api_rpc, function_job_id=function_job_id
-    )
-    from .functions_routes import get_function
-
-    return (
-        await get_function(
-            wb_api_rpc=wb_api_rpc, function_id=function_job.function_uid
-        ),
-        function_job,
-    )
-
-
 @function_job_router.get(
     "/{function_job_id:uuid}/status",
     response_model=FunctionJobStatus,
@@ -125,6 +110,7 @@ async def function_job_status(
     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
     wb_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
 ) -> FunctionJobStatus:
+
     function, function_job = await get_function_from_functionjobid(
         wb_api_rpc=wb_api_rpc, function_job_id=function_job_id
     )
@@ -140,7 +126,8 @@ async def function_job_status(
             director2_api=director2_api,
         )
         return FunctionJobStatus(status=job_status.state)
-    elif (function.function_class == FunctionClass.solver) and (  # noqa: RET505
+
+    if (function.function_class == FunctionClass.solver) and (
         function_job.function_class == FunctionClass.solver
     ):
         job_status = await solvers_jobs.inspect_job(
@@ -151,11 +138,29 @@ async def function_job_status(
             director2_api=director2_api,
         )
         return FunctionJobStatus(status=job_status.state)
-    else:
-        raise UnsupportedFunctionFunctionJobClassCombinationError(
-            function_class=function.function_class,
-            function_job_class=function_job.function_class,
-        )
+
+    raise UnsupportedFunctionFunctionJobClassCombinationError(
+        function_class=function.function_class,
+        function_job_class=function_job.function_class,
+    )
+
+
+async def get_function_from_functionjobid(
+    wb_api_rpc: WbApiRpcClient,
+    function_job_id: FunctionJobID,
+) -> tuple[Function, FunctionJob]:
+    function_job = await get_function_job(
+        wb_api_rpc=wb_api_rpc, function_job_id=function_job_id
+    )
+
+    from .functions_routes import get_function
+
+    return (
+        await get_function(
+            wb_api_rpc=wb_api_rpc, function_id=function_job.function_uid
+        ),
+        function_job,
+    )
 
 
 @function_job_router.get(

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

@@ -13,9 +13,7 @@
     FunctionInputSchema,
     FunctionInputsList,
     FunctionInputsValidationError,
-    FunctionJob,
     FunctionJobCollection,
-    FunctionJobID,
     FunctionOutputSchema,
     FunctionSchemaClass,
     ProjectFunctionJob,
@@ -41,9 +39,10 @@
 from ..dependencies.webserver_http import get_webserver_session
 from ..dependencies.webserver_rpc import get_wb_api_rpc_client
 from . import solvers_jobs, studies_jobs
-from .function_jobs_routes import get_function_job, register_function_job
+from .function_jobs_routes import register_function_job
 
 # pylint: disable=too-many-arguments
+# pylint: disable=cyclic-import
 
 function_router = APIRouter()
 
@@ -289,7 +288,8 @@ async def run_function(  # noqa: PLR0913
                 project_job_id=study_job.id,
             ),
         )
-    elif to_run_function.function_class == FunctionClass.solver:  # noqa: RET505
+
+    if to_run_function.function_class == FunctionClass.solver:
         solver_job = await solvers_jobs.create_solver_job(
             solver_key=to_run_function.solver_key,
             version=to_run_function.solver_version,
@@ -320,10 +320,10 @@ async def run_function(  # noqa: PLR0913
                 solver_job_id=solver_job.id,
             ),
         )
-    else:
-        raise UnsupportedFunctionClassError(
-            function_class=to_run_function.function_class,
-        )
+
+    raise UnsupportedFunctionClassError(
+        function_class=to_run_function.function_class,
+    )
 
 
 @function_router.delete(
@@ -347,22 +347,6 @@ async def delete_function(
 }
 
 
-async def get_function_from_functionjobid(
-    wb_api_rpc: WbApiRpcClient,
-    function_job_id: FunctionJobID,
-) -> tuple[Function, FunctionJob]:
-    function_job = await get_function_job(
-        wb_api_rpc=wb_api_rpc, function_job_id=function_job_id
-    )
-
-    return (
-        await get_function(
-            wb_api_rpc=wb_api_rpc, function_id=function_job.function_uid
-        ),
-        function_job,
-    )
-
-
 @function_router.post(
     "/{function_id:uuid}:map",
     response_model=RegisteredFunctionJobCollection,

services/api-server/tests/unit/api_functions/conftest.py

@@ -3,6 +3,7 @@
 # pylint: disable=super-init-not-called
 # pylint: disable=unused-argument
 # pylint: disable=no-self-use
+# pylint: disable=cyclic-import
 
 from collections.abc import Callable
 from typing import Any
@@ -40,7 +41,7 @@ def app_environment(
     return setenvs_from_dict(
         monkeypatch,
         {
-            **app_environment,  # WARNING: AFTER env_devel_dict because HOST are set to 127.0.0.1 in here
+            **app_environment,
             "WEBSERVER_DEV_FEATURES_ENABLED": "1",
             "WEBSERVER_FUNCTIONS": "1",
         },