continue mypy

Author: giancarloromeo

services/web/server/src/simcore_service_webserver/meta_modeling/_function_nodes.py

@@ -37,7 +37,7 @@ def create_param_node_from_iterator_with_outputs(iterator_node: Node) -> Node:
         label=iterator_node.label,
         inputs={},
         inputNodes=[],
-        thumbnail="",  # type: ignore[arg-type] # NOTE: hack due to issue in projects json-schema
+        thumbnail="",  # NOTE: hack due to issue in projects json-schema
         outputs=deepcopy(iterator_node.outputs),
     )
 

services/web/server/src/simcore_service_webserver/products/_events.py

@@ -90,7 +90,7 @@ async def load_products_on_startup(app: web.Application):
                 app_products[name] = Product(
                     **dict(row.items()),
                     is_payment_enabled=payments.enabled,
-                    credits_per_usd=payments.credits_per_usd,  # type: ignore[arg-type]
+                    credits_per_usd=payments.credits_per_usd,
                 )
 
                 assert name in FRONTEND_APPS_AVAILABLE  # nosec

services/web/server/src/simcore_service_webserver/products/_handlers.py

@@ -41,7 +41,7 @@ async def _get_current_product_price(request: web.Request):
 
     credit_price = GetCreditPrice(
         product_name=req_ctx.product_name,
-        usd_per_credit=price_info.usd_per_credit if price_info else None,  # type: ignore[arg-type]
+        usd_per_credit=price_info.usd_per_credit if price_info else None,
         min_payment_amount_usd=price_info.min_payment_amount_usd  # type: ignore[arg-type]
         if price_info
         else None,

services/web/server/src/simcore_service_webserver/projects/_projects_nodes_pricing_unit_handlers.py

@@ -6,12 +6,12 @@
 import logging
 
 from aiohttp import web
+from common_library.errors_classes import OsparcErrorMixin
 from models_library.api_schemas_webserver.resource_usage import PricingUnitGet
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, NodeIDStr
 from models_library.resource_tracker import PricingPlanId, PricingUnitId
 from pydantic import BaseModel, ConfigDict
-from pydantic.errors import PydanticErrorMixin
 from servicelib.aiohttp.requests_validation import parse_request_path_parameters_as
 from servicelib.aiohttp.typing_extension import Handler
 
@@ -29,7 +29,7 @@
 _logger = logging.getLogger(__name__)
 
 
-class PricingUnitError(PydanticErrorMixin, ValueError):
+class PricingUnitError(OsparcErrorMixin, ValueError):
     ...
 
 
@@ -132,7 +132,7 @@ async def connect_pricing_unit_to_project_node(request: web.Request):
         path_params.pricing_unit_id,
     )
     if rut_pricing_unit.pricing_unit_id != path_params.pricing_unit_id:
-        raise PricingUnitNotFoundError
+        raise PricingUnitNotFoundError()
 
     await db.connect_pricing_unit_to_project_node(
         path_params.project_id,

services/web/server/src/simcore_service_webserver/socketio/models.py

@@ -20,7 +20,7 @@ class WebSocketMessageBase(BaseModel):
 
     @classmethod
     def get_event_type(cls) -> str:
-        _event_type: str = cls.__fields__["event_type"].default
+        _event_type: str = cls.model_fields["event_type"].default
         return _event_type
 
     @abstractmethod

services/web/server/src/simcore_service_webserver/tags/schemas.py

@@ -1,9 +1,10 @@
 import re
 from datetime import datetime
+from typing import Annotated, TypeAlias
 
 from models_library.api_schemas_webserver._base import InputSchema, OutputSchema
 from models_library.users import GroupID, UserID
-from pydantic import ConstrainedStr, Field, PositiveInt
+from pydantic import Field, PositiveInt, StringConstraints
 from servicelib.aiohttp.requests_validation import RequestParams, StrictRequestParams
 from servicelib.request_keys import RQT_USERID_KEY
 from simcore_postgres_database.utils_tags import TagDict
@@ -17,8 +18,9 @@ class TagPathParams(StrictRequestParams):
     tag_id: PositiveInt
 
 
-class ColorStr(ConstrainedStr):
-    regex = re.compile(r"^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$")
+ColorStr: TypeAlias = Annotated[
+    str, StringConstraints(pattern=re.compile(r"^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$"))
+]
 
 
 class TagUpdate(InputSchema):