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

annofabcli/annotation_specs/list_annotation_specs_label_attribute.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_message_with_lang
 from dataclasses_json import DataClassJsonMixin
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -31,9 +30,9 @@ logger = logging.getLogger(__name__)
 @dataclass
 class LabelAndAttribute(DataClassJsonMixin):
     label_id: str
-    label_name_en: Optional[str]
-    label_name_ja: Optional[str]
-    label_name_vi: Optional[str]
+    label_name_en: str | None
+    label_name_ja: str | None
+    label_name_vi: str | None
     annotation_type: str
 
     attribute_id: str
@@ -43,9 +42,9 @@ class LabelAndAttribute(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
 
 
@@ -91,7 +90,7 @@ def create_label_attribute_list(labels_v3: list[dict[str, Any]], additionals_v3:
 class PrintAnnotationSpecsLabelAndAttribute(CommandLine):
     COMMON_MESSAGE = "annofabcli annotation_specs list_label: error:"
 
-    def print_annotation_specs_label(self, annotation_specs_v3: dict[str, Any], output_format: FormatArgument, output: Optional[str] = None) -> None:
+    def print_annotation_specs_label(self, annotation_specs_v3: dict[str, Any], output_format: FormatArgument, output: str | None = None) -> None:
         # アノテーション仕様のv2とv3はほとんど同じなので、`convert_annotation_specs_labels_v2_to_v1`にはV3のアノテーション仕様を渡す
         label_attribute_list = create_label_attribute_list(annotation_specs_v3["labels"], annotation_specs_v3["additionals"])
 
@@ -115,7 +114,7 @@ class PrintAnnotationSpecsLabelAndAttribute(CommandLine):
         elif output_format in [FormatArgument.JSON, FormatArgument.PRETTY_JSON]:
             print_according_to_format([e.to_dict() for e in label_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}個前のアノテーション仕様は見つかりませんでした。")
@@ -205,7 +204,7 @@ def main(args: argparse.Namespace) -> None:
     PrintAnnotationSpecsLabelAndAttribute(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_label_attribute"
 
     subcommand_help = "アノテーション仕様のラベルとラベルに含まれている属性の一覧を出力します。"

annofabcli/annotation_specs/list_attribute_restriction.py

@@ -5,9 +5,7 @@ import json
 import logging
 import sys
 from pathlib import Path
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.annotation_specs.attribute_restriction import AttributeRestrictionMessage, OutputFormat
 from annofabcli.common.cli import (
@@ -25,7 +23,7 @@ logger = logging.getLogger(__name__)
 class ListAttributeRestriction(CommandLine):
     COMMON_MESSAGE = "annofabcli annotation_specs list_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}個前のアノテーション仕様は見つかりませんでした。")
@@ -133,7 +131,7 @@ def main(args: argparse.Namespace) -> None:
     ListAttributeRestriction(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_restriction"
 
     subcommand_help = "アノテーション仕様の属性の制約情報を出力します。"

annofabcli/annotation_specs/list_label_color.py

@@ -4,9 +4,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,
@@ -65,7 +64,7 @@ def main(args: argparse.Namespace) -> None:
     PrintLabelColor(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_label_color"
 
     subcommand_help = "label_name(英名)とRGBの関係をJSONで出力します。"

annofabcli/annotation_specs/put_label_color.py

@@ -4,11 +4,10 @@ import argparse
 import logging
 import sys
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -78,7 +77,7 @@ class PuttingLabelColorMain(CommandLineWithConfirm):
         confirm_message = confirm_message + "\n" + str_changed_labels
         return self.confirm_processing(confirm_message)
 
-    def main(self, label_color: LabelColorDict, comment: Optional[str]) -> None:
+    def main(self, label_color: LabelColorDict, comment: str | None) -> None:
         request_body, changed_labels = self.create_request_body(label_color)
 
         if len(changed_labels) == 0:
@@ -138,7 +137,7 @@ def main(args: argparse.Namespace) -> None:
     PutLabelColor(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 = "put_label_color"
 
     subcommand_help = "ラベルの色を変更します。"

annofabcli/annotation_specs/subcommand_annotation_specs.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.annotation_specs.add_attribute_restriction
 import annofabcli.annotation_specs.export_annotation_specs
 import annofabcli.annotation_specs.get_annotation_specs_with_attribute_id_replaced
@@ -37,7 +35,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.annotation_specs.put_label_color.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_specs"
     subcommand_help = "アノテーション仕様関係のサブコマンド"
     description = "アノテーション仕様関係のサブコマンド"

annofabcli/annotation_zip/list_annotation_3d_bounding_box.py

@@ -0,0 +1,365 @@
+import argparse
+import logging
+import sys
+import tempfile
+from collections.abc import Collection
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any
+
+import pandas
+from annofab_3dpc.annotation import CuboidAnnotationDetailDataV2, convert_annotation_detail_data
+from annofabapi.models import InputDataType, ProjectMemberRole
+from dataclasses_json import DataClassJsonMixin
+
+import annofabcli.common.cli
+from annofabcli.common.annofab.annotation_zip import lazy_parse_simple_annotation_by_input_data
+from annofabcli.common.cli import COMMAND_LINE_ERROR_STATUS_CODE, ArgumentParser, CommandLine, build_annofabapi_resource_and_login, get_list_from_args
+from annofabcli.common.download import DownloadingFile
+from annofabcli.common.enums import FormatArgument
+from annofabcli.common.facade import (
+    AnnofabApiFacade,
+    TaskQuery,
+    match_annotation_with_task_query,
+)
+from annofabcli.common.utils import print_csv, print_json
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass(frozen=True)
+class Annotation3DBoundingBoxInfo(DataClassJsonMixin):
+    project_id: str
+    task_id: str
+    task_status: str
+    task_phase: str
+    task_phase_stage: int
+
+    input_data_id: str
+    input_data_name: str
+
+    label: str
+    annotation_id: str
+
+    dimensions: dict[str, float]
+    """サイズ情報 (width, height, depth)"""
+
+    location: dict[str, float]
+    """中心座標 (x, y, z)"""
+
+    rotation: dict[str, float]
+    """回転情報 (x=roll, y=pitch, z=yaw)"""
+
+    direction: dict[str, dict[str, float]]
+    """方向ベクトル (front, up)"""
+
+    volume: float
+    """体積（width × height × depth）"""
+
+    footprint_area: float
+    """底面積（width × depth）。地面占有面積。"""
+
+    bottom_z: float
+    """底面のZ座標（location.z - height/2）。回転は考慮していない。"""
+
+    top_z: float
+    """天面のZ座標（location.z + height/2）。回転は考慮していない。"""
+
+    attributes: dict[str, str | int | bool]
+    """属性情報"""
+
+    updated_datetime: str | None
+    """アノテーションJSONに格納されているアノテーションの更新日時"""
+
+
+def get_annotation_3d_bounding_box_info_list(simple_annotation: dict[str, Any], *, target_label_names: Collection[str] | None = None) -> list[Annotation3DBoundingBoxInfo]:
+    result = []
+    target_label_names_set = set(target_label_names) if target_label_names is not None else None
+    for detail in simple_annotation["details"]:
+        label = detail["label"]
+        # ラベル名によるフィルタリング
+        if target_label_names_set is not None and label not in target_label_names_set:
+            continue
+
+        annotation_data = convert_annotation_detail_data(detail["data"])
+        if not isinstance(annotation_data, CuboidAnnotationDetailDataV2):
+            continue
+
+        # 追加情報の計算
+        dimensions = annotation_data.shape.dimensions
+        location = annotation_data.shape.location
+        width = dimensions.width
+        height = dimensions.height
+        depth = dimensions.depth
+
+        volume = width * height * depth
+        footprint_area = width * depth
+        bottom_z = location.z - height / 2
+        top_z = location.z + height / 2
+
+        result.append(
+            Annotation3DBoundingBoxInfo(
+                project_id=simple_annotation["project_id"],
+                task_id=simple_annotation["task_id"],
+                task_phase=simple_annotation["task_phase"],
+                task_phase_stage=simple_annotation["task_phase_stage"],
+                task_status=simple_annotation["task_status"],
+                input_data_id=simple_annotation["input_data_id"],
+                input_data_name=simple_annotation["input_data_name"],
+                label=label,
+                annotation_id=detail["annotation_id"],
+                dimensions=dimensions.to_dict(),  # type: ignore[arg-type]
+                location=location.to_dict(),  # type: ignore[arg-type]
+                rotation=annotation_data.shape.rotation.to_dict(),  # type: ignore[arg-type]
+                direction=annotation_data.shape.direction.to_dict(),  # type: ignore[arg-type]
+                volume=volume,
+                footprint_area=footprint_area,
+                bottom_z=bottom_z,
+                top_z=top_z,
+                attributes=detail["attributes"],
+                updated_datetime=simple_annotation["updated_datetime"],
+            )
+        )
+
+    return result
+
+
+def get_annotation_3d_bounding_box_info_list_from_annotation_path(
+    annotation_path: Path,
+    *,
+    target_task_ids: Collection[str] | None = None,
+    task_query: TaskQuery | None = None,
+    target_label_names: Collection[str] | None = None,
+) -> list[Annotation3DBoundingBoxInfo]:
+    annotation_bbox_list = []
+    target_task_ids_set = set(target_task_ids) if target_task_ids is not None else None
+    iter_parser = lazy_parse_simple_annotation_by_input_data(annotation_path)
+    logger.info(f"アノテーションZIPまたはディレクトリ'{annotation_path}'を読み込みます。")
+    for index, parser in enumerate(iter_parser):
+        if (index + 1) % 10000 == 0:
+            logger.info(f"{index + 1}  件目のJSONを読み込み中")
+        if target_task_ids_set is not None and parser.task_id not in target_task_ids_set:
+            continue
+        dict_simple_annotation = parser.load_json()
+        if task_query is not None and not match_annotation_with_task_query(dict_simple_annotation, task_query):
+            continue
+        sub_annotation_bbox_list = get_annotation_3d_bounding_box_info_list(dict_simple_annotation, target_label_names=target_label_names)
+        annotation_bbox_list.extend(sub_annotation_bbox_list)
+    return annotation_bbox_list
+
+
+def create_df(
+    annotation_bbox_list: list[Annotation3DBoundingBoxInfo],
+) -> pandas.DataFrame:
+    tmp_annotation_bbox_list = [e.to_dict(encode_json=True) for e in annotation_bbox_list]
+
+    base_columns = [
+        "project_id",
+        "task_id",
+        "task_status",
+        "task_phase",
+        "task_phase_stage",
+        "input_data_id",
+        "input_data_name",
+        "updated_datetime",
+        "label",
+        "annotation_id",
+        "dimensions.width",
+        "dimensions.height",
+        "dimensions.depth",
+        "location.x",
+        "location.y",
+        "location.z",
+        "rotation.x",
+        "rotation.y",
+        "rotation.z",
+        "volume",
+        "footprint_area",
+        "bottom_z",
+        "top_z",
+    ]
+
+    if len(tmp_annotation_bbox_list) == 0:
+        # 空のDataFrameの場合、base_columnsの列を持つ空のDataFrameを作成
+        return pandas.DataFrame(columns=base_columns)
+
+    df = pandas.json_normalize(tmp_annotation_bbox_list)
+    attribute_columns = sorted(col for col in df.columns if col.startswith("attributes."))
+    columns = base_columns + attribute_columns
+
+    return df[columns]
+
+
+def print_annotation_3d_bounding_box(
+    annotation_path: Path,
+    output_file: Path,
+    output_format: FormatArgument,
+    *,
+    target_task_ids: Collection[str] | None = None,
+    task_query: TaskQuery | None = None,
+    target_label_names: Collection[str] | None = None,
+) -> None:
+    annotation_bbox_list = get_annotation_3d_bounding_box_info_list_from_annotation_path(
+        annotation_path,
+        target_task_ids=target_task_ids,
+        task_query=task_query,
+        target_label_names=target_label_names,
+    )
+
+    logger.info(f"{len(annotation_bbox_list)} 件の3Dバウンディングボックスアノテーションの情報を出力します。 :: output='{output_file}'")
+
+    if output_format == FormatArgument.CSV:
+        df = create_df(annotation_bbox_list)
+        print_csv(df, output_file)
+
+    elif output_format in [FormatArgument.PRETTY_JSON, FormatArgument.JSON]:
+        json_is_pretty = output_format == FormatArgument.PRETTY_JSON
+        # DataClassJsonMixinを使用したtoJSON処理
+        print_json(
+            [e.to_dict(encode_json=True) for e in annotation_bbox_list],
+            is_pretty=json_is_pretty,
+            output=output_file,
+        )
+
+    else:
+        raise ValueError(f"出力形式 '{output_format}' はサポートされていません。")
+
+
+class ListAnnotation3DBoundingBox(CommandLine):
+    COMMON_MESSAGE = "annofabcli annotation_zip list_3d_bounding_box_annotation: error:"
+
+    def validate(self, args: argparse.Namespace) -> bool:
+        if args.project_id is None and args.annotation is None:
+            print(  # noqa: T201
+                f"{self.COMMON_MESSAGE} argument --project_id: '--annotation'が未指定のときは、'--project_id' を指定してください。",
+                file=sys.stderr,
+            )
+            return False
+        return True
+
+    def main(self) -> None:
+        args = self.args
+
+        if not self.validate(args):
+            sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
+
+        project_id: str | None = args.project_id
+        if project_id is not None:
+            super().validate_project(project_id, project_member_roles=[ProjectMemberRole.OWNER, ProjectMemberRole.TRAINING_DATA_USER])
+            project, _ = self.service.api.get_project(project_id)
+            if project["input_data_type"] != InputDataType.CUSTOM.value:
+                print(f"project_id='{project_id}'であるプロジェクトはカスタムプロジェクト（点群など）でないので、終了します", file=sys.stderr)  # noqa: T201
+                sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
+
+        annotation_path = Path(args.annotation) if args.annotation is not None else None
+
+        task_id_list = annofabcli.common.cli.get_list_from_args(args.task_id) if args.task_id is not None else None
+        task_query = TaskQuery.from_dict(annofabcli.common.cli.get_json_from_args(args.task_query)) if args.task_query is not None else None
+        label_name_list = get_list_from_args(args.label_name) if args.label_name is not None else None
+
+        output_file: Path = args.output
+        output_format = FormatArgument(args.format)
+
+        downloading_obj = DownloadingFile(self.service)
+
+        def download_and_print_annotation_bbox(project_id: str, temp_dir: Path, *, is_latest: bool) -> None:
+            annotation_path = temp_dir / f"{project_id}__annotation.zip"
+            downloading_obj.download_annotation_zip(
+                project_id,
+                dest_path=annotation_path,
+                is_latest=is_latest,
+            )
+            print_annotation_3d_bounding_box(
+                annotation_path,
+                output_file,
+                output_format,
+                target_task_ids=task_id_list,
+                task_query=task_query,
+                target_label_names=label_name_list,
+            )
+
+        if project_id is not None:
+            if args.temp_dir is not None:
+                download_and_print_annotation_bbox(project_id=project_id, temp_dir=args.temp_dir, is_latest=args.latest)
+            else:
+                with tempfile.TemporaryDirectory() as str_temp_dir:
+                    download_and_print_annotation_bbox(
+                        project_id=project_id,
+                        temp_dir=Path(str_temp_dir),
+                        is_latest=args.latest,
+                    )
+        else:
+            assert annotation_path is not None
+            print_annotation_3d_bounding_box(
+                annotation_path,
+                output_file,
+                output_format,
+                target_task_ids=task_id_list,
+                task_query=task_query,
+                target_label_names=label_name_list,
+            )
+
+
+def parse_args(parser: argparse.ArgumentParser) -> None:
+    argument_parser = ArgumentParser(parser)
+
+    group = parser.add_mutually_exclusive_group(required=True)
+    group.add_argument(
+        "--annotation",
+        type=str,
+        help="アノテーションzip、またはzipを展開したディレクトリを指定します。",
+    )
+
+    group.add_argument("-p", "--project_id", type=str, help="project_id。アノテーションZIPをダウンロードします。")
+
+    argument_parser.add_format(
+        choices=[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON],
+        default=FormatArgument.CSV,
+    )
+
+    argument_parser.add_output()
+
+    parser.add_argument(
+        "-tq",
+        "--task_query",
+        type=str,
+        help="集計対象タスクを絞り込むためのクエリ条件をJSON形式で指定します。使用できるキーは task_id, status, phase, phase_stage です。"
+        " ``file://`` を先頭に付けると、JSON形式のファイルを指定できます。",
+    )
+    argument_parser.add_task_id(required=False)
+
+    parser.add_argument(
+        "--label_name",
+        type=str,
+        nargs="*",
+        help="指定したラベル名の3Dバウンディングボックスアノテーションのみを対象にします。複数指定できます。",
+    )
+
+    parser.add_argument(
+        "--latest",
+        action="store_true",
+        help="``--annotation`` を指定しないとき、最新のアノテーションzipを参照します。このオプションを指定すると、アノテーションzipを更新するのに数分待ちます。",
+    )
+
+    parser.add_argument(
+        "--temp_dir",
+        type=Path,
+        help="指定したディレクトリに、アノテーションZIPなどの一時ファイルをダウンロードします。",
+    )
+
+    parser.set_defaults(subcommand_func=main)
+
+
+def main(args: argparse.Namespace) -> None:
+    service = build_annofabapi_resource_and_login(args)
+    facade = AnnofabApiFacade(service)
+    ListAnnotation3DBoundingBox(service, facade, args).main()
+
+
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
+    subcommand_name = "list_3d_bounding_box_annotation"
+    subcommand_help = "アノテーションZIPから3Dバウンディングボックス（CUBOID）アノテーションの座標情報を出力します。"
+    epilog = "アノテーションZIPをダウンロードする場合は、オーナロールまたはアノテーションユーザロールを持つユーザで実行してください。"
+    parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help, description=subcommand_help, epilog=epilog)
+    parse_args(parser)
+    return parser

annofabcli/annotation_zip/list_annotation_bounding_box_2d.py

@@ -7,13 +7,12 @@ import tempfile
 from collections.abc import Collection
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import pandas
 from annofabapi.models import InputDataType, ProjectMemberRole
 from dataclasses_json import DataClassJsonMixin
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.annofab.annotation_zip import lazy_parse_simple_annotation_by_input_data
 from annofabcli.common.cli import COMMAND_LINE_ERROR_STATUS_CODE, ArgumentParser, CommandLine, build_annofabapi_resource_and_login, get_list_from_args
@@ -40,7 +39,7 @@ class AnnotationBoundingBoxInfo(DataClassJsonMixin):
     input_data_id: str
     input_data_name: str
 
-    updated_datetime: Optional[str]
+    updated_datetime: str | None
     """アノテーションJSONに格納されているアノテーションの更新日時"""
 
     label: str
@@ -51,7 +50,7 @@ class AnnotationBoundingBoxInfo(DataClassJsonMixin):
     height: int
 
 
-def get_annotation_bounding_box_info_list(simple_annotation: dict[str, Any], *, target_label_names: Optional[Collection[str]] = None) -> list[AnnotationBoundingBoxInfo]:
+def get_annotation_bounding_box_info_list(simple_annotation: dict[str, Any], *, target_label_names: Collection[str] | None = None) -> list[AnnotationBoundingBoxInfo]:
     result = []
     target_label_names_set = set(target_label_names) if target_label_names is not None else None
     for detail in simple_annotation["details"]:
@@ -91,9 +90,9 @@ def get_annotation_bounding_box_info_list(simple_annotation: dict[str, Any], *,
 def get_annotation_bounding_box_info_list_from_annotation_path(
     annotation_path: Path,
     *,
-    target_task_ids: Optional[Collection[str]] = None,
-    task_query: Optional[TaskQuery] = None,
-    target_label_names: Optional[Collection[str]] = None,
+    target_task_ids: Collection[str] | None = None,
+    task_query: TaskQuery | None = None,
+    target_label_names: Collection[str] | None = None,
 ) -> list[AnnotationBoundingBoxInfo]:
     annotation_bbox_list = []
     target_task_ids = set(target_task_ids) if target_task_ids is not None else None
@@ -166,9 +165,9 @@ def print_annotation_bounding_box(
     output_file: Path,
     output_format: FormatArgument,
     *,
-    target_task_ids: Optional[Collection[str]] = None,
-    task_query: Optional[TaskQuery] = None,
-    target_label_names: Optional[Collection[str]] = None,
+    target_task_ids: Collection[str] | None = None,
+    task_query: TaskQuery | None = None,
+    target_label_names: Collection[str] | None = None,
 ) -> None:
     annotation_bbox_list = get_annotation_bounding_box_info_list_from_annotation_path(
         annotation_path,
@@ -214,7 +213,7 @@ class ListAnnotationBoundingBox2d(CommandLine):
         if not self.validate(args):
             sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
 
-        project_id: Optional[str] = args.project_id
+        project_id: str | None = args.project_id
         if project_id is not None:
             super().validate_project(project_id, project_member_roles=[ProjectMemberRole.OWNER, ProjectMemberRole.TRAINING_DATA_USER])
             project, _ = self.service.api.get_project(project_id)
@@ -327,7 +326,7 @@ def main(args: argparse.Namespace) -> None:
     ListAnnotationBoundingBox2d(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_bounding_box_annotation"
     subcommand_help = "アノテーションZIPからバウンディングボックス（矩形）アノテーションの座標情報を出力します。"
     epilog = "アノテーションZIPをダウンロードする場合は、オーナロールまたはアノテーションユーザロールを持つユーザで実行してください。"