Maintenance: mypy on dynamic-scheduler (#6122)

Co-authored-by: Andrei Neagu <[email protected]>

Author: GitHK

.github/workflows/ci-testing-deploy.yml

@@ -1119,7 +1119,6 @@ jobs:
         run: ./ci/github/unit-testing/dynamic-scheduler.bash install
       - name: typecheck
         run: ./ci/github/unit-testing/dynamic-scheduler.bash typecheck
-        continue-on-error: true
       - name: test
         if: always()
         run: ./ci/github/unit-testing/dynamic-scheduler.bash test

services/dynamic-scheduler/setup.cfg

@@ -11,3 +11,7 @@ commit_args = --no-verify
 asyncio_mode = auto
 markers =
 	testit: "marks test to run during development"
+
+[mypy]
+plugins =
+	pydantic.mypy

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/api/rest/_dependencies.py

@@ -1,3 +1,4 @@
+# mypy: disable-error-code=truthy-function
 from fastapi import Request
 from servicelib.fastapi.dependencies import get_app, get_reverse_url_mapper
 from servicelib.rabbitmq import RabbitMQClient, RabbitMQRPCClient

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/api/rest/_meta.py

@@ -1,16 +1,13 @@
-import logging
 from collections.abc import Callable
 from typing import Annotated
 
 from fastapi import APIRouter, Depends
+from models_library.basic_types import VersionStr
 
 from ..._meta import API_VERSION, PROJECT_NAME
 from ...models.schemas.meta import Meta
 from ._dependencies import get_reverse_url_mapper
 
-_logger = logging.getLogger(__name__)
-
-
 router = APIRouter()
 
 
@@ -20,6 +17,6 @@ async def get_service_metadata(
 ):
     return Meta(
         name=PROJECT_NAME,
-        version=API_VERSION,
+        version=VersionStr(API_VERSION),
         docs_url=url_for("swagger_ui_html"),
     )

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/api/rpc/_services.py

@@ -23,15 +23,21 @@ async def get_service_status(
     app: FastAPI, *, node_id: NodeID
 ) -> NodeGet | DynamicServiceGet | NodeGetIdle:
     director_v2_client = DirectorV2Client.get_from_app_state(app)
-    return await director_v2_client.get_status(node_id)
+    response: NodeGet | DynamicServiceGet | NodeGetIdle = (
+        await director_v2_client.get_status(node_id)
+    )
+    return response
 
 
 @router.expose()
 async def run_dynamic_service(
     app: FastAPI, *, dynamic_service_start: DynamicServiceStart
 ) -> NodeGet | DynamicServiceGet:
     director_v2_client = DirectorV2Client.get_from_app_state(app)
-    return await director_v2_client.run_dynamic_service(dynamic_service_start)
+    response: NodeGet | DynamicServiceGet = (
+        await director_v2_client.run_dynamic_service(dynamic_service_start)
+    )
+    return response
 
 
 @router.expose(
@@ -45,9 +51,12 @@ async def stop_dynamic_service(
 ) -> NodeGet | DynamicServiceGet:
     director_v2_client = DirectorV2Client.get_from_app_state(app)
     settings: ApplicationSettings = app.state.settings
-    return await director_v2_client.stop_dynamic_service(
-        node_id=dynamic_service_stop.node_id,
-        simcore_user_agent=dynamic_service_stop.simcore_user_agent,
-        save_state=dynamic_service_stop.save_state,
-        timeout=settings.DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT,
+    response: NodeGet | DynamicServiceGet = (
+        await director_v2_client.stop_dynamic_service(
+            node_id=dynamic_service_stop.node_id,
+            simcore_user_agent=dynamic_service_stop.simcore_user_agent,
+            save_state=dynamic_service_stop.save_state,
+            timeout=settings.DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT,
+        )
     )
+    return response

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/core/settings.py

@@ -1,6 +1,5 @@
 import datetime
 from functools import cached_property
-from typing import cast
 
 from pydantic import Field, parse_obj_as, validator
 from settings_library.application import BaseApplicationSettings
@@ -51,8 +50,7 @@ def LOG_LEVEL(self):  # noqa: N802
     @validator("DYNAMIC_SCHEDULER__LOGLEVEL")
     @classmethod
     def valid_log_level(cls, value: str) -> str:
-        # NOTE: mypy is not happy without the cast
-        return cast(str, cls.validate_log_level(value))
+        return cls.validate_log_level(value)
 
 
 class ApplicationSettings(_BaseApplicationSettings):

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/director_v2/_public_client.py

@@ -48,7 +48,7 @@ async def get_status(
             return DynamicServiceGet.parse_obj(dict_response)
         except UnexpectedStatusError as e:
             if (
-                e.response.status_code  # pylint:disable=no-member # type: ignore
+                e.response.status_code  # type: ignore[attr-defined] # pylint:disable=no-member
                 == status.HTTP_404_NOT_FOUND
             ):
                 return NodeGetIdle.from_node_id(node_id)
@@ -83,14 +83,14 @@ async def stop_dynamic_service(
             )
         except UnexpectedStatusError as e:
             if (
-                e.response.status_code  # pylint:disable=no-member # type: ignore
+                e.response.status_code  # type: ignore[attr-defined] # pylint:disable=no-member
                 == status.HTTP_409_CONFLICT
             ):
                 raise ServiceWaitingForManualInterventionError(
                     node_id=node_id
                 ) from None
             if (
-                e.response.status_code  # pylint:disable=no-member # type: ignore
+                e.response.status_code  # type: ignore[attr-defined] # pylint:disable=no-member
                 == status.HTTP_404_NOT_FOUND
             ):
                 raise ServiceWasNotFoundError(node_id=node_id) from None

services/dynamic-scheduler/src/simcore_service_dynamic_scheduler/services/director_v2/_thin_client.py

@@ -1,4 +1,5 @@
 import datetime
+from typing import cast
 
 from fastapi import FastAPI, status
 from httpx import Response, Timeout
@@ -95,11 +96,14 @@ async def _(
         ) -> Response:
             headers = {X_SIMCORE_USER_AGENT: simcore_user_agent}
 
-            return await self.client.delete(
-                f"dynamic_services/{node_id}?can_save={f'{save_state}'.lower()}",
-                headers=headers,
-                timeout=timeout.total_seconds(),
-                follow_redirects=True,
+            return cast(
+                Response,
+                await self.client.delete(
+                    f"dynamic_services/{node_id}?can_save={f'{save_state}'.lower()}",
+                    headers=headers,
+                    timeout=timeout.total_seconds(),
+                    follow_redirects=True,
+                ),
             )
 
         return await _(self)