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

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 = (

annofabcli/task/copy_tasks.py

@@ -6,12 +6,10 @@ import logging
 import multiprocessing
 import sys
 from dataclasses import dataclass
-from typing import Optional
 
 import annofabapi
 from annofabapi.models import ProjectMemberRole
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -74,7 +72,7 @@ class CopyTasksMain(CommandLineWithConfirm):
         self.is_copy_annotations = is_copy_annotations
         self.is_copy_metadata = is_copy_metadata
 
-    def copy_task(self, project_id: str, src_task_id: str, dest_task_id: str, task_index: Optional[int] = None) -> bool:
+    def copy_task(self, project_id: str, src_task_id: str, dest_task_id: str, task_index: int | None = None) -> bool:
         logging_prefix = f"{task_index + 1} 件目" if task_index is not None else ""
         src_task = self.service.wrapper.get_task_or_none(project_id, src_task_id)
         if src_task is None:
@@ -115,7 +113,7 @@ class CopyTasksMain(CommandLineWithConfirm):
             logger.warning(f"タスク'{copy_target.src_task_id}'を'{copy_target.dest_task_id}'にコピーする際に失敗しました。", exc_info=True)
             return False
 
-    def main(self, project_id: str, copy_target_list: list[CopyTarget], parallelism: Optional[int] = None) -> None:
+    def main(self, project_id: str, copy_target_list: list[CopyTarget], parallelism: int | None = None) -> None:
         """
         タスクをコピーします
 
@@ -218,7 +216,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 = "copy"
     subcommand_help = "タスクをコピーします。"
     description = "タスクをコピーします。タスクに含まれるアノテーションはコピーされません。"

annofabcli/task/delete_metadata_key_of_task.py

@@ -9,12 +9,10 @@ import sys
 from collections.abc import Collection
 from dataclasses import dataclass
 from functools import partial
-from typing import Optional, Union
 
 import annofabapi
 from annofabapi.models import ProjectMemberRole
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -28,7 +26,7 @@ from annofabcli.common.facade import AnnofabApiFacade
 
 logger = logging.getLogger(__name__)
 
-Metadata = dict[str, Union[str, bool, int]]
+Metadata = dict[str, str | bool | int]
 
 
 @dataclass(frozen=True)
@@ -43,7 +41,7 @@ class DeleteMetadataKeysOfTaskMain(CommandLineWithConfirm):
         service: annofabapi.Resource,
         project_id: str,
         *,
-        parallelism: Optional[int] = None,
+        parallelism: int | None = None,
         all_yes: bool = False,
     ) -> None:
         self.service = service
@@ -51,7 +49,7 @@ class DeleteMetadataKeysOfTaskMain(CommandLineWithConfirm):
         self.parallelism = parallelism
         super().__init__(all_yes=all_yes)
 
-    def delete_metadata_keys_for_one_task(self, task_id: str, metadata_keys: Collection[str], *, task_index: Optional[int] = None) -> bool:
+    def delete_metadata_keys_for_one_task(self, task_id: str, metadata_keys: Collection[str], *, task_index: int | None = None) -> bool:
         """
         １個のタスクに対して、メタデータのキーを削除します。
 
@@ -192,7 +190,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_metadata_key"
     subcommand_help = "タスクのメタデータのキーを削除します。"
     epilog = "オーナまたはアノテーションユーザロールを持つユーザで実行してください。"

annofabcli/task/delete_tasks.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import argparse
 import logging
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.dataclass.task import Task
@@ -110,7 +110,7 @@ class DeleteTaskMain(CommandLineWithConfirm):
         self,
         task: dict[str, Any],
         log_prefix: str,
-        task_query: Optional[TaskQuery] = None,
+        task_query: TaskQuery | None = None,
     ) -> bool:
         """タスクを削除するかどうかを判定する"""
 
@@ -137,7 +137,7 @@ class DeleteTaskMain(CommandLineWithConfirm):
 
         return True
 
-    def delete_task(self, task_id: str, task_query: Optional[TaskQuery] = None, task_index: Optional[int] = None) -> bool:
+    def delete_task(self, task_id: str, task_query: TaskQuery | None = None, task_index: int | None = None) -> bool:
         """
         タスクを削除します。
 
@@ -200,7 +200,7 @@ class DeleteTaskMain(CommandLineWithConfirm):
     def delete_task_list(  # noqa: ANN201
         self,
         task_id_list: list[str],
-        task_query: Optional[TaskQuery] = None,
+        task_query: TaskQuery | None = None,
     ):
         """
         複数のタスクを削除する。
@@ -238,7 +238,7 @@ class DeleteTask(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
 
         super().validate_project(args.project_id, [ProjectMemberRole.OWNER])
 
@@ -276,7 +276,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/task/download_task_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,10 +13,10 @@ logger = logging.getLogger(__name__)
 
 
 class DownloadingTaskJson(CommandLine):
-    def download_task_json(self, project_id: str, output_file: Path, is_latest: bool):  # noqa: ANN201, FBT001
+    def download_task_json(self, project_id: str, output_file: Path, *, is_latest: bool) -> 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_id='{project_id}', project_title='{project_title}'")
 
         obj = DownloadingFile(self.service)
         obj.download_task_json(
@@ -26,7 +24,7 @@ class DownloadingTaskJson(CommandLine):
             str(output_file),
             is_latest=is_latest,
         )
-        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
@@ -58,7 +56,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 = "タスク全件ファイルをダウンロードします。"
     description = "タスク全件ファイルをダウンロードします。"

annofabcli/task/list_all_tasks.py

@@ -3,7 +3,7 @@ import json
 import logging
 import tempfile
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -29,8 +29,8 @@ class ListTasksWithJsonMain:
     @staticmethod
     def match_task_with_conditions(
         task: dict[str, Any],
-        task_id_set: Optional[set[str]] = None,
-        task_query: Optional[TaskQuery] = None,
+        task_id_set: set[str] | None = None,
+        task_query: TaskQuery | None = None,
     ) -> bool:
         result = True
 
@@ -43,9 +43,9 @@ class ListTasksWithJsonMain:
     def get_task_list(
         self,
         project_id: str,
-        task_json: Optional[Path],
-        task_id_list: Optional[list[str]] = None,
-        task_query: Optional[TaskQuery] = None,
+        task_json: Path | None,
+        task_id_list: list[str] | None = None,
+        task_query: TaskQuery | None = None,
         is_latest: bool = False,  # noqa: FBT001, FBT002
     ) -> list[dict[str, Any]]:
         if task_json is None:
@@ -142,7 +142,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_all"
     subcommand_help = "すべてのタスクの一覧を出力します。"
     description = "すべてのタスクの一覧を出力します。\n出力されるタスクは、コマンドを実行した日の02:00(JST)頃の状態です。最新の情報を出力したい場合は、 ``--latest`` を指定してください。"