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

annofabcli/statistics/visualize_video_duration.py

@@ -11,7 +11,6 @@ from collections.abc import Collection, Sequence
 from enum import Enum
 from functools import partial
 from pathlib import Path
-from typing import Optional, Union
 
 import bokeh
 import numpy
@@ -22,7 +21,6 @@ from bokeh.models.annotations.labels import Title
 from bokeh.models.widgets.markups import PreText
 from bokeh.plotting import ColumnDataSource, figure
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -49,9 +47,9 @@ def plot_video_duration(
     output_file: Path,
     *,
     time_unit: TimeUnit,
-    bin_width: Optional[float] = None,
-    project_id: Optional[str] = None,
-    project_title: Optional[str] = None,
+    bin_width: float | None = None,
+    project_id: str | None = None,
+    project_title: str | None = None,
 ) -> None:
     """
     ラベルごとの区間アノテーションの長さのヒストグラムを出力します。
@@ -66,7 +64,7 @@ def plot_video_duration(
 
     def create_figure(
         durations: Sequence[float],
-        bins: Union[int, numpy.ndarray],
+        bins: int | numpy.ndarray,
         histogram_range: tuple[float, float],
         title: str,
         x_axis_label: str,
@@ -75,10 +73,10 @@ def plot_video_duration(
         hist, bin_edges = numpy.histogram(durations, bins=bins, range=histogram_range)
 
         df_histogram = pandas.DataFrame({"frequency": hist, "left": bin_edges[:-1], "right": bin_edges[1:]})
-        df_histogram["interval"] = [f"{left:.1f} to {right:.1f}" for left, right in zip(df_histogram["left"], df_histogram["right"])]
+        df_histogram["interval"] = [f"{left:.1f} to {right:.1f}" for left, right in zip(df_histogram["left"], df_histogram["right"], strict=False)]
 
         source = ColumnDataSource(df_histogram)
-        fig = figure(
+        fig = figure(  # type: ignore[call-arg]
             width=400,
             height=300,
             x_axis_label=x_axis_label,
@@ -108,7 +106,7 @@ def plot_video_duration(
         if bins_sequence[-1] == max_duration:
             bins_sequence = numpy.append(bins_sequence, bins_sequence[-1] + bin_width)
 
-        bins: Union[int, numpy.ndarray] = bins_sequence
+        bins: int | numpy.ndarray = bins_sequence
     else:
         bins = BIN_COUNT
 
@@ -142,10 +140,10 @@ def get_video_duration_list(
     input_data_json: Path,
     task_json: Path,
     *,
-    input_data_ids: Optional[Collection[str]] = None,
+    input_data_ids: Collection[str] | None = None,
     from_datetime: datetime.datetime | None = None,
     to_datetime: datetime.datetime | None = None,
-    task_ids: Optional[Collection[str]] = None,
+    task_ids: Collection[str] | None = None,
 ) -> list[float]:
     """
     入力データである動画の長さ（単位は秒）の一覧を取得します。
@@ -214,13 +212,13 @@ class VisualizeVideoDuration(CommandLine):
         output_html: Path,
         *,
         time_unit: TimeUnit,
-        project_id: Optional[str] = None,
-        project_title: Optional[str] = None,
-        bin_width: Optional[float] = None,
-        input_data_ids: Optional[Collection[str]] = None,
-        task_ids: Optional[Collection[str]] = None,
-        from_date: Optional[str] = None,
-        to_date: Optional[str] = None,
+        project_id: str | None = None,
+        project_title: str | None = None,
+        bin_width: float | None = None,
+        input_data_ids: Collection[str] | None = None,
+        task_ids: Collection[str] | None = None,
+        from_date: str | None = None,
+        to_date: str | None = None,
     ) -> None:
         tz_info = datetime.datetime.now().astimezone().tzinfo
         from_datetime = datetime.datetime.fromisoformat(from_date).astimezone(tz_info) if from_date is not None else None
@@ -250,7 +248,7 @@ class VisualizeVideoDuration(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)
@@ -392,7 +390,7 @@ def main(args: argparse.Namespace) -> None:
     VisualizeVideoDuration(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 = "visualize_video_duration"
     subcommand_help = "動画の長さをヒストグラムで可視化します。"
     epilog = "オーナロールまたはアノテーションユーザロールを持つユーザで実行してください。"

annofabcli/supplementary/delete_supplementary_data.py

@@ -3,7 +3,7 @@ import logging
 import sys
 from collections import defaultdict
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -36,7 +36,7 @@ def get_input_data_supplementary_data_dict_from_csv(csv_path: Path) -> InputData
         dtype={"input_data_id": "string", "supplementary_data_id": "string"},
     )
     input_data_dict: InputDataSupplementaryDataDict = defaultdict(list)
-    for input_data_id, supplementary_data_id in zip(df["input_data_id"], df["supplementary_data_id"]):
+    for input_data_id, supplementary_data_id in zip(df["input_data_id"], df["supplementary_data_id"], strict=False):
         input_data_dict[input_data_id].append(supplementary_data_id)
     return input_data_dict
 
@@ -70,7 +70,7 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
 
         """
 
-        def _get_supplementary_data_list(supplementary_data_id: str) -> Optional[dict[str, Any]]:
+        def _get_supplementary_data_list(supplementary_data_id: str) -> dict[str, Any] | None:
             return first_true(supplementary_data_list, pred=lambda e: e["supplementary_data_id"] == supplementary_data_id)
 
         input_data = self.service.wrapper.get_input_data_or_none(project_id, input_data_id)
@@ -275,7 +275,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "delete"
     subcommand_help = "補助情報を削除します。"
     description = "補助情報を削除します。"

annofabcli/supplementary/list_supplementary_data.py

@@ -7,7 +7,7 @@ import logging
 import multiprocessing
 import tempfile
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.models import SupplementaryData
@@ -72,7 +72,7 @@ class ListSupplementaryDataMain:
             logger.warning(f"input_data_id='{input_data_index}': 補助情報の取得に失敗しました。", exc_info=True)
             return []
 
-    def get_all_supplementary_data_list(self, input_data_id_list: list[str], *, parallelism: Optional[int] = None) -> list[SupplementaryData]:
+    def get_all_supplementary_data_list(self, input_data_id_list: list[str], *, parallelism: int | None = None) -> list[SupplementaryData]:
         """
         補助情報一覧を取得する。
         """
@@ -168,7 +168,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/supplementary/put_supplementary_data.py

@@ -7,7 +7,7 @@ from dataclasses import dataclass
 from functools import partial
 from multiprocessing import Pool
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -49,9 +49,9 @@ class CliSupplementaryData(DataClassJsonMixin):
     input_data_id: str
     supplementary_data_name: str
     supplementary_data_path: str
-    supplementary_data_id: Optional[str] = None
-    supplementary_data_type: Optional[str] = None
-    supplementary_data_number: Optional[int] = None
+    supplementary_data_id: str | None = None
+    supplementary_data_type: str | None = None
+    supplementary_data_number: int | None = None
 
 
 @dataclass
@@ -64,9 +64,9 @@ class SupplementaryDataForPut:
     supplementary_data_id: str
     supplementary_data_name: str
     supplementary_data_path: str
-    supplementary_data_type: Optional[str]
+    supplementary_data_type: str | None
     supplementary_data_number: int
-    last_updated_datetime: Optional[str]
+    last_updated_datetime: str | None
 
 
 class SubPutSupplementaryData:
@@ -249,7 +249,7 @@ class PutSupplementaryData(CommandLine):
         supplementary_data_list: list[CliSupplementaryData],
         *,
         overwrite: bool = False,
-        parallelism: Optional[int] = None,
+        parallelism: int | None = None,
     ) -> None:
         """
         補助情報を一括で登録する。
@@ -412,7 +412,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"
     subcommand_help = "補助情報を登録します。"
     description = "補助情報を登録します。"

annofabcli/supplementary/subcommand_supplementary.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
 import annofabcli.supplementary.delete_supplementary_data
 import annofabcli.supplementary.list_supplementary_data
@@ -17,7 +15,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.supplementary.put_supplementary_data.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 = "supplementary"
     subcommand_help = "補助情報関係のサブコマンド"
     description = "補助情報関係のサブコマンド"

annofabcli/task/cancel_acceptance.py

@@ -6,7 +6,7 @@ import multiprocessing
 import sys
 from dataclasses import dataclass
 from functools import partial
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import more_itertools
@@ -14,7 +14,6 @@ import requests
 from annofabapi.dataclass.task import Task
 from annofabapi.models import ProjectMemberRole, TaskPhase, TaskStatus
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -43,12 +42,12 @@ class CancelAcceptanceMain(CommandLineWithConfirm):
         self.project_id = project_id
         self.facade = AnnofabApiFacade(service)
 
-        self._project_members_dict: Optional[dict[str, dict[str, Any]]] = None
+        self._project_members_dict: dict[str, dict[str, Any]] | None = None
         """プロジェクトメンバー情報を保持する変数"""
 
         CommandLineWithConfirm.__init__(self, all_yes)
 
-    def get_project_member_from_account_id(self, account_id: str) -> Optional[dict[str, Any]]:
+    def get_project_member_from_account_id(self, account_id: str) -> dict[str, Any] | None:
         """account_idからプロジェクトメンバを取得します。"""
         if self._project_members_dict is None:
             project_member_list = self.service.wrapper.get_all_project_members(self.project_id)
@@ -59,10 +58,10 @@ class CancelAcceptanceMain(CommandLineWithConfirm):
     def cancel_acceptance_for_task(
         self,
         task_id: str,
-        acceptor: Optional[User] = None,
+        acceptor: User | None = None,
         assign_last_acceptor: bool = True,  # noqa: FBT001, FBT002
-        task_query: Optional[TaskQuery] = None,
-        task_index: Optional[int] = None,
+        task_query: TaskQuery | None = None,
+        task_index: int | None = None,
         dryrun: bool = False,  # noqa: FBT001, FBT002
     ) -> bool:
         logging_prefix = f"{task_index + 1} 件目" if task_index is not None else ""
@@ -77,7 +76,7 @@ class CancelAcceptanceMain(CommandLineWithConfirm):
                 logger.warning(f"{logging_prefix}: task_id = {task_id} は受入完了でありません。status = {task['status']}, phase={task['phase']}")
                 return False
 
-            actual_acceptor: Optional[User] = None
+            actual_acceptor: User | None = None
             if assign_last_acceptor:
                 # 最後の受入フェーズの担当者の情報を取得する
                 acceptor_account_id = task["account_id"]
@@ -119,9 +118,9 @@ class CancelAcceptanceMain(CommandLineWithConfirm):
     def cancel_acceptance_for_wrapper(
         self,
         tpl: tuple[int, str],
-        acceptor: Optional[User] = None,
+        acceptor: User | None = None,
         assign_last_acceptor: bool = True,  # noqa: FBT001, FBT002
-        task_query: Optional[TaskQuery] = None,
+        task_query: TaskQuery | None = None,
         dryrun: bool = False,  # noqa: FBT001, FBT002
     ) -> bool:
         task_index, task_id = tpl
@@ -141,10 +140,10 @@ class CancelAcceptanceMain(CommandLineWithConfirm):
     def cancel_acceptance_for_task_list(  # noqa: ANN201
         self,
         task_id_list: list[str],
-        acceptor: Optional[User] = None,
+        acceptor: User | None = None,
         assign_last_acceptor: bool = True,  # noqa: FBT001, FBT002
-        task_query: Optional[TaskQuery] = None,
-        parallelism: Optional[int] = None,
+        task_query: TaskQuery | None = None,
+        parallelism: int | None = None,
         dryrun: bool = False,  # noqa: FBT001, FBT002
     ):
         """
@@ -221,13 +220,13 @@ class CancelAcceptance(CommandLine):
 
         task_id_list = annofabcli.common.cli.get_list_from_args(args.task_id)
 
-        assigned_acceptor_user_id: Optional[str] = args.assigned_acceptor_user_id
+        assigned_acceptor_user_id: str | None = args.assigned_acceptor_user_id
 
         # 最後の受入フェーズの担当者に割り当てるか否か
         assign_last_acceptor = not args.not_assign and assigned_acceptor_user_id is None
 
         # 受入担当者の情報を取得する
-        acceptor: Optional[User] = None  # 受入担当者
+        acceptor: User | None = None  # 受入担当者
         if assigned_acceptor_user_id is not None:
             project_member_list = self.service.wrapper.get_all_project_members(args.project_id)
             member = more_itertools.first_true(project_member_list, pred=lambda e: e["user_id"] == assigned_acceptor_user_id)
@@ -241,7 +240,7 @@ class CancelAcceptance(CommandLine):
                 acceptor = User(account_id=member["account_id"], user_id=member["user_id"], username=member["username"])
 
         dict_task_query = annofabcli.common.cli.get_json_from_args(args.task_query)
-        task_query: Optional[TaskQuery] = TaskQuery.from_dict(dict_task_query) if dict_task_query is not None else None
+        task_query: TaskQuery | None = TaskQuery.from_dict(dict_task_query) if dict_task_query is not None else None
 
         super().validate_project(args.project_id, [ProjectMemberRole.OWNER])
         main_obj = CancelAcceptanceMain(self.service, project_id=args.project_id, all_yes=args.yes)
@@ -304,7 +303,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 = "cancel_acceptance"
     subcommand_help = "受入が完了したタスクに対して、受入を取り消します。"
     description = "受入が完了したタスクに対して、受入を取り消します。"

annofabcli/task/change_operator.py

@@ -3,14 +3,12 @@ import logging
 import multiprocessing
 import sys
 from functools import partial
-from typing import Optional
 
 import annofabapi
 import requests
 from annofabapi.dataclass.task import Task
 from annofabapi.models import ProjectMemberRole, TaskStatus
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -63,9 +61,9 @@ class ChangeOperatorMain:
         self,
         project_id: str,
         task_id: str,
-        new_account_id: Optional[str] = None,
-        task_query: Optional[TaskQuery] = None,
-        task_index: Optional[int] = None,
+        new_account_id: str | None = None,
+        task_query: TaskQuery | None = None,
+        task_index: int | None = None,
     ) -> bool:
         logging_prefix = f"{task_index + 1} 件目" if task_index is not None else ""
         dict_task = self.service.wrapper.get_task_or_none(project_id, task_id)
@@ -115,8 +113,8 @@ class ChangeOperatorMain:
         self,
         tpl: tuple[int, str],
         project_id: str,
-        task_query: Optional[TaskQuery] = None,
-        new_account_id: Optional[str] = None,
+        task_query: TaskQuery | None = None,
+        new_account_id: str | None = None,
     ) -> bool:
         task_index, task_id = tpl
         try:
@@ -136,9 +134,9 @@ class ChangeOperatorMain:
         project_id: str,
         task_id_list: list[str],
         *,
-        new_user_id: Optional[str] = None,
-        task_query: Optional[TaskQuery] = None,
-        parallelism: Optional[int] = None,
+        new_user_id: str | None = None,
+        task_query: TaskQuery | None = None,
+        parallelism: int | None = None,
     ) -> None:
         """
         指定した複数のタスクの担当者を変更します。
@@ -219,7 +217,7 @@ class ChangeOperator(CommandLine):
             return
 
         dict_task_query = annofabcli.common.cli.get_json_from_args(args.task_query)
-        task_query: Optional[TaskQuery] = TaskQuery.from_dict(dict_task_query) if dict_task_query is not None else None
+        task_query: TaskQuery | None = TaskQuery.from_dict(dict_task_query) if dict_task_query is not None else None
 
         project_id = args.project_id
         super().validate_project(project_id, [ProjectMemberRole.OWNER, ProjectMemberRole.ACCEPTER])
@@ -270,7 +268,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "change_operator"
     subcommand_help = "タスクの担当者を変更します。"
     description = "タスクの担当者を変更します。作業中状態、完了状態のタスクは、担当者を変更できません。保留中状態のタスクは、デフォルトでは担当者を変更できません。"

annofabcli/task/change_status_to_break.py

@@ -3,14 +3,12 @@ import logging
 import multiprocessing
 import sys
 from functools import partial
-from typing import Optional
 
 import annofabapi
 import requests
 from annofabapi.dataclass.task import Task
 from annofabapi.models import ProjectMemberRole, TaskStatus
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -39,8 +37,8 @@ class ChangeStatusToBreakMain(CommandLineWithConfirm):
         self,
         project_id: str,
         task_id: str,
-        task_index: Optional[int] = None,
-        task_query: Optional[TaskQuery] = None,
+        task_index: int | None = None,
+        task_query: TaskQuery | None = None,
     ) -> bool:
         logging_prefix = f"{task_index + 1} 件目" if task_index is not None else ""
         dict_task = self.service.wrapper.get_task_or_none(project_id, task_id)
@@ -79,7 +77,7 @@ class ChangeStatusToBreakMain(CommandLineWithConfirm):
         self,
         tpl: tuple[int, str],
         project_id: str,
-        task_query: Optional[TaskQuery] = None,
+        task_query: TaskQuery | None = None,
     ) -> bool:
         task_index, task_id = tpl
         try:
@@ -97,8 +95,8 @@ class ChangeStatusToBreakMain(CommandLineWithConfirm):
         self,
         project_id: str,
         task_id_list: list[str],
-        task_query: Optional[TaskQuery] = None,
-        parallelism: Optional[int] = None,
+        task_query: TaskQuery | None = None,
+        parallelism: int | None = None,
     ):
         """
         タスクのステータスを休憩中に変更する。
@@ -172,7 +170,7 @@ class ChangeStatusToBreak(CommandLine):
         task_id_list = annofabcli.common.cli.get_list_from_args(args.task_id)
 
         dict_task_query = annofabcli.common.cli.get_json_from_args(args.task_query)
-        task_query: Optional[TaskQuery] = TaskQuery.from_dict(dict_task_query) if dict_task_query is not None else None
+        task_query: TaskQuery | None = TaskQuery.from_dict(dict_task_query) if dict_task_query is not None else None
 
         project_id = args.project_id
         super().validate_project(project_id, [ProjectMemberRole.OWNER, ProjectMemberRole.ACCEPTER, ProjectMemberRole.WORKER])
@@ -210,7 +208,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "change_status_to_break"
     subcommand_help = "タスクのステータスを休憩中に変更します。"
     description = "タスクのステータスを休憩中に変更します。ただし、操作対象のタスクは作業中か保留中である必要があります。"

annofabcli/task/change_status_to_on_hold.py

@@ -6,14 +6,12 @@ import multiprocessing
 import sys
 import uuid
 from functools import partial
-from typing import Optional
 
 import annofabapi
 import requests
 from annofabapi.dataclass.task import Task
 from annofabapi.models import ProjectMemberRole, TaskStatus
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -68,9 +66,9 @@ class ChangingStatusToOnHoldMain(CommandLineWithConfirm):
         self,
         task_id: str,
         *,
-        comment: Optional[str] = None,
-        task_index: Optional[int] = None,
-        task_query: Optional[TaskQuery] = None,
+        comment: str | None = None,
+        task_index: int | None = None,
+        task_query: TaskQuery | None = None,
     ) -> bool:
         """
         Args:
@@ -155,8 +153,8 @@ class ChangingStatusToOnHoldMain(CommandLineWithConfirm):
         self,
         tpl: tuple[int, str],
         *,
-        comment: Optional[str] = None,
-        task_query: Optional[TaskQuery] = None,
+        comment: str | None = None,
+        task_query: TaskQuery | None = None,
     ) -> bool:
         task_index, task_id = tpl
         try:
@@ -174,9 +172,9 @@ class ChangingStatusToOnHoldMain(CommandLineWithConfirm):
         self,
         task_id_list: list[str],
         *,
-        comment: Optional[str] = None,
-        task_query: Optional[TaskQuery] = None,
-        parallelism: Optional[int] = None,
+        comment: str | None = None,
+        task_query: TaskQuery | None = None,
+        parallelism: int | None = None,
     ):
         """
         タスクのステータスを保留中に変更する。
@@ -246,7 +244,7 @@ class ChangingStatusToOnHold(CommandLine):
         task_id_list = annofabcli.common.cli.get_list_from_args(args.task_id)
 
         dict_task_query = annofabcli.common.cli.get_json_from_args(args.task_query)
-        task_query: Optional[TaskQuery] = TaskQuery.from_dict(dict_task_query) if dict_task_query is not None else None
+        task_query: TaskQuery | None = TaskQuery.from_dict(dict_task_query) if dict_task_query is not None else None
 
         project_id = args.project_id
         super().validate_project(project_id, [ProjectMemberRole.OWNER, ProjectMemberRole.ACCEPTER, ProjectMemberRole.WORKER])
@@ -286,7 +284,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "change_status_to_on_hold"
     subcommand_help = "タスクのステータスを保留に変更します。"
     description = "タスクのステータスを保留に変更します。ただし、操作対象のタスクのステータスは休憩中か未着手である必要があります。"

annofabcli/task/complete_tasks.py

@@ -6,7 +6,7 @@ import multiprocessing
 import sys
 import uuid
 from functools import partial
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi.utils
 import dateutil
@@ -15,7 +15,6 @@ from annofabapi.dataclass.task import Task
 from annofabapi.models import CommentStatus, Inspection, ProjectMemberRole, TaskPhase, TaskStatus
 from more_itertools import first_true
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -196,7 +195,7 @@ class CompleteTasksMain(CommandLineWithConfirm):
     def complete_task_for_annotation_phase(
         self,
         task: Task,
-        reply_comment: Optional[str] = None,
+        reply_comment: str | None = None,
     ) -> bool:
         """
         annotation phaseのタスクを完了状態にする。
@@ -247,7 +246,7 @@ class CompleteTasksMain(CommandLineWithConfirm):
     def complete_task_for_inspection_acceptance_phase(
         self,
         task: Task,
-        inspection_status: Optional[CommentStatus] = None,
+        inspection_status: CommentStatus | None = None,
     ) -> bool:
         unprocessed_inspection_list_dict: dict[str, list[Inspection]] = {}
         for input_data_id in task.input_data_id_list:
@@ -286,7 +285,7 @@ class CompleteTasksMain(CommandLineWithConfirm):
         return True
 
     @staticmethod
-    def _validate_task(task: Task, target_phase: TaskPhase, target_phase_stage: int, task_query: Optional[TaskQuery]) -> bool:
+    def _validate_task(task: Task, target_phase: TaskPhase, target_phase_stage: int, task_query: TaskQuery | None) -> bool:
         if not (task.phase == target_phase and task.phase_stage == target_phase_stage):
             logger.warning(f"task_id='{task.task_id}'のタスクは操作対象のフェーズ、フェーズステージではないため、スキップします。")
             return False
@@ -306,10 +305,10 @@ class CompleteTasksMain(CommandLineWithConfirm):
         task_id: str,
         target_phase: TaskPhase,
         target_phase_stage: int,
-        reply_comment: Optional[str] = None,
-        inspection_status: Optional[CommentStatus] = None,
-        task_query: Optional[TaskQuery] = None,
-        task_index: Optional[int] = None,
+        reply_comment: str | None = None,
+        inspection_status: CommentStatus | None = None,
+        task_query: TaskQuery | None = None,
+        task_index: int | None = None,
     ) -> bool:
         logging_prefix = f"{task_index + 1} 件目" if task_index is not None else ""
 
@@ -342,9 +341,9 @@ class CompleteTasksMain(CommandLineWithConfirm):
         project_id: str,
         target_phase: TaskPhase,
         target_phase_stage: int,
-        reply_comment: Optional[str] = None,
-        inspection_status: Optional[CommentStatus] = None,
-        task_query: Optional[TaskQuery] = None,
+        reply_comment: str | None = None,
+        inspection_status: CommentStatus | None = None,
+        task_query: TaskQuery | None = None,
     ) -> bool:
         task_index, task_id = tpl
         try:
@@ -368,10 +367,10 @@ class CompleteTasksMain(CommandLineWithConfirm):
         task_id_list: list[str],
         target_phase: TaskPhase,
         target_phase_stage: int,
-        reply_comment: Optional[str] = None,
-        inspection_status: Optional[CommentStatus] = None,
-        task_query: Optional[TaskQuery] = None,
-        parallelism: Optional[int] = None,
+        reply_comment: str | None = None,
+        inspection_status: CommentStatus | None = None,
+        task_query: TaskQuery | None = None,
+        parallelism: int | None = None,
     ):
         """
         検査コメントのstatusを変更（対応完了 or 対応不要）にした上で、タスクを受け入れ完了状態にする
@@ -465,7 +464,7 @@ class CompleteTasks(CommandLine):
         super().validate_project(project_id, [ProjectMemberRole.OWNER, ProjectMemberRole.ACCEPTER])
 
         dict_task_query = annofabcli.common.cli.get_json_from_args(args.task_query)
-        task_query: Optional[TaskQuery] = TaskQuery.from_dict(dict_task_query) if dict_task_query is not None else None
+        task_query: TaskQuery | None = TaskQuery.from_dict(dict_task_query) if dict_task_query is not None else None
 
         main_obj = CompleteTasksMain(self.service, all_yes=self.all_yes)
         main_obj.complete_task_list(
@@ -542,7 +541,7 @@ def main(args: argparse.Namespace) -> None:
     CompleteTasks(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 = "complete"
     subcommand_help = "タスクを次のフェーズに進めます。（教師付の提出、検査/受入の合格）"
     description = (