Some linting for 2024

Author: ml-evs

optimade/models/files.py

@@ -1,6 +1,6 @@
 # pylint: disable=no-self-argument,line-too-long,no-name-in-module
 from datetime import datetime
-from typing import Dict, Optional, Set, Tuple
+from typing import Optional
 
 from optimade.models.entries import EntryResource, EntryResourceAttributes
 from optimade.models.utils import OptimadeField, StrictField, SupportLevel
@@ -11,7 +11,7 @@
 )
 
 
-CORRELATED_FILE_FIELDS: Tuple[Set[str], ...]
+CORRELATED_FILE_FIELDS: tuple[set[str], ...]
 
 
 class FileResourceAttributes(EntryResourceAttributes):
@@ -142,7 +142,7 @@ class FileResourceAttributes(EntryResourceAttributes):
         queryable=SupportLevel.OPTIONAL,
     )
 
-    checksums: Optional[Dict[str, str]] = OptimadeField(
+    checksums: Optional[dict[str, str]] = OptimadeField(
         ...,
         description="""Dictionary providing checksums of file contents.
 * **Type**: dictionary with keys identifying checksum functions and values (strings) giving the actual checksums
@@ -217,7 +217,7 @@ class FileResource(EntryResource):
 
 - **Examples**:
     - `"structures"`""",
-        regex="^files$",
+        pattern="^files$",
         support=SupportLevel.MUST,
         queryable=SupportLevel.MUST,
     )

optimade/models/responses.py

@@ -141,13 +141,13 @@ class StructureResponseMany(EntryResponseMany):
 
 
 class FileResponseOne(EntryResponseOne):
-    data: Union[FileResource, Dict[str, Any], None] = StrictField(
+    data: Union[FileResource, dict[str, Any], None] = StrictField(
         ..., description="A single files entry resource."
     )
 
 
 class FileResponseMany(EntryResponseMany):
-    data: Union[List[FileResource], List[Dict[str, Any]]] = StrictField(
+    data: Union[list[FileResource], list[dict[str, Any]]] = StrictField(
         ...,
         description="List of unique OPTIMADE files entry resource objects.",
         uniqueItems=True,

optimade/server/config.py

@@ -218,22 +218,12 @@ class ServerConfig(BaseSettings):
     mongo_uri: Annotated[str, Field(description="URI for the Mongo server")] = (
         "localhost:27017"
     )
-
-    page_limit: int = Field(20, description="Default number of resources per page")
-    page_limit_max: int = Field(
-        500, description="Max allowed number of resources per page"
-    )
-    default_db: str = Field(
-        "test_server",
-        description=(
-            "ID of /links endpoint resource for the chosen default OPTIMADE implementation (only "
-            "relevant for the index meta-database)"
-        )
-    )
-    files_collection: str = Field(
-        "files",
-        description="Mongo collection name for /files endpoint resources",
-    )
+    files_collection: Annotated[
+        str,
+        Field(
+            description="Mongo collection name for /files endpoint resources",
+        ),
+    ] = "files"
     links_collection: Annotated[
         str, Field(description="Mongo collection name for /links endpoint resources")
     ] = "links"

optimade/server/mappers/files.py

@@ -5,5 +5,4 @@
 
 
 class FileMapper(BaseResourceMapper):
-
     ENTRY_RESOURCE_CLASS = FileResource