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

annofabcli/annotation_zip/list_range_annotation.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 RangeAnnotationInfo(DataClassJsonMixin):
     input_data_id: str
     input_data_name: str
 
-    updated_datetime: Optional[str]
+    updated_datetime: str | None
     """アノテーションJSONに格納されているアノテーションの更新日時"""
 
     label: str
@@ -48,9 +47,10 @@ class RangeAnnotationInfo(DataClassJsonMixin):
     begin_second: float
     end_second: float
     duration_second: float
+    attributes: dict[str, str | int | bool]
 
 
-def get_range_annotation_info_list(simple_annotation: dict[str, Any], *, target_label_names: Optional[Collection[str]] = None) -> list[RangeAnnotationInfo]:
+def get_range_annotation_info_list(simple_annotation: dict[str, Any], *, target_label_names: Collection[str] | None = None) -> list[RangeAnnotationInfo]:
     result = []
     target_label_names_set = set(target_label_names) if target_label_names is not None else None
     for detail in simple_annotation["details"]:
@@ -81,6 +81,7 @@ def get_range_annotation_info_list(simple_annotation: dict[str, Any], *, target_
                     end_second=end_second,
                     duration_second=duration_second,
                     updated_datetime=simple_annotation["updated_datetime"],
+                    attributes=detail["attributes"],
                 )
             )
 
@@ -90,9 +91,9 @@ def get_range_annotation_info_list(simple_annotation: dict[str, Any], *, target_
 def get_range_annotation_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[RangeAnnotationInfo]:
     range_annotation_list = []
     target_task_ids = set(target_task_ids) if target_task_ids is not None else None
@@ -114,7 +115,7 @@ def get_range_annotation_info_list_from_annotation_path(
 def create_df(
     range_annotation_list: list[RangeAnnotationInfo],
 ) -> pandas.DataFrame:
-    columns = [
+    base_columns = [
         "project_id",
         "task_id",
         "task_status",
@@ -129,7 +130,16 @@ def create_df(
         "end_second",
         "duration_second",
     ]
-    df = pandas.DataFrame([e.to_dict(encode_json=True) for e in range_annotation_list], columns=columns)
+
+    if not range_annotation_list:
+        # 空のリストの場合は、base_columnsのみで空のDataFrameを返す
+        return pandas.DataFrame(columns=base_columns)
+
+    tmp_range_annotation_list = [e.to_dict(encode_json=True) for e in range_annotation_list]
+    df = pandas.json_normalize(tmp_range_annotation_list)
+
+    attribute_columns = sorted(col for col in df.columns if col.startswith("attributes."))
+    columns = base_columns + attribute_columns
 
     return df[columns]
 
@@ -139,9 +149,9 @@ def print_range_annotation(
     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:
     range_annotation_list = get_range_annotation_info_list_from_annotation_path(
         annotation_path,
@@ -187,7 +197,7 @@ class ListRangeAnnotation(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)
@@ -299,7 +309,7 @@ def main(args: argparse.Namespace) -> None:
     ListRangeAnnotation(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_range_annotation"
     subcommand_help = "アノテーションZIPから動画プロジェクトの区間アノテーションの情報を出力します。"
     epilog = "アノテーションZIPをダウンロードする場合は、オーナロールまたはアノテーションユーザロールを持つユーザで実行してください。"

annofabcli/annotation_zip/list_single_point_annotation.py

@@ -5,13 +5,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
@@ -38,7 +37,7 @@ class AnnotationSinglePointInfo(DataClassJsonMixin):
     input_data_id: str
     input_data_name: str
 
-    updated_datetime: Optional[str]
+    updated_datetime: str | None
     """アノテーションJSONに格納されているアノテーションの更新日時"""
 
     label: str
@@ -46,7 +45,7 @@ class AnnotationSinglePointInfo(DataClassJsonMixin):
     point: dict[str, int]
 
 
-def get_annotation_single_point_info_list(simple_annotation: dict[str, Any], *, target_label_names: Optional[Collection[str]] = None) -> list[AnnotationSinglePointInfo]:
+def get_annotation_single_point_info_list(simple_annotation: dict[str, Any], *, target_label_names: Collection[str] | None = None) -> list[AnnotationSinglePointInfo]:
     result = []
     target_label_names_set = set(target_label_names) if target_label_names is not None else None
     for detail in simple_annotation["details"]:
@@ -80,9 +79,9 @@ def get_annotation_single_point_info_list(simple_annotation: dict[str, Any], *,
 def get_annotation_single_point_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[AnnotationSinglePointInfo]:
     annotation_point_list = []
     target_task_ids = set(target_task_ids) if target_task_ids is not None else None
@@ -147,9 +146,9 @@ def print_annotation_single_point(
     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_point_list = get_annotation_single_point_info_list_from_annotation_path(
         annotation_path,
@@ -195,7 +194,7 @@ class ListAnnotationSinglePoint(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)
@@ -308,7 +307,7 @@ def main(args: argparse.Namespace) -> None:
     ListAnnotationSinglePoint(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_single_point_annotation"
     subcommand_help = "アノテーションZIPから点アノテーションの座標情報を出力します。"
     epilog = "アノテーションZIPをダウンロードする場合は、オーナロールまたはアノテーションユーザロールを持つユーザで実行してください。"

annofabcli/annotation_zip/subcommand_annotation_zip.py

@@ -1,9 +1,9 @@
 """サブコマンド annotation_zip"""
 
 import argparse
-from typing import Optional
 
 import annofabcli
+from annofabcli.annotation_zip.list_annotation_3d_bounding_box import add_parser as add_parser_list_annotation_3d_bounding_box
 from annofabcli.annotation_zip.list_annotation_bounding_box_2d import add_parser as add_parser_list_annotation_bounding_box_2d
 from annofabcli.annotation_zip.list_range_annotation import add_parser as add_parser_list_range_annotation
 from annofabcli.annotation_zip.list_single_point_annotation import add_parser as add_parser_list_single_point_annotation
@@ -18,6 +18,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     subparsers = parser.add_subparsers(dest="subcommand_name")
 
     # サブコマンドの定義
+    add_parser_list_annotation_3d_bounding_box(subparsers)
     add_parser_list_annotation_bounding_box_2d(subparsers)
     add_parser_list_range_annotation(subparsers)
     add_parser_list_single_point_annotation(subparsers)
@@ -25,7 +26,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     # add_parser_validate_annotation(subparsers)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     """
     annotation_zipサブコマンドを追加する。
     Args:

annofabcli/annotation_zip/validate_annotation.py

@@ -6,9 +6,10 @@ import json
 import logging
 import sys
 import tempfile
+from collections.abc import Callable
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Callable, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -37,8 +38,8 @@ class ValidationResult:
     label_name: str
     function_name: str
     is_valid: bool
-    error_message: Optional[str] = None
-    detail_data: Optional[dict[str, Any]] = None
+    error_message: str | None = None
+    detail_data: dict[str, Any] | None = None
 
 
 class ValidationFunctionLoader:
@@ -101,7 +102,7 @@ class AnnotationValidator:
         service: annofabapi.Resource,
         project_id: str,
         validation_functions: dict[str, Callable[[dict[str, Any]], bool]],
-        task_query: Optional[TaskQuery] = None,
+        task_query: TaskQuery | None = None,
     ) -> None:
         self.service = service
         self.project_id = project_id
@@ -233,7 +234,7 @@ class ValidateAnnotation(CommandLine):
         logger.info(f"読み込んだバリデーション関数: {list(validation_functions.keys())}")
 
         # タスク検索クエリ
-        task_query: Optional[TaskQuery] = None
+        task_query: TaskQuery | None = None
         if args.task_query is not None:
             dict_task_query = annofabcli.common.cli.get_json_from_args(args.task_query)
             task_query = TaskQuery.from_dict(dict_task_query)
@@ -277,7 +278,7 @@ class ValidateAnnotation(CommandLine):
         # サマリー表示
         self._print_summary(results)
 
-    def _output_results(self, results: list[ValidationResult], format_type: str, output_file: Optional[Path]) -> None:
+    def _output_results(self, results: list[ValidationResult], format_type: str, output_file: Path | None) -> None:
         """バリデーション結果を出力する"""
         if not results:
             logger.info("バリデーション結果はありません。")
@@ -382,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 = "validate"
     subcommand_help = "ユーザー定義のバリデーション関数でアノテーションZIPを検証します。"
     description = "ユーザー定義のバリデーション関数でアノテーションZIPを検証します。\nバリデーション関数は 'validate_' から始まる関数名で定義してください。"

annofabcli/comment/delete_comment.py

@@ -3,14 +3,12 @@ import json
 import logging
 import multiprocessing
 import sys
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
-import annofabapi.utils
 import requests
 from annofabapi.models import ProjectMemberRole, TaskStatus
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -106,7 +104,7 @@ class DeleteCommentMain(CommandLineWithConfirm):
         self,
         task_id: str,
         comment_ids_for_task: DeletedCommentsForTask,
-        task_index: Optional[int] = None,
+        task_index: int | None = None,
     ) -> int:
         """
         タスクに対してコメントを削除します。
@@ -172,7 +170,7 @@ class DeleteCommentMain(CommandLineWithConfirm):
     def delete_comments_for_task_list(
         self,
         comment_ids_for_task_list: DeletedComments,
-        parallelism: Optional[int] = None,
+        parallelism: int | None = None,
     ) -> None:
         comments_count = sum(len(e) for e in comment_ids_for_task_list.values())
         logger.info(f"削除対象のコメントを含むタスクの個数: {len(comment_ids_for_task_list)}, 削除対象のコメントを含む入力データ数: {comments_count}")
@@ -260,7 +258,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 = "コメントを削除します。\n【注意】他人の付けたコメントも削除できてしまいます。"

annofabcli/comment/download_comment_json.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
@@ -15,17 +13,17 @@ logger = logging.getLogger(__name__)
 
 
 class DownloadingComment(CommandLine):
-    def download_comment_json(self, project_id: str, output_file: Path):  # noqa: ANN201
+    def download_comment_json(self, project_id: str, output_file: Path) -> None:
         super().validate_project(project_id, [ProjectMemberRole.OWNER, ProjectMemberRole.TRAINING_DATA_USER])
         project_title = self.facade.get_project_title(project_id)
-        logger.info(f"{project_title} のコメント全件ファイルをダウンロードします。")
+        logger.info(f"project_id='{project_id}'のコメント全件ファイルをダウンロードします。 :: project_title='{project_title}'")
 
         obj = DownloadingFile(self.service)
         obj.download_comment_json(
             project_id,
             str(output_file),
         )
-        logger.info(f"コメント全件ファイルをダウンロードしました。output={output_file}")
+        logger.info(f"project_id='{project_id}'のコメント全件ファイルをダウンロードしました。 :: output='{output_file}', project_title='{project_title}'")
 
     def main(self) -> None:
         args = self.args
@@ -50,7 +48,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 = "コメント全件ファイルをダウンロードします。"
     epilog = "オーナロールまたはアノテーションユーザロールを持つユーザで実行してください。"

annofabcli/comment/list_all_comment.py

@@ -10,13 +10,12 @@ import logging
 import tempfile
 from collections.abc import Collection
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
 from annofabapi.models import CommentType
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.comment.list_comment import create_empty_df_comment, create_reply_counter
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
@@ -36,9 +35,9 @@ class ListAllCommentMain:
     def get_all_comment(
         self,
         project_id: str,
-        comment_json: Optional[Path],
-        task_ids: Optional[Collection[str]],
-        comment_type: Optional[CommentType],
+        comment_json: Path | None,
+        task_ids: Collection[str] | None,
+        comment_type: CommentType | None,
         exclude_reply: bool,  # noqa: FBT001
     ) -> list[dict[str, Any]]:
         if comment_json is None:
@@ -154,7 +153,7 @@ def main(args: argparse.Namespace) -> None:
     ListAllComment(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_all"
     subcommand_help = "すべてのコメントの一覧を出力します。"
     description = (

annofabcli/comment/list_comment.py

@@ -3,13 +3,12 @@ from __future__ import annotations
 import argparse
 import logging
 from collections import Counter
-from typing import Any, Optional
+from typing import Any
 
 import pandas
 import requests
 from annofabapi.models import Comment, CommentType
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.enums import FormatArgument
@@ -61,7 +60,7 @@ class ListingComments(CommandLine):
             c["reply_count"] = reply_counter.get(key, 0)
         return comments
 
-    def get_comment_list(self, project_id: str, task_id_list: list[str], *, comment_type: Optional[CommentType], exclude_reply: bool) -> list[dict[str, Any]]:
+    def get_comment_list(self, project_id: str, task_id_list: list[str], *, comment_type: CommentType | None, exclude_reply: bool) -> list[dict[str, Any]]:
         all_comments: list[Comment] = []
 
         for task_id in task_id_list:
@@ -151,7 +150,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/comment/put_comment.py

@@ -4,10 +4,9 @@ import logging
 import multiprocessing
 import uuid
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
-import annofabapi.utils
 import requests
 from annofabapi.models import CommentType, TaskPhase, TaskStatus
 from dataclasses_json import DataClassJsonMixin
@@ -29,13 +28,13 @@ class AddedComment(DataClassJsonMixin):
     comment: str
     """コメントの中身"""
 
-    data: Optional[dict[str, Any]]
+    data: dict[str, Any] | None
     """コメントを付与する位置や区間"""
 
-    annotation_id: Optional[str]
+    annotation_id: str | None
     """コメントに紐付けるアノテーションID"""
 
-    phrases: Optional[list[str]]
+    phrases: list[str] | None
     """参照している定型指摘ID"""
 
 
@@ -139,7 +138,7 @@ class PutCommentMain(CommandLineWithConfirm):
         self,
         task_id: str,
         comments_for_task: AddedCommentsForTask,
-        task_index: Optional[int] = None,
+        task_index: int | None = None,
     ) -> int:
         """
         タスクにコメントを付与します。
@@ -207,7 +206,7 @@ class PutCommentMain(CommandLineWithConfirm):
     def add_comments_for_task_list(
         self,
         comments_for_task_list: AddedComments,
-        parallelism: Optional[int] = None,
+        parallelism: int | None = None,
     ) -> None:
         comments_count = sum(len(e) for e in comments_for_task_list.values())
         logger.info(f"{self.comment_type_name}を付与するタスク数: {len(comments_for_task_list)}, {self.comment_type_name}を付与する入力データ数: {comments_count}")
@@ -252,10 +251,10 @@ def convert_cli_comments(dict_comments: dict[str, Any], *, comment_type: Comment
         data: dict[str, Any]
         """コメントを付与する位置や区間"""
 
-        annotation_id: Optional[str] = None
+        annotation_id: str | None = None
         """コメントに紐付けるアノテーションID"""
 
-        phrases: Optional[list[str]] = None
+        phrases: list[str] | None = None
         """参照している定型指摘ID"""
 
     @dataclass
@@ -267,7 +266,7 @@ def convert_cli_comments(dict_comments: dict[str, Any], *, comment_type: Comment
         comment: str
         """コメントの中身"""
 
-        annotation_id: Optional[str] = None
+        annotation_id: str | None = None
         """コメントに紐付けるアノテーションID"""
 
     def convert_inspection_comment(comment: dict[str, Any]) -> AddedComment:

annofabcli/comment/put_comment_simply.py

@@ -4,10 +4,9 @@ import uuid
 from collections.abc import Collection
 from dataclasses import dataclass
 from functools import partial
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
-import annofabapi.utils
 from annofabapi.models import CommentType, TaskPhase, TaskStatus
 
 from annofabcli.comment.utils import get_comment_type_name
@@ -26,10 +25,10 @@ class AddedSimpleComment:
     comment: str
     """コメントの中身"""
 
-    data: Optional[dict[str, Any]]
+    data: dict[str, Any] | None
     """コメントを付与する位置や区間"""
 
-    phrases: Optional[list[str]] = None
+    phrases: list[str] | None = None
     """参照している定型指摘ID"""
 
 
@@ -103,7 +102,7 @@ class PutCommentSimplyMain(CommandLineWithConfirm):
         self,
         task_id: str,
         comment_info: AddedSimpleComment,
-        task_index: Optional[int] = None,
+        task_index: int | None = None,
     ) -> bool:
         """
         タスクにコメントを付与します。
@@ -166,7 +165,7 @@ class PutCommentSimplyMain(CommandLineWithConfirm):
         self,
         task_ids: Collection[str],
         comment_info: AddedSimpleComment,
-        parallelism: Optional[int] = None,
+        parallelism: int | None = None,
     ) -> None:
         logger.info(f"{len(task_ids)} 件のタスクに{self.comment_type_name}を付与します。")
 

annofabcli/comment/put_inspection_comment.py

@@ -4,11 +4,9 @@ import argparse
 import json
 import logging
 import sys
-from typing import Optional
 
 from annofabapi.models import CommentType, ProjectMemberRole
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.comment.put_comment import PutCommentMain, convert_cli_comments
 from annofabcli.common.cli import (
@@ -83,7 +81,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_inspection"
     subcommand_help = "検査コメントを付与します"
     description = "検査コメントを付与します。"

annofabcli/comment/put_inspection_comment_simply.py

@@ -1,12 +1,10 @@
 import argparse
 import logging
 import sys
-from typing import Optional
 
 from annofabapi.models import CommentType, InputDataType, ProjectMemberRole
 from annofabapi.plugin import EditorPluginId
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.comment.put_comment_simply import AddedSimpleComment, PutCommentSimplyMain
 from annofabcli.common.cli import (
@@ -135,7 +133,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_inspection_simply"
     subcommand_help = "``comment put_inspection`` コマンドよりも、簡単に検査コメントを付与します。"
     epilog = "チェッカーロールまたはオーナロールを持つユーザで実行してください。"

annofabcli/comment/put_onhold_comment.py

@@ -2,11 +2,9 @@ import argparse
 import json
 import logging
 import sys
-from typing import Optional
 
 from annofabapi.models import CommentType
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.comment.put_comment import PutCommentMain, convert_cli_comments
 from annofabcli.common.cli import (
@@ -84,7 +82,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_onhold"
     subcommand_help = "保留コメントを付与します"
 

annofabcli/comment/put_onhold_comment_simply.py

@@ -1,11 +1,9 @@
 import argparse
 import logging
 import sys
-from typing import Optional
 
 from annofabapi.models import CommentType
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.comment.put_comment_simply import AddedSimpleComment, PutCommentSimplyMain
 from annofabcli.common.cli import (
@@ -87,7 +85,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_onhold_simply"
     subcommand_help = "``comment put_onhold`` コマンドよりも、簡単に保留コメントを付与します。"
 

annofabcli/comment/subcommand_comment.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.comment.delete_comment
 import annofabcli.comment.download_comment_json
 import annofabcli.comment.list_all_comment
@@ -27,7 +25,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.comment.put_onhold_comment_simply.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 = "comment"
     subcommand_help = "コメント関係のサブコマンド"