pylint

Author: Andrei Neagu

packages/models-library/src/models_library/projects.py

@@ -4,7 +4,7 @@
 
 from datetime import datetime
 from enum import Enum
-from typing import Any, Final, TypeAlias
+from typing import Annotated, Any, Final, TypeAlias
 from uuid import UUID
 
 from models_library.basic_types import ConstrainedStr
@@ -77,7 +77,7 @@ class BaseProjectModel(BaseModel):
     last_change_date: datetime = Field(...)
 
     # Pipeline of nodes (SEE projects_nodes.py)
-    workbench: NodesDict = Field(..., description="Project's pipeline")
+    workbench: Annotated[NodesDict, Field(..., description="Project's pipeline")]
 
     # validators
     _empty_thumbnail_is_none = field_validator("thumbnail", mode="before")(

packages/models-library/src/models_library/projects_state.py

@@ -3,6 +3,7 @@
 """
 
 from enum import Enum, unique
+from typing import Annotated
 
 from pydantic import (
     BaseModel,
@@ -126,7 +127,7 @@ class ProjectRunningState(BaseModel):
 
 
 class ProjectState(BaseModel):
-    locked: ProjectLocked = Field(..., description="The project lock state")
+    locked: Annotated[ProjectLocked, Field(..., description="The project lock state")]
     state: ProjectRunningState = Field(..., description="The project running state")
 
     model_config = ConfigDict(extra="forbid")

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

@@ -1,6 +1,6 @@
 import logging
 from functools import cached_property
-from typing import Any, Final
+from typing import Annotated, Any, Final
 
 from aiohttp import web
 from common_library.pydantic_fields_extension import is_nullable
@@ -114,11 +114,16 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     WEBSERVER_CREDIT_COMPUTATION_ENABLED: bool = Field(
         default=False, description="Enables credit computation features."
     )
-    WEBSERVER_LOGLEVEL: LogLevel = Field(
-        default=LogLevel.WARNING.value,
-        validation_alias=AliasChoices("WEBSERVER_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"),
-        # NOTE: suffix '_LOGLEVEL' is used overall
-    )
+    WEBSERVER_LOGLEVEL: Annotated[
+        LogLevel,
+        Field(
+            default=LogLevel.WARNING.value,
+            validation_alias=AliasChoices(
+                "WEBSERVER_LOGLEVEL", "LOG_LEVEL", "LOGLEVEL"
+            ),
+            # NOTE: suffix '_LOGLEVEL' is used overall
+        ),
+    ]
     WEBSERVER_LOG_FORMAT_LOCAL_DEV_ENABLED: bool = Field(
         default=False,
         validation_alias=AliasChoices(
@@ -187,9 +192,13 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
         description="invitations plugin",
     )
 
-    WEBSERVER_LOGIN: LoginSettings | None = Field(
-        json_schema_extra={"auto_default_from_env": True}, description="login plugin"
-    )
+    WEBSERVER_LOGIN: Annotated[
+        LoginSettings | None,
+        Field(
+            json_schema_extra={"auto_default_from_env": True},
+            description="login plugin",
+        ),
+    ]
 
     WEBSERVER_PAYMENTS: PaymentsSettings | None = Field(
         json_schema_extra={"auto_default_from_env": True},
@@ -221,9 +230,13 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
         description="scicrunch plugin",
         json_schema_extra={"auto_default_from_env": True},
     )
-    WEBSERVER_SESSION: SessionSettings = Field(
-        description="session plugin", json_schema_extra={"auto_default_from_env": True}
-    )
+    WEBSERVER_SESSION: Annotated[
+        SessionSettings,
+        Field(
+            description="session plugin",
+            json_schema_extra={"auto_default_from_env": True},
+        ),
+    ]
 
     WEBSERVER_STATICWEB: StaticWebserverModuleSettings | None = Field(
         description="static-webserver service plugin",

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

@@ -1,5 +1,5 @@
 from datetime import timedelta
-from typing import Final, Literal
+from typing import Annotated, Final, Literal
 
 from aiohttp import web
 from pydantic import BaseModel, ValidationInfo, field_validator
@@ -21,11 +21,14 @@
 
 
 class LoginSettings(BaseCustomSettings):
-    LOGIN_ACCOUNT_DELETION_RETENTION_DAYS: PositiveInt = Field(
-        default=30,
-        description="Retention time (in days) of all the data after a user has requested the deletion of their account"
-        "NOTE: exposed to the front-end as `to_client_statics`",
-    )
+    LOGIN_ACCOUNT_DELETION_RETENTION_DAYS: Annotated[
+        PositiveInt,
+        Field(
+            default=30,
+            description="Retention time (in days) of all the data after a user has requested the deletion of their account"
+            "NOTE: exposed to the front-end as `to_client_statics`",
+        ),
+    ]
 
     LOGIN_REGISTRATION_CONFIRMATION_REQUIRED: bool = Field(
         default=True,
@@ -44,10 +47,13 @@ class LoginSettings(BaseCustomSettings):
         default=120, description="Expiration time for code [sec]"
     )
 
-    LOGIN_2FA_REQUIRED: bool = Field(
-        default=False,
-        description="If true, it enables two-factor authentication (2FA)",
-    )
+    LOGIN_2FA_REQUIRED: Annotated[
+        bool,
+        Field(
+            default=False,
+            description="If true, it enables two-factor authentication (2FA)",
+        ),
+    ]
 
     LOGIN_PASSWORD_MIN_LENGTH: PositiveInt = Field(
         default=12,

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

@@ -50,7 +50,7 @@ class Product(BaseModel):
 
     name: ProductName = Field(pattern=PUBLIC_VARIABLE_NAME_RE, validate_default=True)
 
-    display_name: str = Field(..., description="Long display name")
+    display_name: Annotated[str, Field(..., description="Long display name")]
     short_name: str | None = Field(
         None,
         pattern=re.compile(TWILIO_ALPHANUMERIC_SENDER_ID_RE),
@@ -135,7 +135,8 @@ def _validate_name(cls, v):
         return v
 
     @field_serializer("issues", "vendor")
-    def _preserve_snake_case(self, v: Any) -> Any:
+    @staticmethod
+    def _preserve_snake_case(v: Any) -> Any:
         return v
 
     @property

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

@@ -4,7 +4,7 @@
 
 """
 
-from typing import Any
+from typing import Annotated, Any
 
 from models_library.basic_types import IDStr
 from models_library.folders import FolderID
@@ -181,11 +181,14 @@ class ProjectListFullSearchParams(PageQueryParameters):
         max_length=100,
         examples=["My Project"],
     )
-    tag_ids: str | None = Field(
-        default=None,
-        description="Search by tag ID (multiple tag IDs may be provided separated by column)",
-        examples=["1,3"],
-    )
+    tag_ids: Annotated[
+        str | None,
+        Field(
+            default=None,
+            description="Search by tag ID (multiple tag IDs may be provided separated by column)",
+            examples=["1,3"],
+        ),
+    ]
 
     _empty_is_none = field_validator("text", mode="before")(
         empty_str_to_none_pre_validator

services/web/server/src/simcore_service_webserver/scicrunch/_rest.py

@@ -15,7 +15,7 @@
 """
 
 import logging
-from typing import Any
+from typing import Annotated, Any
 
 from aiohttp import ClientSession
 from pydantic import BaseModel, Field, RootModel
@@ -41,7 +41,7 @@ class FieldItem(BaseModel):
 
 
 class ResourceView(BaseModel):
-    resource_fields: list[FieldItem] = Field([], alias="fields")
+    resource_fields: Annotated[list[FieldItem], Field([], alias="fields")]
     version: int
     curation_status: str
     last_curated_version: int
@@ -60,7 +60,8 @@ def _get_field(self, fieldname: str):
         for field in self.resource_fields:
             if field.field_name == fieldname:
                 return field.value
-        raise ValueError(f"Cannot file expected field {fieldname}")
+        msg = f"Cannot file expected field {fieldname}"
+        raise ValueError(msg)
 
     def get_name(self):
         return str(self._get_field("Resource Name"))

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

@@ -1,4 +1,4 @@
-from typing import Final
+from typing import Annotated, Final
 
 from aiohttp import web
 from pydantic import AliasChoices, PositiveInt, field_validator
@@ -17,15 +17,18 @@
 
 class SessionSettings(BaseCustomSettings, MixinSessionSettings):
 
-    SESSION_SECRET_KEY: SecretStr = Field(
-        ...,
-        description="Secret key to encrypt cookies. "
-        'TIP: python3 -c "from cryptography.fernet import *; print(Fernet.generate_key())"',
-        min_length=44,
-        validation_alias=AliasChoices(
-            "SESSION_SECRET_KEY", "WEBSERVER_SESSION_SECRET_KEY"
+    SESSION_SECRET_KEY: Annotated[
+        SecretStr,
+        Field(
+            ...,
+            description="Secret key to encrypt cookies. "
+            'TIP: python3 -c "from cryptography.fernet import *; print(Fernet.generate_key())"',
+            min_length=44,
+            validation_alias=AliasChoices(
+                "SESSION_SECRET_KEY", "WEBSERVER_SESSION_SECRET_KEY"
+            ),
         ),
-    )
+    ]
 
     SESSION_ACCESS_TOKENS_EXPIRATION_INTERVAL_SECS: int = Field(
         30 * _MINUTE,
@@ -37,10 +40,13 @@ class SessionSettings(BaseCustomSettings, MixinSessionSettings):
     # - Defaults taken from https://github.com/aio-libs/aiohttp-session/blob/master/aiohttp_session/cookie_storage.py#L20-L26
     #
 
-    SESSION_COOKIE_MAX_AGE: PositiveInt | None = Field(
-        default=None,
-        description="Max-Age attribute. Maximum age for session data, int seconds or None for “session cookie” which last until you close your browser.",
-    )
+    SESSION_COOKIE_MAX_AGE: Annotated[
+        PositiveInt | None,
+        Field(
+            default=None,
+            description="Max-Age attribute. Maximum age for session data, int seconds or None for “session cookie” which last until you close your browser.",
+        ),
+    ]
     SESSION_COOKIE_SAMESITE: str | None = Field(
         default=None,
         description="SameSite attribute lets servers specify whether/when cookies are sent with cross-site requests",
@@ -54,10 +60,8 @@ class SessionSettings(BaseCustomSettings, MixinSessionSettings):
         default=True,
         description="This prevents JavaScript from accessing the session cookie",
     )
-    
-    model_config = SettingsConfigDict(
-        extra="allow"
-    )
+
+    model_config = SettingsConfigDict(extra="allow")
 
     @field_validator("SESSION_SECRET_KEY")
     @classmethod

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

@@ -1,3 +1,5 @@
+from typing import Annotated
+
 from aiopg.sa.result import RowProxy
 from models_library.services import ServiceKey, ServiceVersion
 from pydantic import BaseModel, Field, HttpUrl, PositiveInt, TypeAdapter
@@ -7,7 +9,7 @@ class ServiceInfo(BaseModel):
     key: ServiceKey
     version: ServiceVersion
 
-    label: str = Field(..., description="Display name")
+    label: Annotated[str, Field(..., description="Display name")]
 
     thumbnail: HttpUrl = Field(
         default=TypeAdapter(HttpUrl).validate_python(

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

@@ -12,7 +12,7 @@
 import secrets
 import string
 from contextlib import suppress
-from datetime import UTC, datetime
+from datetime import datetime
 
 import redis.asyncio as aioredis
 from aiohttp import web