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

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,12 +3,11 @@ import json
 import logging
 import tempfile
 from pathlib import Path
-from typing import Optional
 
 import annofabapi
 from annofabapi.models import TaskHistory
 
-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
@@ -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,11 +1,10 @@
 import argparse
 import logging
-from typing import Optional
 
 import annofabapi
 from annofabapi.models import TaskHistory
 
-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
@@ -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,13 +5,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.models import TaskHistoryEvent
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     ArgumentParser,
     CommandLine,
@@ -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)頃の状態です。最新の情報を出力する方法はありません。"

annofabcli/task_history_event/list_worktime.py

@@ -6,7 +6,7 @@ import logging
 from collections import defaultdict
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -14,7 +14,8 @@ from annofabapi.models import TaskHistoryEvent, TaskStatus
 from dataclasses_json import DataClassJsonMixin
 from dateutil.parser import parse
 
-import annofabcli
+import annofabcli.common.cli
+import annofabcli.common.utils
 from annofabcli.common.cli import (
     ArgumentParser,
     CommandLine,
@@ -45,9 +46,9 @@ class RequestOfTaskHistoryEvent(DataClassJsonMixin):
 
     status: str
     force: bool
-    account_id: Optional[str]
-    user_id: Optional[str]
-    username: Optional[str]
+    account_id: str | None
+    user_id: str | None
+    username: str | None
 
 
 @dataclass
@@ -72,7 +73,7 @@ class ListWorktimeFromTaskHistoryEventMain:
         self.visualize = AddProps(service, project_id)
 
     @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)
@@ -84,7 +85,7 @@ class ListWorktimeFromTaskHistoryEventMain:
 
         return task_history_event_list
 
-    def get_task_history_event_list(self, project_id: str, task_history_event_json: Optional[Path] = None) -> list[dict[str, Any]]:
+    def get_task_history_event_list(self, project_id: str, task_history_event_json: Path | None = None) -> list[dict[str, Any]]:
         if task_history_event_json is None:
             downloading_obj = DownloadingFile(self.service)
             cache_dir = annofabcli.common.utils.get_cache_dir()
@@ -103,8 +104,8 @@ class ListWorktimeFromTaskHistoryEventMain:
     def _create_task_history_event_dict(
         task_history_event_list: list[TaskHistoryEvent],
         *,
-        task_ids: Optional[set[str]],
-        account_ids: Optional[set[str]],
+        task_ids: set[str] | None,
+        account_ids: set[str] | None,
     ) -> dict[str, list[TaskHistoryEvent]]:
         """
         keyがtask_id, valueがタスク履歴イベントのlistであるdictを生成する。
@@ -229,9 +230,9 @@ class ListWorktimeFromTaskHistoryEventMain:
     def get_worktime_list(
         self,
         project_id: str,
-        task_history_event_json: Optional[Path] = None,
-        task_id_list: Optional[list[str]] = None,
-        user_id_list: Optional[list[str]] = None,
+        task_history_event_json: Path | None = None,
+        task_id_list: list[str] | None = None,
+        user_id_list: list[str] | None = None,
     ) -> list[WorktimeFromTaskHistoryEvent]:
         all_task_history_event_list = self.get_task_history_event_list(project_id, task_history_event_json=task_history_event_json)
 
@@ -251,9 +252,9 @@ class ListWorktimeFromTaskHistoryEvent(CommandLine):
     def print_worktime_from_task_history_event(
         self,
         project_id: str,
-        task_history_event_json: Optional[Path],
-        task_id_list: Optional[list[str]],
-        user_id_list: Optional[list[str]],
+        task_history_event_json: Path | None,
+        task_id_list: list[str] | None,
+        user_id_list: list[str] | None,
         arg_format: FormatArgument,
     ) -> None:
         super().validate_project(project_id, project_member_roles=None)
@@ -366,7 +367,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_worktime"
     subcommand_help = "タスク履歴イベントから作業時間の一覧を出力します。"
     description = "タスク履歴イベントから作業時間の一覧を出力します。\nタスク履歴より詳細な作業時間の情報を出力します。"

annofabcli/task_history_event/subcommand_task_history_event.py

@@ -1,5 +1,4 @@
 import argparse
-from typing import Optional
 
 import annofabcli.task_history_event.download_task_history_event_json
 import annofabcli.task_history_event.list_all_task_history_event
@@ -16,7 +15,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.task_history_event.list_worktime.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_event"
     subcommand_help = "タスク履歴イベント関係のサブコマンド"
     description = "タスク履歴イベント関係のサブコマンド。task_history_eventコマンドはベータ版です。予告なく変更される場合があります。"

{annofabcli-1.111.2.dist-info → annofabcli-1.113.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annofabcli
-Version: 1.111.2
+Version: 1.113.0
 Summary: Utility Command Line Interface for AnnoFab
 Author: Kurusugawa Computer Inc.
 License: MIT
@@ -10,25 +10,28 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Utilities
-Requires-Python: >=3.9
+Requires-Python: >=3.10
+Requires-Dist: annofabapi-3dpc-extensions
 Requires-Dist: annofabapi>=1.5.1
-Requires-Dist: bokeh<3.7,>=3.3
+Requires-Dist: bokeh>=3.8
 Requires-Dist: dictdiffer
 Requires-Dist: isodate
 Requires-Dist: more-itertools
 Requires-Dist: numpy
 Requires-Dist: pandas<3,>=2
 Requires-Dist: pillow
+Requires-Dist: pydantic>=2.12; python_version >= '3.14'
 Requires-Dist: pyquery
 Requires-Dist: python-datauri
 Requires-Dist: pyyaml
 Requires-Dist: requests
+Requires-Dist: shapely
 Requires-Dist: typing-extensions>=4.5
 Requires-Dist: ulid-py>=1.1.0
 Description-Content-Type: text/markdown
@@ -58,7 +61,7 @@ Description-Content-Type: text/markdown
 * TODO
 
 # Requirements
-* Python 3.9+
+* Python 3.10+
 
 # Install
 
@@ -110,13 +113,4 @@ $ annofabcli annotation list_count --project_id prj1 --task_id file://task.txt -
 $ annofabcli task reject --project_id prj1 --task_id file://tasks.txt --cancel_acceptance \
   --comment "carラベルのoccluded属性を見直してください"
 
-```
-
-# 補足
-
-# Windowsでannofabcliを使う場合
-WindowsのコマンドプロンプトやPowerShellでannofabcliを使う場合、JSON文字列内の二重引用をエスケープする必要があります。
-
-```
-> annofabcli task list --project_id prj1  --task_query '{"\status\": \"complete\"}'
-```
+```