annofabcli 1.114.3__tar.gz → 1.114.5__tar.gz

{annofabcli-1.114.3 → annofabcli-1.114.5}/.github/copilot-instructions.md

@@ -7,7 +7,7 @@ AnnofabのCLIです。
 * コードのフォーマット: `make format`
 * Lintの実行: `make lint`
 * テストの実行: `make test`
-* ドキュメントの実行: `make docs`
+* ドキュメントのビルド: `make docs`
 
 ## 技術スタック
 * Python 3.10 以上
@@ -86,8 +86,9 @@ Usage Details
 2. Gitにコミットする。コミットメッセージは日本語で、AIが生成したことが分かるようにする。
 3. `make lint`を実行してエラーがないことを確認する。
 4. エラーがあれば修正して、手順1に戻る。
-5. コードの修正が完了したら、対象コマンドのドキュメント（`docs/command_reference/`以下）を修正すべきかどうか検討する。ドキュメントの修正が必要な場合は、忘れずに修正する。
-6. 必要ならばテストコードも記載する。
+5. ドキュメント（`docs/command_reference/`以下）を修正した場合は、`make docs`を実行してビルドエラーがないことを確認する。
+6. コードの修正が完了したら、対象コマンドのドキュメント（`docs/command_reference/`以下）を修正すべきかどうか検討する。ドキュメントの修正が必要な場合は、忘れずに修正する。
+7. 必要ならばテストコードも記載する。
 
 
 ## ユーザーインタフェイス

{annofabcli-1.114.3 → annofabcli-1.114.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annofabcli
-Version: 1.114.3
+Version: 1.114.5
 Summary: Utility Command Line Interface for AnnoFab
 Author: Kurusugawa Computer Inc.
 License: MIT
@@ -24,7 +24,7 @@ Requires-Dist: dictdiffer
 Requires-Dist: isodate
 Requires-Dist: more-itertools
 Requires-Dist: numpy
-Requires-Dist: pandas<3,>=2
+Requires-Dist: pandas>=2
 Requires-Dist: pillow
 Requires-Dist: pydantic>=2.12; python_version >= '3.14'
 Requires-Dist: pyquery

{annofabcli-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation/list_annotation.py

@@ -19,7 +19,7 @@ from annofabcli.common.cli import (
     get_json_from_args,
     get_list_from_args,
 )
-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.visualize import AddProps
@@ -194,7 +194,7 @@ class ListAnnotation(CommandLine):
 
         logger.debug(f"アノテーション {len(annotation_list)} 件を出力します。")
 
-        if self.str_format == FormatArgument.CSV.value:
+        if self.str_format == OutputFormat.CSV.value:
             annotation_list_for_csv = to_annotation_list_for_csv(annotation_list)
             df = pandas.DataFrame(annotation_list_for_csv)
             columns = get_columns_with_priority(df, prior_columns=self.PRIOR_COLUMNS)
@@ -243,8 +243,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-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation/list_annotation_count.py

@@ -20,7 +20,7 @@ from annofabcli.common.cli import (
     get_json_from_args,
     get_list_from_args,
 )
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade
 from annofabcli.common.type_util import assert_noreturn
 from annofabcli.common.visualize import AddProps
@@ -103,7 +103,7 @@ class ListAnnotationCount(CommandLine):
         group_by = GroupBy(args.group_by)
         df = aggregate_annotations(all_annotation_list, group_by)
 
-        if self.str_format == FormatArgument.CSV.value:
+        if self.str_format == OutputFormat.CSV.value:
             self.print_csv(df)
         else:
             self.print_according_to_format(df.to_dict(orient="records"))
@@ -154,8 +154,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-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation_specs/export_annotation_specs.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
 from annofabcli.common.utils import print_according_to_format
 
@@ -62,7 +62,7 @@ class ExportAnnotationSpecs(CommandLine):
 
         annotation_specs = self.get_exported_annotation_specs(args.project_id, history_id=history_id)
 
-        print_according_to_format(annotation_specs, format=FormatArgument(args.format), output=args.output)
+        print_according_to_format(annotation_specs, format=OutputFormat(args.format), output=args.output)
 
 
 def parse_args(parser: argparse.ArgumentParser) -> None:
@@ -98,8 +98,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         "-f",
         "--format",
         type=str,
-        choices=[FormatArgument.JSON.value, FormatArgument.PRETTY_JSON.value],
-        default=FormatArgument.JSON.value,
+        choices=[OutputFormat.JSON.value, OutputFormat.PRETTY_JSON.value],
+        default=OutputFormat.JSON.value,
         help="出力フォーマット",
     )
 

{annofabcli-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation_specs/get_annotation_specs_with_attribute_id_replaced.py

@@ -16,7 +16,7 @@ from annofabcli.common.cli import (
     build_annofabapi_resource_and_login,
     get_list_from_args,
 )
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade
 
 logger = logging.getLogger(__name__)
@@ -150,10 +150,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,
     )
 
     parser.set_defaults(subcommand_func=main)

{annofabcli-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation_specs/get_annotation_specs_with_choice_id_replaced.py

@@ -16,7 +16,7 @@ from annofabcli.common.cli import (
     build_annofabapi_resource_and_login,
     get_list_from_args,
 )
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade
 
 logger = logging.getLogger(__name__)
@@ -124,10 +124,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,
     )
 
     parser.set_defaults(subcommand_func=main)

{annofabcli-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation_specs/get_annotation_specs_with_label_id_replaced.py

@@ -16,7 +16,7 @@ from annofabcli.common.cli import (
     build_annofabapi_resource_and_login,
     get_list_from_args,
 )
-from annofabcli.common.enums import FormatArgument
+from annofabcli.common.enums import OutputFormat
 from annofabcli.common.facade import AnnofabApiFacade
 
 logger = logging.getLogger(__name__)
@@ -135,10 +135,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,
     )
 
     parser.set_defaults(subcommand_func=main)

{annofabcli-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation_specs/list_annotation_specs_attribute.py

@@ -22,7 +22,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
 from annofabcli.common.utils import print_according_to_format, print_csv
 
@@ -124,10 +124,10 @@ def create_flatten_attribute_list_from_additionals(additionals_v3: list[dict[str
 class PrintAnnotationSpecsAttribute(CommandLine):
     COMMON_MESSAGE = "annofabcli annotation_specs list_attribute: error:"
 
-    def print_annotation_specs_attribute(self, annotation_specs_v3: dict[str, Any], output_format: FormatArgument, output: str | None = None) -> None:
+    def print_annotation_specs_attribute(self, annotation_specs_v3: dict[str, Any], output_format: OutputFormat, output: str | None = None) -> None:
         attribute_list = create_flatten_attribute_list_from_additionals(annotation_specs_v3["additionals"], annotation_specs_v3["labels"], annotation_specs_v3["restrictions"])
         logger.info(f"{len(attribute_list)} 件の属性情報を出力します。")
-        if output_format == FormatArgument.CSV:
+        if output_format == OutputFormat.CSV:
             columns = [
                 "attribute_id",
                 "attribute_name_en",
@@ -145,7 +145,7 @@ class PrintAnnotationSpecsAttribute(CommandLine):
             df = pandas.DataFrame(attribute_list, columns=columns)
             print_csv(df, output)
 
-        elif output_format in [FormatArgument.JSON, FormatArgument.PRETTY_JSON]:
+        elif output_format in [OutputFormat.JSON, OutputFormat.PRETTY_JSON]:
             print_according_to_format([e.to_dict() for e in attribute_list], format=output_format, output=output)
 
     def get_history_id_from_before_index(self, project_id: str, before: int) -> str | None:
@@ -179,7 +179,7 @@ class PrintAnnotationSpecsAttribute(CommandLine):
         else:
             raise RuntimeError("'--project_id'か'--annotation_specs_json'のどちらかを指定する必要があります。")
 
-        self.print_annotation_specs_attribute(annotation_specs, output_format=FormatArgument(args.format), output=args.output)
+        self.print_annotation_specs_attribute(annotation_specs, output_format=OutputFormat(args.format), output=args.output)
 
 
 def parse_args(parser: argparse.ArgumentParser) -> None:
@@ -219,8 +219,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         "-f",
         "--format",
         type=str,
-        choices=[FormatArgument.CSV.value, FormatArgument.JSON.value, FormatArgument.PRETTY_JSON.value],
-        default=FormatArgument.CSV.value,
+        choices=[OutputFormat.CSV.value, OutputFormat.JSON.value, OutputFormat.PRETTY_JSON.value],
+        default=OutputFormat.CSV.value,
         help="出力フォーマット ",
     )
 

{annofabcli-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation_specs/list_annotation_specs_choice.py

@@ -21,7 +21,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
 from annofabcli.common.utils import print_according_to_format, print_csv
 
@@ -104,12 +104,11 @@ def create_flatten_choice_list_from_additionals(additionals_v3: list[dict[str, A
 class PrintAnnotationSpecsAttribute(CommandLine):
     COMMON_MESSAGE = "annofabcli annotation_specs list_choice: error:"
 
-    def print_annotation_specs_choice(self, annotation_specs_v3: dict[str, Any], output_format: FormatArgument, output: str | None = None) -> None:
+    def print_annotation_specs_choice(self, annotation_specs_v3: dict[str, Any], output_format: OutputFormat, output: str | None = None) -> None:
         choice_list = create_flatten_choice_list_from_additionals(annotation_specs_v3["additionals"])
         logger.info(f"{len(choice_list)} 件の選択肢情報を出力します。")
 
-        if output_format == FormatArgument.CSV:
-            df = pandas.DataFrame(choice_list)
+        if output_format == OutputFormat.CSV:
             columns = [
                 "attribute_id",
                 "attribute_name_en",
@@ -121,9 +120,10 @@ class PrintAnnotationSpecsAttribute(CommandLine):
                 "is_default",
                 "keybind",
             ]
-            print_csv(df[columns], output)
+            df = pandas.DataFrame(choice_list, columns=columns)
+            print_csv(df, output)
 
-        elif output_format in [FormatArgument.JSON, FormatArgument.PRETTY_JSON]:
+        elif output_format in [OutputFormat.JSON, OutputFormat.PRETTY_JSON]:
             print_according_to_format([e.to_dict() for e in choice_list], format=output_format, output=output)
 
     def get_history_id_from_before_index(self, project_id: str, before: int) -> str | None:
@@ -159,7 +159,7 @@ class PrintAnnotationSpecsAttribute(CommandLine):
         else:
             raise RuntimeError("'--project_id'か'--annotation_specs_json'のどちらかを指定する必要があります。")
 
-        self.print_annotation_specs_choice(annotation_specs, output_format=FormatArgument(args.format), output=args.output)
+        self.print_annotation_specs_choice(annotation_specs, output_format=OutputFormat(args.format), output=args.output)
 
 
 def parse_args(parser: argparse.ArgumentParser) -> None:
@@ -199,8 +199,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         "-f",
         "--format",
         type=str,
-        choices=[FormatArgument.CSV.value, FormatArgument.JSON.value, FormatArgument.PRETTY_JSON.value],
-        default=FormatArgument.CSV.value,
+        choices=[OutputFormat.CSV.value, OutputFormat.JSON.value, OutputFormat.PRETTY_JSON.value],
+        default=OutputFormat.CSV.value,
         help="出力フォーマット ",
     )
 

{annofabcli-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation_specs/list_annotation_specs_history.py

@@ -6,7 +6,7 @@ import annofabapi
 
 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
 
@@ -48,7 +48,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
 
     argument_parser.add_project_id()
 
-    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-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation_specs/list_annotation_specs_label.py

@@ -21,7 +21,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
 from annofabcli.common.utils import print_csv
 
@@ -101,16 +101,16 @@ class PrintAnnotationSpecsLabel(CommandLine):
 
     COMMON_MESSAGE = "annofabcli annotation_specs list_label: error:"
 
-    def print_annotation_specs_label(self, annotation_specs_v3: dict[str, Any], output_format: FormatArgument, output: str | None = None) -> None:
+    def print_annotation_specs_label(self, annotation_specs_v3: dict[str, Any], output_format: OutputFormat, output: str | None = None) -> None:
         label_list = create_label_list(annotation_specs_v3["labels"])
-        if output_format == FormatArgument.CSV:
+        if output_format == OutputFormat.CSV:
             df = pandas.DataFrame(label_list)
 
             columns = ["label_id", "label_name_en", "label_name_ja", "label_name_vi", "annotation_type", "color", "attribute_count", "keybind"]
             print_csv(df[columns], output)
 
-        elif output_format in [FormatArgument.JSON, FormatArgument.PRETTY_JSON]:
-            annofabcli.common.utils.print_according_to_format([e.to_dict() for e in label_list], format=FormatArgument(output_format), output=output)
+        elif output_format in [OutputFormat.JSON, OutputFormat.PRETTY_JSON]:
+            annofabcli.common.utils.print_according_to_format([e.to_dict() for e in label_list], format=OutputFormat(output_format), output=output)
 
     def get_history_id_from_before_index(self, project_id: str, before: int) -> str | None:
         histories, _ = self.service.api.get_annotation_specs_histories(project_id)
@@ -146,7 +146,7 @@ class PrintAnnotationSpecsLabel(CommandLine):
         else:
             raise RuntimeError("'--project_id'か'--annotation_specs_json'のどちらかを指定する必要があります。")
 
-        self.print_annotation_specs_label(annotation_specs, output_format=FormatArgument(args.format), output=args.output)
+        self.print_annotation_specs_label(annotation_specs, output_format=OutputFormat(args.format), output=args.output)
 
 
 def parse_args(parser: argparse.ArgumentParser) -> None:
@@ -186,8 +186,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         "-f",
         "--format",
         type=str,
-        choices=[FormatArgument.CSV.value, FormatArgument.JSON.value, FormatArgument.PRETTY_JSON.value],
-        default=FormatArgument.CSV.value,
+        choices=[OutputFormat.CSV.value, OutputFormat.JSON.value, OutputFormat.PRETTY_JSON.value],
+        default=OutputFormat.CSV.value,
         help="出力フォーマット ",
     )
 

{annofabcli-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation_specs/list_annotation_specs_label_attribute.py

@@ -20,7 +20,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
 from annofabcli.common.utils import print_according_to_format, print_csv
 
@@ -90,11 +90,11 @@ def create_label_attribute_list(labels_v3: list[dict[str, Any]], additionals_v3:
 class PrintAnnotationSpecsLabelAndAttribute(CommandLine):
     COMMON_MESSAGE = "annofabcli annotation_specs list_label: error:"
 
-    def print_annotation_specs_label(self, annotation_specs_v3: dict[str, Any], output_format: FormatArgument, output: str | None = None) -> None:
+    def print_annotation_specs_label(self, annotation_specs_v3: dict[str, Any], output_format: OutputFormat, output: str | None = None) -> None:
         # アノテーション仕様のv2とv3はほとんど同じなので、`convert_annotation_specs_labels_v2_to_v1`にはV3のアノテーション仕様を渡す
         label_attribute_list = create_label_attribute_list(annotation_specs_v3["labels"], annotation_specs_v3["additionals"])
 
-        if output_format == FormatArgument.CSV:
+        if output_format == OutputFormat.CSV:
             columns = [
                 "label_id",
                 "label_name_en",
@@ -111,7 +111,7 @@ class PrintAnnotationSpecsLabelAndAttribute(CommandLine):
             df = pandas.DataFrame(label_attribute_list, columns=columns)
             print_csv(df, output)
 
-        elif output_format in [FormatArgument.JSON, FormatArgument.PRETTY_JSON]:
+        elif output_format in [OutputFormat.JSON, OutputFormat.PRETTY_JSON]:
             print_according_to_format([e.to_dict() for e in label_attribute_list], format=output_format, output=output)
 
     def get_history_id_from_before_index(self, project_id: str, before: int) -> str | None:
@@ -148,7 +148,7 @@ class PrintAnnotationSpecsLabelAndAttribute(CommandLine):
         else:
             raise RuntimeError("'--project_id'か'--annotation_specs_json'のどちらかを指定する必要があります。")
 
-        self.print_annotation_specs_label(annotation_specs, output_format=FormatArgument(args.format), output=args.output)
+        self.print_annotation_specs_label(annotation_specs, output_format=OutputFormat(args.format), output=args.output)
 
 
 def parse_args(parser: argparse.ArgumentParser) -> None:
@@ -188,8 +188,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         "-f",
         "--format",
         type=str,
-        choices=[FormatArgument.CSV.value, FormatArgument.JSON.value, FormatArgument.PRETTY_JSON.value],
-        default=FormatArgument.CSV.value,
+        choices=[OutputFormat.CSV.value, OutputFormat.JSON.value, OutputFormat.PRETTY_JSON.value],
+        default=OutputFormat.CSV.value,
         help="出力フォーマット ",
     )
 

{annofabcli-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation_specs/list_label_color.py

@@ -10,7 +10,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
@@ -51,7 +51,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
 
     argument_parser.add_project_id()
 
-    argument_parser.add_format(choices=[FormatArgument.JSON, FormatArgument.PRETTY_JSON], default=FormatArgument.PRETTY_JSON)
+    argument_parser.add_format(choices=[OutputFormat.JSON, OutputFormat.PRETTY_JSON], default=OutputFormat.PRETTY_JSON)
 
     argument_parser.add_output()
 

{annofabcli-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation_zip/list_annotation_3d_bounding_box.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,
@@ -200,7 +200,7 @@ def create_df(
 def print_annotation_3d_bounding_box(
     annotation_path: Path,
     output_file: Path,
-    output_format: FormatArgument,
+    output_format: OutputFormat,
     *,
     target_task_ids: Collection[str] | None = None,
     task_query: TaskQuery | None = None,
@@ -215,12 +215,12 @@ def print_annotation_3d_bounding_box(
 
     logger.info(f"{len(annotation_bbox_list)} 件の3Dバウンディングボックスアノテーションの情報を出力します。 :: output='{output_file}'")
 
-    if output_format == FormatArgument.CSV:
+    if output_format == OutputFormat.CSV:
         df = create_df(annotation_bbox_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_bbox_list],
@@ -265,7 +265,7 @@ class ListAnnotation3DBoundingBox(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)
 
@@ -320,8 +320,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-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation_zip/list_annotation_bounding_box_2d.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,
@@ -163,7 +163,7 @@ def create_df(
 def print_annotation_bounding_box(
     annotation_path: Path,
     output_file: Path,
-    output_format: FormatArgument,
+    output_format: OutputFormat,
     *,
     target_task_ids: Collection[str] | None = None,
     task_query: TaskQuery | None = None,
@@ -178,12 +178,12 @@ def print_annotation_bounding_box(
 
     logger.info(f"{len(annotation_bbox_list)} 件のバウンディングボックスアノテーションの情報を出力します。 :: output='{output_file}'")
 
-    if output_format == FormatArgument.CSV:
+    if output_format == OutputFormat.CSV:
         df = create_df(annotation_bbox_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_bbox_list],
@@ -228,7 +228,7 @@ class ListAnnotationBoundingBox2d(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)
 
@@ -283,8 +283,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-1.114.3 → annofabcli-1.114.5}/annofabcli/annotation_zip/list_polygon_annotation.py

@@ -16,7 +16,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,
@@ -218,7 +218,7 @@ def create_df(
 def print_annotation_polygon(
     annotation_path: Path,
     output_file: Path,
-    output_format: FormatArgument,
+    output_format: OutputFormat,
     *,
     target_task_ids: Collection[str] | None = None,
     task_query: TaskQuery | None = None,
@@ -233,12 +233,12 @@ def print_annotation_polygon(
 
     logger.info(f"{len(annotation_polygon_list)} 件のポリゴンアノテーションの情報を出力します。 :: output='{output_file}'")
 
-    if output_format == FormatArgument.CSV:
+    if output_format == OutputFormat.CSV:
         df = create_df(annotation_polygon_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
         # Pydantic BaseModelを使用したJSON処理
         print_json(
             [e.model_dump() for e in annotation_polygon_list],
@@ -283,7 +283,7 @@ class ListAnnotationPolygon(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)
 
@@ -338,8 +338,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()