annofabcli 1.111.1__py3-none-any.whl → 1.112.0__py3-none-any.whl

annofabcli/statistics/visualize_statistics.py

@@ -6,13 +6,14 @@ import json
 import logging.handlers
 import sys
 import tempfile
+from collections.abc import Callable
 from multiprocessing import Pool
 from pathlib import Path
-from typing import Any, Callable, Optional
+from typing import Any
 
 import annofabapi
 import pandas
-from annofabapi.models import InputDataType, ProjectMemberRole, TaskPhase
+from annofabapi.models import ProjectMemberRole, TaskPhase
 
 import annofabcli
 from annofabcli.common.cli import (
@@ -74,14 +75,15 @@ class WriteCsvGraph:
         project_dir: ProjectDir,
         actual_worktime: ActualWorktime,
         *,
-        annotation_count: Optional[AnnotationCount] = None,
-        input_data_count: Optional[InputDataCount] = None,
-        custom_production_volume: Optional[CustomProductionVolume] = None,
+        annotation_count: AnnotationCount | None = None,
+        input_data_count: InputDataCount | None = None,
+        custom_production_volume: CustomProductionVolume | None = None,
         minimal_output: bool = False,
         output_only_text: bool = False,
-        production_volume_include_labels: Optional[list[str]] = None,
-        production_volume_exclude_labels: Optional[list[str]] = None,
+        production_volume_include_labels: list[str] | None = None,
+        production_volume_exclude_labels: list[str] | None = None,
         include_annotation_duration_seconds: bool = False,
+        include_video_duration_minutes: bool = False,
     ) -> None:
         self.service = service
         self.project_id = project_id
@@ -98,10 +100,11 @@ class WriteCsvGraph:
         self.production_volume_include_labels = production_volume_include_labels
         self.production_volume_exclude_labels = production_volume_exclude_labels
         self.include_annotation_duration_seconds = include_annotation_duration_seconds
+        self.include_video_duration_minutes = include_video_duration_minutes
 
-        self.task: Optional[Task] = None
-        self.worktime_per_date: Optional[WorktimePerDate] = None
-        self.task_worktime_obj: Optional[TaskWorktimeByPhaseUser] = None
+        self.task: Task | None = None
+        self.worktime_per_date: WorktimePerDate | None = None
+        self.task_worktime_obj: TaskWorktimeByPhaseUser | None = None
 
     def _catch_exception(self, function: Callable[..., Any]) -> Callable[..., Any]:
         """
@@ -119,14 +122,18 @@ class WriteCsvGraph:
 
     def _get_task(self) -> Task:
         if self.task is None:
+            custom_production_volume = self._prepare_custom_production_volume()
+
             if self.annotation_count is None:
-                # アノテーションZIPからアノテーション数を取得
-                annotation_count = AnnotationCount.from_annotation_zip(
-                    self.visualize_source_files.annotation_zip_path,
-                    project_id=self.project_id,
-                    include_labels=self.production_volume_include_labels,
-                    exclude_labels=self.production_volume_exclude_labels,
-                )
+                if self.visualize_source_files.annotation_zip_path.exists():
+                    annotation_count = AnnotationCount.from_annotation_zip(
+                        self.visualize_source_files.annotation_zip_path,
+                        project_id=self.project_id,
+                        include_labels=self.production_volume_include_labels,
+                        exclude_labels=self.production_volume_exclude_labels,
+                    )
+                else:
+                    annotation_count = AnnotationCount.empty()
             else:
                 annotation_count = self.annotation_count
 
@@ -137,36 +144,6 @@ class WriteCsvGraph:
             new_tasks = filter_tasks(tasks, self.task_completion_criteria, self.filtering_query, task_histories=task_histories)
             logger.debug(f"project_id='{self.project_id}' :: 集計対象タスクは {len(new_tasks)} / {len(tasks)} 件です。")
 
-            # annotation_duration_secondsを生産量に含める場合、アノテーション時間を計算
-            custom_production_volume = self.custom_production_volume
-            if self.include_annotation_duration_seconds:
-                logger.debug(f"project_id='{self.project_id}' :: 区間アノテーションの長さ（'annotation_duration_second'）を計算します。")
-                annotation_duration_obj = AnnotationDuration.from_annotation_zip(
-                    self.visualize_source_files.annotation_zip_path,
-                    project_id=self.project_id,
-                    include_labels=self.production_volume_include_labels,
-                    exclude_labels=self.production_volume_exclude_labels,
-                )
-
-                if custom_production_volume is not None:
-                    # 既存のCustomProductionVolumeのデータと結合
-                    if not custom_production_volume.is_empty():
-                        annotation_duration_df = pandas.merge(custom_production_volume.df, annotation_duration_obj.df, on=["project_id", "task_id"], how="outer")
-                    else:
-                        annotation_duration_df = annotation_duration_obj.df
-
-                    # annotation_duration_secondを含む新しいProductionVolumeColumnリストを作成
-                    annotation_duration_column = ProductionVolumeColumn(value="annotation_duration_second", name="区間アノテーションの長さ（秒）")
-                    new_production_volume_list = list(custom_production_volume.custom_production_volume_list)
-                    if annotation_duration_column not in new_production_volume_list:
-                        new_production_volume_list.append(annotation_duration_column)
-
-                    custom_production_volume = CustomProductionVolume(annotation_duration_df, custom_production_volume_list=new_production_volume_list)
-                else:
-                    # CustomProductionVolumeが存在しない場合、新規作成
-                    annotation_duration_column = ProductionVolumeColumn(value="annotation_duration_second", name="区間アノテーションの長さ（秒）")
-                    custom_production_volume = CustomProductionVolume(annotation_duration_obj.df, custom_production_volume_list=[annotation_duration_column])
-
             self.task = Task.from_api_content(
                 tasks=new_tasks,
                 task_histories=task_histories,
@@ -180,6 +157,80 @@ class WriteCsvGraph:
 
         return self.task
 
+    def _prepare_custom_production_volume(self) -> CustomProductionVolume | None:
+        """カスタム生産量の準備を行う"""
+        custom_production_volume = self.custom_production_volume
+
+        # annotation_duration_secondsを生産量に含める場合、アノテーション時間を計算
+        if self.include_annotation_duration_seconds:
+            custom_production_volume = self._add_annotation_duration(custom_production_volume)
+
+        # 動画プロジェクトの場合、動画の長さ（分）を生産量に含める
+        if self.include_video_duration_minutes:
+            custom_production_volume = self._add_video_duration(custom_production_volume)
+
+        return custom_production_volume
+
+    def _add_annotation_duration(self, custom_production_volume: CustomProductionVolume | None) -> CustomProductionVolume:
+        """区間アノテーションの長さを生産量に追加する"""
+        logger.debug(f"project_id='{self.project_id}' :: 区間アノテーションの長さ（'annotation_duration_minute'）を計算します。")
+        annotation_duration_obj = AnnotationDuration.from_annotation_zip(
+            self.visualize_source_files.annotation_zip_path,
+            project_id=self.project_id,
+            include_labels=self.production_volume_include_labels,
+            exclude_labels=self.production_volume_exclude_labels,
+        )
+        annotation_duration_column = ProductionVolumeColumn(value="annotation_duration_minute", name="区間アノテーションの長さ（分）")
+
+        if custom_production_volume is not None:
+            # 既存のCustomProductionVolumeのデータと結合
+            if not custom_production_volume.is_empty():
+                annotation_duration_df = pandas.merge(custom_production_volume.df, annotation_duration_obj.df, on=["project_id", "task_id"], how="outer")
+            else:
+                annotation_duration_df = annotation_duration_obj.df
+
+            # annotation_duration_minuteを含む新しいProductionVolumeColumnリストを作成
+            new_production_volume_list = list(custom_production_volume.custom_production_volume_list)
+            if annotation_duration_column not in new_production_volume_list:
+                new_production_volume_list.append(annotation_duration_column)
+
+            return CustomProductionVolume(annotation_duration_df, custom_production_volume_list=new_production_volume_list)
+        else:
+            # CustomProductionVolumeが存在しない場合、新規作成
+            return CustomProductionVolume(annotation_duration_obj.df, custom_production_volume_list=[annotation_duration_column])
+
+    def _add_video_duration(self, custom_production_volume: CustomProductionVolume | None) -> CustomProductionVolume:
+        """動画の長さ（分）を生産量に追加する"""
+        logger.debug(f"project_id='{self.project_id}' :: 動画の長さ（'video_duration_minute'）を計算します。")
+        video_duration_by_task_id = self.visualize_source_files.get_video_duration_minutes_by_task_id()
+
+        # DataFrameの作成
+        video_duration_data = [{"project_id": self.project_id, "task_id": task_id, "video_duration_minute": duration} for task_id, duration in video_duration_by_task_id.items()]
+        if len(video_duration_data) == 0:
+            video_duration_df = pandas.DataFrame(columns=["project_id", "task_id", "video_duration_minute"])
+        else:
+            video_duration_df = pandas.DataFrame(video_duration_data)
+
+        video_duration_df = video_duration_df.astype({"project_id": "string", "task_id": "string", "video_duration_minute": "float64"})
+        video_duration_column = ProductionVolumeColumn(value="video_duration_minute", name="動画の長さ（分）")
+
+        if custom_production_volume is not None:
+            # 既存のCustomProductionVolumeのデータと結合
+            if not custom_production_volume.is_empty():
+                merged_df = pandas.merge(custom_production_volume.df, video_duration_df, on=["project_id", "task_id"], how="outer")
+            else:
+                merged_df = video_duration_df
+
+            # video_duration_minuteを含む新しいProductionVolumeColumnリストを作成
+            new_production_volume_list = list(custom_production_volume.custom_production_volume_list)
+            if video_duration_column not in new_production_volume_list:
+                new_production_volume_list.append(video_duration_column)
+
+            return CustomProductionVolume(merged_df, custom_production_volume_list=new_production_volume_list)
+        else:
+            # CustomProductionVolumeが存在しない場合、新規作成
+            return CustomProductionVolume(video_duration_df, custom_production_volume_list=[video_duration_column])
+
     def _get_task_worktime_obj(self) -> TaskWorktimeByPhaseUser:
         if self.task_worktime_obj is None:
             task_history = TaskHistory.from_api_content(self.visualize_source_files.read_task_histories_json())
@@ -247,7 +298,7 @@ class WriteCsvGraph:
         if not self.output_only_text:
             self.project_dir.write_user_performance_scatter_plot(user_performance)
 
-    def write_cumulative_linegraph_by_user(self, user_id_list: Optional[list[str]] = None) -> None:
+    def write_cumulative_linegraph_by_user(self, user_id_list: list[str] | None = None) -> None:
         """ユーザごとの累積折れ線グラフをプロットする。"""
         task_worktime_obj = self._get_task_worktime_obj()
         annotator_obj = AnnotatorCumulativeProductivity.from_df_wrapper(task_worktime_obj)
@@ -259,7 +310,7 @@ class WriteCsvGraph:
             self.project_dir.write_cumulative_line_graph(inspector_obj, phase=TaskPhase.INSPECTION, user_id_list=user_id_list, minimal_output=self.minimal_output)
             self.project_dir.write_cumulative_line_graph(acceptor_obj, phase=TaskPhase.ACCEPTANCE, user_id_list=user_id_list, minimal_output=self.minimal_output)
 
-    def write_worktime_per_date(self, user_id_list: Optional[list[str]] = None) -> None:
+    def write_worktime_per_date(self, user_id_list: list[str] | None = None) -> None:
         """日ごとの作業時間情報を出力する。"""
         worktime_per_date_obj = self._get_worktime_per_date()
 
@@ -278,7 +329,7 @@ class WriteCsvGraph:
             self.project_dir.write_whole_productivity_line_graph_per_date(productivity_per_completed_date_obj)
             self.project_dir.write_whole_productivity_line_graph_per_annotation_started_date(productivity_per_started_date_obj)
 
-    def write_user_productivity_per_date(self, user_id_list: Optional[list[str]] = None) -> None:
+    def write_user_productivity_per_date(self, user_id_list: list[str] | None = None) -> None:
         """ユーザごとの日ごとの生産性情報を出力する。"""
         task_worktime_obj = self._get_task_worktime_obj()
 
@@ -312,14 +363,14 @@ class VisualizingStatisticsMain:
         # その他
         download_latest: bool = False,
         is_get_task_histories_one_of_each: bool = False,
-        actual_worktime: Optional[ActualWorktime] = None,
-        annotation_count: Optional[AnnotationCount] = None,
-        input_data_count: Optional[InputDataCount] = None,
-        custom_production_volume: Optional[CustomProductionVolume] = None,
-        user_ids: Optional[list[str]] = None,
+        actual_worktime: ActualWorktime | None = None,
+        annotation_count: AnnotationCount | None = None,
+        input_data_count: InputDataCount | None = None,
+        custom_production_volume: CustomProductionVolume | None = None,
+        user_ids: list[str] | None = None,
         not_download_visualization_source_files: bool = False,
-        production_volume_include_labels: Optional[list[str]] = None,
-        production_volume_exclude_labels: Optional[list[str]] = None,
+        production_volume_include_labels: list[str] | None = None,
+        production_volume_exclude_labels: list[str] | None = None,
     ) -> None:
         self.service = service
         self.facade = AnnofabApiFacade(service)
@@ -350,6 +401,8 @@ class VisualizingStatisticsMain:
             measurement_datetime=annofabapi.utils.str_now(),
             task_completion_criteria=self.task_completion_criteria,
             query=self.filtering_query,
+            production_volume_include_labels=self.production_volume_include_labels,
+            production_volume_exclude_labels=self.production_volume_exclude_labels,
         )
         return project_summary
 
@@ -370,6 +423,9 @@ class VisualizingStatisticsMain:
         # 動画プロジェクトの場合、annotation_duration_secondを生産量に含める
         custom_production_volume = self.custom_production_volume
 
+        # 動画プロジェクトかどうかを判定
+        is_video_project = project_info.input_data_type == "movie"
+
         project_dir = ProjectDir(
             output_project_dir,
             self.task_completion_criteria,
@@ -429,7 +485,8 @@ class VisualizingStatisticsMain:
             output_only_text=self.output_only_text,
             production_volume_include_labels=self.production_volume_include_labels,
             production_volume_exclude_labels=self.production_volume_exclude_labels,
-            include_annotation_duration_seconds=(project_info.input_data_type == InputDataType.MOVIE.value),
+            include_annotation_duration_seconds=is_video_project,
+            include_video_duration_minutes=is_video_project,
         )
 
         write_obj._catch_exception(write_obj.write_user_performance)()  # noqa: SLF001
@@ -447,7 +504,7 @@ class VisualizingStatisticsMain:
         self,
         project_id: str,
         root_output_dir: Path,
-    ) -> Optional[Path]:
+    ) -> Path | None:
         try:
             output_project_dir = root_output_dir / project_id
             self.visualize_statistics(
@@ -464,7 +521,7 @@ class VisualizingStatisticsMain:
         project_id_list: list[str],
         root_output_dir: Path,
         *,
-        parallelism: Optional[int] = None,
+        parallelism: int | None = None,
     ) -> list[Path]:
         output_project_dir_list: list[Path] = []
 
@@ -527,11 +584,11 @@ class VisualizeStatistics(CommandLine):
         temp_dir: Path,
         filtering_query: FilteringQuery,
         task_completion_criteria: TaskCompletionCriteria,
-        user_id_list: Optional[list[str]],
+        user_id_list: list[str] | None,
         actual_worktime: ActualWorktime,
-        annotation_count: Optional[AnnotationCount],
-        input_data_count: Optional[InputDataCount],
-        custom_production_volume: Optional[CustomProductionVolume],
+        annotation_count: AnnotationCount | None,
+        input_data_count: InputDataCount | None,
+        custom_production_volume: CustomProductionVolume | None,
         download_latest: bool,  # noqa: FBT001
         is_get_task_histories_one_of_each: bool,  # noqa: FBT001
         minimal_output: bool,  # noqa: FBT001
@@ -539,9 +596,9 @@ class VisualizeStatistics(CommandLine):
         not_download_visualization_source_files: bool,  # noqa: FBT001
         project_id_list: list[str],
         root_output_dir: Path,
-        parallelism: Optional[int],
-        production_volume_include_labels: Optional[list[str]] = None,
-        production_volume_exclude_labels: Optional[list[str]] = None,
+        parallelism: int | None,
+        production_volume_include_labels: list[str] | None = None,
+        production_volume_exclude_labels: list[str] | None = None,
     ) -> None:
         main_obj = VisualizingStatisticsMain(
             service=self.service,
@@ -596,7 +653,7 @@ class VisualizeStatistics(CommandLine):
         task_completion_criteria = TaskCompletionCriteria(args.task_completion_criteria)
 
         dict_task_query = annofabcli.common.cli.get_json_from_args(args.task_query)
-        task_query: Optional[TaskQuery] = None
+        task_query: TaskQuery | None = None
         if dict_task_query is not None:
             task_query = TaskQuery.from_dict(dict_task_query)
             logger.warning("引数 '--task_query' は非推奨です。代わりに '--task_completion_criteria' を指定してください。")
@@ -852,7 +909,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "visualize"
     subcommand_help = "生産性に関するCSVファイルやグラフを出力します。"
     description = "生産性に関するCSVファイルやグラフを出力します。"

annofabcli/statistics/visualize_video_duration.py

@@ -11,7 +11,6 @@ from collections.abc import Collection, Sequence
 from enum import Enum
 from functools import partial
 from pathlib import Path
-from typing import Optional, Union
 
 import bokeh
 import numpy
@@ -22,7 +21,6 @@ from bokeh.models.annotations.labels import Title
 from bokeh.models.widgets.markups import PreText
 from bokeh.plotting import ColumnDataSource, figure
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -49,9 +47,9 @@ def plot_video_duration(
     output_file: Path,
     *,
     time_unit: TimeUnit,
-    bin_width: Optional[float] = None,
-    project_id: Optional[str] = None,
-    project_title: Optional[str] = None,
+    bin_width: float | None = None,
+    project_id: str | None = None,
+    project_title: str | None = None,
 ) -> None:
     """
     ラベルごとの区間アノテーションの長さのヒストグラムを出力します。
@@ -66,7 +64,7 @@ def plot_video_duration(
 
     def create_figure(
         durations: Sequence[float],
-        bins: Union[int, numpy.ndarray],
+        bins: int | numpy.ndarray,
         histogram_range: tuple[float, float],
         title: str,
         x_axis_label: str,
@@ -75,10 +73,10 @@ def plot_video_duration(
         hist, bin_edges = numpy.histogram(durations, bins=bins, range=histogram_range)
 
         df_histogram = pandas.DataFrame({"frequency": hist, "left": bin_edges[:-1], "right": bin_edges[1:]})
-        df_histogram["interval"] = [f"{left:.1f} to {right:.1f}" for left, right in zip(df_histogram["left"], df_histogram["right"])]
+        df_histogram["interval"] = [f"{left:.1f} to {right:.1f}" for left, right in zip(df_histogram["left"], df_histogram["right"], strict=False)]
 
         source = ColumnDataSource(df_histogram)
-        fig = figure(
+        fig = figure(  # type: ignore[call-arg]
             width=400,
             height=300,
             x_axis_label=x_axis_label,
@@ -108,7 +106,7 @@ def plot_video_duration(
         if bins_sequence[-1] == max_duration:
             bins_sequence = numpy.append(bins_sequence, bins_sequence[-1] + bin_width)
 
-        bins: Union[int, numpy.ndarray] = bins_sequence
+        bins: int | numpy.ndarray = bins_sequence
     else:
         bins = BIN_COUNT
 
@@ -142,10 +140,10 @@ def get_video_duration_list(
     input_data_json: Path,
     task_json: Path,
     *,
-    input_data_ids: Optional[Collection[str]] = None,
+    input_data_ids: Collection[str] | None = None,
     from_datetime: datetime.datetime | None = None,
     to_datetime: datetime.datetime | None = None,
-    task_ids: Optional[Collection[str]] = None,
+    task_ids: Collection[str] | None = None,
 ) -> list[float]:
     """
     入力データである動画の長さ（単位は秒）の一覧を取得します。
@@ -214,13 +212,13 @@ class VisualizeVideoDuration(CommandLine):
         output_html: Path,
         *,
         time_unit: TimeUnit,
-        project_id: Optional[str] = None,
-        project_title: Optional[str] = None,
-        bin_width: Optional[float] = None,
-        input_data_ids: Optional[Collection[str]] = None,
-        task_ids: Optional[Collection[str]] = None,
-        from_date: Optional[str] = None,
-        to_date: Optional[str] = None,
+        project_id: str | None = None,
+        project_title: str | None = None,
+        bin_width: float | None = None,
+        input_data_ids: Collection[str] | None = None,
+        task_ids: Collection[str] | None = None,
+        from_date: str | None = None,
+        to_date: str | None = None,
     ) -> None:
         tz_info = datetime.datetime.now().astimezone().tzinfo
         from_datetime = datetime.datetime.fromisoformat(from_date).astimezone(tz_info) if from_date is not None else None
@@ -250,7 +248,7 @@ class VisualizeVideoDuration(CommandLine):
         if not self.validate(args):
             sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
 
-        project_id: Optional[str] = args.project_id
+        project_id: str | None = args.project_id
         if project_id is not None:
             super().validate_project(project_id, project_member_roles=[ProjectMemberRole.OWNER, ProjectMemberRole.TRAINING_DATA_USER])
             project, _ = self.service.api.get_project(project_id)
@@ -392,7 +390,7 @@ def main(args: argparse.Namespace) -> None:
     VisualizeVideoDuration(service, facade, args).main()
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "visualize_video_duration"
     subcommand_help = "動画の長さをヒストグラムで可視化します。"
     epilog = "オーナロールまたはアノテーションユーザロールを持つユーザで実行してください。"

annofabcli/supplementary/delete_supplementary_data.py

@@ -3,7 +3,7 @@ import logging
 import sys
 from collections import defaultdict
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -36,7 +36,7 @@ def get_input_data_supplementary_data_dict_from_csv(csv_path: Path) -> InputData
         dtype={"input_data_id": "string", "supplementary_data_id": "string"},
     )
     input_data_dict: InputDataSupplementaryDataDict = defaultdict(list)
-    for input_data_id, supplementary_data_id in zip(df["input_data_id"], df["supplementary_data_id"]):
+    for input_data_id, supplementary_data_id in zip(df["input_data_id"], df["supplementary_data_id"], strict=False):
         input_data_dict[input_data_id].append(supplementary_data_id)
     return input_data_dict
 
@@ -70,7 +70,7 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
 
         """
 
-        def _get_supplementary_data_list(supplementary_data_id: str) -> Optional[dict[str, Any]]:
+        def _get_supplementary_data_list(supplementary_data_id: str) -> dict[str, Any] | None:
             return first_true(supplementary_data_list, pred=lambda e: e["supplementary_data_id"] == supplementary_data_id)
 
         input_data = self.service.wrapper.get_input_data_or_none(project_id, input_data_id)
@@ -275,7 +275,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "delete"
     subcommand_help = "補助情報を削除します。"
     description = "補助情報を削除します。"

annofabcli/supplementary/list_supplementary_data.py

@@ -7,7 +7,7 @@ import logging
 import multiprocessing
 import tempfile
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.models import SupplementaryData
@@ -72,7 +72,7 @@ class ListSupplementaryDataMain:
             logger.warning(f"input_data_id='{input_data_index}': 補助情報の取得に失敗しました。", exc_info=True)
             return []
 
-    def get_all_supplementary_data_list(self, input_data_id_list: list[str], *, parallelism: Optional[int] = None) -> list[SupplementaryData]:
+    def get_all_supplementary_data_list(self, input_data_id_list: list[str], *, parallelism: int | None = None) -> list[SupplementaryData]:
         """
         補助情報一覧を取得する。
         """
@@ -168,7 +168,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "list"
     subcommand_help = "補助情報一覧を出力します。"
     description = "補助情報一覧を出力します。"

annofabcli/supplementary/put_supplementary_data.py

@@ -7,7 +7,7 @@ from dataclasses import dataclass
 from functools import partial
 from multiprocessing import Pool
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -49,9 +49,9 @@ class CliSupplementaryData(DataClassJsonMixin):
     input_data_id: str
     supplementary_data_name: str
     supplementary_data_path: str
-    supplementary_data_id: Optional[str] = None
-    supplementary_data_type: Optional[str] = None
-    supplementary_data_number: Optional[int] = None
+    supplementary_data_id: str | None = None
+    supplementary_data_type: str | None = None
+    supplementary_data_number: int | None = None
 
 
 @dataclass
@@ -64,9 +64,9 @@ class SupplementaryDataForPut:
     supplementary_data_id: str
     supplementary_data_name: str
     supplementary_data_path: str
-    supplementary_data_type: Optional[str]
+    supplementary_data_type: str | None
     supplementary_data_number: int
-    last_updated_datetime: Optional[str]
+    last_updated_datetime: str | None
 
 
 class SubPutSupplementaryData:
@@ -249,7 +249,7 @@ class PutSupplementaryData(CommandLine):
         supplementary_data_list: list[CliSupplementaryData],
         *,
         overwrite: bool = False,
-        parallelism: Optional[int] = None,
+        parallelism: int | None = None,
     ) -> None:
         """
         補助情報を一括で登録する。
@@ -412,7 +412,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "put"
     subcommand_help = "補助情報を登録します。"
     description = "補助情報を登録します。"

annofabcli/supplementary/subcommand_supplementary.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
 import annofabcli.supplementary.delete_supplementary_data
 import annofabcli.supplementary.list_supplementary_data
@@ -17,7 +15,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.supplementary.put_supplementary_data.add_parser(subparsers)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "supplementary"
     subcommand_help = "補助情報関係のサブコマンド"
     description = "補助情報関係のサブコマンド"