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

annofabcli/annotation_zip/subcommand_annotation_zip.py

@@ -1,10 +1,12 @@
 """サブコマンド 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_polygon_annotation import add_parser as add_parser_list_polygon_annotation
+from annofabcli.annotation_zip.list_polyline_annotation import add_parser as add_parser_list_polyline_annotation
 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,14 +20,17 @@ 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_polygon_annotation(subparsers)
+    add_parser_list_polyline_annotation(subparsers)
     add_parser_list_range_annotation(subparsers)
     add_parser_list_single_point_annotation(subparsers)
     # 作成中のためコメントアウト
     # 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 = "コメント関係のサブコマンド"
 

annofabcli/common/bokeh.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import json
 import math
-from typing import Any, Optional
+from typing import Any
 
 from bokeh.models import LayoutDOM
 from bokeh.models.widgets.markups import PreText
@@ -15,16 +15,16 @@ def create_pretext_from_metadata(metadata: dict[str, Any]) -> PreText:
     return PreText(text=text)
 
 
-def convert_1d_figure_list_to_2d(figure_list: list[figure], *, ncols: int = 4) -> list[list[Optional[LayoutDOM]]]:
+def convert_1d_figure_list_to_2d(figure_list: list[figure], *, ncols: int = 4) -> list[list[LayoutDOM | None]]:
     """
     1次元のfigure_listを、grid layout用に2次元のfigureリストに変換する。
     """
-    row_list: list[list[Optional[LayoutDOM]]] = []
+    row_list: list[list[LayoutDOM | None]] = []
 
     for i in range(math.ceil(len(figure_list) / ncols)):
         start = i * ncols
         end = (i + 1) * ncols
-        row: list[Optional[LayoutDOM]] = []
+        row: list[LayoutDOM | None] = []
         row.extend(figure_list[start:end])
         if len(row) < ncols:
             row.extend([None] * (ncols - len(row)))

annofabcli/common/cli.py

@@ -6,10 +6,11 @@ import argparse
 import getpass
 import json
 import logging
+import logging.config
 import os
 import pkgutil
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -81,12 +82,12 @@ def build_annofabapi_resource_and_login(args: argparse.Namespace) -> annofabapi.
 
 
 def add_parser(
-    subparsers: Optional[argparse._SubParsersAction],
+    subparsers: argparse._SubParsersAction | None,
     command_name: str,
     command_help: str,
-    description: Optional[str] = None,
+    description: str | None = None,
     is_subcommand: bool = True,  # noqa: FBT001, FBT002
-    epilog: Optional[str] = None,
+    epilog: str | None = None,
 ) -> argparse.ArgumentParser:
     """
     サブコマンド用にparserを追加する
@@ -159,7 +160,7 @@ def add_parser(
     return parser
 
 
-def get_list_from_args(str_list: Optional[list[str]] = None) -> list[str]:
+def get_list_from_args(str_list: list[str] | None = None) -> list[str]:
     """
     文字列のListのサイズが1で、プレフィックスが`file://`ならば、ファイルパスとしてファイルを読み込み、行をListとして返す。
     そうでなければ、引数の値をそのまま返す。
@@ -185,7 +186,7 @@ def get_list_from_args(str_list: Optional[list[str]] = None) -> list[str]:
         return str_list
 
 
-def get_json_from_args(target: Optional[str] = None) -> Any:  # noqa: ANN401
+def get_json_from_args(target: str | None = None) -> Any:  # noqa: ANN401
     """
     JSON形式をPythonオブジェクトに変換する。
     プレフィックスが`file://`ならば、ファイルパスとしてファイルを読み込み、Pythonオブジェクトを返す。
@@ -202,7 +203,7 @@ def get_json_from_args(target: Optional[str] = None) -> Any:  # noqa: ANN401
         return json.loads(target)
 
 
-def get_input_data_size(str_input_data_size: str) -> Optional[InputDataSize]:
+def get_input_data_size(str_input_data_size: str) -> InputDataSize | None:
     """400x300を(400,300)に変換する"""
     splitted_list = str_input_data_size.split("x")
     if len(splitted_list) < 2:
@@ -380,7 +381,7 @@ class ArgumentParser:
     def __init__(self, parser: argparse.ArgumentParser) -> None:
         self.parser = parser
 
-    def add_project_id(self, help_message: Optional[str] = None) -> None:
+    def add_project_id(self, help_message: str | None = None) -> None:
         """
         '--project_id` 引数を追加
         """
@@ -389,7 +390,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-p", "--project_id", type=str, required=True, help=help_message)
 
-    def add_task_id(self, *, required: bool = True, help_message: Optional[str] = None) -> None:
+    def add_task_id(self, *, required: bool = True, help_message: str | None = None) -> None:
         """
         '--task_id` 引数を追加
         """
@@ -398,7 +399,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-t", "--task_id", type=str, required=required, nargs="+", help=help_message)
 
-    def add_input_data_id(self, *, required: bool = True, help_message: Optional[str] = None) -> None:
+    def add_input_data_id(self, *, required: bool = True, help_message: str | None = None) -> None:
         """
         '--input_data_id` 引数を追加
         """
@@ -407,7 +408,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-i", "--input_data_id", type=str, required=required, nargs="+", help=help_message)
 
-    def add_format(self, choices: list[FormatArgument], default: FormatArgument, help_message: Optional[str] = None) -> None:
+    def add_format(self, choices: list[FormatArgument], default: FormatArgument, help_message: str | None = None) -> None:
         """
         '--format` 引数を追加
         """
@@ -416,7 +417,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-f", "--format", type=str, choices=[e.value for e in choices], default=default.value, help=help_message)
 
-    def add_output(self, *, required: bool = False, help_message: Optional[str] = None) -> None:
+    def add_output(self, *, required: bool = False, help_message: str | None = None) -> None:
         """
         '--output` 引数を追加
         """
@@ -425,7 +426,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-o", "--output", type=str, required=required, help=help_message)
 
-    def add_task_query(self, *, required: bool = False, help_message: Optional[str] = None) -> None:
+    def add_task_query(self, *, required: bool = False, help_message: str | None = None) -> None:
         if help_message is None:
             help_message = (
                 "タスクを絞り込むためのクエリ条件をJSON形式で指定します。"
@@ -476,10 +477,10 @@ class CommandLineWithoutWebapi:
     all_yes: bool = False
 
     #: 出力先
-    output: Optional[str] = None
+    output: str | None = None
 
     #: 出力フォーマット
-    str_format: Optional[str] = None
+    str_format: str | None = None
 
     def __init__(self, args: argparse.Namespace) -> None:
         self.args = args
@@ -575,8 +576,8 @@ class CommandLine(CommandLineWithoutWebapi):
     def validate_project(
         self,
         project_id: str,
-        project_member_roles: Optional[list[ProjectMemberRole]] = None,
-        organization_member_roles: Optional[list[OrganizationMemberRole]] = None,
+        project_member_roles: list[ProjectMemberRole] | None = None,
+        organization_member_roles: list[OrganizationMemberRole] | None = None,
     ) -> None:
         """
         プロジェクト or 組織に対して、必要な権限が付与されているかを確認する。