From f33d705c1fdedee91d091bada36fa4ee88678d5f Mon Sep 17 00:00:00 2001 From: c-bata Date: Tue, 23 Jul 2024 16:47:00 +0900 Subject: [PATCH] Update type annotations in artifact module --- optuna_dashboard/artifact/_backend.py | 10 +++++----- optuna_dashboard/artifact/boto3.py | 3 +-- optuna_dashboard/artifact/exceptions.py | 3 +++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/optuna_dashboard/artifact/_backend.py b/optuna_dashboard/artifact/_backend.py index 6ea659873..3be9f4c8c 100644 --- a/optuna_dashboard/artifact/_backend.py +++ b/optuna_dashboard/artifact/_backend.py @@ -74,7 +74,7 @@ def get_artifact_path( def register_artifact_route( - app: Bottle, storage: BaseStorage, artifact_store: Optional[ArtifactStore] + app: Bottle, storage: BaseStorage, artifact_store: ArtifactStore | None ) -> None: @app.get("/artifacts//") def proxy_study_artifact(study_id: int, artifact_id: str) -> HTTPResponse | bytes: @@ -243,8 +243,8 @@ def upload_artifact( trial: optuna.Trial, file_path: str, *, - mimetype: Optional[str] = None, - encoding: Optional[str] = None, + mimetype: str | None = None, + encoding: str | None = None, ) -> str: """Upload an artifact (files), which is associated with the trial. @@ -300,7 +300,7 @@ def _dashboard_artifact_prefix(trial_id: int) -> str: def get_study_artifact_meta( storage: BaseStorage, study_id: int, artifact_id: str -) -> Optional[ArtifactMeta]: +) -> ArtifactMeta | None: study_system_attrs = storage.get_study_system_attrs(study_id) attr_key = ARTIFACTS_ATTR_PREFIX + artifact_id artifact_meta = study_system_attrs.get(attr_key) @@ -311,7 +311,7 @@ def get_study_artifact_meta( def get_trial_artifact_meta( storage: BaseStorage, study_id: int, trial_id: int, artifact_id: str -) -> Optional[ArtifactMeta]: +) -> ArtifactMeta | None: # Search study_system_attrs due to backward compatibility. study_system_attrs = storage.get_study_system_attrs(study_id) attr_key = _dashboard_artifact_prefix(trial_id=trial_id) + artifact_id diff --git a/optuna_dashboard/artifact/boto3.py b/optuna_dashboard/artifact/boto3.py index 46edf165b..a0dafd3dd 100644 --- a/optuna_dashboard/artifact/boto3.py +++ b/optuna_dashboard/artifact/boto3.py @@ -12,7 +12,6 @@ if TYPE_CHECKING: from typing import BinaryIO - from typing import Optional from mypy_boto3_s3 import S3Client @@ -43,7 +42,7 @@ def objective(trial: optuna.Trial) -> float: """ def __init__( - self, bucket_name: str, client: Optional[S3Client] = None, *, avoid_buf_copy: bool = False + self, bucket_name: str, client: S3Client | None = None, *, avoid_buf_copy: bool = False ) -> None: self.bucket = bucket_name self.client = client or boto3.client("s3") diff --git a/optuna_dashboard/artifact/exceptions.py b/optuna_dashboard/artifact/exceptions.py index abc014df7..78913f26d 100644 --- a/optuna_dashboard/artifact/exceptions.py +++ b/optuna_dashboard/artifact/exceptions.py @@ -1,3 +1,6 @@ +from __future__ import annotations + + class ArtifactNotFound(Exception): """Exception raised when an artifact is not found.