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

annofabcli/task/list_all_tasks_added_task_history.py

@@ -6,7 +6,7 @@ import logging
 import sys
 import tempfile
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.models import ProjectMemberRole, TaskHistory
@@ -59,7 +59,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 +72,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 +88,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 +102,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 +115,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 +209,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,6 +1,6 @@
 import argparse
 import logging
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -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
@@ -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,7 +8,6 @@ import tempfile
 from collections import defaultdict
 from enum import Enum
 from pathlib import Path
-from typing import Optional
 
 import annofabapi
 import pandas
@@ -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,7 +3,6 @@ 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
@@ -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 = "オーナロールを持つユーザで実行してください。"

annofabcli/task/reject_tasks.py

@@ -6,16 +6,14 @@ import multiprocessing
 import sys
 import uuid
 from functools import partial
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
-import annofabapi.utils
 import requests
 from annofabapi.dataclass.task import Task
 from annofabapi.models import InputDataType, ProjectMemberRole, TaskPhase, TaskStatus
 from annofabapi.plugin import EditorPluginId
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -32,7 +30,7 @@ logger = logging.getLogger(__name__)
 
 
 class RejectTasksMain(CommandLineWithConfirm):
-    def __init__(self, service: annofabapi.Resource, *, comment_data: Optional[dict[str, Any]], all_yes: bool = False) -> None:
+    def __init__(self, service: annofabapi.Resource, *, comment_data: dict[str, Any] | None, all_yes: bool = False) -> None:
         self.service = service
         self.facade = AnnofabApiFacade(service)
         self.comment_data = comment_data
@@ -70,7 +68,7 @@ class RejectTasksMain(CommandLineWithConfirm):
 
         self.service.api.batch_update_comments(project_id, task["task_id"], first_input_data_id, request_body=req_inspection)
 
-    def confirm_reject_task(self, task_id: str, assign_last_annotator: bool, assigned_annotator_user_id: Optional[str]) -> bool:  # noqa: FBT001
+    def confirm_reject_task(self, task_id: str, assign_last_annotator: bool, assigned_annotator_user_id: str | None) -> bool:  # noqa: FBT001
         confirm_message = f"task_id='{task_id}' のタスクを差し戻しますか？"
         if assign_last_annotator:
             confirm_message += "最後の教師付フェーズの担当者を割り当てます。"
@@ -114,9 +112,9 @@ class RejectTasksMain(CommandLineWithConfirm):
         task: dict[str, Any],
         *,
         assign_last_annotator: bool,
-        assigned_annotator_user_id: Optional[str],
+        assigned_annotator_user_id: str | None,
         cancel_acceptance: bool = False,
-        task_query: Optional[TaskQuery] = None,
+        task_query: TaskQuery | None = None,
     ) -> bool:
         """
         以下の状態を見て、差し戻し可能かどうかを判断します。
@@ -151,12 +149,12 @@ class RejectTasksMain(CommandLineWithConfirm):
         project_id: str,
         task_id: str,
         *,
-        inspection_comment: Optional[str] = None,
+        inspection_comment: str | None = None,
         assign_last_annotator: bool = True,
-        assigned_annotator_user_id: Optional[str] = None,
+        assigned_annotator_user_id: str | None = None,
         cancel_acceptance: bool = False,
-        task_query: Optional[TaskQuery] = None,
-        task_index: Optional[int] = None,
+        task_query: TaskQuery | None = None,
+        task_index: int | None = None,
     ) -> bool:
         """
         タスクを差し戻します。
@@ -235,11 +233,11 @@ class RejectTasksMain(CommandLineWithConfirm):
         self,
         tpl: tuple[int, str],
         project_id: str,
-        inspection_comment: Optional[str] = None,
+        inspection_comment: str | None = None,
         assign_last_annotator: bool = True,  # noqa: FBT001, FBT002
-        assigned_annotator_user_id: Optional[str] = None,
+        assigned_annotator_user_id: str | None = None,
         cancel_acceptance: bool = False,  # noqa: FBT001, FBT002
-        task_query: Optional[TaskQuery] = None,
+        task_query: TaskQuery | None = None,
     ) -> bool:
         task_index, task_id = tpl
         try:
@@ -261,12 +259,12 @@ class RejectTasksMain(CommandLineWithConfirm):
         self,
         project_id: str,
         task_id_list: list[str],
-        inspection_comment: Optional[str] = None,
+        inspection_comment: str | None = None,
         assign_last_annotator: bool = True,  # noqa: FBT001, FBT002
-        assigned_annotator_user_id: Optional[str] = None,
+        assigned_annotator_user_id: str | None = None,
         cancel_acceptance: bool = False,  # noqa: FBT001, FBT002
-        task_query: Optional[TaskQuery] = None,
-        parallelism: Optional[int] = None,
+        task_query: TaskQuery | None = None,
+        parallelism: int | None = None,
     ) -> None:
         if task_query is not None:
             task_query = self.facade.set_account_id_of_task_query(project_id, task_query)
@@ -339,7 +337,7 @@ class RejectTasks(CommandLine):
             super().validate_project(args.project_id, [ProjectMemberRole.OWNER])
 
         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
 
         comment_data = annofabcli.common.cli.get_json_from_args(args.comment_data)
         custom_project_type = CustomProjectType(args.custom_project_type) if args.custom_project_type is not None else None
@@ -447,7 +445,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 = "reject"
     subcommand_help = "タスクを差し戻します。"
     description = "タスクを差し戻します。差し戻す際、検査コメントを付与することもできます。作業中状態のタスクに対しては差し戻せません。"

annofabcli/task/subcommand_task.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
 import annofabcli.task.cancel_acceptance
 import annofabcli.task.change_operator
@@ -45,7 +43,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.task.update_metadata_of_task.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 = "task"
     subcommand_help = "タスク関係のサブコマンド"
     description = "タスク関係のサブコマンド"

annofabcli/task/update_metadata_of_task.py

@@ -8,12 +8,11 @@ import multiprocessing
 import sys
 from dataclasses import dataclass
 from functools import partial
-from typing import Any, Optional, Union
+from typing import Any
 
 import annofabapi
 from annofabapi.models import ProjectMemberRole
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -27,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)
@@ -42,7 +41,7 @@ class UpdateMetadataOfTaskMain(CommandLineWithConfirm):
         service: annofabapi.Resource,
         *,
         is_overwrite_metadata: bool,
-        parallelism: Optional[int] = None,
+        parallelism: int | None = None,
         all_yes: bool = False,
     ) -> None:
         self.service = service
@@ -61,7 +60,7 @@ class UpdateMetadataOfTaskMain(CommandLineWithConfirm):
         project_id: str,
         task_id: str,
         metadata: dict[str, Any],
-        task_index: Optional[int] = None,
+        task_index: int | None = None,
     ) -> bool:
         logging_prefix = f"{task_index + 1} 件目" if task_index is not None else ""
         task = self.service.wrapper.get_task_or_none(project_id, task_id)
@@ -272,7 +271,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 = "update_metadata"
     subcommand_help = "タスクのメタデータを更新します。"
     description = "タスクのメタデータを上書きして更新します。"

annofabcli/task_history/download_task_history_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 DownloadingTaskHistory(CommandLine):
-    def download_task_history_json(self, project_id: str, output_file: Path):  # noqa: ANN201
+    def download_task_history_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_task_history_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/task_history/list_all_task_history.py

@@ -3,7 +3,6 @@ import json
 import logging
 import tempfile
 from pathlib import Path
-from typing import Optional
 
 import annofabapi
 from annofabapi.models import TaskHistory
@@ -27,7 +26,7 @@ class ListTaskHistoryWithJsonMain:
         self.facade = AnnofabApiFacade(service)
 
     @staticmethod
-    def filter_task_history_dict(task_history_dict: TaskHistoryDict, task_id_list: Optional[list[str]] = None) -> TaskHistoryDict:
+    def filter_task_history_dict(task_history_dict: TaskHistoryDict, task_id_list: list[str] | None = None) -> TaskHistoryDict:
         if task_id_list is None:
             return task_history_dict
 
@@ -40,7 +39,7 @@ class ListTaskHistoryWithJsonMain:
                 filtered_task_history_dict[task_id] = task_history_list
         return filtered_task_history_dict
 
-    def get_task_history_dict(self, project_id: str, task_history_json: Optional[Path] = None, task_id_list: Optional[list[str]] = None) -> TaskHistoryDict:
+    def get_task_history_dict(self, project_id: str, task_history_json: Path | None = None, task_id_list: list[str] | None = None) -> TaskHistoryDict:
         """出力対象のタスク履歴情報を取得する"""
         if task_history_json is None:
             downloading_obj = DownloadingFile(self.service)
@@ -78,8 +77,8 @@ class ListTaskHistoryWithJson(CommandLine):
     def print_task_history_list(  # noqa: ANN201
         self,
         project_id: str,
-        task_history_json: Optional[Path],
-        task_id_list: Optional[list[str]],
+        task_history_json: Path | None,
+        task_id_list: list[str] | None,
         arg_format: FormatArgument,
     ):
         """
@@ -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_all"
     subcommand_help = "すべてのタスク履歴の一覧を出力します。"
     description = (

annofabcli/task_history/list_task_history.py

@@ -1,6 +1,5 @@
 import argparse
 import logging
-from typing import Optional
 
 import annofabapi
 from annofabapi.models import TaskHistory
@@ -53,7 +52,7 @@ class ListTaskHistoryMain:
         all_task_list = self.service.wrapper.get_all_tasks(project_id)
         return [e["task_id"] for e in all_task_list]
 
-    def get_task_history_dict_for_output(self, project_id: str, task_id_list: Optional[list[str]] = None) -> TaskHistoryDict:
+    def get_task_history_dict_for_output(self, project_id: str, task_id_list: list[str] | None = None) -> TaskHistoryDict:
         """出力対象のタスク履歴情報を取得する"""
         if task_id_list is None:
             task_id_list = self.get_all_task_id_list(project_id)
@@ -78,7 +77,7 @@ class ListTaskHistory(CommandLine):
     def print_task_history_list(
         self,
         project_id: str,
-        task_id_list: Optional[list[str]],
+        task_id_list: list[str] | None,
         arg_format: FormatArgument,
     ) -> None:
         """
@@ -143,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"
     subcommand_help = "タスク履歴の一覧を出力します。"
     description = "タスク履歴の一覧を出力します。"

annofabcli/task_history/subcommand_task_history.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
 import annofabcli.task_history.download_task_history_json
 import annofabcli.task_history.list_all_task_history
@@ -17,7 +15,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.task_history.list_all_task_history.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 = "task_history"
     subcommand_help = "タスク履歴関係のサブコマンド"
     description = "タスク履歴関係のサブコマンド"

annofabcli/task_history_event/download_task_history_event_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 DownloadingTaskHistoryEvent(CommandLine):
-    def download_task_history_event_json(self, project_id: str, output_file: Path):  # noqa: ANN201
+    def download_task_history_event_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_task_history_event_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/task_history_event/list_all_task_history_event.py

@@ -5,7 +5,7 @@ import json
 import logging
 import tempfile
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -31,7 +31,7 @@ class ListTaskHistoryEventWithJsonMain:
         self.service = service
 
     @staticmethod
-    def filter_task_history_event(task_history_event_list: list[TaskHistoryEvent], task_id_list: Optional[list[str]] = None) -> list[TaskHistoryEvent]:
+    def filter_task_history_event(task_history_event_list: list[TaskHistoryEvent], task_id_list: list[str] | None = None) -> list[TaskHistoryEvent]:
         if task_id_list is not None:
             result = []
             task_id_set = set(task_id_list)
@@ -43,7 +43,7 @@ class ListTaskHistoryEventWithJsonMain:
 
         return task_history_event_list
 
-    def get_task_history_event_list(self, project_id: str, task_history_event_json: Optional[Path] = None, task_id_list: Optional[list[str]] = None) -> list[dict[str, Any]]:
+    def get_task_history_event_list(self, project_id: str, task_history_event_json: Path | None = None, task_id_list: list[str] | None = None) -> list[dict[str, Any]]:
         if task_history_event_json is None:
             downloading_obj = DownloadingFile(self.service)
             # `NamedTemporaryFile`を使わない理由: Windowsで`PermissionError`が発生するため
@@ -72,8 +72,8 @@ class ListTaskHistoryEventWithJson(CommandLine):
     def print_task_history_event_list(
         self,
         project_id: str,
-        task_history_event_json: Optional[Path],
-        task_id_list: Optional[list[str]],
+        task_history_event_json: Path | None,
+        task_id_list: list[str] | None,
         arg_format: FormatArgument,
     ) -> None:
         super().validate_project(project_id, project_member_roles=None)
@@ -165,7 +165,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)頃の状態です。最新の情報を出力する方法はありません。"