[pre-commit.ci] pre-commit autoupdate (#1102)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: pre-commit-ci[bot]

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ exclude: |
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: "v0.11.4"
+    rev: "v0.13.3"
     hooks:
       - id: ruff
         exclude: "examples|tests/assets"
@@ -28,7 +28,7 @@ repos:
         exclude: "examples|tests/assets"
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: check-added-large-files
@@ -37,7 +37,7 @@ repos:
         exclude: ".python-version-default"
 
   - repo: https://github.com/biomejs/pre-commit
-    rev: "v2.0.0-beta.1"
+    rev: "v2.2.5"
     hooks:
     - id: biome-check
       additional_dependencies: ["@biomejs/biome@1.9.4"]

conda-store-server/conda_store_server/_internal/orm.py

@@ -10,7 +10,7 @@
 import shutil
 import sys
 from functools import partial
-from typing import List, Optional
+from typing import List
 
 from sqlalchemy import (
     JSON,
@@ -75,7 +75,7 @@ class Namespace(Base):
 
     deleted_on: Mapped[datetime.datetime] = mapped_column(DateTime, default=None)
 
-    metadata_: Mapped[Optional[dict]] = mapped_column(JSON, default=dict, nullable=True)
+    metadata_: Mapped[dict | None] = mapped_column(JSON, default=dict, nullable=True)
 
     role_mappings: Mapped[List["NamespaceRoleMapping"]] = relationship(
         "NamespaceRoleMapping", back_populates="namespace"

conda-store-server/conda_store_server/_internal/schema.py

@@ -7,7 +7,7 @@
 import os
 import re
 import sys
-from typing import Annotated, Any, Dict, List, Optional, Union
+from typing import Annotated, Any, Dict, List, Union
 
 from conda_lock.lockfile.v1.models import Lockfile
 from pydantic import (
@@ -38,7 +38,7 @@ class StorageBackend(enum.Enum):
 class CondaChannel(BaseModel):
     id: int
     name: str
-    last_update: Optional[datetime.datetime] = None
+    last_update: datetime.datetime | None = None
     model_config = ConfigDict(from_attributes=True)
 
 
@@ -52,10 +52,10 @@ class CondaPackageBuild(BaseModel):
 class CondaPackage(BaseModel):
     id: int
     channel: CondaChannel
-    license: Optional[str] = None
+    license: str | None = None
     name: str
     version: str
-    summary: Optional[str] = None
+    summary: str | None = None
     model_config = ConfigDict(from_attributes=True)
 
 
@@ -81,7 +81,7 @@ def from_list(cls, lst):
 class Namespace(BaseModel):
     id: int
     name: Annotated[str, StringConstraints(pattern=f"^[{ALLOWED_CHARACTERS}]+$")]  # noqa: F722
-    metadata_: Optional[Dict[str, Any]] = None
+    metadata_: Dict[str, Any] | None = None
     role_mappings: List[NamespaceRoleMapping] = []
     model_config = ConfigDict(from_attributes=True)
 
@@ -131,15 +131,15 @@ class BuildArtifact(BaseModel):
 class Build(BaseModel):
     id: int
     environment_id: int
-    specification: Optional[Specification] = None
-    packages: Optional[List[CondaPackage]] = None
+    specification: Specification | None = None
+    packages: List[CondaPackage] | None = None
     status: BuildStatus
-    status_info: Optional[str] = None
+    status_info: str | None = None
     size: int
     scheduled_on: datetime.datetime
-    started_on: Optional[datetime.datetime] = None
-    ended_on: Optional[datetime.datetime] = None
-    build_artifacts: Optional[List[BuildArtifact]] = None
+    started_on: datetime.datetime | None = None
+    ended_on: datetime.datetime | None = None
+    build_artifacts: List[BuildArtifact] | None = None
     model_config = ConfigDict(from_attributes=True, use_enum_values=True)
 
 
@@ -148,9 +148,9 @@ class Environment(BaseModel):
     namespace: Namespace
     name: str
     current_build_id: int
-    current_build: Optional[Build] = None
+    current_build: Build | None = None
 
-    description: Optional[str] = None
+    description: str | None = None
     model_config = ConfigDict(from_attributes=True)
 
 
@@ -167,19 +167,19 @@ class Settings(BaseModel):
         metadata={"global": True},
     )
 
-    default_uid: Optional[int] = Field(
+    default_uid: int | None = Field(
         None if sys.platform == "win32" else os.getuid(),
         description="default uid to assign to built environments",
         metadata={"global": True},
     )
 
-    default_gid: Optional[int] = Field(
+    default_gid: int | None = Field(
         None if sys.platform == "win32" else os.getgid(),
         description="default gid to assign to built environments",
         metadata={"global": True},
     )
 
-    default_permissions: Optional[str] = Field(
+    default_permissions: str | None = Field(
         None if sys.platform == "win32" else "775",
         description="default file permissions to assign to built environments",
         metadata={"global": True},
@@ -317,10 +317,10 @@ class CondaSpecificationPip(BaseModel):
 class CondaSpecification(BaseModel):
     channels: List[str] = []
     dependencies: List[CondaDep | CondaSpecificationPip] = []
-    description: Optional[str] = ""
+    description: str | None = ""
     name: Annotated[str, StringConstraints(pattern=f"^[{ALLOWED_CHARACTERS}]+$")]
-    prefix: Optional[str] = None
-    variables: Optional[Dict[str, Union[str, int]]] = None
+    prefix: str | None = None
+    variables: Dict[str, Union[str, int]] | None = None
     model_config = ConfigDict(from_attributes=True)
 
     @classmethod
@@ -362,7 +362,7 @@ def model_validate(cls, specification):
 
 class LockfileSpecification(BaseModel):
     name: Annotated[str, StringConstraints(pattern=f"^[{ALLOWED_CHARACTERS}]+$")]  # noqa: F722
-    description: Optional[str] = ""
+    description: str | None = ""
     lockfile: Lockfile
     model_config = ConfigDict(from_attributes=True)
 
@@ -441,8 +441,8 @@ class APIStatus(enum.Enum):
 
 class APIResponse(BaseModel):
     status: APIStatus
-    data: Optional[Any] = None
-    message: Optional[str] = None
+    data: Any | None = None
+    message: str | None = None
 
 
 class APIPaginatedResponse(APIResponse):
@@ -452,16 +452,16 @@ class APIPaginatedResponse(APIResponse):
 
 
 class APICursorPaginatedResponse(BaseModel):
-    data: Optional[Any] = None
+    data: Any | None = None
     status: APIStatus
-    message: Optional[str] = None
-    cursor: Optional[str] = None
+    message: str | None = None
+    cursor: str | None = None
     count: int  # the total number of results available to fetch
 
 
 class APIAckResponse(BaseModel):
     status: APIStatus
-    message: Optional[str] = None
+    message: str | None = None
 
 
 # GET /api/v1
@@ -479,7 +479,7 @@ class APIGetPermissionData(BaseModel):
     primary_namespace: str
     entity_permissions: Dict[str, List[str]]
     entity_roles: Dict[str, List[str]]
-    expiration: Optional[datetime.datetime] = None
+    expiration: datetime.datetime | None = None
 
 
 class APIGetPermission(APIResponse):

conda-store-server/conda_store_server/_internal/server/dependencies.py

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-from typing import Optional, TypedDict
+from typing import TypedDict
 
 from fastapi import Depends, Query, Request
 
@@ -65,8 +65,8 @@ class PaginatedArgs(TypedDict):
 
 def get_paginated_args(
     page: int = 1,
-    order: Optional[str] = None,
-    size: Optional[int] = None,
+    order: str | None = None,
+    size: int | None = None,
     sort_by: list[str] = Query([]),
     server=Depends(get_server),
 ) -> PaginatedArgs:

conda-store-server/conda_store_server/_internal/server/views/api.py

@@ -4,7 +4,7 @@
 
 import datetime
 from functools import wraps
-from typing import Any, Callable, Dict, List, Optional
+from typing import Any, Callable, Dict, List
 
 import pydantic
 import yaml
@@ -234,9 +234,9 @@ async def api_get_usage(
 )
 async def api_post_token(
     request: Request,
-    primary_namespace: Optional[str] = Body(None),
-    expiration: Optional[datetime.datetime] = Body(None),
-    role_bindings: Optional[Dict[str, List[str]]] = Body(None),
+    primary_namespace: str | None = Body(None),
+    expiration: datetime.datetime | None = Body(None),
+    role_bindings: Dict[str, List[str]] | None = Body(None),
     conda_store=Depends(dependencies.get_conda_store),
     auth=Depends(dependencies.get_auth),
     entity=Depends(dependencies.get_entity),
@@ -659,13 +659,13 @@ async def api_list_environments_v1(
     paginated_args: dependencies.PaginatedArgs = Depends(
         dependencies.get_paginated_args
     ),
-    artifact: Optional[schema.BuildArtifactType] = None,
-    jwt: Optional[str] = None,
-    name: Optional[str] = None,
-    namespace: Optional[str] = None,
-    packages: Optional[List[str]] = Query([]),
-    search: Optional[str] = None,
-    status: Optional[schema.BuildStatus] = None,
+    artifact: schema.BuildArtifactType | None = None,
+    jwt: str | None = None,
+    name: str | None = None,
+    namespace: str | None = None,
+    packages: List[str] | None = Query([]),
+    search: str | None = None,
+    status: schema.BuildStatus | None = None,
 ):
     """Retrieve a list of environments.
 
@@ -892,10 +892,10 @@ async def api_post_specification(
     auth=Depends(dependencies.get_auth),
     entity=Depends(dependencies.get_entity),
     specification: str = Body(""),
-    namespace: Optional[str] = Body(None),
-    is_lockfile: Optional[bool] = Body(False, embed=True),
-    environment_name: Optional[str] = Body("", embed=True),
-    environment_description: Optional[str] = Body("", embed=True),
+    namespace: str | None = Body(None),
+    is_lockfile: bool | None = Body(False, embed=True),
+    environment_name: str | None = Body("", embed=True),
+    environment_description: str | None = Body("", embed=True),
 ):
     with conda_store.get_db() as db:
         permissions = {Permissions.ENVIRONMENT_CREATE}
@@ -954,12 +954,12 @@ async def api_post_specification(
 
 @router_api.get("/build/", response_model=schema.APIListBuild)
 async def api_list_builds(
-    status: Optional[schema.BuildStatus] = None,
-    packages: Optional[List[str]] = Query([]),
-    artifact: Optional[schema.BuildArtifactType] = None,
-    environment_id: Optional[int] = None,
-    name: Optional[str] = None,
-    namespace: Optional[str] = None,
+    status: schema.BuildStatus | None = None,
+    packages: List[str] | None = Query([]),
+    artifact: schema.BuildArtifactType | None = None,
+    environment_id: int | None = None,
+    name: str | None = None,
+    namespace: str | None = None,
     conda_store=Depends(dependencies.get_conda_store),
     auth=Depends(dependencies.get_auth),
     entity=Depends(dependencies.get_entity),
@@ -1153,9 +1153,9 @@ async def api_delete_build(
 async def api_get_build_packages(
     build_id: int,
     request: Request,
-    search: Optional[str] = None,
-    exact: Optional[str] = None,
-    build: Optional[str] = None,
+    search: str | None = None,
+    exact: str | None = None,
+    build: str | None = None,
     auth=Depends(dependencies.get_auth),
     conda_store=Depends(dependencies.get_conda_store),
     paginated_args=Depends(dependencies.get_paginated_args),
@@ -1233,9 +1233,9 @@ async def api_list_channels(
     response_model=schema.APIListCondaPackage,
 )
 async def api_list_packages(
-    search: Optional[str] = None,
-    exact: Optional[str] = None,
-    build: Optional[str] = None,
+    search: str | None = None,
+    exact: str | None = None,
+    build: str | None = None,
     paginated_args=Depends(dependencies.get_paginated_args),
     conda_store=Depends(dependencies.get_conda_store),
     distinct_on: List[str] = Query([]),

conda-store-server/conda_store_server/_internal/server/views/api_v2.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List
 
 from fastapi import APIRouter, Depends, Query, Request
 
@@ -36,13 +36,13 @@ async def api_list_environments_v2(
         dependencies.get_cursor_paginated_args
     ),
     cursor: Cursor = Depends(dependencies.get_cursor),
-    artifact: Optional[schema.BuildArtifactType] = None,
-    jwt: Optional[str] = None,
-    name: Optional[str] = None,
-    namespace: Optional[str] = None,
-    packages: Optional[List[str]] = Query([]),
-    search: Optional[str] = None,
-    status: Optional[schema.BuildStatus] = None,
+    artifact: schema.BuildArtifactType | None = None,
+    jwt: str | None = None,
+    name: str | None = None,
+    namespace: str | None = None,
+    packages: List[str] | None = Query([]),
+    search: str | None = None,
+    status: schema.BuildStatus | None = None,
 ) -> schema.APIListEnvironment:
     """Retrieve a list of environments.
 

conda-store-server/conda_store_server/_internal/server/views/ui.py

@@ -2,7 +2,6 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-from typing import Optional
 
 import yaml
 from fastapi import APIRouter, Depends, Request
@@ -53,7 +52,7 @@ def sort_namespace(n):
 @router_ui.get("/")
 async def ui_list_environments(
     request: Request,
-    search: Optional[str] = None,
+    search: str | None = None,
     templates=Depends(dependencies.get_templates),
     conda_store=Depends(dependencies.get_conda_store),
     auth=Depends(dependencies.get_auth),

conda-store-server/conda_store_server/_internal/worker/build.py

@@ -78,18 +78,14 @@ def set_build_started(db: Session, build: orm.Build):
     db.commit()
 
 
-def set_build_failed(
-    db: Session, build: orm.Build, status_info: typing.Optional[str] = None
-):
+def set_build_failed(db: Session, build: orm.Build, status_info: str | None = None):
     build.status = schema.BuildStatus.FAILED
     build.status_info = status_info
     build.ended_on = datetime.datetime.utcnow()
     db.commit()
 
 
-def set_build_canceled(
-    db: Session, build: orm.Build, status_info: typing.Optional[str] = None
-):
+def set_build_canceled(db: Session, build: orm.Build, status_info: str | None = None):
     build.status = schema.BuildStatus.CANCELED
     build.status_info = status_info
     build.ended_on = datetime.datetime.utcnow()