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

annofabcli/statistics/list_annotation_duration.py

@@ -14,7 +14,7 @@ from collections.abc import Collection, Iterator
 from dataclasses import dataclass, field
 from enum import Enum
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any
 
 import annofabapi
 import pandas
@@ -26,7 +26,6 @@ from annofabapi.parser import (
 )
 from dataclasses_json import DataClassJsonMixin, config
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -117,10 +116,10 @@ class AnnotationDuration(DataClassJsonMixin):
     input_data_id: str
     input_data_name: str
 
-    updated_datetime: Optional[str]
+    updated_datetime: str | None
     """アノテーションJSONに格納されているアノテーションの更新日時"""
 
-    video_duration_second: Optional[float]
+    video_duration_second: float | None
     """動画の長さ[秒]"""
 
     annotation_duration_second: float
@@ -158,17 +157,17 @@ class ListAnnotationDurationByInputData:
     def __init__(
         self,
         *,
-        target_labels: Optional[Collection[str]] = None,
-        non_target_labels: Optional[Collection[str]] = None,
-        target_attribute_names: Optional[Collection[AttributeNameKey]] = None,
-        non_target_attribute_names: Optional[Collection[AttributeNameKey]] = None,
+        target_labels: Collection[str] | None = None,
+        non_target_labels: Collection[str] | None = None,
+        target_attribute_names: Collection[AttributeNameKey] | None = None,
+        non_target_attribute_names: Collection[AttributeNameKey] | None = None,
     ) -> None:
         self.target_labels = set(target_labels) if target_labels is not None else None
         self.target_attribute_names = set(target_attribute_names) if target_attribute_names is not None else None
         self.non_target_labels = set(non_target_labels) if non_target_labels is not None else None
         self.non_target_attribute_names = set(non_target_attribute_names) if non_target_attribute_names is not None else None
 
-    def get_annotation_duration(self, simple_annotation: dict[str, Any], video_duration_second: Optional[float] = None) -> AnnotationDuration:
+    def get_annotation_duration(self, simple_annotation: dict[str, Any], video_duration_second: float | None = None) -> AnnotationDuration:
         """
         1個のアノテーションJSONに対して、ラベルごと/属性ごとの区間アノテーションの長さを取得する。
 
@@ -181,7 +180,7 @@ class ListAnnotationDurationByInputData:
             """区間アノテーションのdetail情報から、区間アノテーションの長さ（秒）を計算する"""
             return (detail["data"]["end"] - detail["data"]["begin"]) / 1000
 
-        def convert_attribute_value_to_key(value: Union[bool, str, float]) -> str:  # noqa: FBT001
+        def convert_attribute_value_to_key(value: bool | str | float) -> str:  # noqa: FBT001
             """
             アノテーションJSONに格納されている属性値を、dict用のkeyに変換する。
 
@@ -257,9 +256,9 @@ class ListAnnotationDurationByInputData:
         self,
         annotation_path: Path,
         *,
-        input_data_json_path: Optional[Path] = None,
-        target_task_ids: Optional[Collection[str]] = None,
-        task_query: Optional[TaskQuery] = None,
+        input_data_json_path: Path | None = None,
+        target_task_ids: Collection[str] | None = None,
+        task_query: TaskQuery | None = None,
     ) -> list[AnnotationDuration]:
         """
         アノテーションzipまたはそれを展開したディレクトリから、ラベルごと/属性ごとの区間アノテーションの長さを取得する。
@@ -267,7 +266,7 @@ class ListAnnotationDurationByInputData:
         Args:
             input_data_json_path: 入力データ全件ファイルのパス。動画の長さを取得するのに利用します。
         """
-        dict_input_data: Optional[dict[str, dict[str, Any]]] = None
+        dict_input_data: dict[str, dict[str, Any]] | None = None
         if input_data_json_path is not None:
             with input_data_json_path.open() as f:
                 input_data_list = json.load(f)
@@ -292,7 +291,7 @@ class ListAnnotationDurationByInputData:
                 if not match_annotation_with_task_query(simple_annotation_dict, task_query):
                     continue
 
-            video_duration_second: Optional[float] = None
+            video_duration_second: float | None = None
             if dict_input_data is not None:
                 input_data = dict_input_data[parser.input_data_id]
                 video_duration_second = input_data["system_metadata"]["input_duration"]
@@ -331,7 +330,7 @@ class AnnotationDurationCsvByAttribute:
 
         return [(label, attribute_name, attribute_value) for (label, attribute_name, attribute_value) in columns if (label, attribute_name) not in non_selective_attribute_names]
 
-    def _value_columns(self, annotation_duration_list: Collection[AnnotationDuration], prior_attribute_columns: Optional[list[AttributeValueKey]]) -> list[AttributeValueKey]:
+    def _value_columns(self, annotation_duration_list: Collection[AnnotationDuration], prior_attribute_columns: list[AttributeValueKey] | None) -> list[AttributeValueKey]:
         all_attr_key_set = {attr_key for c in annotation_duration_list for attr_key in c.annotation_duration_second_by_attribute}
         if prior_attribute_columns is not None:
             remaining_columns = sorted(all_attr_key_set - set(prior_attribute_columns))
@@ -364,7 +363,7 @@ class AnnotationDurationCsvByAttribute:
     def get_columns(
         self,
         annotation_duration_list: list[AnnotationDuration],
-        prior_attribute_columns: Optional[list[AttributeValueKey]] = None,
+        prior_attribute_columns: list[AttributeValueKey] | None = None,
     ) -> list[AttributeValueKey]:
         basic_columns = [
             ("project_id", "", ""),
@@ -383,7 +382,7 @@ class AnnotationDurationCsvByAttribute:
     def create_df(
         self,
         annotation_duration_list: list[AnnotationDuration],
-        prior_attribute_columns: Optional[list[AttributeValueKey]] = None,
+        prior_attribute_columns: list[AttributeValueKey] | None = None,
     ) -> pandas.DataFrame:
         def to_cell(c: AnnotationDuration) -> dict[tuple[str, str, str], Any]:
             cell: dict[AttributeValueKey, Any] = {
@@ -415,7 +414,7 @@ class AnnotationDurationCsvByLabel:
     ラベルごとのアノテーション長さをCSVとして出力するためのクラス。
     """
 
-    def _value_columns(self, annotation_duration_list: list[AnnotationDuration], prior_label_columns: Optional[list[str]]) -> list[str]:
+    def _value_columns(self, annotation_duration_list: list[AnnotationDuration], prior_label_columns: list[str] | None) -> list[str]:
         all_attr_key_set = {attr_key for elm in annotation_duration_list for attr_key in elm.annotation_duration_second_by_label.keys()}  # noqa: SIM118
         if prior_label_columns is not None:
             remaining_columns = sorted(all_attr_key_set - set(prior_label_columns))
@@ -429,7 +428,7 @@ class AnnotationDurationCsvByLabel:
     def get_columns(
         self,
         annotation_duration_list: list[AnnotationDuration],
-        prior_label_columns: Optional[list[str]] = None,
+        prior_label_columns: list[str] | None = None,
     ) -> list[str]:
         basic_columns = [
             "project_id",
@@ -449,7 +448,7 @@ class AnnotationDurationCsvByLabel:
     def create_df(
         self,
         annotation_duration_list: list[AnnotationDuration],
-        prior_label_columns: Optional[list[str]] = None,
+        prior_label_columns: list[str] | None = None,
     ) -> pandas.DataFrame:
         def to_dict(c: AnnotationDuration) -> dict[str, Any]:
             d: dict[str, Any] = {
@@ -481,16 +480,16 @@ class ListAnnotationDurationMain:
     def __init__(self, service: annofabapi.Resource) -> None:
         self.service = service
 
-    def print_annotation_duration_csv(self, annotation_duration_list: list[AnnotationDuration], csv_type: CsvType, output_file: Path, *, annotation_specs: Optional[AnnotationSpecs]) -> None:
+    def print_annotation_duration_csv(self, annotation_duration_list: list[AnnotationDuration], csv_type: CsvType, output_file: Path, *, annotation_specs: AnnotationSpecs | None) -> None:
         if csv_type == CsvType.LABEL:
             # ラベル名の列順が、アノテーション仕様にあるラベル名の順番に対応するようにする。
-            label_columns: Optional[list[str]] = None
+            label_columns: list[str] | None = None
             if annotation_specs is not None:
                 label_columns = annotation_specs.label_keys()
 
             df = AnnotationDurationCsvByLabel().create_df(annotation_duration_list, prior_label_columns=label_columns)
         elif csv_type == CsvType.ATTRIBUTE:
-            attribute_columns: Optional[list[AttributeValueKey]] = None
+            attribute_columns: list[AttributeValueKey] | None = None
             if annotation_specs is not None:
                 attribute_columns = annotation_specs.selective_attribute_value_keys()
 
@@ -507,14 +506,14 @@ class ListAnnotationDurationMain:
         output_file: Path,
         arg_format: FormatArgument,
         *,
-        project_id: Optional[str] = None,
-        input_data_json_path: Optional[Path] = None,
-        target_task_ids: Optional[Collection[str]] = None,
-        task_query: Optional[TaskQuery] = None,
-        csv_type: Optional[CsvType] = None,
+        project_id: str | None = None,
+        input_data_json_path: Path | None = None,
+        target_task_ids: Collection[str] | None = None,
+        task_query: TaskQuery | None = None,
+        csv_type: CsvType | None = None,
     ) -> None:
-        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()
@@ -565,7 +564,7 @@ class ListAnnotationDuration(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)
@@ -584,7 +583,7 @@ class ListAnnotationDuration(CommandLine):
 
         downloading_obj = DownloadingFile(self.service)
 
-        def download_and_print_annotation_duration(project_id: str, temp_dir: Path, *, is_latest: bool, annotation_path: Optional[Path]) -> None:
+        def download_and_print_annotation_duration(project_id: str, temp_dir: Path, *, is_latest: bool, annotation_path: Path | None) -> None:
             if annotation_path is None:
                 annotation_path = downloading_obj.download_annotation_zip_to_dir(
                     project_id,
@@ -697,7 +696,7 @@ def main(args: argparse.Namespace) -> None:
     ListAnnotationDuration(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 = "list_annotation_duration"
     subcommand_help = "ラベルごとまたは属性値ごとに区間アノテーションの長さ（秒）を出力します。"
     epilog = "オーナロールまたはアノテーションユーザロールを持つユーザで実行してください。"

annofabcli/statistics/list_video_duration.py

@@ -7,12 +7,11 @@ import sys
 import tempfile
 from functools import partial
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import pandas
 from annofabapi.models import InputDataType, ProjectMemberRole
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -83,7 +82,7 @@ class ListVideoDuration(CommandLine):
         task_json: Path,
         input_data_json: Path,
         output_format: FormatArgument,
-        output_file: Optional[Path],
+        output_file: Path | None,
     ) -> None:
         with task_json.open(encoding="utf-8") as f:
             task_list = json.load(f)
@@ -115,7 +114,7 @@ class ListVideoDuration(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)
@@ -218,7 +217,7 @@ def main(args: argparse.Namespace) -> None:
     ListVideoDuration(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 = "list_video_duration"
     subcommand_help = "各タスクの動画の長さを出力します。"
     epilog = "オーナロールまたはアノテーションユーザロールを持つユーザで実行してください。"

annofabcli/statistics/list_worktime.py

@@ -5,7 +5,7 @@ import datetime
 import logging
 from collections import defaultdict
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import pandas
 from dateutil.parser import parse
@@ -110,7 +110,7 @@ class ListWorktimeFromTaskHistoryEvent(CommandLine):
     def print_worktime_list(
         self,
         project_id: str,
-        task_history_event_json: Optional[Path],
+        task_history_event_json: Path | None,
     ) -> None:
         super().validate_project(project_id, project_member_roles=None)
 
@@ -160,7 +160,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_worktime"
     subcommand_help = "日ごとユーザごとの作業時間の一覧を出力します。"
     description = "タスク履歴イベント全件ファイルから、日ごとユーザごとの作業時間の一覧を出力します。"

annofabcli/statistics/scatter.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 import logging
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Callable, Literal, Optional
+from typing import Any, Literal
 
 import bokeh
 import bokeh.layouts
@@ -62,10 +63,10 @@ class ScatterGraph:
         y_axis_label: str,
         width: int = 1200,
         height: int = 1000,
-        tooltip_columns: Optional[list[str]] = None,
+        tooltip_columns: list[str] | None = None,
         **figure_kwargs,  # noqa: ANN003
     ) -> None:
-        fig = figure(
+        fig = figure(  # type: ignore[call-arg]
             title=title,
             x_axis_label=x_axis_label,
             y_axis_label=y_axis_label,
@@ -82,7 +83,7 @@ class ScatterGraph:
 
         self.figure = fig
 
-        self.finding_user_widget: Optional[MultiChoice] = None
+        self.finding_user_widget: MultiChoice | None = None
         """ユーザーを探すためのWidget"""
 
         self.text_glyphs: dict[str, GlyphRenderer] = {}
@@ -146,7 +147,7 @@ class ScatterGraph:
 
         # 1点ごとに`text`で名前を表示している理由：
         # `add_multi_choice_widget_for_searching_user`関数で追加したMultiChoice Widgetで、名前の表示スタイルを変更するため
-        for x, y, username, user_id in zip(source.data[x_column_name], source.data[y_column_name], source.data[username_column_name], source.data[user_id_column_name]):
+        for x, y, username, user_id in zip(source.data[x_column_name], source.data[y_column_name], source.data[username_column_name], source.data[user_id_column_name], strict=False):
             self.text_glyphs[user_id] = self.figure.text(
                 x=x,
                 y=y,
@@ -200,7 +201,7 @@ class ScatterGraph:
 
         # 1点ごとに`text`で名前を表示している理由：
         # `add_multi_choice_widget_for_searching_user`関数で追加したMultiChoice Widgetで、名前の表示スタイルを変更するため
-        for x, y, username, user_id in zip(source.data[x_column_name], source.data[y_column_name], source.data[username_column_name], source.data[user_id_column_name]):
+        for x, y, username, user_id in zip(source.data[x_column_name], source.data[y_column_name], source.data[username_column_name], source.data[user_id_column_name], strict=False):
             self.text_glyphs[user_id] = self.figure.text(
                 x=x,
                 y=y,
@@ -228,7 +229,7 @@ class ScatterGraph:
         # 理由：名前の表示は`ColumnDataSource`を使っていない（`plot_scatter`メソッド参照）ため、ツールチップには値が"???"と表示される。
         # ユーザーが混乱しないようにするため、名前にカーソルを当てたときはツールチップが表示されないようにする。
         if self._hover_tool is not None and self._scatter_glyphs is not None:
-            self._hover_tool.renderers = list(self._scatter_glyphs.values())  # type: ignore[assignment]
+            self._hover_tool.renderers = list(self._scatter_glyphs.values())
 
     def configure_legend(self):  # noqa: ANN201
         """
@@ -275,7 +276,7 @@ class ScatterGraph:
         """
         code = code % (self.DEFAULT_USER_TEXT_FONT_STYLE, self.DEFAULT_USER_TEXT_FONT_SIZE)
         options = [(user_id, f"{user_id}:{username}") for user_id, username in users]
-        multi_choice = MultiChoice(options=options, title="Find User:", width=300)
+        multi_choice = MultiChoice(options=options, title="Find User:", width=300)  # type: ignore[arg-type]
         multi_choice.js_on_change(
             "value",
             CustomJS(code=code, args=args),

annofabcli/statistics/subcommand_statistics.py

@@ -1,9 +1,6 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
-import annofabcli.stat_visualization.merge_visualization_dir
 import annofabcli.statistics.list_annotation_area
 import annofabcli.statistics.list_annotation_attribute
 import annofabcli.statistics.list_annotation_attribute_filled_count
@@ -41,7 +38,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.statistics.visualize_video_duration.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 = "statistics"
     subcommand_help = "統計関係のサブコマンド"
     description = "統計関係のサブコマンド"

annofabcli/statistics/summarize_task_count.py

@@ -5,13 +5,11 @@ import sys
 import tempfile
 from enum import Enum
 from pathlib import Path
-from typing import Optional
 
 import pandas
 from annofabapi.models import ProjectMemberRole, Task, TaskPhase, TaskStatus
 from annofabapi.utils import get_number_of_rejections
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     ArgumentParser,
@@ -136,7 +134,7 @@ class SummarizeTaskCount(CommandLine):
         project, _ = self.service.api.get_project(project_id)
         return project["configuration"]["number_of_inspections"]
 
-    def summarize_task_count(self, project_id: str, *, task_json_path: Optional[Path], is_latest: bool, temp_dir: Optional[Path] = None) -> None:
+    def summarize_task_count(self, project_id: str, *, task_json_path: Path | None, is_latest: bool, temp_dir: Path | None = None) -> None:
         # タスク全件ファイルをダウンロードするので、オーナロールかアノテーションユーザロールであることを確認する。
         super().validate_project(project_id, project_member_roles=[ProjectMemberRole.OWNER, ProjectMemberRole.TRAINING_DATA_USER])
 
@@ -150,7 +148,7 @@ class SummarizeTaskCount(CommandLine):
         task_count_df = create_task_count_summary(task_list, number_of_inspections=number_of_inspections)
         annofabcli.common.utils.print_csv(task_count_df, output=self.output)
 
-    def get_task_list_with_downloading_file(self, project_id: str, task_json_path: Optional[Path], is_latest: bool, temp_dir: Optional[Path] = None) -> list[Task]:  # noqa: FBT001
+    def get_task_list_with_downloading_file(self, project_id: str, task_json_path: Path | None, is_latest: bool, temp_dir: Path | None = None) -> list[Task]:  # noqa: FBT001
         if task_json_path is None:
             if temp_dir is not None:
                 downloading_obj = DownloadingFile(self.service)
@@ -188,7 +186,7 @@ class SummarizeTaskCount(CommandLine):
         project_id = args.project_id
         task_json_path = Path(args.task_json) if args.task_json is not None else None
 
-        def process_task_count(temp_dir: Optional[Path]) -> None:
+        def process_task_count(temp_dir: Path | None) -> None:
             self.summarize_task_count(
                 project_id,
                 task_json_path=task_json_path,
@@ -237,7 +235,7 @@ def main(args: argparse.Namespace) -> None:
     SummarizeTaskCount(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 = "summarize_task_count"
     subcommand_help = "タスクのフェーズ、ステータス、ステップごとにタスク数を出力します。"
     description = "タスクのフェーズ、ステータス、ステップごとにタスク数を、CSV形式で出力します。"

annofabcli/statistics/summarize_task_count_by_task_id_group.py

@@ -6,12 +6,10 @@ import logging
 import tempfile
 from enum import Enum
 from pathlib import Path
-from typing import Optional
 
 import pandas
 from annofabapi.models import ProjectMemberRole, Task, TaskPhase, TaskStatus
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     ArgumentParser,
@@ -99,7 +97,7 @@ def get_task_id_prefix(task_id: str, delimiter: str) -> str:
         return delimiter.join(tmp_list[0 : len(tmp_list) - 1])
 
 
-def create_task_count_summary_df(task_list: list[Task], task_id_delimiter: Optional[str], task_id_groups: Optional[dict[str, list[str]]]) -> pandas.DataFrame:
+def create_task_count_summary_df(task_list: list[Task], task_id_delimiter: str | None, task_id_groups: dict[str, list[str]] | None) -> pandas.DataFrame:
     """
     タスク数を集計したDataFrameを生成する。
 
@@ -228,7 +226,7 @@ def main(args: argparse.Namespace) -> None:
     SummarizeTaskCountByTaskId(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 = "summarize_task_count_by_task_id_group"
     subcommand_help = "task_idのグループごとにタスク数を集計します。"
     epilog = "アノテーションユーザまたはオーナロールを持つユーザで実行してください。"

annofabcli/statistics/summarize_task_count_by_user.py

@@ -4,12 +4,10 @@ import logging
 import tempfile
 from enum import Enum
 from pathlib import Path
-from typing import Optional
 
 import pandas
 from annofabapi.models import ProjectMemberRole, Task, TaskPhase, TaskStatus
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     ArgumentParser,
@@ -185,7 +183,7 @@ def main(args: argparse.Namespace) -> None:
     SummarizeTaskCountByUser(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 = "summarize_task_count_by_user"
     subcommand_help = "ユーザごとに、担当しているタスク数を出力します。"
     description = "ユーザごとに、担当しているタスク数をCSV形式で出力します。"

annofabcli/statistics/visualization/dataframe/annotation_count.py

@@ -2,8 +2,9 @@ from __future__ import annotations
 
 import logging
 from collections import defaultdict
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Callable, Optional
+from typing import Any
 
 import pandas
 from annofabapi.parser import lazy_parse_simple_annotation_zip
@@ -47,9 +48,9 @@ class AnnotationCount:
         annotation_zip: Path,
         project_id: str,
         *,
-        get_annotation_count_func: Optional[Callable[[dict[str, Any]], int]] = None,
-        include_labels: Optional[list[str]] = None,
-        exclude_labels: Optional[list[str]] = None,
+        get_annotation_count_func: Callable[[dict[str, Any]], int] | None = None,
+        include_labels: list[str] | None = None,
+        exclude_labels: list[str] | None = None,
     ) -> AnnotationCount:
         """
         アノテーションZIPファイルからインスタンスを生成します。

annofabcli/statistics/visualization/dataframe/annotation_duration.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import logging
 from collections import defaultdict
 from pathlib import Path
-from typing import Optional
 
 import pandas
 from annofabapi.parser import lazy_parse_simple_annotation_zip
@@ -23,7 +22,7 @@ class AnnotationDuration:
         return [
             "project_id",
             "task_id",
-            "annotation_duration_second",
+            "annotation_duration_minute",
         ]
 
     @classmethod
@@ -47,8 +46,8 @@ class AnnotationDuration:
         annotation_zip: Path,
         project_id: str,
         *,
-        include_labels: Optional[list[str]] = None,
-        exclude_labels: Optional[list[str]] = None,
+        include_labels: list[str] | None = None,
+        exclude_labels: list[str] | None = None,
     ) -> AnnotationDuration:
         """
         アノテーションZIPファイルからインスタンスを生成します。
@@ -62,7 +61,7 @@ class AnnotationDuration:
         """
         logger.debug(f"アノテーションZIPファイルから区間アノテーションの長さを計算します。 :: project_id='{project_id}', file='{annotation_zip!s}'")
 
-        result: dict[tuple[str, str], float] = defaultdict(float)  # key:(project_id, task_id), value:合計アノテーション時間（秒）
+        result: dict[tuple[str, str], float] = defaultdict(float)  # key:(project_id, task_id), value:合計アノテーション時間（分）
 
         for index, parser in enumerate(lazy_parse_simple_annotation_zip(annotation_zip)):
             simple_annotation = parser.load_json()
@@ -83,7 +82,7 @@ class AnnotationDuration:
                     # 区間アノテーションの場合
                     begin = data["begin"]
                     end = data["end"]
-                    total_duration += (end - begin) / 1000.0  # ミリ秒から秒に変換
+                    total_duration += (end - begin) / 1000.0 / 60.0  # ミリ秒から分に変換
 
             result[(project_id, parser.task_id)] += total_duration
 
@@ -114,7 +113,7 @@ class AnnotationDuration:
         df_dtype: dict[str, str] = {
             "project_id": "string",
             "task_id": "string",
-            "annotation_duration_second": "float64",
+            "annotation_duration_minute": "float64",
         }
 
         df = pandas.DataFrame(columns=cls.columns()).astype(df_dtype)

annofabcli/statistics/visualization/dataframe/cumulative_productivity.py

@@ -9,11 +9,9 @@ import abc
 import itertools
 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
@@ -68,7 +66,7 @@ def _create_cumulative_dataframe(task_worktime_by_phase_user: TaskWorktimeByPhas
 class AbstractPhaseCumulativeProductivity(abc.ABC):
     """ロールごとの累積の生産性をプロットするための抽象クラス"""
 
-    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.phase_name = self._get_phase_name(phase)
@@ -110,7 +108,7 @@ class AbstractPhaseCumulativeProductivity(abc.ABC):
         user_id_list: list[str],
         output_file: Path,
         *,
-        metadata: Optional[dict[str, Any]],
+        metadata: dict[str, Any] | None,
     ) -> None:
         """
         折れ線グラフを、HTMLファイルに出力します。
@@ -150,7 +148,7 @@ class AbstractPhaseCumulativeProductivity(abc.ABC):
             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, x_column=x_column, y_column=y_column, legend_label=username, color=color)
 
             plotted_users.append((user_id, username))
@@ -184,14 +182,14 @@ class AbstractPhaseCumulativeProductivity(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()
 
 
 class AnnotatorCumulativeProductivity(AbstractPhaseCumulativeProductivity):
-    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
@@ -205,8 +203,8 @@ class AnnotatorCumulativeProductivity(AbstractPhaseCumulativeProductivity):
         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:
         """
         生産性を教師付作業者ごとにプロットする。
@@ -267,7 +265,7 @@ class AnnotatorCumulativeProductivity(AbstractPhaseCumulativeProductivity):
 
 
 class InspectorCumulativeProductivity(AbstractPhaseCumulativeProductivity):
-    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
@@ -281,8 +279,8 @@ class InspectorCumulativeProductivity(AbstractPhaseCumulativeProductivity):
         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:
         """
         生産性を検査作業者ごとにプロットする。
@@ -329,7 +327,7 @@ class InspectorCumulativeProductivity(AbstractPhaseCumulativeProductivity):
 
 
 class AcceptorCumulativeProductivity(AbstractPhaseCumulativeProductivity):
-    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
@@ -343,8 +341,8 @@ class AcceptorCumulativeProductivity(AbstractPhaseCumulativeProductivity):
         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:
         """
         生産性を受入作業者ごとにプロットする。