annofabcli 1.111.1__py3-none-any.whl → 1.112.0__py3-none-any.whl

annofabcli/common/bokeh.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import json
 import math
-from typing import Any, Optional
+from typing import Any
 
 from bokeh.models import LayoutDOM
 from bokeh.models.widgets.markups import PreText
@@ -15,16 +15,16 @@ def create_pretext_from_metadata(metadata: dict[str, Any]) -> PreText:
     return PreText(text=text)
 
 
-def convert_1d_figure_list_to_2d(figure_list: list[figure], *, ncols: int = 4) -> list[list[Optional[LayoutDOM]]]:
+def convert_1d_figure_list_to_2d(figure_list: list[figure], *, ncols: int = 4) -> list[list[LayoutDOM | None]]:
     """
     1次元のfigure_listを、grid layout用に2次元のfigureリストに変換する。
     """
-    row_list: list[list[Optional[LayoutDOM]]] = []
+    row_list: list[list[LayoutDOM | None]] = []
 
     for i in range(math.ceil(len(figure_list) / ncols)):
         start = i * ncols
         end = (i + 1) * ncols
-        row: list[Optional[LayoutDOM]] = []
+        row: list[LayoutDOM | None] = []
         row.extend(figure_list[start:end])
         if len(row) < ncols:
             row.extend([None] * (ncols - len(row)))

annofabcli/common/cli.py

@@ -9,7 +9,7 @@ import logging
 import os
 import pkgutil
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -81,12 +81,12 @@ def build_annofabapi_resource_and_login(args: argparse.Namespace) -> annofabapi.
 
 
 def add_parser(
-    subparsers: Optional[argparse._SubParsersAction],
+    subparsers: argparse._SubParsersAction | None,
     command_name: str,
     command_help: str,
-    description: Optional[str] = None,
+    description: str | None = None,
     is_subcommand: bool = True,  # noqa: FBT001, FBT002
-    epilog: Optional[str] = None,
+    epilog: str | None = None,
 ) -> argparse.ArgumentParser:
     """
     サブコマンド用にparserを追加する
@@ -159,7 +159,7 @@ def add_parser(
     return parser
 
 
-def get_list_from_args(str_list: Optional[list[str]] = None) -> list[str]:
+def get_list_from_args(str_list: list[str] | None = None) -> list[str]:
     """
     文字列のListのサイズが1で、プレフィックスが`file://`ならば、ファイルパスとしてファイルを読み込み、行をListとして返す。
     そうでなければ、引数の値をそのまま返す。
@@ -185,7 +185,7 @@ def get_list_from_args(str_list: Optional[list[str]] = None) -> list[str]:
         return str_list
 
 
-def get_json_from_args(target: Optional[str] = None) -> Any:  # noqa: ANN401
+def get_json_from_args(target: str | None = None) -> Any:  # noqa: ANN401
     """
     JSON形式をPythonオブジェクトに変換する。
     プレフィックスが`file://`ならば、ファイルパスとしてファイルを読み込み、Pythonオブジェクトを返す。
@@ -202,7 +202,7 @@ def get_json_from_args(target: Optional[str] = None) -> Any:  # noqa: ANN401
         return json.loads(target)
 
 
-def get_input_data_size(str_input_data_size: str) -> Optional[InputDataSize]:
+def get_input_data_size(str_input_data_size: str) -> InputDataSize | None:
     """400x300を(400,300)に変換する"""
     splitted_list = str_input_data_size.split("x")
     if len(splitted_list) < 2:
@@ -380,7 +380,7 @@ class ArgumentParser:
     def __init__(self, parser: argparse.ArgumentParser) -> None:
         self.parser = parser
 
-    def add_project_id(self, help_message: Optional[str] = None) -> None:
+    def add_project_id(self, help_message: str | None = None) -> None:
         """
         '--project_id` 引数を追加
         """
@@ -389,7 +389,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-p", "--project_id", type=str, required=True, help=help_message)
 
-    def add_task_id(self, *, required: bool = True, help_message: Optional[str] = None) -> None:
+    def add_task_id(self, *, required: bool = True, help_message: str | None = None) -> None:
         """
         '--task_id` 引数を追加
         """
@@ -398,7 +398,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-t", "--task_id", type=str, required=required, nargs="+", help=help_message)
 
-    def add_input_data_id(self, *, required: bool = True, help_message: Optional[str] = None) -> None:
+    def add_input_data_id(self, *, required: bool = True, help_message: str | None = None) -> None:
         """
         '--input_data_id` 引数を追加
         """
@@ -407,7 +407,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-i", "--input_data_id", type=str, required=required, nargs="+", help=help_message)
 
-    def add_format(self, choices: list[FormatArgument], default: FormatArgument, help_message: Optional[str] = None) -> None:
+    def add_format(self, choices: list[FormatArgument], default: FormatArgument, help_message: str | None = None) -> None:
         """
         '--format` 引数を追加
         """
@@ -416,7 +416,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-f", "--format", type=str, choices=[e.value for e in choices], default=default.value, help=help_message)
 
-    def add_output(self, *, required: bool = False, help_message: Optional[str] = None) -> None:
+    def add_output(self, *, required: bool = False, help_message: str | None = None) -> None:
         """
         '--output` 引数を追加
         """
@@ -425,7 +425,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-o", "--output", type=str, required=required, help=help_message)
 
-    def add_task_query(self, *, required: bool = False, help_message: Optional[str] = None) -> None:
+    def add_task_query(self, *, required: bool = False, help_message: str | None = None) -> None:
         if help_message is None:
             help_message = (
                 "タスクを絞り込むためのクエリ条件をJSON形式で指定します。"
@@ -476,10 +476,10 @@ class CommandLineWithoutWebapi:
     all_yes: bool = False
 
     #: 出力先
-    output: Optional[str] = None
+    output: str | None = None
 
     #: 出力フォーマット
-    str_format: Optional[str] = None
+    str_format: str | None = None
 
     def __init__(self, args: argparse.Namespace) -> None:
         self.args = args
@@ -575,8 +575,8 @@ class CommandLine(CommandLineWithoutWebapi):
     def validate_project(
         self,
         project_id: str,
-        project_member_roles: Optional[list[ProjectMemberRole]] = None,
-        organization_member_roles: Optional[list[OrganizationMemberRole]] = None,
+        project_member_roles: list[ProjectMemberRole] | None = None,
+        organization_member_roles: list[OrganizationMemberRole] | None = None,
     ) -> None:
         """
         プロジェクト or 組織に対して、必要な権限が付与されているかを確認する。

annofabcli/common/download.py

@@ -3,7 +3,6 @@ import datetime
 import logging.config
 from functools import partial
 from pathlib import Path
-from typing import Optional, Union
 
 import annofabapi
 import requests
@@ -23,7 +22,7 @@ DOWNLOADING_FILETYPE_DICT = {
 DEFAULT_WAIT_OPTIONS = WaitOptions(interval=60, max_tries=360)
 
 
-def _get_annofab_error_message(http_error: requests.HTTPError) -> Optional[str]:
+def _get_annofab_error_message(http_error: requests.HTTPError) -> str | None:
     obj = http_error.response.json()
     errors = obj.get("errors")
     if errors is None:
@@ -48,8 +47,8 @@ class DownloadingFile:
         self,
         project_id: str,
         job_type: ProjectJobType,
-        wait_options: Optional[WaitOptions] = None,
-        job_id: Optional[str] = None,
+        wait_options: WaitOptions | None = None,
+        job_id: str | None = None,
     ):
         if wait_options is None:
             wait_options = DEFAULT_WAIT_OPTIONS
@@ -69,9 +68,9 @@ class DownloadingFile:
     async def download_annotation_zip_with_async(
         self,
         project_id: str,
-        dest_path: Union[str, Path],
+        dest_path: str | Path,
         is_latest: bool = False,  # noqa: FBT001, FBT002
-        wait_options: Optional[WaitOptions] = None,
+        wait_options: WaitOptions | None = None,
     ) -> None:
         loop = asyncio.get_event_loop()
         partial_func = partial(self.download_annotation_zip, project_id, dest_path, is_latest, wait_options)
@@ -80,9 +79,9 @@ class DownloadingFile:
     def download_annotation_zip(
         self,
         project_id: str,
-        dest_path: Union[str, Path],
+        dest_path: str | Path,
         is_latest: bool = False,  # noqa: FBT001, FBT002
-        wait_options: Optional[WaitOptions] = None,
+        wait_options: WaitOptions | None = None,
         should_download_full_annotation: bool = False,  # noqa: FBT001, FBT002
     ) -> None:
         """アノテーションZIPをダウンロードします。"""
@@ -108,7 +107,7 @@ class DownloadingFile:
                 else:
                     raise e  # noqa: TRY201
 
-    def wait_until_updated_annotation_zip(self, project_id: str, wait_options: Optional[WaitOptions] = None) -> None:
+    def wait_until_updated_annotation_zip(self, project_id: str, wait_options: WaitOptions | None = None) -> None:
         job_id = None
         try:
             job = self.service.api.post_annotation_archive_update(project_id)[0]["job"]
@@ -125,9 +124,9 @@ class DownloadingFile:
     async def download_input_data_json_with_async(
         self,
         project_id: str,
-        dest_path: Union[str, Path],
+        dest_path: str | Path,
         is_latest: bool = False,  # noqa: FBT001, FBT002
-        wait_options: Optional[WaitOptions] = None,
+        wait_options: WaitOptions | None = None,
     ) -> None:
         loop = asyncio.get_event_loop()
         partial_func = partial(self.download_input_data_json, project_id, dest_path, is_latest, wait_options)
@@ -136,9 +135,9 @@ class DownloadingFile:
     def download_input_data_json(
         self,
         project_id: str,
-        dest_path: Union[str, Path],
+        dest_path: str | Path,
         is_latest: bool = False,  # noqa: FBT001, FBT002
-        wait_options: Optional[WaitOptions] = None,
+        wait_options: WaitOptions | None = None,
     ) -> None:
         if is_latest:
             self.wait_until_updated_input_data_json(project_id, wait_options)
@@ -155,7 +154,7 @@ class DownloadingFile:
                 else:
                     raise e  # noqa: TRY201
 
-    def wait_until_updated_input_data_json(self, project_id: str, wait_options: Optional[WaitOptions] = None) -> None:
+    def wait_until_updated_input_data_json(self, project_id: str, wait_options: WaitOptions | None = None) -> None:
         job_id = None
         try:
             job = self.service.api.post_project_inputs_update(project_id)[0]["job"]
@@ -172,15 +171,15 @@ class DownloadingFile:
     async def download_task_json_with_async(
         self,
         project_id: str,
-        dest_path: Union[str, Path],
+        dest_path: str | Path,
         is_latest: bool = False,  # noqa: FBT001, FBT002
-        wait_options: Optional[WaitOptions] = None,
+        wait_options: WaitOptions | None = None,
     ) -> None:
         loop = asyncio.get_event_loop()
         partial_func = partial(self.download_task_json, project_id, dest_path, is_latest=is_latest, wait_options=wait_options)
         await loop.run_in_executor(None, partial_func)
 
-    def download_task_json(self, project_id: str, dest_path: Union[str, Path], *, is_latest: bool = False, wait_options: Optional[WaitOptions] = None) -> None:
+    def download_task_json(self, project_id: str, dest_path: str | Path, *, is_latest: bool = False, wait_options: WaitOptions | None = None) -> None:
         if is_latest:
             self.wait_until_updated_task_json(project_id, wait_options)
             self.service.wrapper.download_project_tasks_url(project_id, dest_path)
@@ -196,7 +195,7 @@ class DownloadingFile:
                 else:
                     raise e  # noqa: TRY201
 
-    def wait_until_updated_task_json(self, project_id: str, wait_options: Optional[WaitOptions] = None) -> None:
+    def wait_until_updated_task_json(self, project_id: str, wait_options: WaitOptions | None = None) -> None:
         job_id = None
         try:
             job = self.service.api.post_project_tasks_update(project_id)[0]["job"]
@@ -210,7 +209,7 @@ class DownloadingFile:
 
         self._wait_for_completion(project_id, job_type=ProjectJobType.GEN_TASKS_LIST, wait_options=wait_options, job_id=job_id)
 
-    async def download_task_history_json_with_async(self, project_id: str, dest_path: Union[str, Path]) -> None:
+    async def download_task_history_json_with_async(self, project_id: str, dest_path: str | Path) -> None:
         """
         非同期でタスク履歴全件ファイルをダウンロードする。
 
@@ -219,7 +218,7 @@ class DownloadingFile:
         """
         return self.download_task_history_json(project_id, dest_path=dest_path)
 
-    def download_task_history_json(self, project_id: str, dest_path: Union[str, Path]) -> None:
+    def download_task_history_json(self, project_id: str, dest_path: str | Path) -> None:
         """
         タスク履歴全件ファイルをダウンロードする。
 
@@ -237,7 +236,7 @@ class DownloadingFile:
                 raise DownloadingFileNotFoundError(f"project_id='{project_id}'のプロジェクトに、タスク履歴全件ファイルが存在しないため、ダウンロードできませんでした。") from e
             raise e  # noqa: TRY201
 
-    def download_task_history_event_json(self, project_id: str, dest_path: Union[str, Path]) -> None:
+    def download_task_history_event_json(self, project_id: str, dest_path: str | Path) -> None:
         """
         タスク履歴イベント全件ファイルをダウンロードする。
 
@@ -255,7 +254,7 @@ class DownloadingFile:
                 raise DownloadingFileNotFoundError(f"project_id='{project_id}'のプロジェクトに、タスク履歴イベント全件ファイルが存在しないため、ダウンロードできませんでした。") from e
             raise e  # noqa: TRY201
 
-    async def download_task_history_event_json_with_async(self, project_id: str, dest_path: Union[str, Path]) -> None:
+    async def download_task_history_event_json_with_async(self, project_id: str, dest_path: str | Path) -> None:
         """
         非同期でタスク履歴全件ファイルをダウンロードする。
 
@@ -265,7 +264,7 @@ class DownloadingFile:
         """
         return self.download_task_history_event_json(project_id, dest_path=dest_path)
 
-    async def download_inspection_json_with_async(self, project_id: str, dest_path: Union[str, Path]) -> None:
+    async def download_inspection_json_with_async(self, project_id: str, dest_path: str | Path) -> None:
         """
         非同期で検査コメント全件ファイルをダウンロードする。
 
@@ -275,7 +274,7 @@ class DownloadingFile:
 
         return self.download_inspection_comment_json(project_id, dest_path=dest_path)
 
-    def download_inspection_comment_json(self, project_id: str, dest_path: Union[str, Path]) -> None:
+    def download_inspection_comment_json(self, project_id: str, dest_path: str | Path) -> None:
         """
         検査コメント全件ファイルをダウンロードする。
 
@@ -290,7 +289,7 @@ class DownloadingFile:
                 raise DownloadingFileNotFoundError(f"project_id='{project_id}'のプロジェクトに、検査コメント全件ファイルが存在しないため、ダウンロードできませんでした。") from e
             raise e  # noqa: TRY201
 
-    async def download_comment_json_with_async(self, project_id: str, dest_path: Union[str, Path]) -> None:
+    async def download_comment_json_with_async(self, project_id: str, dest_path: str | Path) -> None:
         """
         非同期でコメント全件ファイルをダウンロードする。
 
@@ -300,7 +299,7 @@ class DownloadingFile:
 
         return self.download_comment_json(project_id, dest_path=dest_path)
 
-    def download_comment_json(self, project_id: str, dest_path: Union[str, Path]) -> None:
+    def download_comment_json(self, project_id: str, dest_path: str | Path) -> None:
         """
         コメント全件ファイルをダウンロードする。
 
@@ -322,7 +321,7 @@ class DownloadingFile:
         output_dir: Path,
         *,
         is_latest: bool = False,
-        wait_options: Optional[WaitOptions] = None,
+        wait_options: WaitOptions | None = None,
     ) -> Path:
         """
         アノテーションZIPをoutput_dirに統一された命名規則でダウンロードする。
@@ -352,7 +351,7 @@ class DownloadingFile:
         output_dir: Path,
         *,
         is_latest: bool = False,
-        wait_options: Optional[WaitOptions] = None,
+        wait_options: WaitOptions | None = None,
     ) -> Path:
         """
         タスクJSONをoutput_dirに統一された命名規則でダウンロードする。
@@ -382,7 +381,7 @@ class DownloadingFile:
         output_dir: Path,
         *,
         is_latest: bool = False,
-        wait_options: Optional[WaitOptions] = None,
+        wait_options: WaitOptions | None = None,
     ) -> Path:
         """
         入力データJSONをoutput_dirに統一された命名規則でダウンロードする。

annofabcli/common/facade.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
 
 import logging
-from collections.abc import Collection
+from collections.abc import Callable, Collection
 from dataclasses import dataclass
-from typing import Any, Callable, Optional
+from typing import Any
 
 import annofabapi
-import annofabapi.utils
 import more_itertools
 from annofabapi.dataclass.annotation import AdditionalDataV1
 from annofabapi.dataclass.input import InputData
@@ -33,27 +32,27 @@ class AnnotationQuery(DataClassJsonMixin):
     """
 
     label_id: str
-    attributes: Optional[list[AdditionalDataV1]] = None
+    attributes: list[AdditionalDataV1] | None = None
 
 
 @dataclass
 class AdditionalDataForCli(DataClassJsonMixin):
-    additional_data_definition_id: Optional[str] = None
+    additional_data_definition_id: str | None = None
     """属性ID"""
 
-    additional_data_definition_name_en: Optional[str] = None
+    additional_data_definition_name_en: str | None = None
     """属性の英語名"""
 
-    flag: Optional[bool] = None
+    flag: bool | None = None
 
-    integer: Optional[int] = None
+    integer: int | None = None
 
-    comment: Optional[str] = None
+    comment: str | None = None
 
-    choice: Optional[str] = None
+    choice: str | None = None
     """選択肢ID"""
 
-    choice_name_en: Optional[str] = None
+    choice_name_en: str | None = None
     """選択肢の英語名"""
 
 
@@ -63,10 +62,10 @@ class AnnotationQueryForCli(DataClassJsonMixin):
     コマンドライン上で指定するアノテーション検索条件
     """
 
-    label_name_en: Optional[str] = None
+    label_name_en: str | None = None
     """ラベルの英語名"""
-    label_id: Optional[str] = None
-    attributes: Optional[list[AdditionalDataForCli]] = None
+    label_id: str | None = None
+    attributes: list[AdditionalDataForCli] | None = None
 
 
 @dataclass
@@ -75,12 +74,12 @@ class TaskQuery(DataClassJsonMixin):
     コマンドライン上で指定するタスクの検索条件
     """
 
-    task_id: Optional[str] = None
-    phase: Optional[TaskPhase] = None
-    status: Optional[TaskStatus] = None
-    phase_stage: Optional[int] = None
-    user_id: Optional[str] = None
-    account_id: Optional[str] = None
+    task_id: str | None = None
+    phase: TaskPhase | None = None
+    status: TaskStatus | None = None
+    phase_stage: int | None = None
+    user_id: str | None = None
+    account_id: str | None = None
     no_user: bool = False
     """Trueなら未割り当てのタスクで絞り込む"""
 
@@ -91,12 +90,12 @@ class InputDataQuery(DataClassJsonMixin):
     コマンドライン上で指定する入力データの検索条件
     """
 
-    input_data_id: Optional[str] = None
-    input_data_name: Optional[str] = None
-    input_data_path: Optional[str] = None
+    input_data_id: str | None = None
+    input_data_name: str | None = None
+    input_data_path: str | None = None
 
 
-def match_annotation_with_task_query(annotation: dict[str, Any], task_query: Optional[TaskQuery]) -> bool:
+def match_annotation_with_task_query(annotation: dict[str, Any], task_query: TaskQuery | None) -> bool:
     """
     Simple Annotationが、タスククエリ条件に合致するか
 
@@ -130,7 +129,7 @@ def match_annotation_with_task_query(annotation: dict[str, Any], task_query: Opt
 
 
 def match_task_with_query(  # pylint: disable=too-many-return-statements  # noqa: PLR0911
-    task: Task, task_query: Optional[TaskQuery]
+    task: Task, task_query: TaskQuery | None
 ) -> bool:
     """
     タスク情報が、タスククエリ条件に合致するかどうか。
@@ -175,7 +174,7 @@ def match_task_with_query(  # pylint: disable=too-many-return-statements  # noqa
 
 
 def match_input_data_with_query(  # pylint: disable=too-many-return-statements
-    input_data: InputData, input_data_query: Optional[InputDataQuery]
+    input_data: InputData, input_data_query: InputDataQuery | None
 ) -> bool:
     """
     入力データが、クエリ条件に合致するかどうか。
@@ -222,7 +221,7 @@ def convert_annotation_specs_labels_v2_to_v1(labels_v2: list[dict[str, Any]], ad
         List[LabelV1]: V1版のラベル情報
     """
 
-    def get_additional(additional_data_definition_id: str) -> Optional[dict[str, Any]]:
+    def get_additional(additional_data_definition_id: str) -> dict[str, Any] | None:
         return more_itertools.first_true(additionals_v2, pred=lambda e: e["additional_data_definition_id"] == additional_data_definition_id)
 
     def to_label_v1(label_v2: dict[str, Any]) -> dict[str, Any]:
@@ -249,7 +248,7 @@ class AnnofabApiFacade:
     """
 
     #: 組織メンバ一覧のキャッシュ
-    _organization_members: Optional[tuple[str, list[OrganizationMember]]] = None
+    _organization_members: tuple[str, list[OrganizationMember]] | None = None
 
     _project_members_dict: dict[str, list[ProjectMember]] = {}  # noqa: RUF012
     """プロジェクトメンバ一覧の情報。key:project_id, value:プロジェクトメンバ一覧"""
@@ -258,7 +257,7 @@ class AnnofabApiFacade:
         self.service = service
 
     @staticmethod
-    def get_account_id_last_annotation_phase(task_histories: list[dict[str, Any]]) -> Optional[str]:
+    def get_account_id_last_annotation_phase(task_histories: list[dict[str, Any]]) -> str | None:
         """
         タスク履歴の最後のannotation phaseを担当したaccount_idを取得する. なければNoneを返す
         Args:
@@ -303,7 +302,7 @@ class AnnofabApiFacade:
         project, _ = self.service.api.get_project(project_id)
         return project["title"]
 
-    def _get_organization_member_with_predicate(self, project_id: str, predicate: Callable[[Any], bool]) -> Optional[OrganizationMember]:
+    def _get_organization_member_with_predicate(self, project_id: str, predicate: Callable[[Any], bool]) -> OrganizationMember | None:
         """
         account_idから組織メンバを取得する。
         インスタンス変数に組織メンバがあれば、WebAPIは実行しない。
@@ -335,7 +334,7 @@ class AnnofabApiFacade:
             update_organization_members()
             return self._get_organization_member_with_predicate(project_id, predicate)
 
-    def _get_project_member_with_predicate(self, project_id: str, predicate: Callable[[Any], bool]) -> Optional[ProjectMember]:
+    def _get_project_member_with_predicate(self, project_id: str, predicate: Callable[[Any], bool]) -> ProjectMember | None:
         """
         project_memberを取得する
 
@@ -352,7 +351,7 @@ class AnnofabApiFacade:
             self._project_members_dict[project_id] = project_member_list
         return more_itertools.first_true(project_member_list, pred=predicate)
 
-    def get_project_member_from_account_id(self, project_id: str, account_id: str) -> Optional[ProjectMember]:
+    def get_project_member_from_account_id(self, project_id: str, account_id: str) -> ProjectMember | None:
         """
         account_idからプロジェクトメンバを取得する。
 
@@ -365,7 +364,7 @@ class AnnofabApiFacade:
         """
         return self._get_project_member_with_predicate(project_id, predicate=lambda e: e["account_id"] == account_id)
 
-    def get_project_member_from_user_id(self, project_id: str, user_id: str) -> Optional[ProjectMember]:
+    def get_project_member_from_user_id(self, project_id: str, user_id: str) -> ProjectMember | None:
         """
         user_idからプロジェクトメンバを取得する。
 
@@ -378,7 +377,7 @@ class AnnofabApiFacade:
         """
         return self._get_project_member_with_predicate(project_id, predicate=lambda e: e["user_id"] == user_id)
 
-    def get_organization_member_from_user_id(self, project_id: str, user_id: str) -> Optional[OrganizationMember]:
+    def get_organization_member_from_user_id(self, project_id: str, user_id: str) -> OrganizationMember | None:
         """
         user_idから組織メンバを取得する。
         インスタンス変数に組織メンバがあれば、WebAPIは実行しない。
@@ -392,7 +391,7 @@ class AnnofabApiFacade:
         """
         return self._get_organization_member_with_predicate(project_id, lambda e: e["user_id"] == user_id)
 
-    def get_user_id_from_account_id(self, project_id: str, account_id: str) -> Optional[str]:
+    def get_user_id_from_account_id(self, project_id: str, account_id: str) -> str | None:
         """
         account_idからuser_idを取得する.
         インスタンス変数に組織メンバがあれば、WebAPIは実行しない。
@@ -411,7 +410,7 @@ class AnnofabApiFacade:
         else:
             return member.get("user_id")
 
-    def get_account_id_from_user_id(self, project_id: str, user_id: str) -> Optional[str]:
+    def get_account_id_from_user_id(self, project_id: str, user_id: str) -> str | None:
         """
         user_idからaccount_idを取得する。
         インスタンス変数に組織メンバがあれば、WebAPIは実行しない。
@@ -502,8 +501,8 @@ class AnnofabApiFacade:
     def validate_project(
         self,
         project_id: str,
-        project_member_roles: Optional[list[ProjectMemberRole]] = None,
-        organization_member_roles: Optional[list[OrganizationMemberRole]] = None,
+        project_member_roles: list[ProjectMemberRole] | None = None,
+        organization_member_roles: list[OrganizationMemberRole] | None = None,
     ) -> None:
         """
         プロジェクト or 組織に対して、必要な権限が付与されているかを確認する。

annofabcli/common/image.py

@@ -5,10 +5,10 @@
 
 import logging
 import zipfile
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Callable, Optional
+from typing import Any
 
-import PIL
 import PIL.Image
 import PIL.ImageDraw
 from annofabapi.dataclass.annotation import SimpleAnnotationDetail
@@ -24,7 +24,7 @@ IsParserFunc = Callable[[SimpleAnnotationParser], bool]
 """アノテーションparserに対してboolを返す関数"""
 
 
-def get_data_uri_of_outer_file(annotation: SimpleAnnotationDetail) -> Optional[str]:
+def get_data_uri_of_outer_file(annotation: SimpleAnnotationDetail) -> str | None:
     """
     外部ファイルの data_uri を取得する
     Args:
@@ -45,7 +45,7 @@ def fill_annotation(
     draw: PIL.ImageDraw.ImageDraw,
     annotation: SimpleAnnotationDetail,
     label_color_dict: dict[str, RGB],
-    outer_image: Optional[Any] = None,  # noqa: ANN401
+    outer_image: Any | None = None,  # noqa: ANN401
 ) -> PIL.ImageDraw.ImageDraw:
     """
     1個のアノテーションを、塗りつぶしで描画する。（矩形、ポリゴン、塗りつぶし、塗りつぶしv2）
@@ -94,7 +94,7 @@ def fill_annotation_list(
     draw: PIL.ImageDraw.ImageDraw,
     parser: SimpleAnnotationParser,
     label_color_dict: dict[str, RGB],
-    label_name_list: Optional[list[str]] = None,
+    label_name_list: list[str] | None = None,
 ) -> PIL.ImageDraw.ImageDraw:
     """
     1個の入力データに属するアノテーションlistを描画する
@@ -142,8 +142,8 @@ def write_annotation_image(  # noqa: ANN201
     image_size: InputDataSize,
     label_color_dict: dict[str, RGB],
     output_image_file: Path,
-    background_color: Optional[Any] = None,  # noqa: ANN401
-    label_name_list: Optional[list[str]] = None,
+    background_color: Any | None = None,  # noqa: ANN401
+    label_name_list: list[str] | None = None,
 ):
     """
     JSONファイルに記載されているアノテーション情報を、画像化する。
@@ -191,7 +191,7 @@ def write_annotation_grayscale_image(
     parser: SimpleAnnotationParser,
     image_size: InputDataSize,
     output_image_file: Path,
-    label_name_list: Optional[list[str]] = None,
+    label_name_list: list[str] | None = None,
 ) -> None:
     """
     JSONファイルに記載されているアノテーション情報を、グレースケール(8bit 1channel)で画像化します。
@@ -267,12 +267,12 @@ def write_annotation_images_from_path(
     annotation_path: Path,
     label_color_dict: dict[str, RGB],
     output_dir_path: Path,
-    image_size: Optional[InputDataSize] = None,
-    input_data_dict: Optional[dict[str, InputData]] = None,
+    image_size: InputDataSize | None = None,
+    input_data_dict: dict[str, InputData] | None = None,
     output_image_extension: str = "png",
-    background_color: Optional[Any] = None,  # noqa: ANN401
-    label_name_list: Optional[list[str]] = None,
-    is_target_parser_func: Optional[IsParserFunc] = None,
+    background_color: Any | None = None,  # noqa: ANN401
+    label_name_list: list[str] | None = None,
+    is_target_parser_func: IsParserFunc | None = None,
 ) -> bool:
     """
     Annofabからダウンロードしたアノテーションzipファイル、またはそのzipを展開したディレクトリから、アノテーション情報を画像化します。
@@ -297,7 +297,7 @@ def write_annotation_images_from_path(
 
     """
 
-    def _get_image_size(input_data_id: str) -> Optional[InputDataSize]:
+    def _get_image_size(input_data_id: str) -> InputDataSize | None:
         def _get_image_size_from_system_metadata(arg_input_data: dict[str, Any]):  # noqa: ANN202
             # 入力データの`input_data.system_metadata.original_resolution`を参照して、画像サイズを決める。
             original_resolution = arg_input_data["system_metadata"]["original_resolution"]