annofabcli 1.114.3__py3-none-any.whl → 1.114.4__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()

annofabcli/statistics/list_annotation_count.py

@@ -40,7 +40,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,
@@ -1001,7 +1001,7 @@ class ListAnnotationCountMain:
         annotation_path: Path,
         group_by: GroupBy,
         output_file: Path,
-        arg_format: FormatArgument,
+        arg_format: OutputFormat,
         *,
         project_id: str | None = None,
         task_json_path: Path | None = None,
@@ -1010,7 +1010,7 @@ class ListAnnotationCountMain:
         csv_type: CsvType | None = None,
     ) -> None:
         """ラベルごと/属性ごとのアノテーション数を出力します。"""
-        if arg_format == FormatArgument.CSV:
+        if arg_format == OutputFormat.CSV:
             assert csv_type is not None
             if group_by == GroupBy.INPUT_DATA_ID:
                 self.print_annotation_counter_csv_by_input_data(
@@ -1033,8 +1033,8 @@ class ListAnnotationCountMain:
                     csv_type=csv_type,
                 )
 
-        elif arg_format in [FormatArgument.PRETTY_JSON, FormatArgument.JSON]:
-            json_is_pretty = arg_format == FormatArgument.PRETTY_JSON
+        elif arg_format in [OutputFormat.PRETTY_JSON, OutputFormat.JSON]:
+            json_is_pretty = arg_format == OutputFormat.PRETTY_JSON
 
             if group_by == GroupBy.INPUT_DATA_ID:
                 self.print_annotation_counter_json_by_input_data(
@@ -1093,7 +1093,7 @@ class ListAnnotationCount(CommandLine):
         group_by = GroupBy(args.group_by)
         csv_type = CsvType(args.type)
         output_file: Path = args.output
-        arg_format = FormatArgument(args.format)
+        arg_format = OutputFormat(args.format)
         main_obj = ListAnnotationCountMain(self.service)
 
         downloading_obj = DownloadingFile(self.service)
@@ -1191,8 +1191,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     )
 
     argument_parser.add_format(
-        choices=[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON],
-        default=FormatArgument.CSV,
+        choices=[OutputFormat.CSV, OutputFormat.JSON, OutputFormat.PRETTY_JSON],
+        default=OutputFormat.CSV,
     )
 
     argument_parser.add_output()

annofabcli/statistics/list_annotation_duration.py

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

annofabcli/statistics/list_video_duration.py

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

annofabcli/statistics/summarize_task_count_by_task_id_group.py

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

annofabcli/statistics/summarize_task_count_by_user.py

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

annofabcli/statistics/visualization/dataframe/project_performance.py

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

annofabcli/statistics/visualization/dataframe/task.py

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

annofabcli/supplementary/list_supplementary_data.py

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

annofabcli/task/list_all_tasks.py

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