continue mypy

Author: giancarloromeo

packages/models-library/src/models_library/api_schemas_payments/errors.py

@@ -1,7 +1,7 @@
-from pydantic.errors import PydanticErrorMixin
+from common_library.errors_classes import OsparcErrorMixin
 
 
-class _BaseRpcApiError(PydanticErrorMixin, ValueError):
+class _BaseRpcApiError(OsparcErrorMixin, ValueError):
     @classmethod
     def get_full_class_name(cls) -> str:
         # Can be used as unique code identifier

services/web/server/src/simcore_service_webserver/application_settings.py

@@ -91,13 +91,13 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     SIMCORE_VCS_RELEASE_TAG: str | None = Field(
         default=None,
         description="Name of the tag that marks this release, or None if undefined",
-        example="ResistanceIsFutile10",
+        examples=["ResistanceIsFutile10"],
     )
 
     SIMCORE_VCS_RELEASE_URL: AnyHttpUrl | None = Field(
         default=None,
         description="URL to release notes",
-        example="https://github.com/ITISFoundation/osparc-simcore/releases/tag/staging_ResistanceIsFutile10",
+        examples=["https://github.com/ITISFoundation/osparc-simcore/releases/tag/staging_ResistanceIsFutile10"],
     )
 
     SWARM_STACK_NAME: str | None = Field(

services/web/server/src/simcore_service_webserver/director_v2/_models.py

@@ -45,7 +45,7 @@ def set_default_thumbnail_if_empty(cls, v, values):
             "examples": [
                 {
                     "name": "My awesome cluster",
-                    "type": ClusterType.ON_PREMISE,  # can use also values from equivalent enum
+                    "type": ClusterType.ON_PREMISE, # type: ignore[dict-item] # can use also values from equivalent enum
                     "endpoint": "https://registry.osparc-development.fake.dev",
                     "authentication": {
                         "type": "simple",
@@ -56,7 +56,7 @@ def set_default_thumbnail_if_empty(cls, v, values):
                 {
                     "name": "My AWS cluster",
                     "description": "a AWS cluster administered by me",
-                    "type": ClusterType.AWS,
+                    "type": ClusterType.AWS,    # type: ignore[dict-item]
                     "owner": 154,
                     "endpoint": "https://registry.osparc-development.fake.dev",
                     "authentication": {
@@ -65,9 +65,9 @@ def set_default_thumbnail_if_empty(cls, v, values):
                         "password": "somepassword",
                     },
                     "access_rights": {
-                        154: CLUSTER_ADMIN_RIGHTS,
-                        12: CLUSTER_MANAGER_RIGHTS,
-                        7899: CLUSTER_USER_RIGHTS,
+                        154: CLUSTER_ADMIN_RIGHTS,  # type: ignore[dict-item]
+                        12: CLUSTER_MANAGER_RIGHTS, # type: ignore[dict-item]
+                        7899: CLUSTER_USER_RIGHTS,  # type: ignore[dict-item]
                     },
                 },
             ]

services/web/server/src/simcore_service_webserver/director_v2/settings.py

@@ -6,7 +6,7 @@
 
 from aiohttp import ClientSession, ClientTimeout, web
 from models_library.basic_types import VersionTag
-from pydantic import Field, PositiveInt
+from pydantic import AliasChoices, Field, PositiveInt
 from servicelib.aiohttp.application_keys import APP_CLIENT_SESSION_KEY
 from settings_library.base import BaseCustomSettings
 from settings_library.basic_types import PortInt
@@ -36,9 +36,9 @@ def base_url(self) -> URL:
     DIRECTOR_V2_RESTART_DYNAMIC_SERVICE_TIMEOUT: PositiveInt = Field(
         1 * _MINUTE,
         description="timeout of containers restart",
-        envs=[
+        validation_alias=AliasChoices(
             "DIRECTOR_V2_RESTART_DYNAMIC_SERVICE_TIMEOUT",
-        ],
+        ),
     )
 
     DIRECTOR_V2_STORAGE_SERVICE_UPLOAD_DOWNLOAD_TIMEOUT: PositiveInt = Field(
@@ -49,9 +49,9 @@ def base_url(self) -> URL:
             "such payloads it is required to have long timeouts which "
             "allow the service to finish the operation."
         ),
-        envs=[
+        validation_alias=AliasChoices(
             "DIRECTOR_V2_DYNAMIC_SERVICE_DATA_UPLOAD_DOWNLOAD_TIMEOUT",
-        ],
+        ),
     )
 
     def get_service_retrieve_timeout(self) -> ClientTimeout:

services/web/server/src/simcore_service_webserver/studies_dispatcher/_catalog.py

@@ -114,7 +114,7 @@ async def iter_latest_product_services(
                 version=row.version,
                 title=row.name,
                 description=row.description,
-                thumbnail=row.thumbnail or settings.STUDIES_DEFAULT_SERVICE_THUMBNAIL,
+                thumbnail=row.thumbnail or f"{settings.STUDIES_DEFAULT_SERVICE_THUMBNAIL}",
                 file_extensions=service_filetypes.get(row.key, []),
             )
 

services/web/server/src/simcore_service_webserver/wallets/_groups_api.py

@@ -77,7 +77,7 @@ async def list_wallet_groups_by_user_and_wallet(
     ] = await wallets_groups_db.list_wallet_groups(app=app, wallet_id=wallet_id)
 
     wallet_groups_api: list[WalletGroupGet] = [
-        TypeAdapter(WalletGroupGet, group) for group in wallet_groups_db
+        TypeAdapter(WalletGroupGet).validate_python(group) for group in wallet_groups_db
     ]
 
     return wallet_groups_api