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

annofabcli/__main__.py

@@ -4,7 +4,6 @@ import argparse
 import copy
 import logging
 import sys
-from typing import Optional
 
 import pandas
 
@@ -65,7 +64,7 @@ def mask_sensitive_value_in_argv(argv: list[str]) -> list[str]:
     return tmp_argv
 
 
-def main(arguments: Optional[list[str]] = None) -> None:
+def main(arguments: list[str] | None = None) -> None:
     """
     annofabcliコマンドのメイン処理
     注意： `deprecated`なツールは、サブコマンド化しない。

annofabcli/annotation/annotation_query.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, Optional, Union
+from typing import Any
 
 import more_itertools
 from annofabapi.dataclass.annotation import AdditionalDataV1
@@ -9,7 +9,7 @@ from annofabapi.models import AdditionalDataDefinitionType
 from annofabapi.util.annotation_specs import get_english_message
 from dataclasses_json import DataClassJsonMixin
 
-AttributeValue = Optional[Union[str, int, bool]]
+AttributeValue = str | int | bool | None
 """属性値の型情報"""
 
 
@@ -138,7 +138,7 @@ def _get_additional_data_v2(additional_data: dict[str, Any], attribute_value: At
     return {"definition_id": additional_data_definition_id, "value": result_value}
 
 
-def convert_attributes_from_cli_to_api(attributes: dict[str, AttributeValue], annotation_specs: dict[str, Any], *, label_id: Optional[str] = None) -> list[AdditionalDataV1]:
+def convert_attributes_from_cli_to_api(attributes: dict[str, AttributeValue], annotation_specs: dict[str, Any], *, label_id: str | None = None) -> list[AdditionalDataV1]:
     """
     CLI用の属性をAPI用の属性に変換します。
 
@@ -193,7 +193,7 @@ def convert_attributes_from_cli_to_api(attributes: dict[str, AttributeValue], an
     return attributes_for_webapi
 
 
-def convert_attributes_from_cli_to_additional_data_list_v2(attributes: dict[str, AttributeValue], annotation_specs: dict[str, Any], *, label_id: Optional[str] = None) -> list[dict[str, Any]]:
+def convert_attributes_from_cli_to_additional_data_list_v2(attributes: dict[str, AttributeValue], annotation_specs: dict[str, Any], *, label_id: str | None = None) -> list[dict[str, Any]]:
     """
     CLI用の属性情報をAPI用の `AdditionalDataV2` に相当するdictに変換します。
 
@@ -254,10 +254,10 @@ class AnnotationQueryForCLI(DataClassJsonMixin):
     CLIでアノテーションを絞り込むためのクエリ。
     """
 
-    label: Optional[str] = None
+    label: str | None = None
     """ラベル名（英語）"""
 
-    attributes: Optional[dict[str, AttributeValue]] = None
+    attributes: dict[str, AttributeValue] | None = None
     """
     keyが属性名(英語),valueが属性値のdict。
     属性が排他選択の場合、属性値は選択肢名(英語)。
@@ -279,8 +279,8 @@ class AnnotationQueryForCLI(DataClassJsonMixin):
             dict[str,Any]: WebAPIのquery_paramsに渡すdict
         """
         assert self.label is not None or self.attributes is not None
-        label_id: Optional[str] = None
-        attributes_for_webapi: Optional[list[AdditionalDataV1]] = None
+        label_id: str | None = None
+        attributes_for_webapi: list[AdditionalDataV1] | None = None
 
         if self.label is not None:
             tmp = [e for e in annotation_specs["labels"] if get_english_message(e["label_name"]) == self.label]
@@ -309,10 +309,10 @@ class AnnotationQueryForAPI(DataClassJsonMixin):
     https://annofab.com/docs/api/#tag/x-data-types/AnnotationQuery に対応しています。
     """
 
-    label_id: Optional[str] = None
+    label_id: str | None = None
     """ラベルID"""
 
-    attributes: Optional[list[AdditionalDataV1]] = None
+    attributes: list[AdditionalDataV1] | None = None
     """属性IDと属性値のList"""
 
     def __post_init__(self) -> None:

annofabcli/annotation/change_annotation_attributes.py

@@ -8,7 +8,7 @@ import multiprocessing
 import sys
 from enum import Enum
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.dataclass.task import Task
@@ -58,7 +58,7 @@ class ChangeAnnotationAttributesMain(CommandLineWithConfirm):
 
         self.dump_annotation_obj = DumpAnnotationMain(service, project_id)
 
-    def change_annotation_attributes(self, annotation_list: list[dict[str, Any]], additional_data_list: list[dict[str, Any]]) -> Optional[list[dict[str, Any]]]:
+    def change_annotation_attributes(self, annotation_list: list[dict[str, Any]], additional_data_list: list[dict[str, Any]]) -> list[dict[str, Any]] | None:
         """
         アノテーション属性値を変更する。
 
@@ -112,8 +112,8 @@ class ChangeAnnotationAttributesMain(CommandLineWithConfirm):
         annotation_query: AnnotationQueryForAPI,
         additional_data_list: list[dict[str, Any]],
         *,
-        backup_dir: Optional[Path] = None,
-        task_index: Optional[int] = None,
+        backup_dir: Path | None = None,
+        task_index: int | None = None,
     ) -> tuple[bool, int]:
         """
         タスクに対してアノテーション属性値を変更する。
@@ -170,7 +170,7 @@ class ChangeAnnotationAttributesMain(CommandLineWithConfirm):
         annotation_query: AnnotationQueryForAPI,
         additional_data_list: list[dict[str, Any]],
         *,
-        backup_dir: Optional[Path] = None,
+        backup_dir: Path | None = None,
     ) -> tuple[bool, int]:
         task_index, task_id = tpl
         try:
@@ -191,8 +191,8 @@ class ChangeAnnotationAttributesMain(CommandLineWithConfirm):
         annotation_query: AnnotationQueryForAPI,
         additional_data_list: list[dict[str, Any]],
         *,
-        backup_dir: Optional[Path] = None,
-        parallelism: Optional[int] = None,
+        backup_dir: Path | None = None,
+        parallelism: int | None = None,
     ) -> None:
         """
         複数のタスクに対してアノテーションの属性値を変更します。
@@ -272,7 +272,7 @@ class ChangeAttributesOfAnnotation(CommandLine):
         return annotation_query_for_cli.to_query_for_api(annotation_specs)
 
     @classmethod
-    def get_additional_data_list_from_cli_attributes(cls, str_attributes: str, annotation_specs: dict[str, Any], label_id: Optional[str]) -> list[dict[str, Any]]:
+    def get_additional_data_list_from_cli_attributes(cls, str_attributes: str, annotation_specs: dict[str, Any], label_id: str | None) -> list[dict[str, Any]]:
         """
         CLIから受け取った`--attributes`の値から、APIに渡す属性情報(`AdditionalDataListV2`)を返します。
         """
@@ -383,7 +383,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 = "change_attributes"
     subcommand_help = "アノテーションの属性値を変更します。"
     description = (

annofabcli/annotation/change_annotation_attributes_per_annotation.py

@@ -6,7 +6,6 @@ import logging
 import sys
 from collections import defaultdict
 from pathlib import Path
-from typing import Optional, Union
 
 import annofabapi
 import pandas
@@ -30,7 +29,7 @@ from annofabcli.common.facade import AnnofabApiFacade
 logger = logging.getLogger(__name__)
 
 
-Attributes = dict[str, Optional[Union[str, int, bool]]]
+Attributes = dict[str, str | int | bool | None]
 """属性情報"""
 
 
@@ -66,7 +65,7 @@ class ChangeAnnotationAttributesPerAnnotationMain(CommandLineWithConfirm):
         project_id: str,
         is_force: bool,
         all_yes: bool,
-        backup_dir: Optional[Path] = None,
+        backup_dir: Path | None = None,
     ) -> None:
         self.service = service
         self.project_id = project_id
@@ -314,7 +313,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 = "change_attributes_per_annotation"
     subcommand_help = "各アノテーションの属性値を変更します。"
     epilog = "オーナロールまたはチェッカーロールを持つユーザで実行してください。"

annofabcli/annotation/change_annotation_properties.py

@@ -8,7 +8,7 @@ import multiprocessing
 import sys
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.models import ProjectMemberRole, SingleAnnotation, TaskStatus
@@ -34,7 +34,7 @@ logger = logging.getLogger(__name__)
 
 @dataclass
 class AnnotationDetailForCli(DataClassJsonMixin):
-    is_protected: Optional[bool] = None
+    is_protected: bool | None = None
 
 
 class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
@@ -113,7 +113,7 @@ class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
         for annotation in annotations:
             _to_request_body_elm(annotation)
 
-    def get_annotation_list_for_task(self, task_id: str, annotation_query: Optional[AnnotationQueryForAPI]) -> list[dict[str, Any]]:
+    def get_annotation_list_for_task(self, task_id: str, annotation_query: AnnotationQueryForAPI | None) -> list[dict[str, Any]]:
         """
         タスク内のアノテーション一覧を取得する。
 
@@ -136,9 +136,9 @@ class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
         self,
         task_id: str,
         properties: AnnotationDetailForCli,
-        annotation_query: Optional[AnnotationQueryForAPI] = None,
-        backup_dir: Optional[Path] = None,
-        task_index: Optional[int] = None,
+        annotation_query: AnnotationQueryForAPI | None = None,
+        backup_dir: Path | None = None,
+        task_index: int | None = None,
     ) -> bool:
         """
         タスクに対してアノテーションのプロパティを変更する。
@@ -162,7 +162,7 @@ class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
             logger.info(f"タスク'{task_id}'は作業中または受入完了状態のため、アノテーションプロパティの変更をスキップします。 status={dict_task['status']}")
             return False
 
-        old_account_id: Optional[str] = dict_task["account_id"]
+        old_account_id: str | None = dict_task["account_id"]
         changed_operator = False
 
         if self.is_force:
@@ -217,8 +217,8 @@ class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
         self,
         tpl: tuple[int, str],
         properties: AnnotationDetailForCli,
-        annotation_query: Optional[AnnotationQueryForAPI] = None,
-        backup_dir: Optional[Path] = None,
+        annotation_query: AnnotationQueryForAPI | None = None,
+        backup_dir: Path | None = None,
     ) -> bool:
         task_index, task_id = tpl
         try:
@@ -237,9 +237,9 @@ class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
         self,
         task_id_list: list[str],
         properties: AnnotationDetailForCli,
-        annotation_query: Optional[AnnotationQueryForAPI] = None,
-        backup_dir: Optional[Path] = None,
-        parallelism: Optional[int] = None,
+        annotation_query: AnnotationQueryForAPI | None = None,
+        backup_dir: Path | None = None,
+        parallelism: int | None = None,
     ):
         project_title = self.facade.get_project_title(self.project_id)
         logger.info(f"プロジェクト'{project_title}'に対して、タスク{len(task_id_list)} 件のアノテーションのプロパティを変更します")
@@ -396,7 +396,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 = "change_properties"
     subcommand_help = "アノテーションのプロパティを変更します。"
     description = (

annofabcli/annotation/copy_annotation.py

@@ -7,7 +7,7 @@ import multiprocessing
 import sys
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.models import ProjectMemberRole
@@ -79,7 +79,7 @@ def parse_copy_target(str_copy_target: str) -> CopyTarget:
     * `task1/input5:task2/input6`
     """
 
-    def _parse_with_slash(target: str) -> tuple[str, Optional[str]]:
+    def _parse_with_slash(target: str) -> tuple[str, str | None]:
         tmp = target.split("/")
         if len(tmp) == 1:
             return (tmp[0], None)
@@ -163,7 +163,7 @@ class CopyAnnotationMain(CommandLineWithConfirm):
 
         copy_count = 0
 
-        for src_input_data_id, dest_input_data_id in zip(src_input_data_id_list, dest_input_data_id_list):
+        for src_input_data_id, dest_input_data_id in zip(src_input_data_id_list, dest_input_data_id_list, strict=False):
             try:
                 result = self.copy_annotation_by_input_data(
                     CopyTargetByInputData(
@@ -304,7 +304,7 @@ class CopyAnnotationMain(CommandLineWithConfirm):
             logger.warning(f"'{copy_target.src}'のアノテーションを'{copy_target.dest}'へコピーするのに失敗しました。", exc_info=True)
             return False
 
-    def copy_annotations(self, copy_target_list: list[CopyTarget], *, parallelism: Optional[int] = None):  # noqa: ANN201
+    def copy_annotations(self, copy_target_list: list[CopyTarget], *, parallelism: int | None = None):  # noqa: ANN201
         if parallelism is not None:
             with multiprocessing.Pool(parallelism) as pool:
                 result_bool_list = pool.map(self.copy_annotation_wrapper, copy_target_list)
@@ -414,7 +414,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/annotation/create_classification_annotation.py

@@ -4,7 +4,7 @@ import argparse
 import logging
 import multiprocessing
 import sys
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.models import DefaultAnnotationType, ProjectMemberRole, TaskStatus
@@ -50,7 +50,7 @@ class CreateClassificationAnnotationMain(CommandLineWithConfirm):
         my_member, _ = self.service.api.get_my_member_in_project(project_id)
         self.my_project_member_role = ProjectMemberRole(my_member["member_role"])
 
-    def _validate_and_prepare_task(self, task_id: str) -> tuple[Optional[dict[str, Any]], bool, Optional[str]]:
+    def _validate_and_prepare_task(self, task_id: str) -> tuple[dict[str, Any] | None, bool, str | None]:
         """
         タスクの検証と準備を行う
 
@@ -76,7 +76,7 @@ class CreateClassificationAnnotationMain(CommandLineWithConfirm):
                 )
                 return None, False, None
 
-        old_account_id: Optional[str] = None
+        old_account_id: str | None = None
         changed_operator = False
 
         if self.is_change_operator_to_me:
@@ -216,7 +216,7 @@ class CreateClassificationAnnotationMain(CommandLineWithConfirm):
 
         return created_count
 
-    def execute_task(self, task_id: str, labels: list[str], task_index: Optional[int] = None) -> bool:
+    def execute_task(self, task_id: str, labels: list[str], task_index: int | None = None) -> bool:
         """
         1個のタスクに対して全体アノテーションを作成する。
 
@@ -260,7 +260,7 @@ class CreateClassificationAnnotationMain(CommandLineWithConfirm):
         else:
             return created_count > 0
 
-    def main(self, task_ids: list[str], labels: list[str], parallelism: Optional[int] = None) -> None:
+    def main(self, task_ids: list[str], labels: list[str], parallelism: int | None = None) -> None:
         """
         メイン処理
 
@@ -392,7 +392,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 = "create_classification"
     subcommand_help = "全体アノテーション（Classification）を作成します。"
     description = (

annofabcli/annotation/delete_annotation.py

@@ -7,7 +7,7 @@ import sys
 from collections import defaultdict
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -87,7 +87,7 @@ class DeleteAnnotationMain(CommandLineWithConfirm):
         request_body = [_to_request_body_elm(annotation) for annotation in annotation_list]
         self.service.api.batch_update_annotations(self.project_id, request_body=request_body)
 
-    def get_annotation_list_for_task(self, task_id: str, annotation_query: Optional[AnnotationQueryForAPI]) -> list[dict[str, Any]]:
+    def get_annotation_list_for_task(self, task_id: str, annotation_query: AnnotationQueryForAPI | None) -> list[dict[str, Any]]:
         """
         タスク内のアノテーション一覧を取得する。
 
@@ -109,8 +109,8 @@ class DeleteAnnotationMain(CommandLineWithConfirm):
     def delete_annotation_for_task(
         self,
         task_id: str,
-        annotation_query: Optional[AnnotationQueryForAPI] = None,
-        backup_dir: Optional[Path] = None,
+        annotation_query: AnnotationQueryForAPI | None = None,
+        backup_dir: Path | None = None,
     ) -> None:
         """
         タスクに対してアノテーションを削除する
@@ -159,8 +159,8 @@ class DeleteAnnotationMain(CommandLineWithConfirm):
     def delete_annotation_for_task_list(
         self,
         task_id_list: list[str],
-        annotation_query: Optional[AnnotationQueryForAPI] = None,
-        backup_dir: Optional[Path] = None,
+        annotation_query: AnnotationQueryForAPI | None = None,
+        backup_dir: Path | None = None,
     ) -> None:
         project_title = self.facade.get_project_title(self.project_id)
         logger.info(f"プロジェクト'{project_title}'に対して、タスク{len(task_id_list)} 件のアノテーションを削除します。")
@@ -278,7 +278,7 @@ class DeleteAnnotationMain(CommandLineWithConfirm):
     def delete_annotation_by_id_list(
         self,
         annotation_list: list[DeletedAnnotationInfo],
-        backup_dir: Optional[Path] = None,
+        backup_dir: Path | None = None,
     ) -> None:
         """
         task_id, input_data_id, annotation_id のリストで指定されたアノテーションのみ削除する
@@ -492,7 +492,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/annotation/download_annotation_zip.py

@@ -1,11 +1,9 @@
 import argparse
 import logging
 from pathlib import Path
-from typing import Optional
 
 from annofabapi.models import ProjectMemberRole
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.download import DownloadingFile
@@ -67,7 +65,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 = "アノテーションZIPをダウンロードします。"
     description = "アノテーションZIPをダウンロードします。"

annofabcli/annotation/dump_annotation.py

@@ -6,7 +6,7 @@ import json
 import logging
 import multiprocessing
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.models import AnnotationDataHoldingType
@@ -63,12 +63,12 @@ class DumpAnnotationMain:
                 outer_file_path = outer_dir / f"{annotation_id}"
                 self.service.wrapper.download(detail["url"], outer_file_path)
 
-    def dump_annotation_for_input_data(self, task_id: str, input_data_id: str, task_dir: Path, *, task_history_id: Optional[str] = None) -> None:
+    def dump_annotation_for_input_data(self, task_id: str, input_data_id: str, task_dir: Path, *, task_history_id: str | None = None) -> None:
         editor_annotation, _ = self.service.api.get_editor_annotation(self.project_id, task_id, input_data_id, query_params={"v": "2", "task_history_id": task_history_id})
         json_path = task_dir / f"{input_data_id}.json"
         self.dump_editor_annotation(editor_annotation=editor_annotation, json_path=json_path)
 
-    def dump_annotation_for_task(self, task_id: str, output_dir: Path, *, task_index: Optional[int] = None, task_history_index: Optional[int] = None) -> bool:
+    def dump_annotation_for_task(self, task_id: str, output_dir: Path, *, task_index: int | None = None, task_history_index: int | None = None) -> bool:
         """
         タスク配下のアノテーションをファイルに保存する。
 
@@ -85,7 +85,7 @@ class DumpAnnotationMain:
             logger.warning(f"task_id = '{task_id}' のタスクは存在しません。スキップします。")
             return False
 
-        task_history_id: Optional[str] = None
+        task_history_id: str | None = None
         if task_history_index is not None:
             task_histories, _ = self.service.api.get_task_histories(self.project_id, task_id)
             if task_history_index >= len(task_histories):
@@ -109,7 +109,7 @@ class DumpAnnotationMain:
 
         return not is_failure
 
-    def dump_annotation_for_task_wrapper(self, tpl: tuple[int, str], output_dir: Path, *, task_history_index: Optional[int] = None) -> bool:
+    def dump_annotation_for_task_wrapper(self, tpl: tuple[int, str], output_dir: Path, *, task_history_index: int | None = None) -> bool:
         task_index, task_id = tpl
         try:
             return self.dump_annotation_for_task(task_id, output_dir=output_dir, task_index=task_index, task_history_index=task_history_index)
@@ -117,7 +117,7 @@ class DumpAnnotationMain:
             logger.warning(f"タスク'{task_id}'のアノテーション情報のダンプに失敗しました。", exc_info=True)
             return False
 
-    def dump_annotation(self, task_id_list: list[str], output_dir: Path, *, task_history_index: Optional[int] = None, parallelism: Optional[int] = None) -> None:
+    def dump_annotation(self, task_id_list: list[str], output_dir: Path, *, task_history_index: int | None = None, parallelism: int | None = None) -> None:
         project_title = self.facade.get_project_title(self.project_id)
         logger.info(f"プロジェクト'{project_title}'に対して、タスク{len(task_id_list)} 件のアノテーションをファイルに保存します。")
 
@@ -191,7 +191,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 = "dump"
     subcommand_help = "``annotation restore`` コマンドに読み込ませることができるアノテーション情報を出力します。"
     description = "``annotation restore`` コマンドに読み込ませることができるアノテーション情報を出力します。アノテーションのバックアップ目的で利用することを想定しています。"

annofabcli/annotation/import_annotation.py

@@ -10,7 +10,7 @@ import zipfile
 from collections.abc import Iterator
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any
 
 import annofabapi
 import ulid
@@ -60,10 +60,10 @@ class ImportedSimpleAnnotationDetail(DataClassJsonMixin):
     data: dict[str, Any]
     """"""
 
-    attributes: Optional[dict[str, Union[str, bool, int]]] = None
+    attributes: dict[str, str | bool | int] | None = None
     """属性情報。キーは属性の名前、値は属性の値。 """
 
-    annotation_id: Optional[str] = None
+    annotation_id: str | None = None
     """アノテーションID"""
 
 
@@ -152,13 +152,13 @@ class AnnotationConverter:
 
     def _convert_attribute_value(  # noqa: PLR0911, PLR0912
         self,
-        attribute_value: Optional[Union[str, int, bool]],  # noqa: FBT001
+        attribute_value: str | int | bool | None,  # noqa: FBT001
         additional_data_type: AdditionalDataDefinitionType,
         attribute_name: str,
         choices: list[dict[str, Any]],
         *,
         log_message_suffix: str,
-    ) -> Optional[dict[str, Any]]:
+    ) -> dict[str, Any] | None:
         """
         JSONに記載されている属性値を、APIに渡すための `AdditionalDataValue`スキーマに変換します。
 
@@ -235,7 +235,7 @@ class AnnotationConverter:
         else:
             assert_noreturn(additional_data_type)
 
-    def convert_attributes(self, attributes: dict[str, Any], *, label_name: Optional[str] = None, log_message_suffix: str = "") -> list[dict[str, Any]]:
+    def convert_attributes(self, attributes: dict[str, Any], *, label_name: str | None = None, log_message_suffix: str = "") -> list[dict[str, Any]]:
         """
         インポート対象のアノテーションJSONに格納されている`attributes`を`AdditionalDataListV2`のlistに変換します。
 
@@ -339,7 +339,7 @@ class AnnotationConverter:
         details: list[ImportedSimpleAnnotationDetail],
         old_details: list[dict[str, Any]],
         *,
-        updated_datetime: Optional[str] = None,
+        updated_datetime: str | None = None,
     ) -> dict[str, Any]:
         """
         アノテーションJSONに記載されたアノテーション情報を、`put_annotation` APIに渡す形式に変換します。
@@ -487,7 +487,7 @@ class ImportAnnotationMain(CommandLineWithConfirm):
 
         return success_input_data_count, success_annotation_count
 
-    def execute_task(self, task_parser: SimpleAnnotationParserByTask, task_index: Optional[int] = None) -> bool:
+    def execute_task(self, task_parser: SimpleAnnotationParserByTask, task_index: int | None = None) -> bool:
         """
         1個のタスクに対してアノテーションを登録する。
 
@@ -514,7 +514,7 @@ class ImportAnnotationMain(CommandLineWithConfirm):
             logger.info(f"タスク'{task_id}'は作業中または受入完了状態のため、インポートをスキップします。 status={task['status']}")
             return False
 
-        old_account_id: Optional[str] = None
+        old_account_id: str | None = None
         changed_operator = False
         if self.is_force:
             if not can_put_annotation(task, self.service.api.account_id):
@@ -566,8 +566,8 @@ class ImportAnnotationMain(CommandLineWithConfirm):
     def main(
         self,
         iter_task_parser: Iterator[SimpleAnnotationParserByTask],
-        target_task_ids: Optional[set[str]] = None,
-        parallelism: Optional[int] = None,
+        target_task_ids: set[str] | None = None,
+        parallelism: int | None = None,
     ) -> None:
         def get_iter_task_parser_from_task_ids(_iter_task_parser: Iterator[SimpleAnnotationParserByTask], _target_task_ids: set[str]) -> Iterator[SimpleAnnotationParserByTask]:
             for task_parser in _iter_task_parser:
@@ -746,7 +746,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 = "import"
     subcommand_help = "アノテーションをインポートします。"
     description = "アノテーションをインポートします。アノテーションのフォーマットは、Simpleアノテーションと同じフォルダ構成のzipファイルまたはディレクトリです。ただし、作業中/完了状態のタスクはインポートできません。"  # noqa: E501

annofabcli/annotation/list_annotation.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import argparse
 import logging
 import sys
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -52,10 +52,10 @@ class ListAnnotationMain:
     def get_annotation_list(
         self,
         project_id: str,
-        annotation_query: Optional[AnnotationQueryForAPI],
+        annotation_query: AnnotationQueryForAPI | None,
         *,
-        task_id: Optional[str] = None,
-        input_data_id: Optional[str] = None,
+        task_id: str | None = None,
+        input_data_id: str | None = None,
     ) -> list[SingleAnnotation]:
         dict_query = {}
         if annotation_query is not None:
@@ -73,10 +73,10 @@ class ListAnnotationMain:
     def get_all_annotation_list(
         self,
         project_id: str,
-        annotation_query: Optional[AnnotationQueryForAPI],
+        annotation_query: AnnotationQueryForAPI | None,
         *,
-        task_id_list: Optional[list[str]],
-        input_data_id_list: Optional[list[str]],
+        task_id_list: list[str] | None,
+        input_data_id_list: list[str] | None,
     ) -> list[SingleAnnotation]:
         assert task_id_list is None or input_data_id_list is None, "task_id_listとinput_data_listのどちらかはNoneにしてください。"
 
@@ -252,7 +252,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 = "アノテーションの一覧を出力します。"