annofabcli 1.111.2__py3-none-any.whl → 1.113.0__py3-none-any.whl

annofabcli/input_data/list_all_input_data_merged_task.py

@@ -7,12 +7,12 @@ import logging
 import sys
 from collections import defaultdict
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import pandas
 from annofabapi.dataclass.input import InputData
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     ArgumentParser,
@@ -105,8 +105,8 @@ def create_df_input_data_with_merged_task(input_data_list: list[dict[str, Any]])
 
 def match_input_data(
     input_data: dict[str, Any],
-    input_data_id_set: Optional[set[str]] = None,
-    input_data_query: Optional[InputDataQuery] = None,
+    input_data_id_set: set[str] | None = None,
+    input_data_query: InputDataQuery | None = None,
 ) -> bool:
     result = True
 
@@ -273,7 +273,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "list_all_merged_task"
     subcommand_help = "タスク一覧と結合したすべての入力データ一覧の情報を出力します。"
 

annofabcli/input_data/list_input_data.py

@@ -1,13 +1,13 @@
 import argparse
 import logging
 import urllib.parse
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
 from annofabapi.models import InputData
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login, print_according_to_format, print_csv
 from annofabcli.common.enums import FormatArgument
 from annofabcli.common.facade import AnnofabApiFacade
@@ -122,8 +122,8 @@ class ListInputDataMain:
     def get_input_data_list(
         self,
         *,
-        input_data_id_list: Optional[list[str]] = None,
-        input_data_query: Optional[dict[str, Any]] = None,
+        input_data_id_list: list[str] | None = None,
+        input_data_query: dict[str, Any] | None = None,
         contain_parent_task_id_list: bool = False,
         contain_supplementary_data_count: bool = False,
     ) -> list[InputData]:
@@ -235,7 +235,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "list"
     subcommand_help = "入力データ一覧を出力します。"
     description = "入力データ一覧を出力します。Annofabの制約上、10,000件までしか出力されません。"

annofabcli/input_data/put_input_data.py

@@ -6,7 +6,7 @@ from dataclasses import dataclass
 from functools import partial
 from multiprocessing import Pool
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -15,7 +15,7 @@ from annofabapi.exceptions import CheckSumError
 from annofabapi.models import ProjectMemberRole
 from dataclasses_json import DataClassJsonMixin
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     PARALLELISM_CHOICES,
@@ -39,7 +39,7 @@ class CsvInputData(DataClassJsonMixin):
 
     input_data_name: str
     input_data_path: str
-    input_data_id: Optional[str] = None
+    input_data_id: str | None = None
 
 
 @dataclass
@@ -129,7 +129,7 @@ class SubPutInputData:
         self.facade = facade
         self.all_yes = all_yes
 
-    def put_input_data(self, project_id: str, csv_input_data: InputDataForPut, last_updated_datetime: Optional[str] = None) -> None:
+    def put_input_data(self, project_id: str, csv_input_data: InputDataForPut, last_updated_datetime: str | None = None) -> None:
         request_body: dict[str, Any] = {"last_updated_datetime": last_updated_datetime}
 
         file_path = get_file_scheme_path(csv_input_data.input_data_path)
@@ -246,7 +246,7 @@ class PutInputData(CommandLine):
         project_id: str,
         input_data_list: list[CsvInputData],
         overwrite: bool = False,  # noqa: FBT001, FBT002
-        parallelism: Optional[int] = None,
+        parallelism: int | None = None,
     ) -> None:
         """
         入力データを一括で登録する。
@@ -423,7 +423,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "put"
     subcommand_help = "入力データを登録します。"
     epilog = "オーナロールを持つユーザで実行してください。"

annofabcli/input_data/put_input_data_with_zip.py

@@ -4,11 +4,10 @@ import sys
 import uuid
 import zipfile
 from pathlib import Path
-from typing import Optional
 
 from annofabapi.models import ProjectJobType, ProjectMemberRole
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     ArgumentParser,
@@ -35,7 +34,7 @@ class PutInputData(CommandLine):
         project_id: str,
         zip_file: Path,
         wait_options: WaitOptions,
-        input_data_name_prefix: Optional[str] = None,
+        input_data_name_prefix: str | None = None,
         wait: bool = False,  # noqa: FBT001, FBT002
     ) -> None:
         """
@@ -137,7 +136,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "put_with_zip"
     subcommand_help = "zipファイルを入力データとして登録します。"
     description = "zipファイルを入力データとして登録します。"

annofabcli/input_data/subcommand_input_data.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
 import annofabcli.input_data.copy_input_data
 import annofabcli.input_data.delete_input_data
@@ -33,7 +31,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.input_data.update_metadata_of_input_data.add_parser(subparsers)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "input_data"
     subcommand_help = "入力データ関係のサブコマンド"
     description = "入力データ関係のサブコマンド"

annofabcli/input_data/update_input_data.py

@@ -9,13 +9,11 @@ from dataclasses import dataclass
 from enum import Enum
 from functools import partial
 from pathlib import Path
-from typing import Optional
 
 import annofabapi
 import pandas
 from dataclasses_json import DataClassJsonMixin
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -50,9 +48,9 @@ class UpdatedInputData(DataClassJsonMixin):
 
     input_data_id: str
     """更新対象の入力データを表すID"""
-    input_data_name: Optional[str] = None
+    input_data_name: str | None = None
     """変更後の入力データ名（指定した場合のみ更新）"""
-    input_data_path: Optional[str] = None
+    input_data_path: str | None = None
     """変更後の入力データパス（指定した場合のみ更新）"""
 
 
@@ -66,9 +64,9 @@ class UpdateInputDataMain(CommandLineWithConfirm):
         project_id: str,
         input_data_id: str,
         *,
-        new_input_data_name: Optional[str] = None,
-        new_input_data_path: Optional[str] = None,
-        input_data_index: Optional[int] = None,
+        new_input_data_name: str | None = None,
+        new_input_data_path: str | None = None,
+        input_data_index: int | None = None,
     ) -> UpdateResult:
         """
         1個の入力データを更新します。
@@ -299,7 +297,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "update"
     subcommand_help = "入力データの名前または入力データのパスを更新します。"
     epilog = "オーナロールを持つユーザで実行してください。"

annofabcli/input_data/update_metadata_of_input_data.py

@@ -8,12 +8,10 @@ import multiprocessing
 import sys
 from dataclasses import dataclass
 from functools import partial
-from typing import Optional
 
 import annofabapi
 from annofabapi.models import ProjectMemberRole
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -52,7 +50,7 @@ class UpdateMetadataMain(CommandLineWithConfirm):
         metadata: Metadata,
         *,
         overwrite_metadata: bool = False,
-        input_data_index: Optional[int] = None,
+        input_data_index: int | None = None,
     ) -> bool:
         def get_confirm_message() -> str:
             if overwrite_metadata:
@@ -97,7 +95,7 @@ class UpdateMetadataMain(CommandLineWithConfirm):
         metadata_by_input_data_id: dict[str, Metadata],
         *,
         overwrite_metadata: bool = False,
-        parallelism: Optional[int] = None,
+        parallelism: int | None = None,
     ) -> None:
         metadata_info_list = [InputDataMetadataInfo(input_data_id, metadata) for input_data_id, metadata in metadata_by_input_data_id.items()]
         if overwrite_metadata:
@@ -256,7 +254,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "update_metadata"
     subcommand_help = "入力データのメタデータを更新します。"
     description = "入力データのメタデータを更新します。"

annofabcli/instruction/copy_instruction.py

@@ -1,13 +1,12 @@
 import argparse
 import logging
 import mimetypes
-from typing import Optional
 
 import requests
 from annofabapi.models import ProjectMemberRole
 from pyquery import PyQuery
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.facade import AnnofabApiFacade
 
@@ -36,7 +35,7 @@ class CopyInstruction(CommandLine):
         return url_without_query.split("/")[-1]
 
     @staticmethod
-    def _get_mime_type_from_filename(filename: Optional[str]) -> str:
+    def _get_mime_type_from_filename(filename: str | None) -> str:
         """
         ファイル名からMIME TYPEを取得する。
         """
@@ -47,7 +46,7 @@ class CopyInstruction(CommandLine):
         content_type = mimetypes.guess_type(filename)[0]
         return content_type if content_type is not None else DEFAULT_MIME_TYPE
 
-    def upload_instruction_image(self, src_project_id: str, dest_project_id: str, pq_img: PyQuery) -> Optional[str]:
+    def upload_instruction_image(self, src_project_id: str, dest_project_id: str, pq_img: PyQuery) -> str | None:
         """
         コピー元の作業ガイド画像を、コピー先にアップロードする。
         Args:
@@ -60,7 +59,7 @@ class CopyInstruction(CommandLine):
 
         """
 
-        src_instruction_image_url: Optional[str] = pq_img.attr["src"]
+        src_instruction_image_url: str | None = pq_img.attr["src"]
         if src_instruction_image_url is None:
             logger.warning(f"{pq_img=} にsrc属性がないのでスキップします。")
             return None
@@ -148,7 +147,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "copy"
     subcommand_help = "作業ガイドをコピーします。"
     description = "作業ガイドを別プロジェクトにコピーします。"

annofabcli/instruction/download_instruction.py

@@ -2,12 +2,11 @@ import argparse
 import logging.handlers
 import sys
 from pathlib import Path
-from typing import Optional
 
 import annofabapi
 import pyquery
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     ArgumentParser,
@@ -62,7 +61,7 @@ class DownloadInstructionMain:
         img_dir = output_dir / "img"
         img_dir.mkdir(exist_ok=True, parents=True)
         for img_elm in pq_img:
-            src_value: Optional[str] = img_elm.attrib.get("src")
+            src_value: str | None = img_elm.attrib.get("src")
             if src_value is None:
                 continue
 
@@ -81,7 +80,7 @@ class DownloadInstructionMain:
 
         return pq.outer_html()
 
-    def download_instruction(self, project_id: str, output_dir: Path, history_id: Optional[str] = None, is_download_image: bool = False):  # noqa: ANN201, FBT001, FBT002
+    def download_instruction(self, project_id: str, output_dir: Path, history_id: str | None = None, is_download_image: bool = False):  # noqa: ANN201, FBT001, FBT002
         """
         作業ガイドをダウンロードする
 
@@ -115,7 +114,7 @@ class DownloadInstructionMain:
 class DownloadInstruction(CommandLine):
     COMMON_MESSAGE = "annofabcli instruction download"
 
-    def get_history_id_from_before_index(self, project_id: str, before: int) -> Optional[str]:
+    def get_history_id_from_before_index(self, project_id: str, before: int) -> str | None:
         histories, _ = self.service.api.get_instruction_history(project_id, query_params={"limit": 10000})
         if before + 1 > len(histories):
             logger.warning(f"作業ガイドの変更履歴は{len(histories)}個のため、最新より{before}個前の作業ガイドは見つかりませんでした。")
@@ -190,7 +189,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "download"
     subcommand_help = "作業ガイドをダウンロードします。"
     description = "作業ガイドをダウンロードします。HTMLファイルにはbodyタグの内部が記載されています。"

annofabcli/instruction/list_instruction_history.py

@@ -1,8 +1,8 @@
 import argparse
 import logging
-from typing import Any, Optional
+from typing import Any
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.enums import FormatArgument
 from annofabcli.common.facade import AnnofabApiFacade
@@ -45,7 +45,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "list_history"
     subcommand_help = "作業ガイドの変更履歴を出力します。"
     description = "作業ガイドの変更履歴を出力します。"

annofabcli/instruction/subcommand_instruction.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
 import annofabcli.instruction.copy_instruction
 import annofabcli.instruction.download_instruction
@@ -19,7 +17,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.instruction.upload_instruction.add_parser(subparsers)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "instruction"
     subcommand_help = "作業ガイド関係のサブコマンド"
     description = "作業ガイド関係のサブコマンド"

annofabcli/instruction/upload_instruction.py

@@ -7,13 +7,12 @@ import logging.handlers
 import tempfile
 import uuid
 from pathlib import Path
-from typing import Optional
 
 import pyquery
 from datauri import DataURI
 from PIL import Image
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.facade import AnnofabApiFacade
 
@@ -60,7 +59,7 @@ class UploadInstruction(CommandLine):
         img_path_dict: dict[str, str] = {}
         # 画像をすべてアップロードして、img要素のsrc属性値を annofab urlに変更する
         for img_elm in pq_img:
-            src_value: Optional[str] = img_elm.attrib.get("src")
+            src_value: str | None = img_elm.attrib.get("src")
             if src_value is None:
                 continue
 
@@ -144,7 +143,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "upload"
     subcommand_help = "HTMLファイルを作業ガイドとして登録します。"
     description = "HTMLファイルを作業ガイドとして登録します。img要素のsrc属性がローカルの画像を参照している場合（http, https, dataスキーマが付与されていない）、画像もアップロードします。"

annofabcli/job/delete_job.py

@@ -1,11 +1,10 @@
 import argparse
 import logging
-from typing import Optional
 
 import annofabapi
 from annofabapi.models import ProjectJobType, ProjectMemberRole
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     ArgumentParser,
     CommandLine,
@@ -77,7 +76,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "delete"
     subcommand_help = "ジョブを削除する。"
     description = "ジョブを削除する。"

annofabcli/job/list_job.py

@@ -1,11 +1,11 @@
 import argparse
 import copy
 import logging
-from typing import Any, Optional
+from typing import Any
 
 from annofabapi.models import ProjectJobInfo, ProjectJobType
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.enums import FormatArgument
 from annofabcli.common.facade import AnnofabApiFacade
@@ -18,7 +18,7 @@ class ListJob(CommandLine):
     ジョブ一覧を表示する。
     """
 
-    def get_job_list(self, project_id: str, job_type: ProjectJobType, job_query: Optional[dict[str, Any]] = None) -> list[ProjectJobInfo]:
+    def get_job_list(self, project_id: str, job_type: ProjectJobType, job_query: dict[str, Any] | None = None) -> list[ProjectJobInfo]:
         """
         ジョブ一覧を取得する。
         """
@@ -34,7 +34,7 @@ class ListJob(CommandLine):
         job_list = self.service.wrapper.get_all_project_job(project_id, query_params=query_params)
         return job_list
 
-    def print_job_list(self, project_id: str, job_type: ProjectJobType, job_query: Optional[dict[str, Any]] = None) -> None:
+    def print_job_list(self, project_id: str, job_type: ProjectJobType, job_query: dict[str, Any] | None = None) -> None:
         """
         ジョブ一覧を出力する
 
@@ -83,7 +83,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "list"
     subcommand_help = "ジョブ一覧を出力します。"
     description = "ジョブ一覧を出力します。"

annofabcli/job/list_last_job.py

@@ -1,11 +1,11 @@
 import argparse
 import logging
 import sys
-from typing import Any, Optional
+from typing import Any
 
 from annofabapi.models import Project, ProjectJobInfo, ProjectJobType
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     ArgumentParser,
@@ -23,7 +23,7 @@ class ListLastJob(CommandLine):
     ジョブ一覧を表示する。
     """
 
-    def get_last_job(self, project_id: str, job_type: ProjectJobType) -> Optional[ProjectJobInfo]:
+    def get_last_job(self, project_id: str, job_type: ProjectJobType) -> ProjectJobInfo | None:
         """
         最新のジョブを取得する。ジョブが存在しない場合はNoneを返す。
 
@@ -163,7 +163,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "list_last"
     subcommand_help = "複数のプロジェクトに対して、最新のジョブを出力します。"
     description = "複数のプロジェクトに対して、最新のジョブを出力します。"

annofabcli/job/subcommand_job.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
 import annofabcli.job.delete_job
 import annofabcli.job.list_job
@@ -20,7 +18,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.job.wait_job.add_parser(subparsers)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "job"
     subcommand_help = "ジョブ関係のサブコマンド"
     description = "ジョブ関係のサブコマンド"

annofabcli/job/wait_job.py

@@ -1,12 +1,11 @@
 import argparse
 import dataclasses
 import logging
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.models import ProjectJobType
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     ArgumentParser,
@@ -20,7 +19,7 @@ from annofabcli.common.facade import AnnofabApiFacade
 logger = logging.getLogger(__name__)
 
 
-def get_wait_options_from_args(dict_wait_options: Optional[dict[str, Any]]) -> WaitOptions:
+def get_wait_options_from_args(dict_wait_options: dict[str, Any] | None) -> WaitOptions:
     """
     デフォルト値とマージして、wait_optionsを取得する。
 
@@ -45,7 +44,7 @@ class WaitJobMain:
         self.service = service
         self.facade = AnnofabApiFacade(service)
 
-    def wait_job(self, project_id: str, job_type: ProjectJobType, wait_options: WaitOptions, job_id: Optional[str] = None) -> None:
+    def wait_job(self, project_id: str, job_type: ProjectJobType, wait_options: WaitOptions, job_id: str | None = None) -> None:
         MAX_WAIT_MINUTE = wait_options.max_tries * wait_options.interval / 60  # noqa: N806
         logger.info(f"job_type='{job_type.value}', job_id='{job_id}' :: ジョブが完了するまで、最大{MAX_WAIT_MINUTE}分間待ちます。")
         result = self.service.wrapper.wait_until_job_finished(
@@ -100,7 +99,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "wait"
     subcommand_help = "ジョブの終了を待ちます。"
     description = "ジョブの終了を待ちます。"

annofabcli/my_account/get_my_account.py

@@ -2,9 +2,8 @@ from __future__ import annotations
 
 import argparse
 import logging
-from typing import Optional
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     ArgumentParser,
     CommandLine,
@@ -44,7 +43,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "get"
     subcommand_help = "自分のアカウント情報を出力します。"
 

annofabcli/my_account/subcommand_my_account.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
 import annofabcli.my_account.get_my_account
 
@@ -13,7 +11,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.my_account.get_my_account.add_parser(subparsers)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "my_account"
     subcommand_help = "自分のアカウント関係のサブコマンド"
 

annofabcli/organization/list_organization.py

@@ -1,8 +1,7 @@
 import argparse
 import logging
-from typing import Optional
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.enums import FormatArgument
 from annofabcli.common.facade import AnnofabApiFacade
@@ -39,7 +38,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "list"
     subcommand_help = "所属している組織の一覧を出力します。"
 

annofabcli/organization/subcommand_organization.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
 import annofabcli.organization.list_organization
 
@@ -13,7 +11,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.organization.list_organization.add_parser(subparsers)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "organization"
     subcommand_help = "組織関係のサブコマンド"