annofabcli 1.114.3__py3-none-any.whl → 1.114.5__py3-none-any.whl

annofabcli/statistics/list_annotation_duration.py

@@ -34,7 +34,7 @@ from annofabcli.common.cli import (
     build_annofabapi_resource_and_login,
 )
 from annofabcli.common.download import DownloadingFile
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import (
     AnnofabApiFacade,
     TaskQuery,
@@ -504,7 +504,7 @@ class ListAnnotationDurationMain:
         self,
         annotation_path: Path,
         output_file: Path,
-        arg_format: FormatArgument,
+        arg_format: OutputFormat,
         *,
         project_id: str | None = None,
         input_data_json_path: Path | None = None,
@@ -527,12 +527,12 @@ class ListAnnotationDurationMain:
 
         logger.info(f"{len(annotation_duration_list)} 件のタスクに含まれる区間アノテーションの長さ情報を出力します。")
 
-        if arg_format == FormatArgument.CSV:
+        if arg_format == OutputFormat.CSV:
             assert csv_type is not None
             self.print_annotation_duration_csv(annotation_duration_list, output_file=output_file, csv_type=csv_type, annotation_specs=annotation_specs)
 
-        elif arg_format in [FormatArgument.PRETTY_JSON, FormatArgument.JSON]:
-            json_is_pretty = arg_format == FormatArgument.PRETTY_JSON
+        elif arg_format in [OutputFormat.PRETTY_JSON, OutputFormat.JSON]:
+            json_is_pretty = arg_format == OutputFormat.PRETTY_JSON
 
             print_json(
                 [e.to_dict(encode_json=True) for e in annotation_duration_list],
@@ -578,7 +578,7 @@ class ListAnnotationDuration(CommandLine):
 
         csv_type = CsvType(args.type)
         output_file: Path = args.output
-        arg_format = FormatArgument(args.format)
+        arg_format = OutputFormat(args.format)
         main_obj = ListAnnotationDurationMain(self.service)
 
         downloading_obj = DownloadingFile(self.service)
@@ -660,8 +660,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     )
 
     argument_parser.add_format(
-        choices=[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON],
-        default=FormatArgument.CSV,
+        choices=[OutputFormat.CSV, OutputFormat.JSON, OutputFormat.PRETTY_JSON],
+        default=OutputFormat.CSV,
     )
 
     argument_parser.add_output()

annofabcli/statistics/list_video_duration.py

@@ -20,7 +20,7 @@ from annofabcli.common.cli import (
     build_annofabapi_resource_and_login,
 )
 from annofabcli.common.download import DownloadingFile
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade
 from annofabcli.common.utils import print_according_to_format, print_csv
 
@@ -81,7 +81,7 @@ class ListVideoDuration(CommandLine):
         self,
         task_json: Path,
         input_data_json: Path,
-        output_format: FormatArgument,
+        output_format: OutputFormat,
         output_file: Path | None,
     ) -> None:
         with task_json.open(encoding="utf-8") as f:
@@ -91,7 +91,7 @@ class ListVideoDuration(CommandLine):
 
         video_duration_list = get_video_duration_list(task_list=task_list, input_data_list=input_data_list)
         logger.info(f"{len(video_duration_list)} 件のタスクの動画長さを出力します。")
-        if output_format == FormatArgument.CSV:
+        if output_format == OutputFormat.CSV:
             columns = [
                 "project_id",
                 "task_id",
@@ -125,7 +125,7 @@ class ListVideoDuration(CommandLine):
                 )
                 sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
 
-        func = partial(self.list_video_duration, output_file=args.output, output_format=FormatArgument(args.format))
+        func = partial(self.list_video_duration, output_file=args.output, output_format=OutputFormat(args.format))
 
         def wrapper_func(temp_dir: Path) -> None:
             downloading_obj = DownloadingFile(self.service)
@@ -190,8 +190,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     )
 
     argument_parser.add_format(
-        choices=[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON],
-        default=FormatArgument.CSV,
+        choices=[OutputFormat.CSV, OutputFormat.JSON, OutputFormat.PRETTY_JSON],
+        default=OutputFormat.CSV,
     )
 
     argument_parser.add_output()

annofabcli/statistics/summarize_task_count_by_task_id_group.py

@@ -19,7 +19,7 @@ from annofabcli.common.cli import (
 )
 from annofabcli.common.dataclasses import WaitOptions
 from annofabcli.common.download import DownloadingFile
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade
 from annofabcli.statistics.summarize_task_count import get_step_for_current_phase
 
@@ -144,7 +144,7 @@ class SummarizeTaskCountByTaskId(CommandLine):
         columns = ["task_id_group"] + [status.value for status in TaskStatusForSummary] + ["sum"]
         annofabcli.common.utils.print_according_to_format(
             df[columns],
-            format=FormatArgument(FormatArgument.CSV),
+            format=OutputFormat.CSV,
             output=self.output,
         )
 

annofabcli/statistics/summarize_task_count_by_user.py

@@ -16,7 +16,7 @@ from annofabcli.common.cli import (
 )
 from annofabcli.common.dataclasses import WaitOptions
 from annofabcli.common.download import DownloadingFile
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade
 
 logger = logging.getLogger(__name__)
@@ -112,7 +112,7 @@ class SummarizeTaskCountByUser(CommandLine):
         target_df = df[columns].sort_values("user_id")
         annofabcli.common.utils.print_according_to_format(
             target_df,
-            format=FormatArgument(FormatArgument.CSV),
+            format=OutputFormat.CSV,
             output=self.output,
         )
 

annofabcli/statistics/visualization/dataframe/project_performance.py

@@ -136,7 +136,8 @@ class ProjectWorktimePerMonth:
         series = df.groupby(pandas.Grouper(key="dt_date", freq=get_frequency_of_monthend())).sum(numeric_only=True)[worktime_column.value]
         # indexを"2022-04"という形式にする
         new_index = [str(dt)[0:7] for dt in series.index]
-        result = pandas.Series(series.values, index=new_index)
+        # pandas 3.0対応: .valuesではなく.to_numpy()を使用
+        result = pandas.Series(series.to_numpy(), index=new_index)
         result["dirname"] = project_dir.project_dir.name
         result["project_title"] = project_dir.get_project_title()
         return result

annofabcli/statistics/visualization/dataframe/task.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import datetime
 import logging
 from pathlib import Path
 from typing import Any
@@ -9,7 +10,6 @@ import bokeh
 import bokeh.layouts
 import numpy
 import pandas
-import pytz
 from bokeh.plotting import figure
 
 from annofabcli.common.bokeh import convert_1d_figure_list_to_2d, create_pretext_from_metadata
@@ -426,10 +426,11 @@ class Task:
             # タイムゾーンを指定している理由::
             # すべてがNaNのseriesをdatetimeに変換すると、型にタイムゾーンが指定されない。
             # その状態で加算すると、`TypeError: DatetimeArray subtraction must have the same timezones or no timezones`というエラーが発生するため
+            # pandas 3.0対応: pytz.FixedOffsetの代わりにdatetime.timezoneを使用
             if not isinstance(dt1.dtype, pandas.DatetimeTZDtype):
-                dt1 = dt1.dt.tz_localize(pytz.FixedOffset(540))
+                dt1 = dt1.dt.tz_localize(datetime.timezone(datetime.timedelta(hours=9)))
             if not isinstance(dt2.dtype, pandas.DatetimeTZDtype):
-                dt2 = dt2.dt.tz_localize(pytz.FixedOffset(540))
+                dt2 = dt2.dt.tz_localize(datetime.timezone(datetime.timedelta(hours=9)))
 
             return (dt1 - dt2).dt.total_seconds() / 3600 / 24
 
@@ -532,9 +533,27 @@ class Task:
         if not self._validate_df_for_output(output_file):
             return
 
-        existing_optional_columns = [col for col in self.optional_columns if col in set(self.df.columns)]
-        columns = self.required_columns + existing_optional_columns
-        print_csv(self.df[columns], str(output_file))
+        # metadata列が存在する場合は展開する
+        if "metadata" in self.df.columns:
+            # metadata列のみをjson_normalizeで展開
+            df_metadata = pandas.json_normalize(self.df["metadata"].tolist())
+            # 列名にmetadata.プレフィックスを追加
+            df_metadata.columns = [f"metadata.{col}" for col in df_metadata.columns]
+            # 元のDataFrameからmetadata列を削除
+            df_without_metadata = self.df.drop(columns=["metadata"])
+            # 展開したmetadata列を結合
+            df_normalized = pandas.concat([df_without_metadata.reset_index(drop=True), df_metadata.reset_index(drop=True)], axis=1)
+        else:
+            df_normalized = self.df
+
+        # metadata.*列を検出
+        metadata_columns = sorted([col for col in df_normalized.columns if col.startswith("metadata.")])
+
+        # 出力対象の列を定義
+        existing_optional_columns = [col for col in self.optional_columns if col in set(df_normalized.columns)]
+        columns = self.required_columns + existing_optional_columns + metadata_columns
+
+        print_csv(df_normalized[columns], str(output_file))
 
     def mask_user_info(
         self,

annofabcli/supplementary/list_supplementary_data.py

@@ -15,7 +15,7 @@ from annofabapi.models import SupplementaryData
 import annofabcli.common.cli
 from annofabcli.common.cli import PARALLELISM_CHOICES, ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.download import DownloadingFile
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade
 
 logger = logging.getLogger(__name__)
@@ -155,7 +155,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         ),
     )
 
-    argument_parser.add_format(choices=[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON], default=FormatArgument.CSV)
+    argument_parser.add_format(choices=[OutputFormat.CSV, OutputFormat.JSON, OutputFormat.PRETTY_JSON], default=OutputFormat.CSV)
     argument_parser.add_output()
 
     parser.add_argument(

annofabcli/task/list_all_tasks.py

@@ -6,17 +6,15 @@ from pathlib import Path
 from typing import Any
 
 import annofabapi
-import pandas
 from annofabapi.dataclass.task import Task
 
 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
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade, TaskQuery, match_task_with_query
-from annofabcli.common.utils import get_columns_with_priority
 from annofabcli.common.visualize import AddProps
-from annofabcli.task.list_tasks import ListTasks
+from annofabcli.task.list_tasks import print_task_list
 
 logger = logging.getLogger(__name__)
 
@@ -44,9 +42,10 @@ class ListTasksWithJsonMain:
         self,
         project_id: str,
         task_json: Path | None,
+        *,
         task_id_list: list[str] | None = None,
         task_query: TaskQuery | None = None,
-        is_latest: bool = False,  # noqa: FBT001, FBT002
+        is_latest: bool = False,
         temp_dir: Path | None = None,
     ) -> list[dict[str, Any]]:
         if task_json is None:
@@ -108,17 +107,8 @@ class ListTasksWithJson(CommandLine):
             temp_dir=temp_dir,
         )
 
-        logger.debug(f"タスク一覧の件数: {len(task_list)}")
-
-        if len(task_list) > 0:
-            if self.str_format == FormatArgument.CSV.value:
-                df = pandas.DataFrame(task_list)
-                columns = get_columns_with_priority(df, prior_columns=ListTasks.PRIOR_COLUMNS)
-                self.print_csv(df[columns])
-            else:
-                self.print_according_to_format(task_list)
-        else:
-            logger.info("タスク一覧の件数が0件のため、出力しません。")
+        logger.info(f"{len(task_list)}件のタスク情報を出力します。")
+        print_task_list(task_list, OutputFormat(args.format), args.output)
 
 
 def main(args: argparse.Namespace) -> None:
@@ -155,8 +145,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     )
 
     argument_parser.add_format(
-        choices=[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON, FormatArgument.TASK_ID_LIST],
-        default=FormatArgument.CSV,
+        choices=[OutputFormat.CSV, OutputFormat.JSON, OutputFormat.PRETTY_JSON, OutputFormat.TASK_ID_LIST],
+        default=OutputFormat.CSV,
     )
     argument_parser.add_output()
 

annofabcli/task/list_all_tasks_added_task_history.py

@@ -21,7 +21,7 @@ from annofabcli.common.cli import (
 )
 from annofabcli.common.dataclasses import WaitOptions
 from annofabcli.common.download import DownloadingFile
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade, TaskQuery, match_task_with_query
 from annofabcli.task.list_tasks_added_task_history import AddingAdditionalInfoToTask, TasksAddedTaskHistoryOutput
 
@@ -118,14 +118,14 @@ class ListAllTasksAddedTaskHistoryMain:
         filtered_task_list = [e for e in task_list if self.match_task_with_conditions(e, task_query=task_query, task_id_set=task_id_set)]
         return filtered_task_list
 
-    def get_task_list_added_task_history(  # noqa: ANN201
+    def get_task_list_added_task_history(
         self,
         task_json_path: Path | None,
         task_history_json_path: Path | None,
         task_id_list: list[str] | None,
         task_query: TaskQuery | None,
         temp_dir: Path | None,
-    ):
+    ) -> list[dict[str, Any]]:
         """
         タスク履歴情報を加えたタスク一覧を取得する。
         """
@@ -178,7 +178,7 @@ class ListAllTasksAddedTaskHistory(CommandLine):
         )
 
         logger.info(f"タスク一覧の件数: {len(task_list)}")
-        TasksAddedTaskHistoryOutput(task_list).output(output_path=args.output, output_format=FormatArgument(args.format))
+        TasksAddedTaskHistoryOutput(task_list).output(output_path=args.output, output_format=OutputFormat(args.format))
 
 
 def main(args: argparse.Namespace) -> None:
@@ -216,8 +216,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     argument_parser.add_output()
 
     argument_parser.add_format(
-        choices=[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON],
-        default=FormatArgument.CSV,
+        choices=[OutputFormat.CSV, OutputFormat.JSON, OutputFormat.PRETTY_JSON],
+        default=OutputFormat.CSV,
     )
 
     parser.set_defaults(subcommand_func=main)

annofabcli/task/list_tasks.py

@@ -1,5 +1,6 @@
 import argparse
 import logging
+from pathlib import Path
 from typing import Any
 
 import annofabapi
@@ -8,14 +9,77 @@ from annofabapi.models import Task
 
 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.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade
-from annofabcli.common.utils import get_columns_with_priority
+from annofabcli.common.utils import get_columns_with_priority, print_csv, print_id_list, print_json
 from annofabcli.common.visualize import AddProps
 
 logger = logging.getLogger(__name__)
 
 
+def print_task_list(
+    task_list: list[dict[str, Any]],
+    output_format: OutputFormat,
+    output_file: Path | None,
+) -> None:
+    """
+    タスク一覧を指定されたフォーマットで出力する。
+
+    Args:
+        task_list: タスク一覧
+        output_format: 出力フォーマット
+        output_file: 出力先
+    """
+    task_prior_columns = [
+        "project_id",
+        "task_id",
+        "phase",
+        "phase_stage",
+        "status",
+        "started_datetime",
+        "updated_datetime",
+        "operation_updated_datetime",
+        "account_id",
+        "user_id",
+        "username",
+        "worktime_hour",
+        "number_of_rejections_by_inspection",
+        "number_of_rejections_by_acceptance",
+        "sampling",
+        "input_data_count",
+    ]
+
+    if output_format == OutputFormat.CSV:
+        if len(task_list) > 0:
+            # json_normalizeでメタデータを自動展開
+            df = pandas.json_normalize(task_list)
+
+            # metadata.*列を検出して優先列リストに追加
+            metadata_columns = sorted([col for col in df.columns if col.startswith("metadata.")])
+            prior_columns_with_metadata = task_prior_columns + metadata_columns
+            columns = get_columns_with_priority(df, prior_columns=prior_columns_with_metadata)
+            # work_time_span列を除外（worktime_hourと重複するため）
+            # histories_by_phase列を除外（list型のためCSVでは扱いにくいため）
+            # input_data_id_list列を除外（list型のためCSVでは扱いにくいため。input_data_countで件数は把握できる）
+            columns = [col for col in columns if col not in ["work_time_span", "histories_by_phase", "input_data_id_list"]]
+            print_csv(df[columns], output=output_file)
+        else:
+            df = pandas.DataFrame(columns=task_prior_columns)
+            print_csv(df, output=output_file)
+
+    elif output_format == OutputFormat.PRETTY_JSON:
+        print_json(task_list, is_pretty=True, output=output_file)
+
+    elif output_format == OutputFormat.JSON:
+        print_json(task_list, is_pretty=False, output=output_file)
+
+    elif output_format == OutputFormat.TASK_ID_LIST:
+        task_id_list = [e["task_id"] for e in task_list]
+        print_id_list(task_id_list, output=output_file)
+    else:
+        raise ValueError(f"{output_format}は対応していないフォーマットです。")
+
+
 class ListTasksMain:
     def __init__(self, service: annofabapi.Resource, project_id: str) -> None:
         self.service = service
@@ -53,7 +117,7 @@ class ListTasksMain:
 
         """
 
-        def remove_key(arg_key: str):  # noqa: ANN202
+        def remove_key(arg_key: str) -> None:
             if arg_key in task_query:
                 logger.info(f"タスク検索クエリから、`{arg_key}`　キーを削除しました。")
                 task_query.pop(arg_key)
@@ -96,7 +160,6 @@ class ListTasksMain:
             task_query = {}
 
         if user_id_list is None:
-            logger.debug(f"task_query: {task_query}")
             tasks = self.service.wrapper.get_all_tasks(project_id, query_params=task_query)
             if len(tasks) == 10000:
                 logger.warning("タスク一覧は10,000件で打ち切られている可能性があります。")
@@ -151,27 +214,6 @@ class ListTasks(CommandLine):
         super().__init__(service, facade, args)
         self.visualize = AddProps(self.service, args.project_id)
 
-    PRIOR_COLUMNS = [  # noqa: RUF012
-        "project_id",
-        "task_id",
-        "phase",
-        "phase_stage",
-        "status",
-        "started_datetime",
-        "updated_datetime",
-        "operation_updated_datetime",
-        "account_id",
-        "user_id",
-        "username",
-        "worktime_hour",
-        "number_of_rejections_by_inspection",
-        "number_of_rejections_by_acceptance",
-        "metadata",
-        "sampling",
-        "input_data_count",
-        "input_data_id_list",
-    ]
-
     def main(self) -> None:
         args = self.args
 
@@ -190,17 +232,11 @@ class ListTasks(CommandLine):
             user_id_list=user_id_list,
         )
 
-        logger.debug(f"タスク一覧の件数: {len(task_list)}")
+        logger.info(f"{len(task_list)}件のタスク情報を出力します。")
 
-        if len(task_list) > 0:
-            if self.str_format == FormatArgument.CSV.value:
-                df = pandas.DataFrame(task_list)
-                columns = get_columns_with_priority(df, prior_columns=self.PRIOR_COLUMNS)
-                self.print_csv(df[columns])
-            else:
-                self.print_according_to_format(task_list)
-        else:
-            logger.info("タスク一覧の件数が0件のため、出力しません。")
+        output_file = args.output
+        output_format = OutputFormat(args.format)
+        print_task_list(task_list, output_format, output_file)
 
 
 def main(args: argparse.Namespace) -> None:
@@ -245,8 +281,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     )
 
     argument_parser.add_format(
-        choices=[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON, FormatArgument.TASK_ID_LIST],
-        default=FormatArgument.CSV,
+        choices=[OutputFormat.CSV, OutputFormat.JSON, OutputFormat.PRETTY_JSON, OutputFormat.TASK_ID_LIST],
+        default=OutputFormat.CSV,
     )
     argument_parser.add_output()
 

annofabcli/task/list_tasks_added_task_history.py

@@ -14,7 +14,7 @@ from annofabapi.utils import get_task_history_index_skipped_acceptance, get_task
 
 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.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade
 from annofabcli.common.utils import isoduration_to_hour, print_csv, print_json
 from annofabcli.common.visualize import AddProps
@@ -384,7 +384,7 @@ class ListTasksAddedTaskHistoryMain:
 
         for index, task in enumerate(task_list):
             if (index + 1) % 100 == 0:
-                logger.debug(f"{index + 1} 件目のタスク履歴情報を取得します。")
+                logger.info(f"{index + 1} 件目のタスク履歴情報を取得します。")
 
             obj.add_additional_info_to_task(task)
             task_id = task["task_id"]
@@ -422,7 +422,6 @@ class TasksAddedTaskHistoryOutput:
             "user_id",
             "username",
             "input_data_count",
-            "metadata",
             "sampling",
             # 作業時間情報
             "worktime_hour",
@@ -454,20 +453,30 @@ class TasksAddedTaskHistoryOutput:
             ]
         )
 
-    def output(self, output_path: Path, output_format: FormatArgument) -> None:
+    def output(self, output_path: Path, output_format: OutputFormat) -> None:
         task_list = self.task_list
         logger.debug(f"タスク {len(task_list)} 件の情報を出力します。")
-        if output_format == FormatArgument.CSV:
-            df_task = pandas.DataFrame(task_list, columns=self._get_output_target_columns())
-            print_csv(
-                df_task[self._get_output_target_columns()],
-                output=output_path,
-            )
-
-        elif output_format == FormatArgument.JSON:
+        if output_format == OutputFormat.CSV:
+            if len(task_list) > 0:
+                # json_normalizeでメタデータを自動展開
+                df = pandas.json_normalize(task_list)
+
+                # metadata.*列を検出して出力対象列リストに追加
+                metadata_columns = sorted([col for col in df.columns if col.startswith("metadata.")])
+                output_columns = self._get_output_target_columns() + metadata_columns
+                # 出力列を output_columns に含まれる列のみに限定（意図しない列の混入を防ぐ）
+                columns = [col for col in output_columns if col in df.columns]
+                print_csv(df[columns], output=output_path)
+            else:
+                df = pandas.DataFrame(columns=self._get_output_target_columns())
+                print_csv(df, output=output_path)
+
+        elif output_format == OutputFormat.JSON:
             print_json(task_list, is_pretty=False, output=output_path)
-        elif output_format == FormatArgument.PRETTY_JSON:
+        elif output_format == OutputFormat.PRETTY_JSON:
             print_json(task_list, is_pretty=True, output=output_path)
+        else:
+            raise ValueError(f"{output_format=}は不正な値です。")
 
 
 class ListTasksAddedTaskHistory(CommandLine):
@@ -481,7 +490,7 @@ class ListTasksAddedTaskHistory(CommandLine):
         task_list = main_obj.main(task_query=task_query, task_id_list=task_id_list)
 
         output_obj = TasksAddedTaskHistoryOutput(task_list)
-        output_obj.output(args.output, output_format=FormatArgument(args.format))
+        output_obj.output(args.output, output_format=OutputFormat(args.format))
 
 
 def main(args: argparse.Namespace) -> None:
@@ -519,8 +528,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     argument_parser.add_output()
 
     argument_parser.add_format(
-        choices=[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON],
-        default=FormatArgument.CSV,
+        choices=[OutputFormat.CSV, OutputFormat.JSON, OutputFormat.PRETTY_JSON],
+        default=OutputFormat.CSV,
     )
 
     parser.set_defaults(subcommand_func=main)

annofabcli/task_history/list_all_task_history.py

@@ -10,7 +10,7 @@ from annofabapi.models import TaskHistory
 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
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade
 from annofabcli.common.visualize import AddProps
 
@@ -92,7 +92,7 @@ class ListTaskHistoryWithJson(CommandLine):
         project_id: str,
         task_history_json: Path | None,
         task_id_list: list[str] | None,
-        arg_format: FormatArgument,
+        arg_format: OutputFormat,
         temp_dir: Path | None,
     ):
         """
@@ -111,7 +111,7 @@ class ListTaskHistoryWithJson(CommandLine):
         main_obj = ListTaskHistoryWithJsonMain(self.service)
         task_history_dict = main_obj.get_task_history_dict(project_id, task_history_json=task_history_json, task_id_list=task_id_list, temp_dir=temp_dir)
         logger.debug(f"{len(task_history_dict)} 件のタスクの履歴情報を出力します。")
-        if arg_format == FormatArgument.CSV:
+        if arg_format == OutputFormat.CSV:
             all_task_history_list = main_obj.to_all_task_history_list_from_dict(task_history_dict)
             self.print_according_to_format(all_task_history_list)
         else:
@@ -127,7 +127,7 @@ class ListTaskHistoryWithJson(CommandLine):
             args.project_id,
             task_history_json=args.task_history_json,
             task_id_list=task_id_list,
-            arg_format=FormatArgument(args.format),
+            arg_format=OutputFormat(args.format),
             temp_dir=temp_dir,
         )
 
@@ -164,8 +164,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     )
 
     argument_parser.add_format(
-        choices=[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON],
-        default=FormatArgument.CSV,
+        choices=[OutputFormat.CSV, OutputFormat.JSON, OutputFormat.PRETTY_JSON],
+        default=OutputFormat.CSV,
     )
     argument_parser.add_output()