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

annofabcli/statistics/visualization/dataframe/productivity_per_date.py

@@ -7,11 +7,9 @@ from __future__ import annotations
 import abc
 import logging
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
-import bokeh
 import bokeh.layouts
-import bokeh.palettes
 import pandas
 from annofabapi.models import TaskPhase
 from bokeh.models.ui import UIElement
@@ -80,7 +78,7 @@ class AbstractPhaseProductivityPerDate(abc.ABC):
     PLOT_WIDTH = 1200
     PLOT_HEIGHT = 600
 
-    def __init__(self, df: pandas.DataFrame, phase: TaskPhase, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> None:
+    def __init__(self, df: pandas.DataFrame, phase: TaskPhase, *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> None:
         self.df = df
         self.phase = phase
         self.custom_production_volume_list = custom_production_volume_list if custom_production_volume_list is not None else []
@@ -97,7 +95,7 @@ class AbstractPhaseProductivityPerDate(abc.ABC):
         line_graph_list: list[LineGraph],
         plotted_users: list[tuple[str, str]],
         output_file: Path,
-        metadata: Optional[dict[str, Any]],
+        metadata: dict[str, Any] | None,
     ) -> None:
         """
         折れ線グラフを、HTMLファイルに出力します。
@@ -139,8 +137,8 @@ class AbstractPhaseProductivityPerDate(abc.ABC):
         production_volume_name: str,
         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:
         raise NotImplementedError()
 
@@ -220,7 +218,7 @@ class AbstractPhaseProductivityPerDate(abc.ABC):
 class AnnotatorProductivityPerDate(AbstractPhaseProductivityPerDate):
     """教師付開始日ごとの教師付者の生産性に関する情報"""
 
-    def __init__(self, df: pandas.DataFrame, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> None:
+    def __init__(self, df: pandas.DataFrame, *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> None:
         super().__init__(df, phase=TaskPhase.ANNOTATION, custom_production_volume_list=custom_production_volume_list)
 
     @classmethod
@@ -234,8 +232,8 @@ class AnnotatorProductivityPerDate(AbstractPhaseProductivityPerDate):
         production_volume_name: str,
         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:
         """
         生産性を教師付作業者ごとにプロットする。
@@ -344,7 +342,7 @@ class AnnotatorProductivityPerDate(AbstractPhaseProductivityPerDate):
             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):
                 if y_column.endswith(WEEKLY_MOVING_AVERAGE_COLUMN_SUFFIX):
                     line_graph.add_moving_average_line(
                         source=source,
@@ -380,7 +378,7 @@ class AnnotatorProductivityPerDate(AbstractPhaseProductivityPerDate):
 class InspectorProductivityPerDate(AbstractPhaseProductivityPerDate):
     """検査開始日ごとの検査者の生産性に関する情報"""
 
-    def __init__(self, df: pandas.DataFrame, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> None:
+    def __init__(self, df: pandas.DataFrame, *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> None:
         super().__init__(df, phase=TaskPhase.INSPECTION, custom_production_volume_list=custom_production_volume_list)
 
     @classmethod
@@ -394,8 +392,8 @@ class InspectorProductivityPerDate(AbstractPhaseProductivityPerDate):
         production_volume_name: str,
         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:
         """
         アノテーション単位の生産性を受入作業者ごとにプロットする。
@@ -477,7 +475,7 @@ class InspectorProductivityPerDate(AbstractPhaseProductivityPerDate):
             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):
                 if y_column.endswith(WEEKLY_MOVING_AVERAGE_COLUMN_SUFFIX):
                     line_graph.add_moving_average_line(
                         source=source,
@@ -517,7 +515,7 @@ class InspectorProductivityPerDate(AbstractPhaseProductivityPerDate):
 class AcceptorProductivityPerDate(AbstractPhaseProductivityPerDate):
     """受入開始日ごとの受入者の生産性に関する情報"""
 
-    def __init__(self, df: pandas.DataFrame, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> None:
+    def __init__(self, df: pandas.DataFrame, *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> None:
         super().__init__(df, phase=TaskPhase.ACCEPTANCE, custom_production_volume_list=custom_production_volume_list)
 
     @classmethod
@@ -531,8 +529,8 @@ class AcceptorProductivityPerDate(AbstractPhaseProductivityPerDate):
         production_volume_name: str,
         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:
         """
         アノテーション単位の生産性を受入作業者ごとにプロットする。
@@ -617,7 +615,7 @@ class AcceptorProductivityPerDate(AbstractPhaseProductivityPerDate):
             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):
                 if y_column.endswith(WEEKLY_MOVING_AVERAGE_COLUMN_SUFFIX):
                     line_graph.add_moving_average_line(
                         source=source,

annofabcli/statistics/visualization/dataframe/project_performance.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import logging
 from pathlib import Path
-from typing import Optional
 
 import numpy
 import pandas
@@ -23,7 +22,7 @@ class ProjectPerformance:
     プロジェクトごとの生産性と品質
     """
 
-    def __init__(self, df: pandas.DataFrame, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> None:
+    def __init__(self, df: pandas.DataFrame, *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> None:
         self.df = df
         self.custom_production_volume_list = custom_production_volume_list if custom_production_volume_list is not None else []
 
@@ -89,7 +88,7 @@ class ProjectPerformance:
         return [e.value for e in TaskPhase if e.value in tmp_set]
 
     @classmethod
-    def from_project_dirs(cls, project_dir_list: list[ProjectDir], *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> ProjectPerformance:
+    def from_project_dirs(cls, project_dir_list: list[ProjectDir], *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> ProjectPerformance:
         row_list: list[pandas.Series] = [cls._get_series_from_project_dir(project_dir) for project_dir in project_dir_list]
         return cls(pandas.DataFrame(row_list), custom_production_volume_list=custom_production_volume_list)
 
@@ -139,15 +138,7 @@ class ProjectWorktimePerMonth:
         new_index = [str(dt)[0:7] for dt in series.index]
         result = pandas.Series(series.values, index=new_index)
         result["dirname"] = project_dir.project_dir.name
-
-        try:
-            project_info = project_dir.read_project_info()
-            project_title = project_info.project_title
-        except Exception:
-            # 複数のプロジェクトをマージして生産性情報を出力した場合は、`project_info.json`は存在しないので、このブロックに入る
-            logger.info(f"'{project_dir}'からプロジェクト情報を読み込むのに失敗しました。project_titleは空文字にします。", exc_info=True)
-            project_title = ""
-        result["project_title"] = project_title
+        result["project_title"] = project_dir.get_project_title()
         return result
 
     @classmethod

annofabcli/statistics/visualization/dataframe/task.py

@@ -2,12 +2,11 @@ from __future__ import annotations
 
 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 numpy
 import pandas
 import pytz
@@ -64,7 +63,7 @@ class Task:
         """
         return list(set(self.required_columns) - set(df.columns))
 
-    def __init__(self, df: pandas.DataFrame, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> None:
+    def __init__(self, df: pandas.DataFrame, *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> None:
         self.custom_production_volume_list = custom_production_volume_list if custom_production_volume_list is not None else []
 
         if self._duplicated_keys(df):
@@ -184,8 +183,8 @@ class Task:
         project_id: str,
         annofab_service: annofabapi.Resource,
         *,
-        input_data_count: Optional[InputDataCount] = None,
-        custom_production_volume: Optional[CustomProductionVolume] = None,
+        input_data_count: InputDataCount | None = None,
+        custom_production_volume: CustomProductionVolume | None = None,
     ) -> Task:
         """
         APIから取得した情報と、DataFrameのラッパーからインスタンスを生成します。
@@ -255,7 +254,7 @@ class Task:
         return len(self.df) == 0
 
     @classmethod
-    def empty(cls, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> Task:
+    def empty(cls, *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> Task:
         """空のデータフレームを持つインスタンスを生成します。"""
 
         bool_columns = [
@@ -316,12 +315,12 @@ class Task:
         return cls(df, custom_production_volume_list=custom_production_volume_list)
 
     @classmethod
-    def from_csv(cls, csv_file: Path, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> Task:
+    def from_csv(cls, csv_file: Path, *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> Task:
         df = pandas.read_csv(str(csv_file))
         return cls(df, custom_production_volume_list=custom_production_volume_list)
 
     @staticmethod
-    def merge(*obj: Task, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> Task:
+    def merge(*obj: Task, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> Task:
         """
         複数のインスタンスをマージします。
 
@@ -332,7 +331,7 @@ class Task:
         df_merged = pandas.concat(df_list)
         return Task(df_merged, custom_production_volume_list=custom_production_volume_list)
 
-    def plot_histogram_of_worktime(self, output_file: Path, *, metadata: Optional[dict[str, Any]] = None) -> None:
+    def plot_histogram_of_worktime(self, output_file: Path, *, metadata: dict[str, Any] | None = None) -> None:
         """作業時間に関する情報をヒストグラムでプロットする。
 
         Args:
@@ -413,7 +412,7 @@ class Task:
         bokeh.plotting.save(bokeh_obj)
         logger.debug(f"'{output_file}'を出力しました。")
 
-    def plot_histogram_of_others(self, output_file: Path, *, metadata: Optional[dict[str, Any]] = None) -> None:
+    def plot_histogram_of_others(self, output_file: Path, *, metadata: dict[str, Any] | None = None) -> None:
         """アノテーション数や、検査コメント数など、作業時間以外の情報をヒストグラムで表示する。
 
         Args:
@@ -539,8 +538,8 @@ class Task:
 
     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_user_id: dict[str, str] | None = None,
+        to_replace_for_username: dict[str, str] | None = None,
     ) -> Task:
         """
         引数から渡された情報を元に、インスタンス変数`df`内のユーザー情報をマスクして、新しいインスタンスを返します。

annofabcli/statistics/visualization/dataframe/task_worktime_by_phase_user.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import logging
 from functools import partial
 from pathlib import Path
-from typing import Optional
 
 import pandas
 from annofabapi.models import TaskPhase
@@ -113,7 +112,7 @@ class TaskWorktimeByPhaseUser:
         duplicated = df.duplicated(subset=["project_id", "task_id", "phase", "phase_stage", "account_id"])
         return duplicated.any()
 
-    def __init__(self, df: pandas.DataFrame, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> None:
+    def __init__(self, df: pandas.DataFrame, *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> None:
         self.custom_production_volume_list = custom_production_volume_list if custom_production_volume_list is not None else []
 
         if self._duplicated_keys(df):
@@ -168,7 +167,7 @@ class TaskWorktimeByPhaseUser:
         print_csv(self.df[self.columns], str(output_file))
 
     @staticmethod
-    def merge(*obj: TaskWorktimeByPhaseUser, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> TaskWorktimeByPhaseUser:
+    def merge(*obj: TaskWorktimeByPhaseUser, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> TaskWorktimeByPhaseUser:
         """
         複数のインスタンスをマージします。
 
@@ -179,7 +178,7 @@ class TaskWorktimeByPhaseUser:
         return TaskWorktimeByPhaseUser(df_merged, custom_production_volume_list=custom_production_volume_list)
 
     @classmethod
-    def empty(cls, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> TaskWorktimeByPhaseUser:
+    def empty(cls, *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> TaskWorktimeByPhaseUser:
         """空のデータフレームを持つインスタンスを生成します。"""
 
         df_dtype: dict[str, str] = {
@@ -216,17 +215,17 @@ class TaskWorktimeByPhaseUser:
         return len(self.df) == 0
 
     @classmethod
-    def from_csv(cls, csv_file: Path, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> TaskWorktimeByPhaseUser:
+    def from_csv(cls, csv_file: Path, *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> TaskWorktimeByPhaseUser:
         df = pandas.read_csv(str(csv_file))
         return cls(df, custom_production_volume_list=custom_production_volume_list)
 
     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,
     ) -> TaskWorktimeByPhaseUser:
         """
         引数から渡された情報を元に、インスタンス変数`df`内のユーザー情報をマスクして、新しいインスタンスを返します。
@@ -248,7 +247,7 @@ class TaskWorktimeByPhaseUser:
         return TaskWorktimeByPhaseUser(df, custom_production_volume_list=self.custom_production_volume_list)
 
     @staticmethod
-    def _create_annotation_count_ratio_df(task_history_df: pandas.DataFrame, task_df: pandas.DataFrame, *, custom_production_volume_columns: Optional[list[str]]) -> pandas.DataFrame:
+    def _create_annotation_count_ratio_df(task_history_df: pandas.DataFrame, task_df: pandas.DataFrame, *, custom_production_volume_columns: list[str] | None) -> pandas.DataFrame:
         """
         task_id, phase, (phase_index), user_idの作業時間比から、アノテーション数などの生産量を求める
 

annofabcli/statistics/visualization/dataframe/user_performance.py

@@ -10,11 +10,9 @@ import math
 from collections.abc import Sequence
 from enum import Enum
 from pathlib import Path
-from typing import Any, Literal, Optional
+from typing import Any, Literal
 
-import bokeh
 import bokeh.layouts
-import bokeh.palettes
 import numpy
 import pandas
 from annofabapi.models import TaskPhase
@@ -93,7 +91,7 @@ class UserPerformance:
         df: pandas.DataFrame,
         task_completion_criteria: TaskCompletionCriteria,
         *,
-        custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None,
+        custom_production_volume_list: list[ProductionVolumeColumn] | None = None,
     ) -> None:
         self.task_completion_criteria = task_completion_criteria
         phase_list = self.get_phase_list(df.columns)
@@ -184,13 +182,13 @@ class UserPerformance:
         csv_file: Path,
         task_completion_criteria: TaskCompletionCriteria,
         *,
-        custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None,
+        custom_production_volume_list: list[ProductionVolumeColumn] | None = None,
     ) -> UserPerformance:
         df = read_multiheader_csv(str(csv_file))
         return cls(df, task_completion_criteria, custom_production_volume_list=custom_production_volume_list)
 
     @classmethod
-    def empty(cls, task_completion_criteria: TaskCompletionCriteria, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> UserPerformance:
+    def empty(cls, task_completion_criteria: TaskCompletionCriteria, *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> UserPerformance:
         """空のデータフレームを持つインスタンスを生成します。"""
         production_volume_columns = ["input_data_count", "annotation_count"]
         if custom_production_volume_list is not None:
@@ -440,7 +438,7 @@ class UserPerformance:
                     ("working_days", "acceptance")
         """
 
-        def _create_df_first_last_working_date(phase: Optional[str]) -> pandas.DataFrame:
+        def _create_df_first_last_working_date(phase: str | None) -> pandas.DataFrame:
             """
             指定したフェーズに対応する作業開始日、作業終了日、作業日数を算出する
 
@@ -730,7 +728,7 @@ class UserPerformance:
         print_csv(self.df[self.columns], str(output_file))
 
     @staticmethod
-    def _get_average_value(df: pandas.DataFrame, numerator_column: tuple[str, str], denominator_column: tuple[str, str]) -> Optional[float]:
+    def _get_average_value(df: pandas.DataFrame, numerator_column: tuple[str, str], denominator_column: tuple[str, str]) -> float | None:
         numerator = df[numerator_column].sum()
         denominator = df[denominator_column].sum()
         if denominator > 0:
@@ -831,7 +829,7 @@ class UserPerformance:
         worktime_type: WorktimeType,
         production_volume_column: str,
         *,
-        metadata: Optional[dict[str, Any]] = None,
+        metadata: dict[str, Any] | None = None,
     ) -> None:
         """作業時間と生産性の関係をメンバごとにプロットする。
 
@@ -885,7 +883,7 @@ class UserPerformance:
             df[(f"{worktime_type.value}_worktime_minute/{production_volume_column}", phase)] = df[(f"{worktime_type.value}_worktime_hour/{production_volume_column}", phase)] * 60
 
         for biography_index, biography in enumerate(sorted(set(df["biography"]))):
-            for scatter_obj, phase in zip(scatter_obj_list, self.phase_list):
+            for scatter_obj, phase in zip(scatter_obj_list, self.phase_list, strict=False):
                 filtered_df = df[(df["biography"] == biography) & df[(x_column, phase)].notna() & df[(y_column, phase)].notna()]
                 if len(filtered_df) == 0:
                     continue
@@ -900,7 +898,7 @@ class UserPerformance:
                     color=get_color_from_palette(biography_index),
                 )
 
-        for scatter_obj, phase in zip(scatter_obj_list, self.phase_list):
+        for scatter_obj, phase in zip(scatter_obj_list, self.phase_list, strict=False):
             average_hour = self._get_average_value(
                 df,
                 numerator_column=(f"{worktime_type.value}_worktime_hour", phase),
@@ -913,7 +911,7 @@ class UserPerformance:
             quartile = self._get_quartile_value(df[(f"{worktime_type.value}_worktime_minute/{production_volume_column}", phase)])
             scatter_obj.plot_quartile_line(quartile, dimension="width")
 
-            scatter_obj.add_multi_choice_widget_for_searching_user(list(zip(df[("user_id", "")], df[("username", "")])))
+            scatter_obj.add_multi_choice_widget_for_searching_user(list(zip(df[("user_id", "")], df[("username", "")], strict=False)))
             scatter_obj.process_after_adding_glyphs()
 
         div_element = self._create_div_element()
@@ -923,7 +921,7 @@ class UserPerformance:
 
         write_bokeh_graph(bokeh.layouts.column(element_list), output_file)
 
-    def plot_quality(self, output_file: Path, *, metadata: Optional[dict[str, Any]] = None) -> None:
+    def plot_quality(self, output_file: Path, *, metadata: dict[str, Any] | None = None) -> None:
         """
         メンバごとに品質を散布図でプロットする
 
@@ -981,7 +979,7 @@ class UserPerformance:
         ]
 
         for biography_index, biography in enumerate(sorted(set(df["biography"]))):
-            for column_pair, scatter_obj in zip(column_pair_list, scatter_obj_list):
+            for column_pair, scatter_obj in zip(column_pair_list, scatter_obj_list, strict=False):
                 x_column = column_pair[0]
                 y_column = column_pair[1]
                 filtered_df = df[(df["biography"] == biography) & df[(x_column, PHASE)].notna() & df[(y_column, PHASE)].notna()]
@@ -1002,6 +1000,7 @@ class UserPerformance:
         for column_pair, scatter_obj in zip(
             [("rejected_count", "task_count"), ("pointed_out_inspection_comment_count", "annotation_count")],
             scatter_obj_list,
+            strict=False,
         ):
             average_value = self._get_average_value(df, numerator_column=(column_pair[0], PHASE), denominator_column=(column_pair[1], PHASE))
             if average_value is not None:
@@ -1010,12 +1009,13 @@ class UserPerformance:
         for column, scatter_obj in zip(
             ["rejected_count/task_count", "pointed_out_inspection_comment_count/annotation_count"],
             scatter_obj_list,
+            strict=False,
         ):
             quartile = self._get_quartile_value(df[(column, PHASE)])
             scatter_obj.plot_quartile_line(quartile, dimension="width")
 
         for scatter_obj in scatter_obj_list:
-            scatter_obj.add_multi_choice_widget_for_searching_user(list(zip(df[("user_id", "")], df[("username", "")])))
+            scatter_obj.add_multi_choice_widget_for_searching_user(list(zip(df[("user_id", "")], df[("username", "")], strict=False)))
             scatter_obj.process_after_adding_glyphs()
 
         div_element = self._create_div_element()
@@ -1025,7 +1025,7 @@ class UserPerformance:
 
         write_bokeh_graph(bokeh.layouts.column(element_list), output_file)
 
-    def plot_quality_and_productivity(self, output_file: Path, worktime_type: WorktimeType, production_volume_column: str, *, metadata: Optional[dict[str, Any]] = None) -> None:
+    def plot_quality_and_productivity(self, output_file: Path, worktime_type: WorktimeType, production_volume_column: str, *, metadata: dict[str, Any] | None = None) -> None:
         """
         作業時間を元に算出した生産性と品質の関係を、メンバごとにプロットする
         """
@@ -1079,6 +1079,7 @@ class UserPerformance:
             for column_pair, scatter_obj in zip(
                 [("rejected_count", "task_count"), ("pointed_out_inspection_comment_count", production_volume_column)],
                 scatter_obj_list,
+                strict=False,
             ):
                 if x_average_minute is not None:
                     scatter_obj.plot_average_line(x_average_minute, dimension="height")
@@ -1095,6 +1096,7 @@ class UserPerformance:
             for column, scatter_obj in zip(
                 ["rejected_count/task_count", f"pointed_out_inspection_comment_count/{production_volume_column}"],
                 scatter_obj_list,
+                strict=False,
             ):
                 scatter_obj.plot_quartile_line(x_quartile, dimension="height")
                 y_quartile = self._get_quartile_value(df[(column, PHASE)])
@@ -1133,7 +1135,7 @@ class UserPerformance:
         ]
 
         for biography_index, biography in enumerate(sorted(set(df["biography"]))):
-            for scatter_obj, column_pair in zip(scatter_obj_list, column_pair_list):
+            for scatter_obj, column_pair in zip(scatter_obj_list, column_pair_list, strict=False):
                 x_column, y_column = column_pair
                 filtered_df = df[(df["biography"] == biography) & df[(x_column, PHASE)].notna() & df[(y_column, PHASE)].notna()]
                 if len(filtered_df) == 0:
@@ -1155,11 +1157,11 @@ class UserPerformance:
         plot_average_and_quartile_line()
 
         for scatter_obj in scatter_obj_list:
-            scatter_obj.add_multi_choice_widget_for_searching_user(list(zip(df[("user_id", "")], df[("username", "")])))
+            scatter_obj.add_multi_choice_widget_for_searching_user(list(zip(df[("user_id", "")], df[("username", "")], strict=False)))
             scatter_obj.process_after_adding_glyphs()
 
         div_element = self._create_div_element()
-        div_element.text = div_element.text + """円の大きさ：作業時間<br>"""  # type: ignore[operator]
+        div_element.text = div_element.text + """円の大きさ：作業時間<br>"""
 
         element_list = [div_element, *[e.layout for e in scatter_obj_list]]
         if metadata is not None:

annofabcli/statistics/visualization/dataframe/whole_performance.py

@@ -7,7 +7,6 @@ from __future__ import annotations
 import logging
 from collections.abc import Sequence
 from pathlib import Path
-from typing import Optional
 
 import numpy
 import pandas
@@ -37,7 +36,7 @@ class WholePerformance:
         series: pandas.Series,
         task_completion_criteria: TaskCompletionCriteria,
         *,
-        custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None,
+        custom_production_volume_list: list[ProductionVolumeColumn] | None = None,
     ) -> None:
         self.series = series
         self.task_completion_criteria = task_completion_criteria
@@ -138,7 +137,7 @@ class WholePerformance:
         return cls(df_all.iloc[0], task_completion_criteria, custom_production_volume_list=task_worktime_by_phase_user.custom_production_volume_list)
 
     @classmethod
-    def empty(cls, task_completion_criteria: TaskCompletionCriteria, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> WholePerformance:
+    def empty(cls, task_completion_criteria: TaskCompletionCriteria, *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> WholePerformance:
         """空のデータフレームを持つインスタンスを生成します。"""
 
         production_volume_columns = ["input_data_count", "annotation_count"]
@@ -202,7 +201,7 @@ class WholePerformance:
         csv_file: Path,
         task_completion_criteria: TaskCompletionCriteria,
         *,
-        custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None,
+        custom_production_volume_list: list[ProductionVolumeColumn] | None = None,
     ) -> WholePerformance:
         """CSVファイルからインスタンスを生成します。"""
         df = pandas.read_csv(str(csv_file), header=None, index_col=[0, 1])

annofabcli/statistics/visualization/dataframe/whole_productivity_per_date.py

@@ -8,11 +8,9 @@ from __future__ import annotations
 import logging
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
-import bokeh
 import bokeh.layouts
-import bokeh.palettes
 import pandas
 from annofabapi.models import TaskPhase, TaskStatus
 from bokeh.models import DataRange1d
@@ -99,7 +97,7 @@ class WholeProductivityPerCompletedDate:
         df: pandas.DataFrame,
         task_completion_criteria: TaskCompletionCriteria,
         *,
-        custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None,
+        custom_production_volume_list: list[ProductionVolumeColumn] | None = None,
     ) -> None:
         self.df = df
         self.task_completion_criteria = task_completion_criteria
@@ -117,7 +115,7 @@ class WholeProductivityPerCompletedDate:
         csv_file: Path,
         task_completion_criteria: TaskCompletionCriteria,
         *,
-        custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None,
+        custom_production_volume_list: list[ProductionVolumeColumn] | None = None,
     ) -> WholeProductivityPerCompletedDate:
         """CSVファイルからインスタンスを生成します。"""
         df = pandas.read_csv(str(csv_file))
@@ -298,7 +296,7 @@ class WholeProductivityPerCompletedDate:
         self,
         output_file: Path,
         *,
-        metadata: Optional[dict[str, Any]] = None,
+        metadata: dict[str, Any] | None = None,
     ) -> None:
         """
         全体の生産量や生産性をプロットする
@@ -537,7 +535,7 @@ class WholeProductivityPerCompletedDate:
 
         write_bokeh_graph(bokeh.layouts.column(element_list), output_file)
 
-    def plot_cumulatively(self, output_file: Path, *, metadata: Optional[dict[str, Any]] = None) -> None:
+    def plot_cumulatively(self, output_file: Path, *, metadata: dict[str, Any] | None = None) -> None:
         """
         全体の生産量や作業時間の累積折れ線グラフを出力する
         """
@@ -756,7 +754,7 @@ class WholeProductivityPerCompletedDate:
         write_bokeh_graph(bokeh.layouts.column(element_list), output_file)
 
     @classmethod
-    def empty(cls, *, task_completion_criteria: TaskCompletionCriteria, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> WholeProductivityPerCompletedDate:
+    def empty(cls, *, task_completion_criteria: TaskCompletionCriteria, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> WholeProductivityPerCompletedDate:
         df = pandas.DataFrame(columns=cls.get_columns(custom_production_volume_list=custom_production_volume_list))
         return cls(df, task_completion_criteria, custom_production_volume_list=custom_production_volume_list)
 
@@ -765,7 +763,7 @@ class WholeProductivityPerCompletedDate:
         return self.get_columns(custom_production_volume_list=self.custom_production_volume_list)
 
     @staticmethod
-    def get_columns(custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> list[str]:
+    def get_columns(custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> list[str]:
         production_volume_columns = ["input_data_count", "annotation_count"]
         if custom_production_volume_list is not None:
             production_volume_columns.extend([e.value for e in custom_production_volume_list])
@@ -833,7 +831,7 @@ class WholeProductivityPerFirstAnnotationStartedDate:
         df: pandas.DataFrame,
         task_completion_criteria: TaskCompletionCriteria,
         *,
-        custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None,
+        custom_production_volume_list: list[ProductionVolumeColumn] | None = None,
     ) -> None:
         self.task_completion_criteria = task_completion_criteria
         self.custom_production_volume_list = custom_production_volume_list if custom_production_volume_list is not None else []
@@ -845,7 +843,7 @@ class WholeProductivityPerFirstAnnotationStartedDate:
         csv_file: Path,
         task_completion_criteria: TaskCompletionCriteria,
         *,
-        custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None,
+        custom_production_volume_list: list[ProductionVolumeColumn] | None = None,
     ) -> WholeProductivityPerFirstAnnotationStartedDate:
         """CSVファイルからインスタンスを生成します。"""
         df = pandas.read_csv(str(csv_file))
@@ -945,12 +943,12 @@ class WholeProductivityPerFirstAnnotationStartedDate:
         return True
 
     @classmethod
-    def empty(cls, task_completion_criteria: TaskCompletionCriteria, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> WholeProductivityPerFirstAnnotationStartedDate:
+    def empty(cls, task_completion_criteria: TaskCompletionCriteria, *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> WholeProductivityPerFirstAnnotationStartedDate:
         df = pandas.DataFrame(columns=cls.get_columns(custom_production_volume_list=custom_production_volume_list))
         return cls(df, task_completion_criteria, custom_production_volume_list=custom_production_volume_list)
 
     @staticmethod
-    def get_columns(*, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> list[str]:
+    def get_columns(*, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> list[str]:
         production_volume_columns = ["input_data_count", "annotation_count"]
         if custom_production_volume_list is not None:
             production_volume_columns.extend([e.value for e in custom_production_volume_list])
@@ -989,7 +987,7 @@ class WholeProductivityPerFirstAnnotationStartedDate:
 
         print_csv(self.df[self.columns], str(output_file))
 
-    def plot(self, output_file: Path, *, metadata: Optional[dict[str, Any]] = None) -> None:  # noqa: PLR0915
+    def plot(self, output_file: Path, *, metadata: dict[str, Any] | None = None) -> None:  # noqa: PLR0915
         """
         全体の生産量や生産性をプロットする
         """