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

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,13 +2,13 @@ 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
 from annofabapi.models import ProjectMemberRole, TaskStatus
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     ArgumentParser,
     CommandLine,
@@ -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,13 +3,13 @@ import json
 import logging
 import tempfile
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
 from annofabapi.dataclass.task import Task
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.download import DownloadingFile
 from annofabcli.common.enums import FormatArgument
@@ -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`` を指定してください。"

annofabcli/task/list_all_tasks_added_task_history.py

@@ -6,12 +6,13 @@ import logging
 import sys
 import tempfile
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
+import annofabapi.dataclass.task
 from annofabapi.models import ProjectMemberRole, TaskHistory
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     ArgumentParser,
@@ -59,7 +60,7 @@ class ListAllTasksAddedTaskHistoryMain:
 
         return task_list
 
-    def load_task_list(self, task_json_path: Optional[Path]) -> list[dict[str, Any]]:
+    def load_task_list(self, task_json_path: Path | None) -> list[dict[str, Any]]:
         if task_json_path is not None:
             with task_json_path.open(encoding="utf-8") as f:
                 return json.load(f)
@@ -72,7 +73,7 @@ class ListAllTasksAddedTaskHistoryMain:
             with task_json_path.open(encoding="utf-8") as f:
                 return json.load(f)
 
-    def load_task_history_dict(self, task_history_json_path: Optional[Path]) -> TaskHistoryDict:
+    def load_task_history_dict(self, task_history_json_path: Path | None) -> TaskHistoryDict:
         if task_history_json_path is not None:
             with task_history_json_path.open(encoding="utf-8") as f:
                 return json.load(f)
@@ -88,8 +89,8 @@ class ListAllTasksAddedTaskHistoryMain:
     @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
 
@@ -102,8 +103,8 @@ class ListAllTasksAddedTaskHistoryMain:
     def filter_task_list(
         self,
         task_list: list[dict[str, Any]],
-        task_id_list: Optional[list[str]] = None,
-        task_query: Optional[TaskQuery] = None,
+        task_id_list: list[str] | None = None,
+        task_query: TaskQuery | None = None,
     ) -> list[dict[str, Any]]:
         if task_query is not None:
             task_query = self.facade.set_account_id_of_task_query(self.project_id, task_query)
@@ -115,10 +116,10 @@ class ListAllTasksAddedTaskHistoryMain:
 
     def get_task_list_added_task_history(  # noqa: ANN201
         self,
-        task_json_path: Optional[Path],
-        task_history_json_path: Optional[Path],
-        task_id_list: Optional[list[str]],
-        task_query: Optional[TaskQuery],
+        task_json_path: Path | None,
+        task_history_json_path: Path | None,
+        task_id_list: list[str] | None,
+        task_query: TaskQuery | None,
     ):
         """
         タスク履歴情報を加えたタスク一覧を取得する。
@@ -209,7 +210,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_added_task_history"
     subcommand_help = "タスク履歴に関する情報を加えたタスク一覧のすべてを出力します。"
     description = "タスク履歴に関する情報（フェーズごとの作業時間、担当者、開始日時）を加えたタスク一覧のすべてを出力します。"

annofabcli/task/list_tasks.py

@@ -1,12 +1,12 @@
 import argparse
 import logging
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
 from annofabapi.models import Task
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.enums import FormatArgument
 from annofabcli.common.facade import AnnofabApiFacade
@@ -79,7 +79,7 @@ class ListTasksMain:
 
         return task_query
 
-    def get_task_list_with_api(self, project_id: str, task_query: Optional[dict[str, Any]] = None, user_id_list: Optional[list[str]] = None) -> list[Task]:
+    def get_task_list_with_api(self, project_id: str, task_query: dict[str, Any] | None = None, user_id_list: list[str] | None = None) -> list[Task]:
         """
         タスク一覧を取得する。
 
@@ -118,9 +118,9 @@ class ListTasksMain:
         self,
         project_id: str,
         *,
-        task_id_list: Optional[list[str]] = None,
-        task_query: Optional[dict[str, Any]] = None,
-        user_id_list: Optional[list[str]] = None,
+        task_id_list: list[str] | None = None,
+        task_query: dict[str, Any] | None = None,
+        user_id_list: list[str] | None = None,
     ) -> list[Task]:
         """
 
@@ -253,7 +253,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/task/list_tasks_added_task_history.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import argparse
 import logging
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import more_itertools
@@ -12,7 +12,7 @@ from annofabapi.models import Task, TaskHistory, TaskPhase, TaskStatus
 from annofabapi.util.task_history import find_rejected_task_history_indices, get_task_creation_datetime
 from annofabapi.utils import get_task_history_index_skipped_acceptance, get_task_history_index_skipped_inspection
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.enums import FormatArgument
 from annofabcli.common.facade import AnnofabApiFacade
@@ -89,7 +89,7 @@ def get_post_rejection_acceptance_worktime_hour(task_histories: list[TaskHistory
     )
 
 
-def get_completed_datetime(task: dict[str, Any], task_histories: list[TaskHistory]) -> Optional[str]:
+def get_completed_datetime(task: dict[str, Any], task_histories: list[TaskHistory]) -> str | None:
     """受入完了状態になった日時を取得する。
 
     Args:
@@ -106,7 +106,7 @@ def get_completed_datetime(task: dict[str, Any], task_histories: list[TaskHistor
         return None
 
 
-def get_first_acceptance_completed_datetime(task_histories: list[TaskHistory]) -> Optional[str]:
+def get_first_acceptance_completed_datetime(task_histories: list[TaskHistory]) -> str | None:
     """はじめて受入完了状態になった日時を取得する。
 
     Args:
@@ -135,7 +135,7 @@ def get_first_acceptance_completed_datetime(task_histories: list[TaskHistory]) -
     return None
 
 
-def get_first_acceptance_reached_datetime(task_histories: list[TaskHistory]) -> Optional[str]:
+def get_first_acceptance_reached_datetime(task_histories: list[TaskHistory]) -> str | None:
     """
     はじめて受入フェーズに到達した日時を取得する。
     受入フェーズを着手した日時とは異なる。
@@ -155,7 +155,7 @@ def get_first_acceptance_reached_datetime(task_histories: list[TaskHistory]) ->
     return None
 
 
-def get_first_inspection_reached_datetime(task_histories: list[TaskHistory]) -> Optional[str]:
+def get_first_inspection_reached_datetime(task_histories: list[TaskHistory]) -> str | None:
     """
     はじめて検査フェーズに到達した日時を取得する。
     検査フェーズを着手した日時とは異なる。
@@ -213,7 +213,7 @@ def calculate_total_worktime_in_phase(task_histories: list[TaskHistory], phase:
     return sum(isoduration_to_hour(history["accumulated_labor_time_milliseconds"]) for history in task_histories if history["phase"] == phase.value)
 
 
-def get_first_task_history(task_histories: list[TaskHistory], phase: TaskPhase) -> Optional[TaskHistory]:
+def get_first_task_history(task_histories: list[TaskHistory], phase: TaskPhase) -> TaskHistory | None:
     """
     指定したフェーズの最初に作業したタスク履歴を取得します。
     取得したタスク履歴には、account_idはnot Noneで、作業時間は0より大きいです。
@@ -263,7 +263,7 @@ class AddingAdditionalInfoToTask:
         self.project_id = project_id
         self.visualize = AddProps(self.service, project_id)
 
-    def _add_task_history_info(self, task: Task, task_history: Optional[TaskHistory], column_prefix: str) -> Task:
+    def _add_task_history_info(self, task: Task, task_history: TaskHistory | None, column_prefix: str) -> Task:
         """
         1個のタスク履歴情報を、タスクに設定する。
 
@@ -375,7 +375,7 @@ class ListTasksAddedTaskHistoryMain:
         self.service = service
         self.project_id = project_id
 
-    def main(self, *, task_query: Optional[dict[str, Any]], task_id_list: Optional[list[str]]) -> list[dict[str, Any]]:
+    def main(self, *, task_query: dict[str, Any] | None, task_id_list: list[str] | None) -> list[dict[str, Any]]:
         list_task_obj = ListTasksMain(self.service, self.project_id)
         task_list = list_task_obj.get_task_list(self.project_id, task_id_list=task_id_list, task_query=task_query)
 
@@ -526,7 +526,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_added_task_history"
     subcommand_help = "タスク履歴に関する情報を加えたタスク一覧を出力します。"
     description = "タスク履歴に関する情報（フェーズごとの作業時間、担当者、開始日時）を加えたタスク一覧を出力します。"

annofabcli/task/put_tasks.py

@@ -8,13 +8,12 @@ import tempfile
 from collections import defaultdict
 from enum import Enum
 from pathlib import Path
-from typing import Optional
 
 import annofabapi
 import pandas
 from annofabapi.models import JobStatus, ProjectJobType, ProjectMemberRole
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     PARALLELISM_CHOICES,
@@ -54,7 +53,7 @@ def get_task_relation_dict(csv_file: Path) -> TaskInputRelation:
     # `dtype=str`を指定した理由：指定しないと、IDが`001`のときに`1`に変換されてしまうため
     df = pandas.read_csv(str(csv_file), header=None, usecols=(0, 1), names=("task_id", "input_data_id"), dtype=str)
     result: TaskInputRelation = defaultdict(list)
-    for task_id, input_data_id in zip(df["task_id"], df["input_data_id"]):
+    for task_id, input_data_id in zip(df["task_id"], df["input_data_id"], strict=False):
         result[task_id].append(input_data_id)
     return result
 
@@ -88,7 +87,7 @@ class PuttingTaskMain:
         service: annofabapi.Resource,
         project_id: str,
         *,
-        parallelism: Optional[int],
+        parallelism: int | None,
         should_wait: bool = False,
     ) -> None:
         self.service = service
@@ -156,7 +155,7 @@ class PuttingTaskMain:
 
     def generate_task(
         self,
-        api: Optional[ApiWithCreatingTask],
+        api: ApiWithCreatingTask | None,
         task_relation_dict: TaskInputRelation,
     ) -> None:
         """
@@ -305,7 +304,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/task/put_tasks_by_count.py

@@ -3,12 +3,11 @@ from __future__ import annotations
 import argparse
 import logging
 from enum import Enum
-from typing import Optional
 
 import annofabapi
 from annofabapi.models import JobStatus, ProjectJobType, ProjectMemberRole
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.dataclasses import WaitOptions
 from annofabcli.common.facade import AnnofabApiFacade
@@ -141,7 +140,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_by_count"
     subcommand_help = "タスクに割り当てる入力データの個数を指定して、タスクを作成します。"
     epilog = "オーナロールを持つユーザで実行してください。"