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

annofabcli/organization/list_organization.py

@@ -3,7 +3,7 @@ import logging
 
 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__)
@@ -27,11 +27,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/organization_member/list_organization_member.py

@@ -7,7 +7,7 @@ import requests
 
 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
 
@@ -52,7 +52,7 @@ class ListOrganizationMember(CommandLine):
                 logger.warning(f"組織'{organization_name}'のメンバー一覧を取得できませんでした。", exc_info=True)
                 continue
 
-        if args.format == FormatArgument.CSV.value:
+        if args.format == OutputFormat.CSV.value:
             df = pandas.DataFrame(organization_member_list)
             columns = get_columns_with_priority(df, prior_columns=self.PRIOR_COLUMNS)
             self.print_csv(df[columns])
@@ -79,8 +79,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     )
 
     argument_parser.add_format(
-        choices=[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON, FormatArgument.USER_ID_LIST],
-        default=FormatArgument.CSV,
+        choices=[OutputFormat.CSV, OutputFormat.JSON, OutputFormat.PRETTY_JSON, OutputFormat.USER_ID_LIST],
+        default=OutputFormat.CSV,
     )
     argument_parser.add_output()
 

annofabcli/project/list_project.py

@@ -15,7 +15,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 get_columns_with_priority
 
@@ -186,10 +186,10 @@ class ListProject(CommandLine):
 
         logger.info(f"プロジェクト一覧の件数: {len(project_list)}")
 
-        if args.format == FormatArgument.MINIMAL_CSV.value:
+        if args.format == OutputFormat.MINIMAL_CSV.value:
             df = create_minimal_dataframe(project_list)
             self.print_csv(df)
-        elif args.format == FormatArgument.CSV.value:
+        elif args.format == OutputFormat.CSV.value:
             df = pandas.DataFrame(project_list)
             columns = get_columns_with_priority(df, prior_columns=self.PRIOR_COLUMNS)
             self.print_csv(df[columns])
@@ -241,13 +241,13 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
 
     argument_parser.add_format(
         choices=[
-            FormatArgument.CSV,
-            FormatArgument.MINIMAL_CSV,
-            FormatArgument.JSON,
-            FormatArgument.PRETTY_JSON,
-            FormatArgument.PROJECT_ID_LIST,
+            OutputFormat.CSV,
+            OutputFormat.MINIMAL_CSV,
+            OutputFormat.JSON,
+            OutputFormat.PRETTY_JSON,
+            OutputFormat.PROJECT_ID_LIST,
         ],
-        default=FormatArgument.CSV,
+        default=OutputFormat.CSV,
     )
     argument_parser.add_output()
 

annofabcli/project_member/list_users.py

@@ -7,7 +7,7 @@ from annofabapi.models import ProjectMember
 
 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.visualize import AddProps
@@ -75,7 +75,7 @@ class ListUser(CommandLine):
         )
 
         logger.info(f"プロジェクトメンバ一覧の件数: {len(project_members)}")
-        if args.format == FormatArgument.CSV.value:
+        if args.format == OutputFormat.CSV.value:
             df = pandas.DataFrame(project_members)
             columns = get_columns_with_priority(df, prior_columns=self.PRIOR_COLUMNS)
             self.print_csv(df[columns])
@@ -104,8 +104,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.add_argument("--include_inactive", action="store_true", help="脱退しているメンバも出力します。")
 
     argument_parser.add_format(
-        choices=[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON, FormatArgument.USER_ID_LIST],
-        default=FormatArgument.CSV,
+        choices=[OutputFormat.CSV, OutputFormat.JSON, OutputFormat.PRETTY_JSON, OutputFormat.USER_ID_LIST],
+        default=OutputFormat.CSV,
     )
     argument_parser.add_output()
 

annofabcli/statistics/list_annotation_area.py

@@ -30,7 +30,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,
@@ -189,7 +189,7 @@ def create_df(
 def print_annotation_area(
     annotation_path: Path,
     output_file: Path,
-    output_format: FormatArgument,
+    output_format: OutputFormat,
     *,
     target_task_ids: Collection[str] | None = None,
     task_query: TaskQuery | None = None,
@@ -202,12 +202,12 @@ def print_annotation_area(
 
     logger.info(f"{len(annotation_area_list)} 件のタスクに含まれる塗りつぶし、矩形、ポリゴンアノテーションの面積情報を出力します。")
 
-    if output_format == FormatArgument.CSV:
+    if output_format == OutputFormat.CSV:
         df = create_df(annotation_area_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
         print_json(
             [e.to_dict(encode_json=True) for e in annotation_area_list],
             is_pretty=json_is_pretty,
@@ -249,7 +249,7 @@ class ListAnnotationArea(CommandLine):
         task_query = TaskQuery.from_dict(annofabcli.common.cli.get_json_from_args(args.task_query)) if args.task_query 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)
 
@@ -298,8 +298,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     group.add_argument("-p", "--project_id", type=str, help="project_id。``--annotation`` が未指定のときは必須です。\n")
 
     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_annotation_attribute.py

@@ -27,7 +27,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,
@@ -164,14 +164,14 @@ def print_annotation_attribute_list_as_csv(annotation_attribute_list: list, outp
 def print_annotation_attribute_list(
     annotation_attribute_list: list[AnnotationAttribute],
     output_file: Path,
-    output_format: Literal[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON],
+    output_format: Literal[OutputFormat.CSV, OutputFormat.JSON, OutputFormat.PRETTY_JSON],
 ) -> None:
     tmp_annotation_attribute_list = [e.model_dump() for e in annotation_attribute_list]
-    if output_format == FormatArgument.CSV:
+    if output_format == OutputFormat.CSV:
         print_annotation_attribute_list_as_csv(tmp_annotation_attribute_list, output_file)
-    elif output_format == FormatArgument.JSON:
+    elif output_format == OutputFormat.JSON:
         print_json(tmp_annotation_attribute_list, output=output_file, is_pretty=False)
-    elif output_format == FormatArgument.PRETTY_JSON:
+    elif output_format == OutputFormat.PRETTY_JSON:
         print_json(tmp_annotation_attribute_list, output=output_file, is_pretty=True)
     else:
         raise assert_noreturn(output_format)
@@ -207,7 +207,7 @@ class ListAnnotationAttribute(CommandLine):
         task_query = TaskQuery.from_dict(annofabcli.common.cli.get_json_from_args(args.task_query)) if args.task_query 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)
 
@@ -254,8 +254,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annotation_group.add_argument("-p", "--project_id", type=str, help="対象プロジェクトの project_id")
 
     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_annotation_attribute_filled_count.py

@@ -36,7 +36,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,
@@ -480,7 +480,7 @@ class ListAnnotationAttributeFilledCountMain:
         annotation_path: Path,
         output_file: Path,
         group_by: GroupBy,
-        output_format: FormatArgument,
+        output_format: OutputFormat,
         *,
         project_id: str | None = None,
         include_flag_attribute: bool = False,
@@ -505,11 +505,11 @@ class ListAnnotationAttributeFilledCountMain:
 
         if group_by == GroupBy.INPUT_DATA_ID:
             logger.info(f"{len(annotation_count_list_by_input_data)} 件の入力データに含まれるアノテーション数の情報を出力します。")
-            if output_format == FormatArgument.CSV:
+            if output_format == OutputFormat.CSV:
                 self.print_annotation_count_csv_by_input_data(annotation_count_list_by_input_data, output_file=output_file, attribute_names=target_attribute_names)
 
-            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
 
                 print_json(
                     [e.to_dict(encode_json=True) for e in annotation_count_list_by_input_data],
@@ -519,11 +519,11 @@ class ListAnnotationAttributeFilledCountMain:
         elif group_by == GroupBy.TASK_ID:
             annotation_count_list_by_task = convert_annotation_count_list_by_input_data_to_by_task(annotation_count_list_by_input_data)
             logger.info(f"{len(annotation_count_list_by_task)} 件のタスクに含まれるアノテーション数の情報を出力します。")
-            if output_format == FormatArgument.CSV:
+            if output_format == OutputFormat.CSV:
                 self.print_annotation_count_csv_by_task(annotation_count_list_by_task, output_file=output_file, attribute_names=target_attribute_names)
 
-            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
 
                 print_json(
                     [e.to_dict(encode_json=True) for e in annotation_count_list_by_task],
@@ -565,7 +565,7 @@ class ListAnnotationAttributeFilledCount(CommandLine):
 
         group_by = GroupBy(args.group_by)
         output_file: Path = args.output
-        output_format = FormatArgument(args.format)
+        output_format = OutputFormat(args.format)
         main_obj = ListAnnotationAttributeFilledCountMain(self.service)
 
         downloading_obj = DownloadingFile(self.service)
@@ -668,8 +668,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()