annofabcli 1.100.0__tar.gz → 100.3__tar.gz

{annofabcli-1.100.0 → annofabcli-100.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annofabcli
-Version: 1.100.0
+Version: 100.3
 Summary: Utility Command Line Interface for AnnoFab
 Home-page: https://github.com/kurusugawa-computer/annofab-cli
 License: MIT
@@ -23,7 +23,6 @@ Requires-Dist: annofabapi (>=1.4.1,<2.0.0)
 Requires-Dist: bokeh (>=3.3,<3.7)
 Requires-Dist: dictdiffer
 Requires-Dist: isodate
-Requires-Dist: jmespath
 Requires-Dist: more-itertools
 Requires-Dist: numpy
 Requires-Dist: pandas (>=2,<3)
@@ -58,14 +57,10 @@ Description-Content-Type: text/markdown
 
 
 ## 廃止予定
-
-
-### 2022-11-01 以降
-* JMESPathを指定できる `--query`を削除します。使いどころがあまりないのと、`jq`コマンドでも対応できるためです。
-
+* TODO
 
 # Requirements
-* Python 3.9
+* Python 3.9+
 
 # Install
 

{annofabcli-1.100.0 → annofabcli-100.3}/README.md

@@ -21,14 +21,10 @@
 
 
 ## 廃止予定
-
-
-### 2022-11-01 以降
-* JMESPathを指定できる `--query`を削除します。使いどころがあまりないのと、`jq`コマンドでも対応できるためです。
-
+* TODO
 
 # Requirements
-* Python 3.9
+* Python 3.9+
 
 # Install
 

annofabcli-100.3/annofabcli/__version__.py

@@ -0,0 +1 @@
+__version__ = "100.3"  # `poetry-dynamic-versioning`を使ってGitHubのバージョンタグを取得している。変更不要

{annofabcli-1.100.0 → annofabcli-100.3}/annofabcli/annotation/change_annotation_attributes.py

@@ -138,12 +138,12 @@ class ChangeAnnotationAttributesMain(CommandLineWithConfirm):
 
         task: Task = Task.from_dict(dict_task)
         if task.status == TaskStatus.WORKING:
-            logger.warning(f"task_id={task_id}: タスクが作業中状態のため、スキップします。")
+            logger.warning(f"task_id='{task_id}': タスクが作業中状態のため、スキップします。")
             return False
 
         if not self.is_force:  # noqa: SIM102
             if task.status == TaskStatus.COMPLETE:
-                logger.warning(f"task_id={task_id}: タスクが完了状態のため、スキップします。")
+                logger.warning(f"task_id='{task_id}': タスクが完了状態のため、スキップします。")
                 return False
 
         annotation_list = self.get_annotation_list_for_task(task_id, annotation_query)

{annofabcli-1.100.0 → annofabcli-100.3}/annofabcli/annotation_specs/list_annotation_specs_attribute.py

@@ -16,6 +16,7 @@ from dataclasses_json import DataClassJsonMixin
 
 import annofabcli
 import annofabcli.common.cli
+from annofabcli.common.annofab.annotation_specs import keybind_to_text
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     ArgumentParser,
@@ -24,15 +25,16 @@ from annofabcli.common.cli import (
 )
 from annofabcli.common.enums import FormatArgument
 from annofabcli.common.facade import AnnofabApiFacade
-from annofabcli.common.utils import print_csv
+from annofabcli.common.utils import print_according_to_format, print_csv
 
 logger = logging.getLogger(__name__)
 
 
 @dataclass
-class AttributeForCsv(DataClassJsonMixin):
+class FlattenAttribute(DataClassJsonMixin):
     """
-    CSV用の属性情報を格納するクラスです。
+    ネストされていないフラットな属性情報を格納するクラスです。
+    選択肢の一覧などは格納できません。
     """
 
     attribute_id: str
@@ -45,7 +47,7 @@ class AttributeForCsv(DataClassJsonMixin):
     attribute_name_en: Optional[str]
     attribute_name_ja: Optional[str]
     attribute_name_vi: Optional[str]
-    type: str
+    attribute_type: str
     """属性の種類"""
     default: Optional[Union[str, bool, int]]
     """デフォルト値"""
@@ -60,6 +62,7 @@ class AttributeForCsv(DataClassJsonMixin):
     """制約の個数"""
     reference_label_count: int
     """参照されているラベルの個数"""
+    keybind: Optional[str]
 
 
 def create_relationship_between_attribute_and_label(labels_v3: list[dict[str, Any]]) -> dict[str, set[str]]:
@@ -78,11 +81,11 @@ def create_relationship_between_attribute_and_label(labels_v3: list[dict[str, An
     return result
 
 
-def create_df_from_additionals(
+def create_flatten_attribute_list_from_additionals(
     additionals_v3: list[dict[str, Any]], labels_v3: list[dict[str, Any]], restrictions: list[dict[str, Any]]
-) -> pandas.DataFrame:
+) -> list[FlattenAttribute]:
     """
-    APIから取得した属性情報（v3版）から、pandas.DataFrameを生成します。
+    APIから取得した属性情報（v3版）から、属性情報の一覧を生成します。
 
     Args:
         additionals_v3: APIから取得した属性情報（v3版）
@@ -98,52 +101,60 @@ def create_df_from_additionals(
     # keyが属性ID、valueが属性に紐づくラベルのIDのsetであるdict
     dict_label_ids = create_relationship_between_attribute_and_label(labels_v3)
 
-    def dict_additional_to_dataclass(additional: dict[str, Any]) -> AttributeForCsv:
+    def dict_additional_to_dataclass(additional: dict[str, Any]) -> FlattenAttribute:
         """
         辞書の属性情報をDataClassのラベル情報に変換します。
         """
         attribute_id = additional["additional_data_definition_id"]
         additional_name = additional["name"]
-        return AttributeForCsv(
+        return FlattenAttribute(
             attribute_id=attribute_id,
             attribute_name_en=get_message_with_lang(additional_name, lang=Lang.EN_US),
             attribute_name_ja=get_message_with_lang(additional_name, lang=Lang.JA_JP),
             attribute_name_vi=get_message_with_lang(additional_name, lang=Lang.VI_VN),
-            type=additional["type"],
+            attribute_type=additional["type"],
             default=additional["default"],
             read_only=additional["read_only"],
             choice_count=len(additional["choices"]),
             restriction_count=dict_restriction_count[attribute_id],
             reference_label_count=len(dict_label_ids[attribute_id]),
+            keybind=keybind_to_text(additional["keybind"]),
         )
 
-    new_labels = [dict_additional_to_dataclass(e) for e in additionals_v3]
-
-    columns = [
-        "attribute_id",
-        "attribute_name_en",
-        "attribute_name_ja",
-        "attribute_name_vi",
-        "type",
-        "default",
-        "read_only",
-        "choice_count",
-        "restriction_count",
-        "reference_label_count",
-    ]
-
-    df = pandas.DataFrame(new_labels, columns=columns)
-    return df
+    return [dict_additional_to_dataclass(e) for e in additionals_v3]
 
 
 class PrintAnnotationSpecsAttribute(CommandLine):
     COMMON_MESSAGE = "annofabcli annotation_specs list_attribute: error:"
 
-    def print_annotation_specs_attribute(self, annotation_specs_v3: dict[str, Any], arg_format: str, output: Optional[str] = None) -> None:
-        if arg_format == FormatArgument.CSV.value:
-            df = create_df_from_additionals(annotation_specs_v3["additionals"], annotation_specs_v3["labels"], annotation_specs_v3["restrictions"])
+    def print_annotation_specs_attribute(
+        self, annotation_specs_v3: dict[str, Any], output_format: FormatArgument, output: Optional[str] = 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:
+            columns = [
+                "attribute_id",
+                "attribute_name_en",
+                "attribute_name_ja",
+                "attribute_name_vi",
+                "type",
+                "default",
+                "read_only",
+                "choice_count",
+                "restriction_count",
+                "reference_label_count",
+                "keybind",
+            ]
+
+            df = pandas.DataFrame(attribute_list, columns=columns)
             print_csv(df, output)
 
+        elif output_format in [FormatArgument.JSON, FormatArgument.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) -> Optional[str]:
         histories, _ = self.service.api.get_annotation_specs_histories(project_id)
         if before + 1 > len(histories):
@@ -177,7 +188,7 @@ class PrintAnnotationSpecsAttribute(CommandLine):
         else:
             raise RuntimeError("'--project_id'か'--annotation_specs_json'のどちらかを指定する必要があります。")
 
-        self.print_annotation_specs_attribute(annotation_specs, arg_format=args.format, output=args.output)
+        self.print_annotation_specs_attribute(annotation_specs, output_format=FormatArgument(args.format), output=args.output)
 
 
 def parse_args(parser: argparse.ArgumentParser) -> None:
@@ -216,7 +227,14 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         ),
     )
 
-    parser.add_argument("-f", "--format", type=str, choices=[FormatArgument.CSV.value], default=FormatArgument.CSV.value, help="出力フォーマット ")
+    parser.add_argument(
+        "-f",
+        "--format",
+        type=str,
+        choices=[FormatArgument.CSV.value, FormatArgument.JSON.value, FormatArgument.PRETTY_JSON.value],
+        default=FormatArgument.CSV.value,
+        help="出力フォーマット ",
+    )
 
     argument_parser.add_output()
 
@@ -232,7 +250,7 @@ def main(args: argparse.Namespace) -> None:
 def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
     subcommand_name = "list_attribute"
 
-    subcommand_help = "アノテーション仕様の属性情報を出力する"
+    subcommand_help = "アノテーション仕様の属性情報を出力します。"
 
     parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help)
     parse_args(parser)

{annofabcli-1.100.0 → annofabcli-100.3}/annofabcli/annotation_specs/list_annotation_specs_choice.py

@@ -15,6 +15,7 @@ from dataclasses_json import DataClassJsonMixin
 
 import annofabcli
 import annofabcli.common.cli
+from annofabcli.common.annofab.annotation_specs import keybind_to_text
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     ArgumentParser,
@@ -23,13 +24,13 @@ from annofabcli.common.cli import (
 )
 from annofabcli.common.enums import FormatArgument
 from annofabcli.common.facade import AnnofabApiFacade
-from annofabcli.common.utils import print_csv
+from annofabcli.common.utils import print_according_to_format, print_csv
 
 logger = logging.getLogger(__name__)
 
 
 @dataclass
-class ChoiceForCsv(DataClassJsonMixin):
+class FlattenChoice(DataClassJsonMixin):
     """
     CSV用の選択肢情報を格納するクラスです。
     """
@@ -54,11 +55,13 @@ class ChoiceForCsv(DataClassJsonMixin):
     choice_name_vi: Optional[str]
     is_default: bool
     """初期値として設定されているかどうか"""
+    keybind: Optional[str]
+    """キーバインド"""
 
 
-def create_df_from_additionals(additionals_v3: list[dict[str, Any]]) -> pandas.DataFrame:
+def create_flatten_choice_list_from_additionals(additionals_v3: list[dict[str, Any]]) -> list[FlattenChoice]:
     """
-    APIから取得した属性情報（v3版）から、pandas.DataFrameを生成します。
+    APIから取得した属性情報（v3版）から、選択肢情報の一覧を生成します。
 
     Args:
         additionals_v3: APIから取得した属性情報（v3版）
@@ -67,7 +70,7 @@ def create_df_from_additionals(additionals_v3: list[dict[str, Any]]) -> pandas.D
     def dict_choice_to_dataclass(
         choice: dict[str, Any],
         additional: dict[str, Any],
-    ) -> ChoiceForCsv:
+    ) -> FlattenChoice:
         """
         辞書の選択肢情報をDataClassの選択肢情報に変換します。
         """
@@ -77,7 +80,7 @@ def create_df_from_additionals(additionals_v3: list[dict[str, Any]]) -> pandas.D
         choice_id = choice["choice_id"]
         choice_name = choice["name"]
         is_default = additional["default"] == choice_id
-        return ChoiceForCsv(
+        return FlattenChoice(
             attribute_id=attribute_id,
             attribute_name_en=get_english_message(additional_name),
             attribute_type=additional["type"],
@@ -86,6 +89,7 @@ def create_df_from_additionals(additionals_v3: list[dict[str, Any]]) -> pandas.D
             choice_name_ja=get_message_with_lang(choice_name, lang=Lang.JA_JP),
             choice_name_vi=get_message_with_lang(choice_name, lang=Lang.VI_VN),
             is_default=is_default,
+            keybind=keybind_to_text(choice["keybind"]),
         )
 
     tmp_list = []
@@ -95,19 +99,33 @@ def create_df_from_additionals(additionals_v3: list[dict[str, Any]]) -> pandas.D
             continue
         for choice in choices:
             tmp_list.append(dict_choice_to_dataclass(choice, additional))  # noqa: PERF401
-
-    columns = ["attribute_id", "attribute_name_en", "attribute_type", "choice_id", "choice_name_en", "choice_name_ja", "choice_name_vi", "is_default"]
-    df = pandas.DataFrame(tmp_list, columns=columns)
-    return df
+    return tmp_list
 
 
 class PrintAnnotationSpecsAttribute(CommandLine):
     COMMON_MESSAGE = "annofabcli annotation_specs list_choice: error:"
 
-    def print_annotation_specs_choice(self, annotation_specs_v3: dict[str, Any], arg_format: str, output: Optional[str] = None) -> None:
-        if arg_format == FormatArgument.CSV.value:
-            df = create_df_from_additionals(annotation_specs_v3["additionals"])
-            print_csv(df, output)
+    def print_annotation_specs_choice(self, annotation_specs_v3: dict[str, Any], output_format: FormatArgument, output: Optional[str] = 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)
+            columns = [
+                "attribute_id",
+                "attribute_name_en",
+                "attribute_type",
+                "choice_id",
+                "choice_name_en",
+                "choice_name_ja",
+                "choice_name_vi",
+                "is_default",
+                "keybind",
+            ]
+            print_csv(df[columns], output)
+
+        elif output_format in [FormatArgument.JSON, FormatArgument.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) -> Optional[str]:
         histories, _ = self.service.api.get_annotation_specs_histories(project_id)
@@ -144,7 +162,7 @@ class PrintAnnotationSpecsAttribute(CommandLine):
         else:
             raise RuntimeError("'--project_id'か'--annotation_specs_json'のどちらかを指定する必要があります。")
 
-        self.print_annotation_specs_choice(annotation_specs, arg_format=args.format, output=args.output)
+        self.print_annotation_specs_choice(annotation_specs, output_format=FormatArgument(args.format), output=args.output)
 
 
 def parse_args(parser: argparse.ArgumentParser) -> None:
@@ -183,7 +201,14 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         ),
     )
 
-    parser.add_argument("-f", "--format", type=str, choices=[FormatArgument.CSV.value], default=FormatArgument.CSV.value, help="出力フォーマット ")
+    parser.add_argument(
+        "-f",
+        "--format",
+        type=str,
+        choices=[FormatArgument.CSV.value, FormatArgument.JSON.value, FormatArgument.PRETTY_JSON.value],
+        default=FormatArgument.CSV.value,
+        help="出力フォーマット ",
+    )
 
     argument_parser.add_output()
 
@@ -199,7 +224,7 @@ def main(args: argparse.Namespace) -> None:
 def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
     subcommand_name = "list_choice"
 
-    subcommand_help = "アノテーション仕様のドロップダウンまたはラジオボタン属性の選択肢情報を出力する"
+    subcommand_help = "アノテーション仕様のドロップダウンまたはラジオボタン属性の選択肢情報を出力します。"
 
     parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help)
     parse_args(parser)

{annofabcli-1.100.0 → annofabcli-100.3}/annofabcli/annotation_specs/list_annotation_specs_history.py

@@ -51,7 +51,6 @@ 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_output()
     argument_parser.add_csv_format()
-    argument_parser.add_query()
 
     parser.set_defaults(subcommand_func=main)
 

{annofabcli-1.100.0 → annofabcli-100.3}/annofabcli/annotation_specs/list_annotation_specs_label.py

@@ -15,6 +15,7 @@ from dataclasses_json import DataClassJsonMixin
 
 import annofabcli
 import annofabcli.common.cli
+from annofabcli.common.annofab.annotation_specs import keybind_to_text
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     ArgumentParser,
@@ -22,16 +23,16 @@ from annofabcli.common.cli import (
     build_annofabapi_resource_and_login,
 )
 from annofabcli.common.enums import FormatArgument
-from annofabcli.common.facade import AnnofabApiFacade, convert_annotation_specs_labels_v2_to_v1
+from annofabcli.common.facade import AnnofabApiFacade
 from annofabcli.common.utils import print_csv
 
 logger = logging.getLogger(__name__)
 
 
 @dataclass
-class LabelForCsv(DataClassJsonMixin):
+class FlattenLabel(DataClassJsonMixin):
     """
-    CSV用のラベル情報を格納するクラスです。
+    ラベル情報を格納するクラスです。
     """
 
     label_id: str
@@ -50,6 +51,8 @@ class LabelForCsv(DataClassJsonMixin):
     Notes:
         APIでは`additional_data_definitions`のような名前だが、分かりにくかったので"attribute"という名前に変えた。
     """
+    keybind: Optional[str]
+    """キーバインド"""
 
 
 def decimal_to_hex_color(red: int, green: int, blue: int) -> str:
@@ -63,22 +66,22 @@ def decimal_to_hex_color(red: int, green: int, blue: int) -> str:
     return f"#{red:02X}{green:02X}{blue:02X}"
 
 
-def create_df_from_labels(labels_v3: list[dict[str, Any]]) -> pandas.DataFrame:
+def create_label_list(labels_v3: list[dict[str, Any]]) -> list[FlattenLabel]:
     """
-    APIから取得したラベル情報（v3版）から、pandas.DataFrameを生成します。
+    APIから取得したラベル情報（v3版）から、`FlattenLabel`のlistを生成します。
 
     Args:
         labels_v3: APIから取得したラベル情報（v3版）
     """
 
-    def dict_label_to_dataclass(label: dict[str, Any]) -> LabelForCsv:
+    def dict_label_to_dataclass(label: dict[str, Any]) -> FlattenLabel:
         """
         辞書のラベル情報をDataClassのラベル情報に変換します。
         """
         label_color = label["color"]
         hex_color_code = decimal_to_hex_color(label_color["red"], label_color["green"], label_color["blue"])
         additional_data_definitions = label["additional_data_definitions"]
-        return LabelForCsv(
+        return FlattenLabel(
             label_id=label["label_id"],
             label_name_en=get_message_with_lang(label["label_name"], lang=Lang.EN_US),
             label_name_ja=get_message_with_lang(label["label_name"], lang=Lang.JA_JP),
@@ -86,21 +89,10 @@ def create_df_from_labels(labels_v3: list[dict[str, Any]]) -> pandas.DataFrame:
             annotation_type=label["annotation_type"],
             color=hex_color_code,
             attribute_count=len(additional_data_definitions),
+            keybind=keybind_to_text(label["keybind"]),
         )
 
-    new_labels = [dict_label_to_dataclass(e) for e in labels_v3]
-
-    columns = [
-        "label_id",
-        "label_name_en",
-        "label_name_ja",
-        "label_name_vi",
-        "annotation_type",
-        "color",
-        "attribute_count",
-    ]
-    df = pandas.DataFrame(new_labels, columns=columns)
-    return df
+    return [dict_label_to_dataclass(e) for e in labels_v3]
 
 
 class PrintAnnotationSpecsLabel(CommandLine):
@@ -110,69 +102,16 @@ class PrintAnnotationSpecsLabel(CommandLine):
 
     COMMON_MESSAGE = "annofabcli annotation_specs list_label: error:"
 
-    def print_annotation_specs_label(self, annotation_specs_v3: dict[str, Any], arg_format: str, output: Optional[str] = None) -> None:
-        # アノテーション仕様のv2とv3はほとんど同じなので、`convert_annotation_specs_labels_v2_to_v1`にはV3のアノテーション仕様を渡す
-        labels_v1 = convert_annotation_specs_labels_v2_to_v1(
-            labels_v2=annotation_specs_v3["labels"], additionals_v2=annotation_specs_v3["additionals"]
-        )
-        if arg_format == "text":
-            self._print_text_format_labels(labels_v1, output=output)
+    def print_annotation_specs_label(self, annotation_specs_v3: dict[str, Any], output_format: FormatArgument, output: Optional[str] = None) -> None:
+        label_list = create_label_list(annotation_specs_v3["labels"])
+        if output_format == FormatArgument.CSV:
+            df = pandas.DataFrame(label_list)
 
-        elif arg_format == FormatArgument.CSV.value:
-            df = create_df_from_labels(annotation_specs_v3["labels"])
-            print_csv(df, output)
+            columns = ["label_id", "label_name_en", "label_name_ja", "label_name_vi", "annotation_type", "color", "attribute_count", "keybind"]
+            print_csv(df[columns], output)
 
-        elif arg_format in [FormatArgument.JSON.value, FormatArgument.PRETTY_JSON.value]:
-            annofabcli.common.utils.print_according_to_format(target=labels_v1, format=FormatArgument(arg_format), output=output)
-
-    @staticmethod
-    def _get_name_tuple(messages: list[dict[str, Any]]) -> tuple[str, str]:
-        """
-        日本語名、英語名のタプルを取得する。
-        """
-        ja_name = [e["message"] for e in messages if e["lang"] == "ja-JP"][0]  # noqa: RUF015
-        en_name = [e["message"] for e in messages if e["lang"] == "en-US"][0]  # noqa: RUF015
-        return (ja_name, en_name)
-
-    @staticmethod
-    def _print_text_format_labels(labels: list[dict[str, Any]], output: Optional[str] = None) -> None:
-        output_lines = []
-        for label in labels:
-            output_lines.append(
-                "\t".join(
-                    [
-                        label["label_id"],
-                        label["annotation_type"],
-                        *PrintAnnotationSpecsLabel._get_name_tuple(label["label_name"]["messages"]),
-                    ]
-                )
-            )
-            for additional_data_definition in label["additional_data_definitions"]:
-                output_lines.append(
-                    "\t".join(
-                        [
-                            "",
-                            additional_data_definition["additional_data_definition_id"],
-                            additional_data_definition["type"],
-                            *PrintAnnotationSpecsLabel._get_name_tuple(additional_data_definition["name"]["messages"]),
-                        ]
-                    )
-                )
-                if additional_data_definition["type"] in ["choice", "select"]:
-                    for choice in additional_data_definition["choices"]:
-                        output_lines.append(  # noqa: PERF401
-                            "\t".join(
-                                [
-                                    "",
-                                    "",
-                                    choice["choice_id"],
-                                    "",
-                                    *PrintAnnotationSpecsLabel._get_name_tuple(choice["name"]["messages"]),
-                                ]
-                            )
-                        )
-
-        annofabcli.common.utils.output_string("\n".join(output_lines), 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)
 
     def get_history_id_from_before_index(self, project_id: str, before: int) -> Optional[str]:
         histories, _ = self.service.api.get_annotation_specs_histories(project_id)
@@ -210,7 +149,7 @@ class PrintAnnotationSpecsLabel(CommandLine):
         else:
             raise RuntimeError("'--project_id'か'--annotation_specs_json'のどちらかを指定する必要があります。")
 
-        self.print_annotation_specs_label(annotation_specs, arg_format=args.format, output=args.output)
+        self.print_annotation_specs_label(annotation_specs, output_format=FormatArgument(args.format), output=args.output)
 
 
 def parse_args(parser: argparse.ArgumentParser) -> None:
@@ -253,13 +192,9 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         "-f",
         "--format",
         type=str,
-        choices=["text", FormatArgument.CSV.value, FormatArgument.PRETTY_JSON.value, FormatArgument.JSON.value],
-        default="text",
-        help=f"出力フォーマット "
-        "text: 人が見やすい形式, "
-        f"{FormatArgument.CSV.value}: ラベル情報の一覧が記載されたCSV, "
-        f"{FormatArgument.PRETTY_JSON.value}: インデントされたJSON, "
-        f"{FormatArgument.JSON.value}: フラットなJSON",
+        choices=[FormatArgument.CSV.value, FormatArgument.JSON.value, FormatArgument.PRETTY_JSON.value],
+        default=FormatArgument.CSV.value,
+        help="出力フォーマット ",
     )
 
     argument_parser.add_output()
@@ -276,10 +211,8 @@ def main(args: argparse.Namespace) -> None:
 def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
     subcommand_name = "list_label"
 
-    subcommand_help = "アノテーション仕様のラベル情報を出力する"
-
-    description = "アノテーション仕様のラベル情報を出力する"
+    subcommand_help = "アノテーション仕様のラベル情報を出力します。"
 
-    parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help, description)
+    parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help)
     parse_args(parser)
     return parser