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

annofabcli/statistics/visualization/dataframe/worktime_per_date.py

@@ -8,12 +8,10 @@ from __future__ import annotations
 import datetime
 import logging
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
-import bokeh
 import bokeh.layouts
-import bokeh.palettes
 import pandas
 from bokeh.models.ui import UIElement
 from bokeh.plotting import ColumnDataSource
@@ -250,9 +248,9 @@ class WorktimePerDate:
         project_id: str,
         actual_worktime: ActualWorktime,
         *,
-        task_history_event_json: Optional[Path] = None,
-        start_date: Optional[str] = None,
-        end_date: Optional[str] = None,
+        task_history_event_json: Path | None = None,
+        start_date: str | None = None,
+        end_date: str | None = None,
     ) -> WorktimePerDate:
         """
 
@@ -371,8 +369,8 @@ class WorktimePerDate:
         self,
         output_file: Path,
         *,
-        target_user_id_list: Optional[list[str]] = None,
-        metadata: Optional[dict[str, Any]] = None,
+        target_user_id_list: list[str] | None = None,
+        metadata: dict[str, Any] | None = None,
     ) -> None:
         """
         作業時間の累積値をプロットする。
@@ -468,7 +466,7 @@ class WorktimePerDate:
             username = df_subset.iloc[0]["username"]
 
             line_count += 1
-            for line_graph, (x_column, y_column) in zip(line_graph_list, columns_list):
+            for line_graph, (x_column, y_column) in zip(line_graph_list, columns_list, strict=False):
                 line_graph.add_line(
                     source=source,
                     x_column=x_column,
@@ -510,10 +508,10 @@ class WorktimePerDate:
 
     def mask_user_info(
         self,
-        to_replace_for_user_id: Optional[dict[str, str]] = None,
-        to_replace_for_username: Optional[dict[str, str]] = None,
-        to_replace_for_account_id: Optional[dict[str, str]] = None,
-        to_replace_for_biography: Optional[dict[str, str]] = None,
+        to_replace_for_user_id: dict[str, str] | None = None,
+        to_replace_for_username: dict[str, str] | None = None,
+        to_replace_for_account_id: dict[str, str] | None = None,
+        to_replace_for_biography: dict[str, str] | None = None,
     ) -> WorktimePerDate:
         """
         引数から渡された情報を元に、インスタンス変数`df`内のユーザー情報をマスクして、新しいインスタンスを返します。

annofabcli/statistics/visualization/filtering_query.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import logging
 from collections.abc import Collection
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import Any
 
 from annofabapi.dataclass.task import Task as DcTask
 from annofabapi.models import Task
@@ -21,13 +21,13 @@ class FilteringQuery:
     絞り込み条件
     """
 
-    task_query: Optional[TaskQuery] = None
-    start_date: Optional[str] = None
-    end_date: Optional[str] = None
-    ignored_task_ids: Optional[Collection[str]] = None
+    task_query: TaskQuery | None = None
+    start_date: str | None = None
+    end_date: str | None = None
+    ignored_task_ids: Collection[str] | None = None
 
 
-def _get_first_annotation_started_datetime(sub_task_history_list: list[dict[str, Any]]) -> Optional[str]:
+def _get_first_annotation_started_datetime(sub_task_history_list: list[dict[str, Any]]) -> str | None:
     """
     1個のタスクのタスク履歴一覧から、最初に教師付フェーズを作業した日時を取得します。
     """
@@ -40,7 +40,7 @@ def _get_first_annotation_started_datetime(sub_task_history_list: list[dict[str,
     return task_history_list_with_annotation_phase[0]["started_datetime"]
 
 
-def filter_task_histories(task_histories: dict[str, list[dict[str, Any]]], *, start_date: Optional[str] = None, end_date: Optional[str] = None) -> dict[str, list[dict[str, Any]]]:
+def filter_task_histories(task_histories: dict[str, list[dict[str, Any]]], *, start_date: str | None = None, end_date: str | None = None) -> dict[str, list[dict[str, Any]]]:
     """
     タスク履歴を絞り込みます。
 

annofabcli/statistics/visualization/project_dir.py

@@ -4,7 +4,7 @@ import json
 import logging
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 from annofabapi.models import TaskPhase
 from dataclasses_json import DataClassJsonMixin
@@ -36,13 +36,9 @@ class ProjectDir(DataClassJsonMixin):
 
     Args:
         project_dir: ``annofabcli statistics visualize``コマンドによって出力されたプロジェクトディレクトリ
-        metadata:
-
-    タスクの完了条件（task_completion_criteria）は以下のいずれかです。
-        - acceptance_completed: 受入フェーズの完了状態
-        - acceptance_reached: 受入フェーズに到達
-        - inspection_reached: 検査フェーズまたは受入フェーズに到達
-        - annotation_started: 教師付フェーズが着手された
+        task_completion_criteria: タスクの完了条件
+        metadata: プロジェクトIDや絞り込み条件などの情報が含まれるメタデータ。この情報はグラフに埋め込まれます。
+        custom_production_volume_list: 独自の生産量に関する列情報のリスト
     """
 
     FILENAME_WHOLE_PERFORMANCE = "全体の生産性と品質.csv"
@@ -61,8 +57,8 @@ class ProjectDir(DataClassJsonMixin):
         project_dir: Path,
         task_completion_criteria: TaskCompletionCriteria,
         *,
-        metadata: Optional[dict[str, Any]] = None,
-        custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None,
+        metadata: dict[str, Any] | None = None,
+        custom_production_volume_list: list[ProductionVolumeColumn] | None = None,
     ) -> None:
         self.project_dir = project_dir
         self.task_completion_criteria = task_completion_criteria
@@ -130,7 +126,7 @@ class ProjectDir(DataClassJsonMixin):
         obj: AbstractPhaseCumulativeProductivity,
         phase: TaskPhase,
         *,
-        user_id_list: Optional[list[str]] = None,
+        user_id_list: list[str] | None = None,
         minimal_output: bool = False,
     ) -> None:
         """
@@ -179,7 +175,7 @@ class ProjectDir(DataClassJsonMixin):
         phase_name = self.get_phase_name_for_filename(phase)
         obj.to_csv(self.project_dir / Path(f"{phase_name}者_{phase_name}開始日list.csv"))
 
-    def write_performance_line_graph_per_date(self, obj: AbstractPhaseProductivityPerDate, phase: TaskPhase, *, user_id_list: Optional[list[str]] = None) -> None:
+    def write_performance_line_graph_per_date(self, obj: AbstractPhaseProductivityPerDate, phase: TaskPhase, *, user_id_list: list[str] | None = None) -> None:
         """
         指定したフェーズの開始日ごとの作業時間や生産性情報を、折れ線グラフとして出力します。
         """
@@ -396,7 +392,7 @@ class ProjectDir(DataClassJsonMixin):
         """`ユーザ_日付list-作業時間.csvを書き込む"""
         obj.to_csv(self.project_dir / self.FILENAME_WORKTIME_PER_DATE_USER)
 
-    def write_worktime_line_graph(self, obj: WorktimePerDate, user_id_list: Optional[list[str]] = None) -> None:
+    def write_worktime_line_graph(self, obj: WorktimePerDate, user_id_list: list[str] | None = None) -> None:
         """横軸が日付、縦軸がユーザごとの作業時間である折れ線グラフを出力します。"""
         obj.plot_cumulatively(self.project_dir / "line-graph/累積折れ線-横軸_日-縦軸_作業時間.html", target_user_id_list=user_id_list, metadata=self.metadata)
 
@@ -429,7 +425,7 @@ class ProjectDir(DataClassJsonMixin):
         """
         print_json(obj.to_dict(encode_json=True), output=self.project_dir / self.FILENAME_MERGE_INFO, is_pretty=True)
 
-    def read_metadata(self) -> Optional[dict[str, Any]]:
+    def read_metadata(self) -> dict[str, Any] | None:
         """
         `project_info`または`merge_info`の内容をメタデータとして読み込む。
         どちらも存在しない場合はNoneを返す。
@@ -448,6 +444,17 @@ class ProjectDir(DataClassJsonMixin):
 
         return None
 
+    def get_project_title(self) -> str:
+        """
+        `project_info`に記載されているプジェクトのタイトルを返します。
+        ただし`self.is_merged()`がTrueの場合は、`project_info`が存在しないので空文字を返します。
+        """
+        if self.is_merged():
+            return ""
+
+        project_info = self.read_project_info()
+        return project_info.project_title
+
 
 @dataclass
 class ProjectInfo(DataClassJsonMixin):
@@ -464,6 +471,12 @@ class ProjectInfo(DataClassJsonMixin):
     query: FilteringQuery
     """集計対象を絞り込むためのクエリ"""
 
+    production_volume_include_labels: list[str] | None = None
+    """生産量に含める「アノテーション仕様のラベル名（英語）」のリスト。Noneの場合、すべてのラベルを含む。"""
+
+    production_volume_exclude_labels: list[str] | None = None
+    """生産量から除外する「アノテーション仕様のラベル名（英語）」のリスト。Noneの場合、除外しない。"""
+
 
 @dataclass
 class MergingInfo(DataClassJsonMixin):

annofabcli/statistics/visualize_annotation_count.py

@@ -10,7 +10,7 @@ from collections import defaultdict
 from collections.abc import Collection, Sequence
 from functools import partial
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import bokeh
 import numpy
@@ -20,7 +20,6 @@ from bokeh.models import LayoutDOM
 from bokeh.models.widgets.markups import Div
 from bokeh.plotting import figure
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.bokeh import convert_1d_figure_list_to_2d, create_pretext_from_metadata
 from annofabcli.common.cli import (
@@ -56,11 +55,11 @@ def _get_y_axis_label(group_by: GroupBy) -> str:
         raise RuntimeError(f"group_by='{group_by}'が対象外です。")
 
 
-def convert_to_2d_figure_list(figures_dict: dict[tuple[str, str], list[figure]], *, ncols: int = 4) -> list[list[Optional[LayoutDOM]]]:
+def convert_to_2d_figure_list(figures_dict: dict[tuple[str, str], list[figure]], *, ncols: int = 4) -> list[list[LayoutDOM | None]]:
     """
     grid layout用に2次元のfigureリストに変換する。
     """
-    row_list: list[list[Optional[LayoutDOM]]] = []
+    row_list: list[list[LayoutDOM | None]] = []
 
     for (label_name, attribute_name), figure_list in figures_dict.items():
         row_list.append([Div(text=f"<h3>ラベル名='{label_name}', 属性名='{attribute_name}'</h3>")])
@@ -68,7 +67,7 @@ def convert_to_2d_figure_list(figures_dict: dict[tuple[str, str], list[figure]],
         for i in range(math.ceil(len(figure_list) / ncols)):
             start = i * ncols
             end = (i + 1) * ncols
-            row: list[Optional[LayoutDOM]] = []
+            row: list[LayoutDOM | None] = []
             row.extend(figure_list[start:end])
             if len(row) < ncols:
                 row.extend([None] * (ncols - len(row)))
@@ -101,11 +100,11 @@ def plot_label_histogram(
     group_by: GroupBy,
     output_file: Path,
     *,
-    prior_keys: Optional[list[str]] = None,
-    bin_width: Optional[int] = None,
+    prior_keys: list[str] | None = None,
+    bin_width: int | None = None,
     exclude_empty_value: bool = False,
     arrange_bin_edge: bool = False,
-    metadata: Optional[dict[str, Any]] = None,
+    metadata: dict[str, Any] | None = None,
 ) -> None:
     """
     ラベルごとのアノテーション数のヒストグラムを出力する。
@@ -152,7 +151,7 @@ def plot_label_histogram(
 
     max_annotation_count = df.max(numeric_only=True).max()
 
-    figure_list_2d: list[list[Optional[LayoutDOM]]] = [
+    figure_list_2d: list[list[LayoutDOM | None]] = [
         [
             Div(text="<h3>アノテーション数の分布（ラベル名ごと）</h3>"),
         ]
@@ -203,11 +202,11 @@ def plot_attribute_histogram(  # noqa: PLR0915
     group_by: GroupBy,
     output_file: Path,
     *,
-    prior_keys: Optional[list[AttributeValueKey]] = None,
-    bin_width: Optional[int] = None,
+    prior_keys: list[AttributeValueKey] | None = None,
+    bin_width: int | None = None,
     exclude_empty_value: bool = False,
     arrange_bin_edge: bool = False,
-    metadata: Optional[dict[str, Any]] = None,
+    metadata: dict[str, Any] | None = None,
 ) -> None:
     """
     属性値ごとのアノテーション数のヒストグラムを出力する。
@@ -256,7 +255,7 @@ def plot_attribute_histogram(  # noqa: PLR0915
 
     max_annotation_count = df.max(numeric_only=True).max()
 
-    figure_list_2d: list[list[Optional[LayoutDOM]]] = [
+    figure_list_2d: list[list[LayoutDOM | None]] = [
         [
             Div(text="<h3>アノテーション数の分布（属性値ごと）</h3>"),
         ]
@@ -322,10 +321,10 @@ class VisualizeAnnotationCount(CommandLine):
         annotation_path: Path,
         output_dir: Path,
         *,
-        bin_width: Optional[int] = None,
-        project_id: Optional[str] = None,
-        target_task_ids: Optional[Collection[str]] = None,
-        task_query: Optional[TaskQuery] = None,
+        bin_width: int | None = None,
+        project_id: str | None = None,
+        target_task_ids: Collection[str] | None = None,
+        task_query: TaskQuery | None = None,
         exclude_empty_value: bool = False,
         arrange_bin_edge: bool = False,
     ) -> None:
@@ -333,8 +332,8 @@ class VisualizeAnnotationCount(CommandLine):
         attributes_count_html = output_dir / "attributes_count.html"
 
         # 集計対象の属性を、選択肢系の属性にする
-        annotation_specs: Optional[AnnotationSpecs] = None
-        non_selective_attribute_name_keys: Optional[list[AttributeNameKey]] = None
+        annotation_specs: AnnotationSpecs | None = None
+        non_selective_attribute_name_keys: list[AttributeNameKey] | None = None
         if project_id is not None:
             annotation_specs = AnnotationSpecs(self.service, project_id)
             non_selective_attribute_name_keys = annotation_specs.non_selective_attribute_name_keys()
@@ -361,8 +360,8 @@ class VisualizeAnnotationCount(CommandLine):
         else:
             raise RuntimeError(f"group_by='{group_by}'が対象外です。")
 
-        label_keys: Optional[list[str]] = None
-        attribute_value_keys: Optional[list[AttributeValueKey]] = None
+        label_keys: list[str] | None = None
+        attribute_value_keys: list[AttributeValueKey] | None = None
         if annotation_specs is not None:
             label_keys = annotation_specs.label_keys()
             attribute_value_keys = annotation_specs.selective_attribute_value_keys()
@@ -406,7 +405,7 @@ class VisualizeAnnotationCount(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])
 
@@ -534,7 +533,7 @@ def main(args: argparse.Namespace) -> None:
     VisualizeAnnotationCount(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_annotation_count"
     subcommand_help = "各ラベル、各属性値のアノテーション数をヒストグラムで可視化します。"
     description = "各ラベル、各属性値のアノテーション数をヒストグラムで可視化したファイルを出力します。"

annofabcli/statistics/visualize_annotation_duration.py

@@ -9,7 +9,7 @@ from collections.abc import Collection, Sequence
 from enum import Enum
 from functools import partial
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import bokeh
 import numpy
@@ -19,7 +19,6 @@ from bokeh.models import LayoutDOM
 from bokeh.models.widgets.markups import Div
 from bokeh.plotting import figure
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.bokeh import convert_1d_figure_list_to_2d, create_pretext_from_metadata
 from annofabcli.common.cli import (
@@ -56,11 +55,11 @@ def plot_annotation_duration_histogram_by_label(  # noqa: PLR0915
     output_file: Path,
     *,
     time_unit: TimeUnit,
-    bin_width: Optional[float] = None,
-    prior_keys: Optional[list[str]] = None,
+    bin_width: float | None = None,
+    prior_keys: list[str] | None = None,
     exclude_empty_value: bool = False,
     arrange_bin_edge: bool = False,
-    metadata: Optional[dict[str, Any]] = None,
+    metadata: dict[str, Any] | None = None,
 ) -> None:
     """
     ラベルごとの区間アノテーションの長さのヒストグラムを出力します。
@@ -88,7 +87,7 @@ def plot_annotation_duration_histogram_by_label(  # noqa: PLR0915
             df = df / 60
         return df
 
-    def get_histogram_range(df: pandas.DataFrame) -> Optional[tuple[float, float]]:
+    def get_histogram_range(df: pandas.DataFrame) -> tuple[float, float] | None:
         if arrange_bin_edge:
             return (
                 df.min(numeric_only=True).min(),
@@ -101,7 +100,7 @@ def plot_annotation_duration_histogram_by_label(  # noqa: PLR0915
 
     max_duration = df.max(numeric_only=True).max()
 
-    figure_list_2d: list[list[Optional[LayoutDOM]]] = [
+    figure_list_2d: list[list[LayoutDOM | None]] = [
         [
             Div(text="<h3>区間アノテーションの長さの分布（ラベル名ごと）</h3>"),
         ]
@@ -165,11 +164,11 @@ def plot_annotation_duration_histogram_by_attribute(  # noqa: PLR0915
     output_file: Path,
     *,
     time_unit: TimeUnit,
-    bin_width: Optional[float] = None,
-    prior_keys: Optional[list[AttributeValueKey]] = None,
+    bin_width: float | None = None,
+    prior_keys: list[AttributeValueKey] | None = None,
     exclude_empty_value: bool = False,
     arrange_bin_edge: bool = False,
-    metadata: Optional[dict[str, Any]] = None,
+    metadata: dict[str, Any] | None = None,
 ) -> None:
     """
     属性値ごとの区間アノテーションの長さのヒストグラムを出力します。
@@ -198,7 +197,7 @@ def plot_annotation_duration_histogram_by_attribute(  # noqa: PLR0915
             df = df / 60
         return df
 
-    def get_histogram_range(df: pandas.DataFrame) -> Optional[tuple[float, float]]:
+    def get_histogram_range(df: pandas.DataFrame) -> tuple[float, float] | None:
         if arrange_bin_edge:
             return (
                 df.min(numeric_only=True).min(),
@@ -224,7 +223,7 @@ def plot_annotation_duration_histogram_by_attribute(  # noqa: PLR0915
     max_duration = df.max(numeric_only=True).max()
     x_axis_label = "区間アノテーションの長さ[分]" if time_unit == TimeUnit.MINUTE else "区間アノテーションの長さ[秒]"
 
-    figure_list_2d: list[list[Optional[LayoutDOM]]] = [
+    figure_list_2d: list[list[LayoutDOM | None]] = [
         [
             Div(text="<h3>区間アノテーションの長さの分布（属性値ごと）</h3>"),
         ]
@@ -290,10 +289,10 @@ class VisualizeAnnotationDuration(CommandLine):
         output_dir: Path,
         time_unit: TimeUnit,
         *,
-        bin_width: Optional[int] = None,
-        project_id: Optional[str] = None,
-        target_task_ids: Optional[Collection[str]] = None,
-        task_query: Optional[TaskQuery] = None,
+        bin_width: int | None = None,
+        project_id: str | None = None,
+        target_task_ids: Collection[str] | None = None,
+        task_query: TaskQuery | None = None,
         exclude_empty_value: bool = False,
         arrange_bin_edge: bool = False,
     ) -> None:
@@ -301,8 +300,8 @@ class VisualizeAnnotationDuration(CommandLine):
         duration_by_attribute_html = output_dir / "annotation_duration_by_attribute.html"
 
         # 集計対象の属性を、選択肢系の属性にする
-        annotation_specs: Optional[AnnotationSpecs] = None
-        non_selective_attribute_name_keys: Optional[list[AttributeNameKey]] = None
+        annotation_specs: AnnotationSpecs | None = None
+        non_selective_attribute_name_keys: list[AttributeNameKey] | None = None
         if project_id is not None:
             annotation_specs = AnnotationSpecs(self.service, project_id, annotation_type=DefaultAnnotationType.RANGE.value)
             non_selective_attribute_name_keys = annotation_specs.non_selective_attribute_name_keys()
@@ -315,8 +314,8 @@ class VisualizeAnnotationDuration(CommandLine):
             task_query=task_query,
         )
 
-        label_keys: Optional[list[str]] = None
-        attribute_value_keys: Optional[list[AttributeValueKey]] = None
+        label_keys: list[str] | None = None
+        attribute_value_keys: list[AttributeValueKey] | None = None
         if annotation_specs is not None:
             label_keys = annotation_specs.label_keys()
             attribute_value_keys = annotation_specs.selective_attribute_value_keys()
@@ -359,7 +358,7 @@ class VisualizeAnnotationDuration(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)
@@ -487,7 +486,7 @@ def main(args: argparse.Namespace) -> None:
     VisualizeAnnotationDuration(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_annotation_duration"
     subcommand_help = "ラベルごとまたは属性値ごとに区間アノテーションの長さをヒストグラムで可視化したファイルを出力します。"
     epilog = "オーナロールまたはアノテーションユーザロールを持つユーザで実行してください。"

annofabcli/statistics/visualize_statistics.py

@@ -6,9 +6,10 @@ 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
@@ -74,13 +75,13 @@ 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:
@@ -101,9 +102,9 @@ class WriteCsvGraph:
         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]:
         """
@@ -156,7 +157,7 @@ class WriteCsvGraph:
 
         return self.task
 
-    def _prepare_custom_production_volume(self) -> Optional[CustomProductionVolume]:
+    def _prepare_custom_production_volume(self) -> CustomProductionVolume | None:
         """カスタム生産量の準備を行う"""
         custom_production_volume = self.custom_production_volume
 
@@ -170,7 +171,7 @@ class WriteCsvGraph:
 
         return custom_production_volume
 
-    def _add_annotation_duration(self, custom_production_volume: Optional[CustomProductionVolume]) -> CustomProductionVolume:
+    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(
@@ -198,7 +199,7 @@ class WriteCsvGraph:
             # CustomProductionVolumeが存在しない場合、新規作成
             return CustomProductionVolume(annotation_duration_obj.df, custom_production_volume_list=[annotation_duration_column])
 
-    def _add_video_duration(self, custom_production_volume: Optional[CustomProductionVolume]) -> CustomProductionVolume:
+    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()
@@ -297,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)
@@ -309,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()
 
@@ -328,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()
 
@@ -362,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)
@@ -400,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
 
@@ -501,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(
@@ -518,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] = []
 
@@ -581,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
@@ -593,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,
@@ -650,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' を指定してください。")
@@ -906,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ファイルやグラフを出力します。"