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

annofabcli/annotation/list_annotation.py

@@ -3,13 +3,13 @@ from __future__ import annotations
 import argparse
 import logging
 import sys
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
 from annofabapi.models import SingleAnnotation
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.annotation.annotation_query import AnnotationQueryForAPI, AnnotationQueryForCLI
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -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 = "アノテーションの一覧を出力します。"

annofabcli/annotation/list_annotation_count.py

@@ -4,13 +4,12 @@ import argparse
 import logging
 import sys
 from enum import Enum
-from typing import Optional
 
 import annofabapi
 import pandas
 from annofabapi.models import SingleAnnotation
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.annotation.annotation_query import AnnotationQueryForCLI
 from annofabcli.annotation.list_annotation import ListAnnotationMain
 from annofabcli.common.cli import (
@@ -162,7 +161,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_count"
     subcommand_help = "task_idまたはinput_data_idで集約したアノテーションの個数を出力します。"
     description = "task_idまたはinput_data_idで集約したアノテーションの個数を出力します。"

annofabcli/annotation/merge_segmentation.py

@@ -8,7 +8,7 @@ import sys
 import tempfile
 from collections.abc import Collection
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import numpy
@@ -19,7 +19,7 @@ from annofabapi.segmentation import read_binary_image, write_binary_image
 from annofabapi.util.annotation_specs import AnnotationSpecsAccessor
 from annofabapi.utils import can_put_annotation
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     PARALLELISM_CHOICES,
@@ -84,7 +84,7 @@ class MergeSegmentationMain(CommandLineWithConfirm):
             tuple[1]: 削除対象の塗りつぶしアノテーションのannotation_idのlist
         """
 
-        def func(label_id: str) -> tuple[Optional[str], list[str]]:
+        def func(label_id: str) -> tuple[str | None, list[str]]:
             updated_annotation_id = None
             deleted_annotation_id_list = []
             binary_image_array_list = []
@@ -181,7 +181,7 @@ class MergeSegmentationMain(CommandLineWithConfirm):
         )
         return True
 
-    def merge_segmentation_annotation_for_task(self, task_id: str, *, task_index: Optional[int] = None) -> int:
+    def merge_segmentation_annotation_for_task(self, task_id: str, *, task_index: int | None = None) -> int:
         """
         1個のタスクに対して、label_idに対応する複数の塗りつぶしアノテーションを1つにまとめます。
 
@@ -256,7 +256,7 @@ class MergeSegmentationMain(CommandLineWithConfirm):
     def main(
         self,
         task_ids: Collection[str],
-        parallelism: Optional[int] = None,
+        parallelism: int | None = None,
     ) -> None:
         logger.info(f"{len(task_ids)} 件のタスクに対して、複数の塗りつぶしアノテーションを1個にまとめます。")
         success_input_data_count = 0
@@ -371,7 +371,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 = "merge_segmentation"
     subcommand_help = "複数の塗りつぶしアノテーションを1つにまとめます。"
     description = (

annofabcli/annotation/remove_segmentation_overlap.py

@@ -8,7 +8,7 @@ import sys
 import tempfile
 from collections.abc import Collection
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import numpy
@@ -17,7 +17,7 @@ from annofabapi.pydantic_models.task_status import TaskStatus
 from annofabapi.segmentation import read_binary_image, write_binary_image
 from annofabapi.utils import can_put_annotation
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     PARALLELISM_CHOICES,
@@ -160,7 +160,7 @@ class RemoveSegmentationOverlapMain(CommandLineWithConfirm):
         logger.debug(f"{log_message_prefix}{len(updated_annotation_id_list)} 件の塗りつぶしアノテーションを更新しました。 :: task_id='{task_id}', input_data_id='{input_data_id}'")
         return True
 
-    def update_segmentation_annotation_for_task(self, task_id: str, *, task_index: Optional[int] = None) -> int:
+    def update_segmentation_annotation_for_task(self, task_id: str, *, task_index: int | None = None) -> int:
         """
         1個のタスクに対して、塗りつぶしアノテーションの重なりを除去します。
 
@@ -235,7 +235,7 @@ class RemoveSegmentationOverlapMain(CommandLineWithConfirm):
     def main(
         self,
         task_ids: Collection[str],
-        parallelism: Optional[int] = None,
+        parallelism: int | None = None,
     ) -> None:
         logger.info(f"{len(task_ids)} 件のタスクの塗りつぶしアノテーションの重なりを除去します。")
         success_input_data_count = 0
@@ -317,7 +317,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 = "remove_segmentation_overlap"
     subcommand_help = "塗りつぶしアノテーションの重なりを除去します。"
     description = "塗りつぶしアノテーションの重なりを除去します。Annofabでインスタンスセグメンテーションは重ねることができてしまいます。この重なりをなくしたいときに有用です。"

annofabcli/annotation/restore_annotation.py

@@ -7,7 +7,7 @@ import multiprocessing
 import sys
 from collections.abc import Iterator
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.dataclass.annotation import AnnotationDetailV1, AnnotationV1
@@ -19,7 +19,7 @@ from annofabapi.parser import (
 )
 from annofabapi.utils import can_put_annotation
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     PARALLELISM_CHOICES,
@@ -164,7 +164,7 @@ class RestoreAnnotationMain(CommandLineWithConfirm):
 
         return success_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個のタスクに対してアノテーションを登録する。
 
@@ -193,7 +193,7 @@ class RestoreAnnotationMain(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):
@@ -243,8 +243,8 @@ class RestoreAnnotationMain(CommandLineWithConfirm):
     def main(  # noqa: ANN201
         self,
         annotation_dir: Path,
-        target_task_ids: Optional[set[str]] = None,
-        parallelism: Optional[int] = None,
+        target_task_ids: set[str] | None = None,
+        parallelism: int | None = None,
     ):
         """`annotation_dir`にあるファイルからアノテーションをリストアします。
 
@@ -363,7 +363,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 = "restore"
     subcommand_help = "'annotation dump'コマンドの出力結果から、アノテーション情報をリストアします。"
     description = "'annotation dump'コマンドの出力結果から、アノテーション情報をリストアします。ただし、作業中/完了状態のタスクはリストアできません。"

annofabcli/annotation/subcommand_annotation.py

@@ -1,5 +1,4 @@
 import argparse
-from typing import Optional
 
 import annofabcli.annotation.change_annotation_attributes
 import annofabcli.annotation.change_annotation_attributes_per_annotation
@@ -38,7 +37,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.annotation.restore_annotation.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 = "annotation"
     subcommand_help = "アノテーション関係のサブコマンド"
     description = "アノテーション関係のサブコマンド"

annofabcli/annotation_specs/add_attribute_restriction.py

@@ -5,11 +5,10 @@ import copy
 import json
 import logging
 import sys
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.annotation_specs.attribute_restriction import AttributeRestrictionMessage, OutputFormat
 from annofabcli.common.cli import (
@@ -43,7 +42,7 @@ class AddAttributeRestrictionMain(CommandLineWithConfirm):
         CommandLineWithConfirm.__init__(self, all_yes)
         self.project_id = project_id
 
-    def add_restrictions(self, restrictions: list[dict[str, Any]], comment: Optional[str] = None) -> bool:
+    def add_restrictions(self, restrictions: list[dict[str, Any]], comment: str | None = None) -> bool:
         old_annotation_specs, _ = self.service.api.get_annotation_specs(self.project_id, query_params={"v": "3"})
         old_restrictions = old_annotation_specs["restrictions"]
 
@@ -95,7 +94,7 @@ class AddAttributeRestrictionMain(CommandLineWithConfirm):
 class AddAttributeRestriction(CommandLine):
     COMMON_MESSAGE = "annofabcli annotation_specs add_restriction: error:"
 
-    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_annotation_specs_histories(project_id)
         if before + 1 > len(histories):
             logger.warning(f"アノテーション仕様の履歴は{len(histories)}個のため、最新より{before}個前のアノテーション仕様は見つかりませんでした。")
@@ -142,7 +141,7 @@ def main(args: argparse.Namespace) -> None:
     AddAttributeRestriction(service, facade, args).main()
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "add_attribute_restriction"
 
     subcommand_help = "アノテーション仕様に属性の制約を追加します。"

annofabcli/annotation_specs/attribute_restriction.py

@@ -1,7 +1,7 @@
 import logging
 from collections.abc import Collection
 from enum import Enum
-from typing import Any, Optional
+from typing import Any
 
 from more_itertools import first_true
 
@@ -69,7 +69,7 @@ class AttributeRestrictionMessage:
 
         return ", ".join(label_message_list)
 
-    def get_object_for_equals_or_notequals(self, value: str, attribute: Optional[dict[str, Any]]) -> str:
+    def get_object_for_equals_or_notequals(self, value: str, attribute: dict[str, Any] | None) -> str:
         """制約条件が `Equals` or `NotEquals`のときの目的語を生成する。
         属性の種類がドロップダウンかセレクトボックスのときは、選択肢の名前を返す。
 
@@ -173,7 +173,7 @@ class AttributeRestrictionMessage:
             tmp = f"{tmp} {str_object}"
         return tmp
 
-    def get_attribute_from_name(self, attribute_name: str) -> Optional[dict[str, Any]]:
+    def get_attribute_from_name(self, attribute_name: str) -> dict[str, Any] | None:
         tmp = [attribute for attribute in self.attribute_dict.values() if AnnofabApiFacade.get_additional_data_definition_name_en(attribute) == attribute_name]
         if len(tmp) == 1:
             return tmp[0]
@@ -184,7 +184,7 @@ class AttributeRestrictionMessage:
             logger.warning(f"属性名(英語)が'{attribute_name}'の属性は複数存在します。")
             return None
 
-    def get_label_from_name(self, label_name: str) -> Optional[dict[str, Any]]:
+    def get_label_from_name(self, label_name: str) -> dict[str, Any] | None:
         tmp = [label for label in self.label_dict.values() if AnnofabApiFacade.get_label_name_en(label) == label_name]
         if len(tmp) == 1:
             return tmp[0]
@@ -197,8 +197,8 @@ class AttributeRestrictionMessage:
 
     def get_target_attribute_ids(
         self,
-        target_attribute_names: Optional[Collection[str]] = None,
-        target_label_names: Optional[Collection[str]] = None,
+        target_attribute_names: Collection[str] | None = None,
+        target_label_names: Collection[str] | None = None,
     ) -> set[str]:
         result: set[str] = set()
 
@@ -219,8 +219,8 @@ class AttributeRestrictionMessage:
         self,
         restrictions: list[dict[str, Any]],
         *,
-        target_attribute_names: Optional[Collection[str]] = None,
-        target_label_names: Optional[Collection[str]] = None,
+        target_attribute_names: Collection[str] | None = None,
+        target_label_names: Collection[str] | None = None,
     ) -> list[str]:
         """
         複数の属性制約から自然言語で記載されたメッセージのlistを返します。

annofabcli/annotation_specs/export_annotation_specs.py

@@ -3,9 +3,8 @@ from __future__ import annotations
 import argparse
 import logging
 import sys
-from typing import Any, Optional
+from typing import Any
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -23,7 +22,7 @@ logger = logging.getLogger(__name__)
 class ExportAnnotationSpecs(CommandLine):
     COMMON_MESSAGE = "annofabcli annotation_specs export: error:"
 
-    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_annotation_specs_histories(project_id)
         sorted_histories = sorted(histories, key=lambda x: x["updated_datetime"], reverse=True)
 
@@ -34,7 +33,7 @@ class ExportAnnotationSpecs(CommandLine):
         history = sorted_histories[before]
         return history["history_id"]
 
-    def get_exported_annotation_specs(self, project_id: str, history_id: Optional[str]) -> dict[str, Any]:
+    def get_exported_annotation_specs(self, project_id: str, history_id: str | None) -> dict[str, Any]:
         query_params = {"v": "3"}
         if history_id is not None:
             query_params["history_id"] = history_id
@@ -113,7 +112,7 @@ def main(args: argparse.Namespace) -> None:
     ExportAnnotationSpecs(service, facade, args).main()
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "export"
 
     subcommand_help = "アノテーション仕様の情報をエクスポートします。"

annofabcli/annotation_specs/get_annotation_specs_with_attribute_id_replaced.py

@@ -4,11 +4,10 @@ import argparse
 import logging
 import re
 from collections.abc import Collection
-from typing import Any, Optional
+from typing import Any
 
 import more_itertools
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     ArgumentParser,
@@ -78,7 +77,7 @@ class ReplacingAttributeId(CommandLineWithConfirm):
         """
         return re.fullmatch("[A-Za-z0-9_.\\-]+", str_id) is not None
 
-    def main(self, annotation_specs: dict[str, Any], *, target_attribute_names: Optional[Collection[str]] = None) -> None:
+    def main(self, annotation_specs: dict[str, Any], *, target_attribute_names: Collection[str] | None = None) -> None:
         """
         アノテーション仕様内の属性IDを英語名に変更します。
 
@@ -166,7 +165,7 @@ def main(args: argparse.Namespace) -> None:
     GetAnnotationSpecsWithAttributeIdReplaced(service, facade, args).main()
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "get_with_attribute_id_replaced_english_name"
 
     subcommand_help = "属性IDをUUIDから英語名に置換したアノテーション仕様のJSONを出力します。"

annofabcli/annotation_specs/get_annotation_specs_with_choice_id_replaced.py

@@ -4,11 +4,10 @@ import argparse
 import logging
 import re
 from collections.abc import Collection
-from typing import Any, Optional
+from typing import Any
 
 import more_itertools
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     ArgumentParser,
@@ -36,7 +35,7 @@ class ReplacingChoiceId(CommandLineWithConfirm):
         """
         return re.fullmatch("[A-Za-z0-9_.\\-]+", str_id) is not None
 
-    def main(self, annotation_specs: dict[str, Any], *, target_attribute_names: Optional[Collection[str]] = None) -> None:
+    def main(self, annotation_specs: dict[str, Any], *, target_attribute_names: Collection[str] | None = None) -> None:
         """
         アノテーション仕様内の選択肢IDを英語名に変更します。
 
@@ -140,7 +139,7 @@ def main(args: argparse.Namespace) -> None:
     GetAnnotationSpecsWithAttributeIdReplaced(service, facade, args).main()
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "get_with_choice_id_replaced_english_name"
 
     subcommand_help = "選択肢IDをUUIDから英語名に置換したアノテーション仕様のJSONを出力します。"

annofabcli/annotation_specs/get_annotation_specs_with_label_id_replaced.py

@@ -4,11 +4,10 @@ import argparse
 import logging
 import re
 from collections.abc import Collection
-from typing import Any, Optional
+from typing import Any
 
 import more_itertools
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     ArgumentParser,
@@ -64,7 +63,7 @@ class ReplacingLabelId(CommandLineWithConfirm):
         """
         return re.fullmatch("[A-Za-z0-9_.\\-]+", str_id) is not None
 
-    def main(self, annotation_specs: dict[str, Any], *, target_label_names: Optional[Collection[str]] = None) -> None:
+    def main(self, annotation_specs: dict[str, Any], *, target_label_names: Collection[str] | None = None) -> None:
         """
         アノテーション仕様内のlabel_idをラベル英語名に変更します。
 
@@ -151,7 +150,7 @@ def main(args: argparse.Namespace) -> None:
     GetAnnotationSpecsWithLabelIdReplaced(service, facade, args).main()
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "get_with_label_id_replaced_english_name"
 
     subcommand_help = "label_idをUUIDから英語名に置換したアノテーション仕様のJSONを出力します。"

annofabcli/annotation_specs/list_annotation_specs_attribute.py

@@ -7,14 +7,13 @@ import sys
 from collections import defaultdict
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any
 
 import pandas
 from annofabapi.models import Lang
 from annofabapi.util.annotation_specs import get_message_with_lang
 from dataclasses_json import DataClassJsonMixin
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.annofab.annotation_specs import keybind_to_text
 from annofabcli.common.cli import (
@@ -44,12 +43,12 @@ class FlattenAttribute(DataClassJsonMixin):
         APIレスポンスの ``additional_data_definition_id`` に相当します。
         ``additional_data_definition_id`` という名前がアノテーションJSONの `attributes` と対応していることが分かりにくかったので、`attribute_id`という名前に変えました。
     """
-    attribute_name_en: Optional[str]
-    attribute_name_ja: Optional[str]
-    attribute_name_vi: Optional[str]
+    attribute_name_en: str | None
+    attribute_name_ja: str | None
+    attribute_name_vi: str | None
     attribute_type: str
     """属性の種類"""
-    default: Optional[Union[str, bool, int]]
+    default: str | bool | int | None
     """デフォルト値"""
     read_only: bool
     """読み込み専用の属性か否か"""
@@ -62,7 +61,7 @@ class FlattenAttribute(DataClassJsonMixin):
     """制約の個数"""
     reference_label_count: int
     """参照されているラベルの個数"""
-    keybind: Optional[str]
+    keybind: str | None
 
 
 def create_relationship_between_attribute_and_label(labels_v3: list[dict[str, Any]]) -> dict[str, set[str]]:
@@ -125,7 +124,7 @@ def create_flatten_attribute_list_from_additionals(additionals_v3: list[dict[str
 class PrintAnnotationSpecsAttribute(CommandLine):
     COMMON_MESSAGE = "annofabcli annotation_specs list_attribute: error:"
 
-    def print_annotation_specs_attribute(self, annotation_specs_v3: dict[str, Any], output_format: FormatArgument, output: Optional[str] = None) -> None:
+    def print_annotation_specs_attribute(self, annotation_specs_v3: dict[str, Any], output_format: FormatArgument, output: str | None = None) -> None:
         attribute_list = create_flatten_attribute_list_from_additionals(annotation_specs_v3["additionals"], annotation_specs_v3["labels"], annotation_specs_v3["restrictions"])
         logger.info(f"{len(attribute_list)} 件の属性情報を出力します。")
         if output_format == FormatArgument.CSV:
@@ -149,7 +148,7 @@ class PrintAnnotationSpecsAttribute(CommandLine):
         elif output_format in [FormatArgument.JSON, FormatArgument.PRETTY_JSON]:
             print_according_to_format([e.to_dict() for e in attribute_list], format=output_format, output=output)
 
-    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_annotation_specs_histories(project_id)
         if before + 1 > len(histories):
             logger.warning(f"アノテーション仕様の履歴は{len(histories)}個のため、最新より{before}個前のアノテーション仕様は見つかりませんでした。")
@@ -236,7 +235,7 @@ def main(args: argparse.Namespace) -> None:
     PrintAnnotationSpecsAttribute(service, facade, args).main()
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "list_attribute"
 
     subcommand_help = "アノテーション仕様の属性情報を出力します。"

annofabcli/annotation_specs/list_annotation_specs_choice.py

@@ -6,14 +6,13 @@ import logging
 import sys
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import pandas
 from annofabapi.models import Lang
 from annofabapi.util.annotation_specs import get_english_message, get_message_with_lang
 from dataclasses_json import DataClassJsonMixin
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.annofab.annotation_specs import keybind_to_text
 from annofabcli.common.cli import (
@@ -41,7 +40,7 @@ class FlattenChoice(DataClassJsonMixin):
     どの属性に属しているか分かるようにするため追加した。
     """
 
-    attribute_name_en: Optional[str]
+    attribute_name_en: str | None
     """
     属性名（英語）
     どの属性に属しているか分かるようにするため追加した。
@@ -50,12 +49,12 @@ class FlattenChoice(DataClassJsonMixin):
     attribute_type: str
     """属性の種類"""
     choice_id: str
-    choice_name_en: Optional[str]
-    choice_name_ja: Optional[str]
-    choice_name_vi: Optional[str]
+    choice_name_en: str | None
+    choice_name_ja: str | None
+    choice_name_vi: str | None
     is_default: bool
     """初期値として設定されているかどうか"""
-    keybind: Optional[str]
+    keybind: str | None
     """キーバインド"""
 
 
@@ -105,7 +104,7 @@ def create_flatten_choice_list_from_additionals(additionals_v3: list[dict[str, A
 class PrintAnnotationSpecsAttribute(CommandLine):
     COMMON_MESSAGE = "annofabcli annotation_specs list_choice: error:"
 
-    def print_annotation_specs_choice(self, annotation_specs_v3: dict[str, Any], output_format: FormatArgument, output: Optional[str] = None) -> None:
+    def print_annotation_specs_choice(self, annotation_specs_v3: dict[str, Any], output_format: FormatArgument, output: str | None = None) -> None:
         choice_list = create_flatten_choice_list_from_additionals(annotation_specs_v3["additionals"])
         logger.info(f"{len(choice_list)} 件の選択肢情報を出力します。")
 
@@ -127,7 +126,7 @@ class PrintAnnotationSpecsAttribute(CommandLine):
         elif output_format in [FormatArgument.JSON, FormatArgument.PRETTY_JSON]:
             print_according_to_format([e.to_dict() for e in choice_list], format=output_format, output=output)
 
-    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_annotation_specs_histories(project_id)
         if before + 1 > len(histories):
             logger.warning(f"アノテーション仕様の履歴は{len(histories)}個のため、最新より{before}個前のアノテーション仕様は見つかりませんでした。")
@@ -216,7 +215,7 @@ def main(args: argparse.Namespace) -> None:
     PrintAnnotationSpecsAttribute(service, facade, args).main()
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "list_choice"
 
     subcommand_help = "アノテーション仕様のドロップダウンまたはラジオボタン属性の選択肢情報を出力します。"

annofabcli/annotation_specs/list_annotation_specs_history.py

@@ -1,10 +1,10 @@
 import argparse
 import logging
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 
-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
@@ -54,7 +54,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 = "アノテーション仕様の変更履歴を表示する。"