annofabcli 1.114.2__py3-none-any.whl → 1.114.4__py3-none-any.whl

annofabcli/annotation_zip/list_range_annotation.py

@@ -17,7 +17,7 @@ import annofabcli.common.cli
 from annofabcli.common.annofab.annotation_zip import lazy_parse_simple_annotation_by_input_data
 from annofabcli.common.cli import COMMAND_LINE_ERROR_STATUS_CODE, ArgumentParser, CommandLine, build_annofabapi_resource_and_login, get_list_from_args
 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,
@@ -147,7 +147,7 @@ def create_df(
 def print_range_annotation(
     annotation_path: Path,
     output_file: Path,
-    output_format: FormatArgument,
+    output_format: OutputFormat,
     *,
     target_task_ids: Collection[str] | None = None,
     task_query: TaskQuery | None = None,
@@ -162,12 +162,12 @@ def print_range_annotation(
 
     logger.info(f"{len(range_annotation_list)} 件の区間アノテーションの情報を出力します。 :: output='{output_file}'")
 
-    if output_format == FormatArgument.CSV:
+    if output_format == OutputFormat.CSV:
         df = create_df(range_annotation_list)
         print_csv(df, output_file)
 
-    elif output_format in [FormatArgument.PRETTY_JSON, FormatArgument.JSON]:
-        json_is_pretty = output_format == FormatArgument.PRETTY_JSON
+    elif output_format in [OutputFormat.PRETTY_JSON, OutputFormat.JSON]:
+        json_is_pretty = output_format == OutputFormat.PRETTY_JSON
         # DataClassJsonMixinを使用したtoJSON処理
         print_json(
             [e.to_dict(encode_json=True) for e in range_annotation_list],
@@ -212,7 +212,7 @@ class ListRangeAnnotation(CommandLine):
         label_name_list = get_list_from_args(args.label_name) if args.label_name is not None else None
 
         output_file: Path = args.output
-        output_format = FormatArgument(args.format)
+        output_format = OutputFormat(args.format)
 
         downloading_obj = DownloadingFile(self.service)
 
@@ -266,8 +266,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     group.add_argument("-p", "--project_id", type=str, help="project_id。アノテーションZIPをダウンロードします。")
 
     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/annotation_zip/list_single_point_annotation.py

@@ -15,7 +15,7 @@ import annofabcli.common.cli
 from annofabcli.common.annofab.annotation_zip import lazy_parse_simple_annotation_by_input_data
 from annofabcli.common.cli import COMMAND_LINE_ERROR_STATUS_CODE, ArgumentParser, CommandLine, build_annofabapi_resource_and_login, get_list_from_args
 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,
@@ -136,7 +136,7 @@ def create_df(
 def print_annotation_single_point(
     annotation_path: Path,
     output_file: Path,
-    output_format: FormatArgument,
+    output_format: OutputFormat,
     *,
     target_task_ids: Collection[str] | None = None,
     task_query: TaskQuery | None = None,
@@ -151,12 +151,12 @@ def print_annotation_single_point(
 
     logger.info(f"{len(annotation_point_list)} 件の点アノテーションの情報を出力します。 :: output='{output_file}'")
 
-    if output_format == FormatArgument.CSV:
+    if output_format == OutputFormat.CSV:
         df = create_df(annotation_point_list)
         print_csv(df, output_file)
 
-    elif output_format in [FormatArgument.PRETTY_JSON, FormatArgument.JSON]:
-        json_is_pretty = output_format == FormatArgument.PRETTY_JSON
+    elif output_format in [OutputFormat.PRETTY_JSON, OutputFormat.JSON]:
+        json_is_pretty = output_format == OutputFormat.PRETTY_JSON
         # DataClassJsonMixinを使用したtoJSON処理
         print_json(
             [e.to_dict(encode_json=True) for e in annotation_point_list],
@@ -201,7 +201,7 @@ class ListAnnotationSinglePoint(CommandLine):
         label_name_list = get_list_from_args(args.label_name) if args.label_name is not None else None
 
         output_file: Path = args.output
-        output_format = FormatArgument(args.format)
+        output_format = OutputFormat(args.format)
 
         downloading_obj = DownloadingFile(self.service)
 
@@ -256,8 +256,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     group.add_argument("-p", "--project_id", type=str, help="project_id。アノテーションZIPをダウンロードします。")
 
     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/annotation_zip/validate_annotation.py

@@ -19,7 +19,7 @@ import annofabcli.common.cli
 from annofabcli.common.annofab.annotation_zip import lazy_parse_simple_annotation_by_input_data
 from annofabcli.common.cli import COMMAND_LINE_ERROR_STATUS_CODE, 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_annotation_with_task_query
 from annofabcli.common.utils import print_csv, print_json
 
@@ -377,7 +377,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         ),
     )
 
-    argument_parser.add_format(choices=[FormatArgument.CSV, FormatArgument.JSON], default=FormatArgument.CSV)
+    argument_parser.add_format(choices=[OutputFormat.CSV, OutputFormat.JSON], default=OutputFormat.CSV)
     argument_parser.add_output()
 
     parser.set_defaults(subcommand_func=main)

annofabcli/comment/list_all_comment.py

@@ -20,7 +20,7 @@ import annofabcli.common.cli
 from annofabcli.comment.list_comment import create_empty_df_comment, create_reply_counter
 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.utils import print_according_to_format, print_csv
 from annofabcli.common.visualize import AddProps
@@ -125,8 +125,8 @@ class ListAllComment(CommandLine):
 
         logger.info(f"コメントの件数: {len(comment_list)}")
 
-        output_format = FormatArgument(args.format)
-        if output_format == FormatArgument.CSV:
+        output_format = OutputFormat(args.format)
+        if output_format == OutputFormat.CSV:
             if len(comment_list) > 0:
                 df = pandas.json_normalize(comment_list)
             else:
@@ -168,12 +168,12 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
 
     argument_parser.add_format(
         choices=[
-            FormatArgument.CSV,
-            FormatArgument.JSON,
-            FormatArgument.PRETTY_JSON,
-            FormatArgument.COMMENT_ID_LIST,
+            OutputFormat.CSV,
+            OutputFormat.JSON,
+            OutputFormat.PRETTY_JSON,
+            OutputFormat.COMMENT_ID_LIST,
         ],
-        default=FormatArgument.CSV,
+        default=OutputFormat.CSV,
     )
     argument_parser.add_output()
 

annofabcli/comment/list_comment.py

@@ -11,7 +11,7 @@ from annofabapi.models import Comment, CommentType
 
 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 print_according_to_format, print_csv
 from annofabcli.common.visualize import AddProps
@@ -101,8 +101,8 @@ class ListingComments(CommandLine):
 
         logger.info(f"コメントの件数: {len(comment_list)}")
 
-        output_format = FormatArgument(args.format)
-        if output_format == FormatArgument.CSV:
+        output_format = OutputFormat(args.format)
+        if output_format == OutputFormat.CSV:
             if len(comment_list) > 0:
                 df = pandas.json_normalize(comment_list)
             else:
@@ -138,12 +138,12 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
 
     argument_parser.add_format(
         choices=[
-            FormatArgument.CSV,
-            FormatArgument.JSON,
-            FormatArgument.PRETTY_JSON,
-            FormatArgument.COMMENT_ID_LIST,
+            OutputFormat.CSV,
+            OutputFormat.JSON,
+            OutputFormat.PRETTY_JSON,
+            OutputFormat.COMMENT_ID_LIST,
         ],
-        default=FormatArgument.CSV,
+        default=OutputFormat.CSV,
     )
     argument_parser.add_output()
 

annofabcli/common/cli.py

@@ -21,7 +21,7 @@ from annofabapi.exceptions import AnnofabApiException
 from annofabapi.models import OrganizationMemberRole, ProjectMemberRole
 from more_itertools import first_true
 
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.exceptions import AnnofabCliException, AuthenticationError
 from annofabcli.common.facade import AnnofabApiFacade
 from annofabcli.common.typing import InputDataSize
@@ -408,7 +408,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-i", "--input_data_id", type=str, required=required, nargs="+", help=help_message)
 
-    def add_format(self, choices: list[FormatArgument], default: FormatArgument, help_message: str | None = None) -> None:
+    def add_format(self, choices: list[OutputFormat], default: OutputFormat, help_message: str | None = None) -> None:
         """
         '--format` 引数を追加
         """
@@ -529,7 +529,7 @@ class CommandLineWithoutWebapi:
         print_csv(df, output=self.output)
 
     def print_according_to_format(self, target: Any) -> None:  # noqa: ANN401
-        print_according_to_format(target, format=FormatArgument(self.str_format), output=self.output)
+        print_according_to_format(target, format=OutputFormat(self.str_format), output=self.output)
 
 
 class PrettyHelpFormatter(argparse.RawTextHelpFormatter, argparse.ArgumentDefaultsHelpFormatter):

annofabcli/common/enums.py

@@ -1,7 +1,7 @@
 from enum import Enum
 
 
-class FormatArgument(Enum):
+class OutputFormat(Enum):
     """
     表示するフォーマット ``--format`` で指定できる値
 

annofabcli/common/pandas.py

@@ -9,9 +9,10 @@ def get_frequency_of_monthend() -> str:
     https://github.com/pandas-dev/pandas/issues/9586
     """
     tmp = pandas.__version__.split(".")
-    major = tmp[0]
-    minor = tmp[1]
+    major = int(tmp[0])
+    minor = int(tmp[1])
 
-    if int(major) >= 2 and int(minor) >= 2:
+    # pandas 3.0以上、または pandas 2.2以上の場合は"ME"を返す
+    if major >= 3 or (major == 2 and minor >= 2):
         return "ME"
     return "M"

annofabcli/common/utils.py

@@ -11,7 +11,7 @@ import dateutil.parser
 import isodate
 import pandas
 
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.enums import OutputFormat
 
 logger = logging.getLogger(__name__)
 
@@ -105,7 +105,7 @@ def print_id_list(id_list: list[Any], output: str | Path | None) -> None:
 
 def print_according_to_format(
     target: Any,  # noqa: ANN401
-    format: FormatArgument,  # noqa: A002
+    format: OutputFormat,  # noqa: A002
     output: str | Path | None = None,
 ) -> None:
     """
@@ -119,33 +119,33 @@ def print_according_to_format(
 
     """
 
-    if format == FormatArgument.PRETTY_JSON:
+    if format == OutputFormat.PRETTY_JSON:
         print_json(target, is_pretty=True, output=output)
 
-    elif format == FormatArgument.JSON:
+    elif format == OutputFormat.JSON:
         print_json(target, is_pretty=False, output=output)
 
-    elif format == FormatArgument.CSV:
+    elif format == OutputFormat.CSV:
         df = pandas.DataFrame(target)
         print_csv(df, output=output)
 
-    elif format == FormatArgument.TASK_ID_LIST:
+    elif format == OutputFormat.TASK_ID_LIST:
         task_id_list = [e["task_id"] for e in target]
         print_id_list(task_id_list, output)
 
-    elif format == FormatArgument.PROJECT_ID_LIST:
+    elif format == OutputFormat.PROJECT_ID_LIST:
         project_id_list = [e["project_id"] for e in target]
         print_id_list(project_id_list, output)
 
-    elif format == FormatArgument.INPUT_DATA_ID_LIST:
+    elif format == OutputFormat.INPUT_DATA_ID_LIST:
         input_data_id_list = [e["input_data_id"] for e in target]
         print_id_list(input_data_id_list, output)
 
-    elif format == FormatArgument.USER_ID_LIST:
+    elif format == OutputFormat.USER_ID_LIST:
         user_id_list = [e["user_id"] for e in target]
         print_id_list(user_id_list, output)
 
-    elif format == FormatArgument.INSPECTION_ID_LIST:
+    elif format == OutputFormat.INSPECTION_ID_LIST:
         inspection_id_list = [e["inspection_id"] for e in target]
         print_id_list(inspection_id_list, output)
 

annofabcli/common/visualize.py

@@ -375,10 +375,10 @@ class AddProps:
 
         * user_id
         * username
-        * request.user_id
-        * request.username
+        * `request`キー配下のdictに、`user_id`と`username`を追加する.
 
         """
         self._add_user_info(task_history_event)
-        self._add_user_info(task_history_event["request"])
+        if task_history_event.get("request") is not None:
+            self._add_user_info(task_history_event["request"])
         return task_history_event

annofabcli/filesystem/mask_user_info.py

@@ -4,8 +4,8 @@ from functools import partial
 from pathlib import Path
 from typing import Any
 
-import numpy
 import pandas
+from pandas.api.types import is_string_dtype
 
 import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLineWithoutWebapi, get_list_from_args
@@ -160,7 +160,8 @@ def replace_by_columns(  # noqa: ANN201
             df[sub_column] = df.apply(get_username_func, axis=1)
 
     # 列の型を合わせないとreplaceに失敗するため, dtype を確認する
-    if df[main_column].dtype == numpy.dtype("object"):
+    # pandas 3.0対応: is_string_dtypeを使用してobject型と新しいstring型の両方に対応
+    if is_string_dtype(df[main_column].dtype):
         df[main_column] = df[main_column].replace(replacement_dict)
 
 

annofabcli/input_data/list_all_input_data.py

@@ -9,16 +9,15 @@ from pathlib import Path
 from typing import Any
 
 import annofabapi
-import pandas
 from annofabapi.dataclass.input import InputData
 from annofabapi.models import ProjectMemberRole
 
 import annofabcli.common.cli
-from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login, print_according_to_format, print_csv
+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, InputDataQuery, match_input_data_with_query
-from annofabcli.input_data.list_input_data import AddingDetailsToInputData
+from annofabcli.input_data.list_input_data import AddingDetailsToInputData, print_input_data_list
 from annofabcli.input_data.utils import remove_unnecessary_keys_from_input_data
 
 logger = logging.getLogger(__name__)
@@ -144,20 +143,10 @@ class ListAllInputData(CommandLine):
             temp_dir=temp_dir,
         )
 
-        logger.debug(f"入力データ一覧の件数: {len(input_data_list)}")
+        logger.info(f"入力データ一覧の件数: {len(input_data_list)}")
 
-        if len(input_data_list) > 0:
-            output_format = FormatArgument(args.format)
-            if output_format == FormatArgument.CSV:
-                # pandas.DataFrameでなくpandas.json_normalizeを使う理由:
-                # ネストしたオブジェクトを`system_metadata.input_duration`のような列名でアクセスできるようにするため
-                df = pandas.json_normalize(input_data_list)
-                print_csv(df, output=args.output)
-            else:
-                print_according_to_format(input_data_list, format=output_format, output=args.output)
-
-        else:
-            logger.info("入力データ一覧の件数が0件のため、出力しません。")
+        output_format = OutputFormat(args.format)
+        print_input_data_list(input_data_list, output_format=output_format, output_file=args.output)
 
 
 def main(args: argparse.Namespace) -> None:
@@ -220,12 +209,12 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
 
     argument_parser.add_format(
         choices=[
-            FormatArgument.CSV,
-            FormatArgument.JSON,
-            FormatArgument.PRETTY_JSON,
-            FormatArgument.INPUT_DATA_ID_LIST,
+            OutputFormat.CSV,
+            OutputFormat.JSON,
+            OutputFormat.PRETTY_JSON,
+            OutputFormat.INPUT_DATA_ID_LIST,
         ],
-        default=FormatArgument.CSV,
+        default=OutputFormat.CSV,
     )
     argument_parser.add_output()
 

annofabcli/input_data/list_all_input_data_merged_task.py

@@ -21,7 +21,7 @@ from annofabcli.common.cli import (
     get_list_from_args,
 )
 from annofabcli.common.download import DownloadingFile
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade, InputDataQuery, match_input_data_with_query
 from annofabcli.common.utils import print_csv
 from annofabcli.input_data.utils import remove_unnecessary_keys_from_input_data
@@ -191,11 +191,11 @@ class ListInputDataMergedTask(CommandLine):
 
         logger.debug(f"入力データ {len(filtered_input_data_list_with_merged_task)} 件を出力します。")
 
-        if self.str_format == FormatArgument.CSV.value:
+        if self.str_format == OutputFormat.CSV.value:
             df_input_data = create_df_input_data_with_merged_task(filtered_input_data_list_with_merged_task)
             print_csv(df_input_data, output=args.output)
 
-        elif self.str_format in [FormatArgument.JSON.value, FormatArgument.PRETTY_JSON.value]:
+        elif self.str_format in [OutputFormat.JSON.value, OutputFormat.PRETTY_JSON.value]:
             self.print_according_to_format(filtered_input_data_list_with_merged_task)
 
 
@@ -262,11 +262,11 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
 
     argument_parser.add_format(
         choices=[
-            FormatArgument.CSV,
-            FormatArgument.JSON,
-            FormatArgument.PRETTY_JSON,
+            OutputFormat.CSV,
+            OutputFormat.JSON,
+            OutputFormat.PRETTY_JSON,
         ],
-        default=FormatArgument.CSV,
+        default=OutputFormat.CSV,
     )
     argument_parser.add_output()
 

annofabcli/input_data/list_input_data.py

@@ -1,6 +1,7 @@
 import argparse
 import logging
 import urllib.parse
+from pathlib import Path
 from typing import Any
 
 import annofabapi
@@ -8,14 +9,71 @@ import pandas
 from annofabapi.models import InputData
 
 import annofabcli.common.cli
-from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login, print_according_to_format, print_csv
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade
+from annofabcli.common.utils import get_columns_with_priority, print_csv, print_id_list, print_json
 from annofabcli.input_data.utils import remove_unnecessary_keys_from_input_data
 
 logger = logging.getLogger(__name__)
 
 
+def print_input_data_list(
+    input_data_list: list[dict[str, Any]],
+    output_format: OutputFormat,
+    output_file: Path | None,
+) -> None:
+    """
+    入力データ一覧を指定されたフォーマットで出力する。
+
+    Args:
+        input_data_list: 入力データ一覧
+        output_format: 出力フォーマット
+        output_file: 出力先
+    """
+    input_data_prior_columns = [
+        "organization_id",
+        "input_data_set_id",
+        "project_id",
+        "input_data_id",
+        "input_data_name",
+        "input_data_path",
+        "url",
+        "etag",
+        "updated_datetime",
+        "sign_required",
+    ]
+
+    if output_format == OutputFormat.CSV:
+        if len(input_data_list) > 0:
+            # pandas.DataFrameでなくpandas.json_normalizeを使う理由:
+            # ネストしたオブジェクトを`system_metadata.input_duration`のような列名でアクセスできるようにするため
+            df = pandas.json_normalize(input_data_list)
+
+            # system_metadata.*列とmetadata.*列を検出して優先列リストに追加
+            # 順序: input_data_prior_columns → system_metadata.* → metadata.*
+            system_metadata_columns = sorted([col for col in df.columns if col.startswith("system_metadata.")])
+            metadata_columns = sorted([col for col in df.columns if col.startswith("metadata.")])
+            prior_columns_with_metadata = input_data_prior_columns + system_metadata_columns + metadata_columns
+            columns = get_columns_with_priority(df, prior_columns=prior_columns_with_metadata)
+            print_csv(df[columns], output=output_file)
+        else:
+            df = pandas.DataFrame(columns=input_data_prior_columns)
+            print_csv(df, output=output_file)
+
+    elif output_format == OutputFormat.PRETTY_JSON:
+        print_json(input_data_list, is_pretty=True, output=output_file)
+
+    elif output_format == OutputFormat.JSON:
+        print_json(input_data_list, is_pretty=False, output=output_file)
+
+    elif output_format == OutputFormat.INPUT_DATA_ID_LIST:
+        input_data_id_list = [e["input_data_id"] for e in input_data_list]
+        print_id_list(input_data_id_list, output=output_file)
+    else:
+        raise ValueError(f"{output_format}は対応していないフォーマットです。")
+
+
 class AddingDetailsToInputData:
     """
     入力データに詳細情報を追加するためのクラス
@@ -173,17 +231,8 @@ class ListInputData(CommandLine):
         if len(input_data_list) == 10_000:
             logger.warning("入力データ一覧は10,000件で打ち切られている可能性があります。")
 
-        output_format = FormatArgument(args.format)
-        if len(input_data_list) > 0:
-            if output_format == FormatArgument.CSV:
-                # pandas.DataFrameでなくpandas.json_normalizeを使う理由:
-                # ネストしたオブジェクトを`system_metadata.input_duration`のような列名でアクセスできるようにするため
-                df = pandas.json_normalize(input_data_list)
-                print_csv(df, output=args.output)
-            else:
-                print_according_to_format(input_data_list, format=output_format, output=args.output)
-        else:
-            logger.info("入力データの件数が0件のため、出力しません。")
+        output_format = OutputFormat(args.format)
+        print_input_data_list(input_data_list, output_format=output_format, output_file=args.output)
 
 
 def main(args: argparse.Namespace) -> None:
@@ -223,12 +272,12 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
 
     argument_parser.add_format(
         choices=[
-            FormatArgument.CSV,
-            FormatArgument.JSON,
-            FormatArgument.PRETTY_JSON,
-            FormatArgument.INPUT_DATA_ID_LIST,
+            OutputFormat.CSV,
+            OutputFormat.JSON,
+            OutputFormat.PRETTY_JSON,
+            OutputFormat.INPUT_DATA_ID_LIST,
         ],
-        default=FormatArgument.CSV,
+        default=OutputFormat.CSV,
     )
     argument_parser.add_output()
 

annofabcli/instruction/list_instruction_history.py

@@ -4,7 +4,7 @@ from typing import Any
 
 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.visualize import AddProps
 
@@ -40,7 +40,7 @@ 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)
+    argument_parser.add_format(choices=[OutputFormat.CSV, OutputFormat.JSON, OutputFormat.PRETTY_JSON], default=OutputFormat.CSV)
 
     parser.set_defaults(subcommand_func=main)
 

annofabcli/job/list_job.py

@@ -7,7 +7,7 @@ from annofabapi.models import ProjectJobInfo, ProjectJobType
 
 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
 
 logger = logging.getLogger(__name__)
@@ -77,7 +77,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         help="ジョブタイプを指定します。指定できる値については https://annofab-cli.readthedocs.io/ja/latest/user_guide/command_line_options.html#job-type を参照してください。",
     )
 
-    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.set_defaults(subcommand_func=main)

annofabcli/job/list_last_job.py

@@ -12,7 +12,7 @@ from annofabcli.common.cli import (
     CommandLine,
     build_annofabapi_resource_and_login,
 )
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade
 
 logger = logging.getLogger(__name__)
@@ -157,7 +157,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         help="プロジェクトに関する詳細情報を表示します（ ``task_last_updated_datetime, annotation_specs_last_updated_datetime`` ）",
     )
 
-    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.set_defaults(subcommand_func=main)

annofabcli/my_account/get_my_account.py

@@ -7,7 +7,7 @@ import annofabcli.common.cli
 from annofabcli.common.cli import (
     ArgumentParser,
     CommandLine,
-    FormatArgument,
+    OutputFormat,
     build_annofabapi_resource_and_login,
 )
 from annofabcli.common.facade import AnnofabApiFacade
@@ -32,10 +32,10 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
 
     argument_parser.add_format(
         choices=[
-            FormatArgument.JSON,
-            FormatArgument.PRETTY_JSON,
+            OutputFormat.JSON,
+            OutputFormat.PRETTY_JSON,
         ],
-        default=FormatArgument.PRETTY_JSON,
+        default=OutputFormat.PRETTY_JSON,
     )
 
     argument_parser.add_output()