annofabcli 1.105.0__py3-none-any.whl → 1.106.0__py3-none-any.whl

annofabcli/__main__.py

@@ -38,7 +38,9 @@ def warn_pandas_copy_on_write() -> None:
     pandas 3.0で予期しない挙動になるのを防ぐため。
     https://pandas.pydata.org/docs/user_guide/copy_on_write.html
     """
-    major, minor, _ = pandas.__version__.split(".")
+    tmp = pandas.__version__.split(".")
+    major = tmp[0]
+    minor = tmp[1]
     if int(major) >= 2 and int(minor) >= 2:
         pandas.options.mode.copy_on_write = "warn"
 

annofabcli/annotation/change_annotation_attributes_per_annotation.py

@@ -9,6 +9,7 @@ from pathlib import Path
 from typing import Any, Optional, Union
 
 import annofabapi
+import pandas
 from annofabapi.models import ProjectMemberRole
 from annofabapi.pydantic_models.task_status import TaskStatus
 from pydantic import BaseModel
@@ -177,7 +178,8 @@ class ChangeAnnotationAttributesPerAnnotationMain(CommandLineWithConfirm):
             anno_list: 各アノテーションの変更内容リスト
         """
         changed_task_count = 0
-        failed_to_change_annotation_count = 0
+        total_failed_to_change_annotation_count = 0
+        total_succeed_to_change_annotation_count = 0
         annotation_list_per_task_id_input_data_id = get_annotation_list_per_task_id_input_data_id(anno_list)
 
         total_task_count = len(annotation_list_per_task_id_input_data_id)
@@ -185,13 +187,16 @@ class ChangeAnnotationAttributesPerAnnotationMain(CommandLineWithConfirm):
 
         for task_id, input_data_dict in annotation_list_per_task_id_input_data_id.items():
             is_changeable_task, succeed_to_change_annotation_count, failed_to_change_annotation_count = self.change_annotation_attributes_for_task(task_id, input_data_dict)
+            total_succeed_to_change_annotation_count += succeed_to_change_annotation_count
+            total_failed_to_change_annotation_count += failed_to_change_annotation_count
+
             if is_changeable_task:
                 changed_task_count += 1
 
         logger.info(
-            f"{succeed_to_change_annotation_count}/{total_annotation_count} 件のアノテーションの属性値を変更しました。 :: "
+            f"{total_succeed_to_change_annotation_count}/{total_annotation_count} 件のアノテーションの属性値を変更しました。 :: "
             f"アノテーションが変更されたタスク数は {changed_task_count}/{total_task_count} 件です。"
-            f"{failed_to_change_annotation_count} 件のアノテーションは変更できませんでした。"
+            f"{total_failed_to_change_annotation_count} 件のアノテーションは変更できませんでした。"
         )
 
 
@@ -205,12 +210,23 @@ class ChangeAttributesPerAnnotation(CommandLine):
     def main(self) -> None:
         args = self.args
 
-        annotation_items = get_json_from_args(args.json)
-        if not isinstance(annotation_items, list):
-            print(f"{self.COMMON_MESSAGE} argument --json: JSON形式が不正です。オブジェクトの配列を指定してください。", file=sys.stderr)  # noqa: T201
-            sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
+        if args.json is not None:
+            annotation_items = get_json_from_args(args.json)
+            if not isinstance(annotation_items, list):
+                print(f"{self.COMMON_MESSAGE} argument --json: JSON形式が不正です。オブジェクトの配列を指定してください。", file=sys.stderr)  # noqa: T201
+                sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
+
+            target_annotation_list = [TargetAnnotation.model_validate(anno) for anno in annotation_items]
 
-        target_annotation_list = [TargetAnnotation.model_validate(anno) for anno in annotation_items]
+        elif args.csv is not None:
+            df_input = pandas.read_csv(args.csv)
+            target_annotation_list = [
+                TargetAnnotation(task_id=e["task_id"], input_data_id=e["input_data_id"], annotation_id=e["annotation_id"], attributes=json.loads(e["attributes"]))
+                for e in df_input.to_dict(orient="records")
+            ]
+        else:
+            print(f"{self.COMMON_MESSAGE} argument '--json' または '--csv' のいずれかを指定してください。", file=sys.stderr)  # noqa: T201
+            sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
 
         project_id = args.project_id
 
@@ -243,13 +259,20 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     argument_parser.add_project_id()
 
     sample_json_obj = [{"task_id": "t1", "input_data_id": "i1", "annotation_id": "a1", "attributes": {"occluded": True}}]
-    parser.add_argument(
+    input_group = parser.add_mutually_exclusive_group(required=True)
+    input_group.add_argument(
         "--json",
         type=str,
-        required=True,
         help="各アノテーションごとに変更内容を記載したJSONリストを指定します。 ``file://`` を先頭に付けるとJSON形式のファイルを指定できます。\n"
         f"(例) '{json.dumps(sample_json_obj, ensure_ascii=False)}'",
     )
+    input_group.add_argument(
+        "--csv",
+        type=str,
+        help="各アノテーションごとに変更内容を記載したCSVファイルを指定します。 \n"
+        "* `task_id`, `input_data_id`, `annotation_id`, `attributes` の4つのカラムが必要です。\n"
+        f"`attributes` カラムには、属性名と値を '{json.dumps({'occluded': True})}' のようにJSON形式で指定します。\n",
+    )
 
     parser.add_argument(
         "--force",

annofabcli/common/cli.py

@@ -524,33 +524,6 @@ class CommandLineWithoutWebapi:
 
         return yes
 
-    def confirm_processing_task(self, task_id: str, confirm_message: str) -> bool:
-        """
-        タスクに対して処理するかどうか問い合わせる。
-        `all_yes`属性も設定する。
-
-        Args:
-            task_id: 処理するtask_id
-            confirm_message: 確認メッセージ
-
-        Returns:
-            Trueならば対象のタスクを処理する。
-
-        """
-        if self.all_yes:
-            return True
-
-        yes, all_yes = prompt_yesnoall(confirm_message)
-
-        if not yes:
-            logger.info(f"task_id = {task_id} をスキップします。")
-            return False
-
-        if all_yes:
-            self.all_yes = True
-
-        return True
-
     def print_csv(self, df: pandas.DataFrame) -> None:
         print_csv(df, output=self.output)
 

annofabcli/common/pandas.py

@@ -8,7 +8,10 @@ def get_frequency_of_monthend() -> str:
 
     https://github.com/pandas-dev/pandas/issues/9586
     """
-    major, minor, _ = pandas.__version__.split(".")
+    tmp = pandas.__version__.split(".")
+    major = tmp[0]
+    minor = tmp[1]
+
     if int(major) >= 2 and int(minor) >= 2:
         return "ME"
     return "M"

annofabcli/statistics/list_annotation_area.py

@@ -64,6 +64,9 @@ class AnnotationAreaInfo(DataClassJsonMixin):
     input_data_id: str
     input_data_name: str
 
+    updated_datetime: Optional[str]
+    """アノテーションJSONに格納されているアノテーションの更新日時"""
+
     label: str
     annotation_id: str
     annotation_area: int
@@ -77,7 +80,7 @@ def calculate_bounding_box_area(data: dict[str, Any]) -> int:
 
 def calculate_segmentation_area(outer_file: Path) -> int:
     nd_array = read_binary_image(outer_file)
-    return numpy.count_nonzero(nd_array)
+    return int(numpy.count_nonzero(nd_array))
 
 
 def get_annotation_area_info_list(parser: SimpleAnnotationParser, simple_annotation: dict[str, Any]) -> list[AnnotationAreaInfo]:
@@ -103,6 +106,7 @@ def get_annotation_area_info_list(parser: SimpleAnnotationParser, simple_annotat
                 label=detail["label"],
                 annotation_id=detail["annotation_id"],
                 annotation_area=annotation_area,
+                updated_datetime=simple_annotation["updated_datetime"],
             )
         )
 
@@ -144,6 +148,7 @@ def create_df(
         "task_phase_stage",
         "input_data_id",
         "input_data_name",
+        "updated_datetime",
         "label",
         "annotation_id",
         "annotation_area",

annofabcli/statistics/list_annotation_attribute.py

@@ -65,6 +65,8 @@ class AnnotationAttribute(pydantic.BaseModel):
 
     input_data_id: str
     input_data_name: str
+    updated_datetime: Optional[str]
+    """アノテーションJSONに格納されているアノテーションの更新日時"""
     annotation_id: str
     label: str
     attributes: dict[str, Union[str, int, bool]]
@@ -98,6 +100,7 @@ def get_annotation_attribute_list_from_annotation_json(simple_annotation: dict[s
                 label=detail["label"],
                 annotation_id=detail["annotation_id"],
                 attributes=detail["attributes"],
+                updated_datetime=simple_annotation["updated_datetime"],
             )
         )
     return result
@@ -150,6 +153,7 @@ def print_annotation_attribute_list_as_csv(annotation_attribute_list: list, outp
         "task_phase_stage",
         "input_data_id",
         "input_data_name",
+        "updated_datetime",
         "annotation_id",
         "label",
     ]

annofabcli/statistics/list_annotation_attribute_filled_count.py

@@ -108,6 +108,8 @@ class AnnotationCountByInputData(DataClassJsonMixin, HasAnnotationAttributeCount
 
     input_data_id: str
     input_data_name: str
+    updated_datetime: Optional[str]
+    """アノテーションJSONに格納されているアノテーションの更新日時"""
 
     annotation_attribute_counts: dict[AttributeValueKey, int] = field(
         metadata=config(
@@ -275,6 +277,7 @@ class ListAnnotationCounterByInputData:
             input_data_name=simple_annotation["input_data_name"],
             annotation_attribute_counts=annotation_count_by_attribute,
             frame_no=frame_no,
+            updated_datetime=simple_annotation["updated_datetime"],
         )
 
     def get_annotation_count_list(
@@ -355,6 +358,7 @@ class AnnotationCountCsvByAttribute:
             ("input_data_id", "", ""),
             ("input_data_name", "", ""),
             ("frame_no", "", ""),
+            ("updated_datetime", "", ""),
         ]
         value_columns = self._value_columns(annotation_count_list, prior_attribute_columns=prior_attribute_columns)
         return basic_columns + value_columns
@@ -390,6 +394,7 @@ class AnnotationCountCsvByAttribute:
                 ("task_phase_stage", "", ""): c.task_phase_stage,
                 ("input_data_id", "", ""): c.input_data_id,
                 ("input_data_name", "", ""): c.input_data_name,
+                ("updated_datetime", "", ""): c.updated_datetime,
                 ("frame_no", "", ""): c.frame_no,
             }
             cell.update(c.annotation_attribute_counts)  # type: ignore[arg-type]

annofabcli/statistics/list_annotation_count.py

@@ -133,6 +133,8 @@ class AnnotationCounterByInputData(AnnotationCounter, DataClassJsonMixin):
 
     input_data_id: str
     input_data_name: str
+    updated_datetime: Optional[str]
+    """アノテーションJSONに格納されているアノテーションの更新日時"""
     frame_no: Optional[int] = None
     """アノテーションJSONには含まれていない情報なので、Optionalにする"""
 
@@ -263,6 +265,7 @@ class ListAnnotationCounterByInputData:
             task_status=TaskStatus(simple_annotation["task_status"]),
             input_data_id=simple_annotation["input_data_id"],
             input_data_name=simple_annotation["input_data_name"],
+            updated_datetime=simple_annotation["updated_datetime"],
             annotation_count=sum(annotation_count_by_label.values()),
             annotation_count_by_label=annotation_count_by_label,
             annotation_count_by_attribute=annotation_count_by_attribute,
@@ -520,6 +523,7 @@ class AttributeCountCsv:
                 ("input_data_id", "", ""),
                 ("input_data_name", "", ""),
                 ("frame_no", "", ""),
+                ("updated_datetime", "", ""),
                 ("annotation_count", "", ""),
             ]
             value_columns = self._value_columns(counter_list, prior_attribute_columns)
@@ -531,6 +535,7 @@ class AttributeCountCsv:
                 ("input_data_id", "", ""): c.input_data_id,
                 ("input_data_name", "", ""): c.input_data_name,
                 ("frame_no", "", ""): c.frame_no,
+                ("updated_datetime", "", ""): c.updated_datetime,
                 ("task_id", "", ""): c.task_id,
                 ("task_status", "", ""): c.task_status.value,
                 ("task_phase", "", ""): c.task_phase.value,
@@ -625,6 +630,7 @@ class LabelCountCsv:
                 "input_data_id",
                 "input_data_name",
                 "frame_no",
+                "updated_datetime",
                 "annotation_count",
             ]
             value_columns = self._value_columns(counter_list, prior_label_columns)
@@ -636,6 +642,7 @@ class LabelCountCsv:
                 "input_data_id": c.input_data_id,
                 "input_data_name": c.input_data_name,
                 "frame_no": c.frame_no,
+                "updated_datetime": c.updated_datetime,
                 "task_id": c.task_id,
                 "task_status": c.task_status.value,
                 "task_phase": c.task_phase.value,

annofabcli/statistics/list_annotation_duration.py

@@ -116,6 +116,10 @@ class AnnotationDuration(DataClassJsonMixin):
 
     input_data_id: str
     input_data_name: str
+
+    updated_datetime: Optional[str]
+    """アノテーションJSONに格納されているアノテーションの更新日時"""
+
     video_duration_second: Optional[float]
     """動画の長さ[秒]"""
 
@@ -242,6 +246,7 @@ class ListAnnotationDurationByInputData:
             task_status=TaskStatus(simple_annotation["task_status"]),
             input_data_id=simple_annotation["input_data_id"],
             input_data_name=simple_annotation["input_data_name"],
+            updated_datetime=simple_annotation["updated_datetime"],
             video_duration_second=video_duration_second,
             annotation_duration_second=sum(annotation_duration_by_label.values()),
             annotation_duration_second_by_label=annotation_duration_by_label,
@@ -434,6 +439,7 @@ class AnnotationDurationCsvByLabel:
             "task_phase_stage",
             "input_data_id",
             "input_data_name",
+            "updated_datetime",
             "video_duration_second",
             "annotation_duration_second",
         ]
@@ -456,6 +462,7 @@ class AnnotationDurationCsvByLabel:
                 "task_phase_stage": c.task_phase_stage,
                 "video_duration_second": c.video_duration_second,
                 "annotation_duration_second": c.annotation_duration_second,
+                "updated_datetime": c.updated_datetime,
             }
             d.update(c.annotation_duration_second_by_label)
             return d

annofabcli/statistics/visualization/dataframe/cumulative_productivity.py

@@ -62,10 +62,6 @@ def _create_cumulative_dataframe(task_worktime_by_phase_user: TaskWorktimeByPhas
     # `YYYY-MM-DDThh:mm:ss.sss+09:00`から`YYYY-MM-DD`を取得する
     # キャストする理由: 全部nanだとfloat型になって、".str"にアクセスできないため
     df[f"first_{str_phase}_started_date"] = df["started_datetime"].astype("string").str[:10]
-    # bokeh3.0.3では、string型の列を持つpandas.DataFrameを描画できないため、改めてobject型に戻す
-    # TODO この問題が解決されたら、削除する
-    # https://qiita.com/yuji38kwmt/items/b5da6ed521e827620186
-    df[f"first_{str_phase}_started_date"] = df[f"first_{str_phase}_started_date"].astype("object")
     return df
 
 

annofabcli/statistics/visualization/dataframe/task.py

@@ -94,6 +94,21 @@ class Task:
         df["acceptance_worktime_hour"] = 0
         return Task(df, custom_production_volume_list=self.custom_production_volume_list)
 
+    def to_non_inspection_acceptance(self) -> Task:
+        """
+        検査フェーズと受入フェーズの作業時間を0にした新しいインスタンスを生成します。
+
+        `--task_completion_criteria inspection_reached`を指定したときに利用します。
+        この場合、検査/受入フェーズの作業時間を無視して集計する必要があるためです。
+
+        """
+        df = self.df.copy()
+        df["first_inspection_worktime_hour"] = 0
+        df["first_acceptance_worktime_hour"] = 0
+        df["inspection_worktime_hour"] = 0
+        df["acceptance_worktime_hour"] = 0
+        return Task(df, custom_production_volume_list=self.custom_production_volume_list)
+
     @property
     def optional_columns(self) -> list[str]:
         return [
@@ -104,6 +119,9 @@ class Task:
             "post_rejection_annotation_worktime_hour",
             "post_rejection_inspection_worktime_hour",
             "post_rejection_acceptance_worktime_hour",
+            # 作業時間に関する内容
+            "completed_datetime",
+            "operation_updated_datetime",
         ]
 
     @property
@@ -134,7 +152,8 @@ class Task:
             "first_acceptance_username",
             "first_acceptance_worktime_hour",
             "first_acceptance_started_datetime",
-            # 受入フェーズの日時
+            # 初めて～になった日時
+            "first_inspection_reached_datetime",
             "first_acceptance_reached_datetime",
             "first_acceptance_completed_datetime",
             # 作業時間に関する内容
@@ -254,6 +273,7 @@ class Task:
             "first_annotation_user_id",
             "first_annotation_username",
             "first_annotation_started_datetime",
+            "first_inspection_reached_datetime",
             "first_inspection_user_id",
             "first_inspection_username",
             "first_inspection_started_datetime",

annofabcli/statistics/visualization/dataframe/task_worktime_by_phase_user.py

@@ -63,6 +63,19 @@ class TaskWorktimeByPhaseUser:
         df = df[df["phase"] != TaskPhase.ACCEPTANCE.value]
         return TaskWorktimeByPhaseUser(df, custom_production_volume_list=self.custom_production_volume_list)
 
+    def to_non_inspection_acceptance(self) -> TaskWorktimeByPhaseUser:
+        """
+        検査/受入フェーズの作業時間を0にした新しいインスタンスを生成します。
+
+        `--task_completion_criteria inspection_reached`を指定したときに利用します。
+        この場合、検査/受入フェーズの作業時間を無視して集計する必要があるためです。
+
+        """
+        df = self.df.copy()
+        # 教師付フェーズのみ残す
+        df = df[df["phase"] == TaskPhase.ANNOTATION.value]
+        return TaskWorktimeByPhaseUser(df, custom_production_volume_list=self.custom_production_volume_list)
+
     @property
     def columns(self) -> list[str]:
         """

annofabcli/statistics/visualization/dataframe/user_performance.py

@@ -553,6 +553,12 @@ class UserPerformance:
             worktime_per_date = worktime_per_date.to_non_acceptance()
             task_worktime_by_phase_user = task_worktime_by_phase_user.to_non_acceptance()
 
+        elif task_completion_criteria == TaskCompletionCriteria.INSPECTION_REACHED:
+            # 検査フェーズに到達したらタスクの作業が完了したとみなす場合、
+            # 検査フェーズと受入フェーズの作業時間や生産量は不要な情報なので、検査作業時間と受入作業時間を0にする
+            worktime_per_date = worktime_per_date.to_non_inspection_acceptance()
+            task_worktime_by_phase_user = task_worktime_by_phase_user.to_non_inspection_acceptance()
+
         # 実際の計測作業時間情報（集計タスクに影響されない作業時間）と実績作業時間を算出する
         df = cls._create_df_real_worktime(worktime_per_date)
 

annofabcli/statistics/visualization/dataframe/whole_productivity_per_date.py

@@ -156,10 +156,12 @@ class WholeProductivityPerCompletedDate:
                 monitored_inspection_worktime_hour
                 monitored_acceptance_worktime_hour
         """
-
         if task_completion_criteria == TaskCompletionCriteria.ACCEPTANCE_REACHED:
             # 受入フェーズに到達したらタスクの作業が完了したとみなす場合、受入フェーズの作業時間や生産量は不要な情報なので、受入作業時間を0にする
             worktime_per_date = worktime_per_date.to_non_acceptance()
+        if task_completion_criteria == TaskCompletionCriteria.INSPECTION_REACHED:
+            # 検査フェーズに到達したらタスクの作業が完了したとみなす場合、検査/受入フェーズの作業時間や生産量は不要な情報なので、検査/受入作業時間を0にする
+            worktime_per_date = worktime_per_date.to_non_inspection_acceptance()
 
         # 生産量を表す列名
         production_volume_columns = ["input_data_count", "annotation_count", *[e.value for e in task.custom_production_volume_list]]
@@ -168,6 +170,8 @@ class WholeProductivityPerCompletedDate:
             datetime_column = "first_acceptance_completed_datetime"
         elif task_completion_criteria == TaskCompletionCriteria.ACCEPTANCE_REACHED:
             datetime_column = "first_acceptance_reached_datetime"
+        elif task_completion_criteria == TaskCompletionCriteria.INSPECTION_REACHED:
+            datetime_column = "first_inspection_reached_datetime"
         else:
             assert_noreturn(task_completion_criteria)
 
@@ -271,15 +275,19 @@ class WholeProductivityPerCompletedDate:
         HTMLページの先頭に付与するdiv要素を生成する。
         """
         if self.task_completion_criteria == TaskCompletionCriteria.ACCEPTANCE_COMPLETED:
-            str_task = "受入フェーズ完了状態"
+            str_task = "受入フェーズ完了状態になった"
         elif self.task_completion_criteria == TaskCompletionCriteria.ACCEPTANCE_REACHED:
-            str_task = "受入フェーズ"
+            str_task = "受入フェーズに到達した"
+        elif self.task_completion_criteria == TaskCompletionCriteria.INSPECTION_REACHED:
+            str_task = "検査フェーズに到達した"
         else:
             assert_noreturn(self.task_completion_criteria)
 
-        elm_list = ["<h4>注意</h4>", f"<p>「X日のタスク数」は、X日に初めて{str_task}になったタスクの個数です。</p>"]
+        elm_list = ["<h4>注意</h4>", f"<p>「X日のタスク数」は、X日に初めて{str_task}タスクの個数です。</p>"]
         if self.task_completion_criteria == TaskCompletionCriteria.ACCEPTANCE_REACHED:
             elm_list.append("<p>タスクが受入フェーズに到達したら作業が完了したとみなしているため、受入作業時間は0にしています。</p>")
+        elif self.task_completion_criteria == TaskCompletionCriteria.INSPECTION_REACHED:
+            elm_list.append("<p>タスクが検査フェーズに到達したら作業が完了したとみなしているため、検査作業時間と受入作業時間は0にしています。</p>")
         return Div(text=" ".join(elm_list))
 
     def plot(
@@ -865,12 +873,17 @@ class WholeProductivityPerFirstAnnotationStartedDate:
         if task_completion_criteria == TaskCompletionCriteria.ACCEPTANCE_REACHED:
             # 受入フェーズに到達したらタスクの作業が完了したとみなす場合、受入フェーズの作業時間や生産量は不要な情報なので、受入作業時間を0にする
             task = task.to_non_acceptance()
+        elif task_completion_criteria == TaskCompletionCriteria.INSPECTION_REACHED:
+            # 検査フェーズに到達したらタスクの作業が完了したとみなす場合、検査/受入フェーズの作業時間や生産量は不要な情報なので、検査/受入作業時間を0にする
+            task = task.to_non_inspection_acceptance()
 
         df_task = task.df
         if task_completion_criteria == TaskCompletionCriteria.ACCEPTANCE_COMPLETED:
             df_sub_task = df_task[df_task["status"] == TaskStatus.COMPLETE.value]
         elif task_completion_criteria == TaskCompletionCriteria.ACCEPTANCE_REACHED:
             df_sub_task = df_task[df_task["phase"] == TaskPhase.ACCEPTANCE.value]
+        elif task_completion_criteria == TaskCompletionCriteria.INSPECTION_REACHED:
+            df_sub_task = df_task[df_task["phase"].isin([TaskPhase.INSPECTION.value, TaskPhase.ACCEPTANCE.value])]
         else:
             assert_noreturn(task_completion_criteria)
 
@@ -998,12 +1011,16 @@ class WholeProductivityPerFirstAnnotationStartedDate:
                 str_task = "受入フェーズ完了状態"
             elif self.task_completion_criteria == TaskCompletionCriteria.ACCEPTANCE_REACHED:
                 str_task = "受入フェーズ"
+            elif self.task_completion_criteria == TaskCompletionCriteria.INSPECTION_REACHED:
+                str_task = "検査フェーズまたは受入フェーズ"
             else:
                 assert_noreturn(self.task_completion_criteria)
 
             elm_list = ["<h4>注意</h4>", f"<p>「X日のタスク数」は、X日に教師付フェーズを開始したタスクの内、{str_task}であるタスクの個数です。</p>"]
             if self.task_completion_criteria == TaskCompletionCriteria.ACCEPTANCE_REACHED:
                 elm_list.append("<p>タスクが受入フェーズに到達したら作業が完了したとみなしているため、受入作業時間は0にしています。</p>")
+            elif self.task_completion_criteria == TaskCompletionCriteria.INSPECTION_REACHED:
+                elm_list.append("<p>タスクが検査フェーズまたは受入フェーズに到達したら作業が完了したとみなしているため、検査作業時間と受入作業時間は0にしています。</p>")
 
             return Div(text=" ".join(elm_list))
 

annofabcli/statistics/visualization/dataframe/worktime_per_date.py

@@ -14,7 +14,6 @@ import annofabapi
 import bokeh
 import bokeh.layouts
 import bokeh.palettes
-import numpy
 import pandas
 from bokeh.models.ui import UIElement
 from bokeh.plotting import ColumnDataSource
@@ -113,6 +112,20 @@ class WorktimePerDate:
         df["monitored_worktime_hour"] = df["monitored_annotation_worktime_hour"] + df["monitored_inspection_worktime_hour"] + df["monitored_acceptance_worktime_hour"]
         return WorktimePerDate(df)
 
+    def to_non_inspection_acceptance(self) -> WorktimePerDate:
+        """
+        検査フェーズと受入フェーズの作業時間を0にした新しいインスタンスを生成します。
+
+        `--task_completion_criteria inspection_reached`を指定したときに利用します。
+        この場合、検査フェーズと受入フェーズの作業時間を無視して集計する必要があるためです。
+
+        """
+        df = self.df.copy()
+        df["monitored_inspection_worktime_hour"] = 0
+        df["monitored_acceptance_worktime_hour"] = 0
+        df["monitored_worktime_hour"] = df["monitored_annotation_worktime_hour"]
+        return WorktimePerDate(df)
+
     def is_empty(self) -> bool:
         """
         空のデータフレームを持つかどうかを返します。
@@ -442,13 +455,6 @@ class WorktimePerDate:
         df_cumulative = self._get_cumulative_dataframe(df_continuous_date)
         df_cumulative["dt_date"] = df_cumulative["date"].map(lambda e: datetime.datetime.fromisoformat(e).date())
 
-        # bokeh3.0.3では、string型の列を持つpandas.DataFrameを描画できないため、改めてobject型に戻す
-        # またpandas.NAを持つDataFrameも描画できないので、numpy.nanに変換する
-        # TODO この問題が解決されたら、削除する
-        # https://qiita.com/yuji38kwmt/items/b5da6ed521e827620186
-        df_cumulative = df_cumulative.astype({"date": "object", "account_id": "object", "user_id": "object", "username": "object", "biography": "object"})
-        df_cumulative.replace(pandas.NA, numpy.nan, inplace=True)
-
         line_count = 0
         plotted_users: list[tuple[str, str]] = []
         for user_index, user_id in enumerate(user_id_list):

annofabcli/statistics/visualization/filtering_query.py

@@ -10,6 +10,7 @@ from annofabapi.models import Task
 
 from annofabcli.common.facade import TaskQuery, match_task_with_query
 from annofabcli.common.utils import isoduration_to_hour
+from annofabcli.statistics.visualization.model import TaskCompletionCriteria
 
 logger = logging.getLogger(__name__)
 
@@ -72,7 +73,7 @@ def filter_task_histories(task_histories: dict[str, list[dict[str, Any]]], *, st
     return {task_id: sub_task_history_list for task_id, sub_task_history_list in task_histories.items() if pred(sub_task_history_list)}
 
 
-def filter_tasks(tasks: list[dict[str, Any]], query: FilteringQuery, *, task_histories: dict[str, list[dict[str, Any]]]) -> list[Task]:
+def filter_tasks(tasks: list[dict[str, Any]], task_completion_criteria: TaskCompletionCriteria, query: FilteringQuery, task_histories: dict[str, list[dict[str, Any]]]) -> list[Task]:
     """
     タスク一覧を絞り込みます。
 
@@ -95,6 +96,9 @@ def filter_tasks(tasks: list[dict[str, Any]], query: FilteringQuery, *, task_his
         """
 
         flag = True
+
+        flag = flag and task_completion_criteria.is_task_completed(arg_task)
+
         if query.task_query is not None:
             flag = flag and match_task_with_query(DcTask.from_dict(arg_task), query.task_query)
 

annofabcli/statistics/visualization/model.py

@@ -1,5 +1,11 @@
 from dataclasses import dataclass
 from enum import Enum
+from typing import Any
+
+from annofabapi.pydantic_models.task_phase import TaskPhase
+from annofabapi.pydantic_models.task_status import TaskStatus
+
+from annofabcli.common.type_util import assert_noreturn
 
 
 class WorktimeColumn(Enum):
@@ -32,3 +38,29 @@ class TaskCompletionCriteria(Enum):
     """タスクが受入フェーズの完了状態であれば「タスクの完了」とみなす"""
     ACCEPTANCE_REACHED = "acceptance_reached"
     """タスクが受入フェーズに到達したら「タスクの完了」とみなす"""
+    INSPECTION_REACHED = "inspection_reached"
+    """タスクが検査フェーズに到達したら「タスクの完了」とみなす"""
+
+    def is_task_completed(self, task: dict[str, Any]) -> bool:
+        """指定したタスクが、タスクの完了条件に合致するかどうかを判定します。
+
+        Args:
+            task: タスク情報。以下のキーを参照します。
+                * phase
+                * status
+
+        Returns:
+            タスクの完了条件に合致する場合はTrue、そうでない場合はFalse
+        """
+        if self == TaskCompletionCriteria.ACCEPTANCE_COMPLETED:
+            return task["phase"] == TaskPhase.ACCEPTANCE.value and task["status"] == TaskStatus.COMPLETE.value
+
+        elif self == TaskCompletionCriteria.ACCEPTANCE_REACHED:
+            return task["phase"] == TaskPhase.ACCEPTANCE.value
+
+        elif self == TaskCompletionCriteria.INSPECTION_REACHED:
+            # 受入フェーズも含む理由：検査フェーズに到達したタスクを「完了」とみなすならば、検査フェーズより後段フェーズである受入フェーズも「完了」とみなせるため
+            return task["phase"] in {TaskPhase.INSPECTION.value, TaskPhase.ACCEPTANCE.value}
+
+        else:
+            assert_noreturn(self)

annofabcli/statistics/visualization/project_dir.py

@@ -37,6 +37,12 @@ class ProjectDir(DataClassJsonMixin):
     Args:
         project_dir: ``annofabcli statistics visualize``コマンドによって出力されたプロジェクトディレクトリ
         metadata:
+
+    タスクの完了条件（task_completion_criteria）は以下のいずれかです。
+        - acceptance_completed: 受入フェーズの完了状態
+        - acceptance_reached: 受入フェーズに到達
+        - inspection_reached: 検査フェーズまたは受入フェーズに到達
+        - annotation_started: 教師付フェーズを着手
     """
 
     FILENAME_WHOLE_PERFORMANCE = "全体の生産性と品質.csv"
@@ -454,7 +460,7 @@ class ProjectInfo(DataClassJsonMixin):
     measurement_datetime: str
     """計測日時。（2004-04-01T12:00+09:00形式）"""
     task_completion_criteria: TaskCompletionCriteria
-    """タスクの完了条件"""
+    """タスクの完了条件（acceptance_completed / acceptance_reached / inspection_reached / annotation_started）"""
     query: FilteringQuery
     """集計対象を絞り込むためのクエリ"""
 

annofabcli/statistics/visualize_statistics.py

@@ -12,7 +12,7 @@ from typing import Any, Callable, Optional
 
 import annofabapi
 import pandas
-from annofabapi.models import ProjectMemberRole, TaskPhase, TaskStatus
+from annofabapi.models import ProjectMemberRole, TaskPhase
 
 import annofabcli
 from annofabcli.common.cli import (
@@ -24,7 +24,6 @@ from annofabcli.common.cli import (
     get_list_from_args,
 )
 from annofabcli.common.facade import AnnofabApiFacade, TaskQuery
-from annofabcli.common.type_util import assert_noreturn
 from annofabcli.statistics.visualization.dataframe.actual_worktime import ActualWorktime
 from annofabcli.statistics.visualization.dataframe.annotation_count import AnnotationCount
 from annofabcli.statistics.visualization.dataframe.cumulative_productivity import (
@@ -123,7 +122,7 @@ class WriteCsvGraph:
 
             tasks = self.visualize_source_files.read_tasks_json()
             task_histories = self.visualize_source_files.read_task_histories_json()
-            new_tasks = filter_tasks(tasks, self.filtering_query, task_histories=task_histories)
+            new_tasks = filter_tasks(tasks, self.task_completion_criteria, self.filtering_query, task_histories=task_histories)
             logger.debug(f"project_id='{self.project_id}' :: 集計対象タスクは {len(new_tasks)} / {len(tasks)} 件です。")
 
             self.task = Task.from_api_content(
@@ -534,14 +533,9 @@ class VisualizeStatistics(CommandLine):
             sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
 
         task_completion_criteria = TaskCompletionCriteria(args.task_completion_criteria)
-        if task_completion_criteria == TaskCompletionCriteria.ACCEPTANCE_COMPLETED:
-            task_query = TaskQuery(phase=TaskPhase.ACCEPTANCE, status=TaskStatus.COMPLETE)
-        elif task_completion_criteria == TaskCompletionCriteria.ACCEPTANCE_REACHED:
-            task_query = TaskQuery(phase=TaskPhase.ACCEPTANCE)
-        else:
-            assert_noreturn(task_completion_criteria)
 
         dict_task_query = annofabcli.common.cli.get_json_from_args(args.task_query)
+        task_query: Optional[TaskQuery] = None
         if dict_task_query is not None:
             task_query = TaskQuery.from_dict(dict_task_query)
             logger.warning("引数 '--task_query' は非推奨です。代わりに '--task_completion_criteria' を指定してください。")

annofabcli/statistics/visualize_video_duration.py

@@ -106,7 +106,7 @@ def plot_video_duration(
         bins_sequence = numpy.arange(0, max_duration + bin_width, bin_width)
 
         if bins_sequence[-1] == max_duration:
-            bins_sequence = numpy.append(bins_sequence, bins_sequence[-1] + bin_width)  # type: ignore[assignment]
+            bins_sequence = numpy.append(bins_sequence, bins_sequence[-1] + bin_width)
 
         bins: Union[int, numpy.ndarray] = bins_sequence
     else:

annofabcli/task/list_tasks_added_task_history.py

@@ -148,12 +148,33 @@ def get_first_acceptance_reached_datetime(task_histories: list[TaskHistory]) ->
         if history["phase"] != TaskPhase.ACCEPTANCE.value:
             continue
 
+        assert index > 0
         first_acceptance_reached_datetime = task_histories[index - 1]["ended_datetime"]
         assert first_acceptance_reached_datetime is not None
         return first_acceptance_reached_datetime
     return None
 
 
+def get_first_inspection_reached_datetime(task_histories: list[TaskHistory]) -> Optional[str]:
+    """
+    はじめて検査フェーズに到達した日時を取得する。
+    検査フェーズを着手した日時とは異なる。
+    必ず`first_inspection_started_datetime`よりも前の日時になる。
+
+    たとえば教師付フェーズで提出して検査フェーズに到達した場合、教師付フェーズを提出した日時が「検査フェーズに到達した日時」になる。
+
+    """
+    for index, history in enumerate(task_histories):
+        if history["phase"] != TaskPhase.INSPECTION.value:
+            continue
+
+        assert index > 0
+        first_inspection_reached_datetime = task_histories[index - 1]["ended_datetime"]
+        assert first_inspection_reached_datetime is not None
+        return first_inspection_reached_datetime
+    return None
+
+
 def is_acceptance_phase_skipped(task_histories: list[TaskHistory]) -> bool:
     """抜取受入によって、受入フェーズでスキップされたことがあるかを取得する。
 
@@ -332,7 +353,8 @@ class AddingAdditionalInfoToTask:
             first_task_history = get_first_task_history(task_histories, phase)
             self._add_task_history_info(task, first_task_history, column_prefix=f"first_{phase.value}")
 
-        # 初めて受入が完了した日時
+        # 初めて～になった日時
+        task["first_inspection_reached_datetime"] = get_first_inspection_reached_datetime(task_histories)
         task["first_acceptance_reached_datetime"] = get_first_acceptance_reached_datetime(task_histories)
         task["first_acceptance_completed_datetime"] = get_first_acceptance_completed_datetime(task_histories)
 
@@ -387,6 +409,7 @@ class TasksAddedTaskHistoryOutput:
     def _get_output_target_columns() -> list[str]:
         base_columns = [
             # タスクの基本情報
+            "project_id",
             "task_id",
             "phase",
             "phase_stage",
@@ -409,6 +432,7 @@ class TasksAddedTaskHistoryOutput:
             # 差し戻し回数
             "number_of_rejections_by_inspection",
             "number_of_rejections_by_acceptance",
+            "first_inspection_reached_datetime",
             "first_acceptance_reached_datetime",
             "first_acceptance_completed_datetime",
             "completed_datetime",
@@ -432,17 +456,14 @@ class TasksAddedTaskHistoryOutput:
 
     def output(self, output_path: Path, output_format: FormatArgument) -> None:
         task_list = self.task_list
-        if len(task_list) == 0:
-            logger.info("タスク一覧の件数が0件のため、出力しません。")
-            return
-
-        logger.debug(f"タスク一覧の件数: {len(task_list)}")
+        logger.debug(f"タスク {len(task_list)} 件の情報を出力します。")
         if output_format == FormatArgument.CSV:
-            df_task = pandas.DataFrame(task_list)
+            df_task = pandas.DataFrame(task_list, columns=self._get_output_target_columns())
             print_csv(
                 df_task[self._get_output_target_columns()],
                 output=output_path,
             )
+
         elif output_format == FormatArgument.JSON:
             print_json(task_list, is_pretty=False, output=output_path)
         elif output_format == FormatArgument.PRETTY_JSON:

{annofabcli-1.105.0.dist-info → annofabcli-1.106.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annofabcli
-Version: 1.105.0
+Version: 1.106.0
 Summary: Utility Command Line Interface for AnnoFab
 Author: Kurusugawa Computer Inc.
 License: MIT

{annofabcli-1.105.0.dist-info → annofabcli-1.106.0.dist-info}/RECORD

@@ -1,10 +1,10 @@
 annofabcli/__init__.py,sha256=fdBtxy5rOI8zi26jf0hmXS5KTBjQIsm2b9ZUSAIR558,319
-annofabcli/__main__.py,sha256=83jLGTlNGoXaYU3fz9akYXoL3kgfIuaVXo_TkpK72IU,5267
+annofabcli/__main__.py,sha256=YfuJE9E43xSo6iHTxVuQPHCz2eBaJS07QnVU42-0znQ,5293
 annofabcli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/annotation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/annotation/annotation_query.py,sha256=VwfPWpLOpVa2SeEJ264LmCKkBGDJvpX8o7GbWIrDE0o,15712
 annofabcli/annotation/change_annotation_attributes.py,sha256=Zjqax-sb7ujJnTUVv4io0GFmZzfqx0rpN2N1W86uVTs,17092
-annofabcli/annotation/change_annotation_attributes_per_annotation.py,sha256=7_the3-G18pu5YIlXQeyRhn9cUIFE3rlEPm-p9H8D50,12735
+annofabcli/annotation/change_annotation_attributes_per_annotation.py,sha256=iU199MlMfD-nfyRiHL44Zqrvr12vOeUHXyxCrDgaivI,14130
 annofabcli/annotation/change_annotation_properties.py,sha256=Kp_LZ5sSoVmmjGE80ABVO3InxsXBIxiFFvVcIJNsOMk,18309
 annofabcli/annotation/copy_annotation.py,sha256=Pih2k3vvpgfT3Ovb3gZw2L_8fK_ws_wKR7ARYG5hG_8,18407
 annofabcli/annotation/delete_annotation.py,sha256=hQApNrx2Ci1bBWk0dRGA0oJkIgDHwl6Jy0-33gYF6jo,22989
@@ -48,14 +48,14 @@ annofabcli/comment/subcommand_comment.py,sha256=gd8w8ArXM1Tq9VUduDgn8m4G6HwevRWJ
 annofabcli/comment/utils.py,sha256=aUj7U6MtGh64F3Ko83y4NKPKyWAqcg-c1XLqjkmIpSk,350
 annofabcli/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/common/bokeh.py,sha256=x5-Siok3cIhq-biTOb3JG91_q--ob1m48TDgB72P1Hc,1071
-annofabcli/common/cli.py,sha256=zGbelWfEct1UXVDp8l2NM2lmYa8B2bRFAt8o5O4W1gY,22381
+annofabcli/common/cli.py,sha256=pmbieBx1-Eb-mlVqJAG0dJnalggczdbBly_u-qzHX84,21666
 annofabcli/common/dataclasses.py,sha256=FRDihsB-H5P5ioVE3kfJtorsS5EbSMySlHrp8BJ3ktg,385
 annofabcli/common/download.py,sha256=b3e5tVn1dmM1BMti67WwGzDCRH7hYJQEgk0xxkkuMIw,14003
 annofabcli/common/enums.py,sha256=pnMZEk8ADK2qO2Hmujx6NxeCwvSAEDNhmgK4ajPSC9Q,1233
 annofabcli/common/exceptions.py,sha256=trgC5eqvy7jgqOQ41pbAOC__uxy19GgrM9NAgkH_lBw,2051
 annofabcli/common/facade.py,sha256=1d5DxC4O5yHr0gisqaqgkacY5Omn1X-L1syPnYPyiwQ,19401
 annofabcli/common/image.py,sha256=qUsQXEYmttT443BOiaxLthccE7hLji5toLjgSdneNWA,16706
-annofabcli/common/pandas.py,sha256=IW9xqHkdRF1I6YZc7CP_9tkGxJuu1MKEXFILjhaNUU0,449
+annofabcli/common/pandas.py,sha256=Vyozu52UiZ0aCVtQ9jySxT_LrLMwpQvvpM8Uu3S2nCs,476
 annofabcli/common/type_util.py,sha256=i3r5pFtRYQwJrYkl1-lVQi8XOePQxTUX_cAHgBTsagM,224
 annofabcli/common/typing.py,sha256=_AcEogoaMbib0esfN2RvHshAZH0oyRb2Ro9-rbn7NJ8,330
 annofabcli/common/utils.py,sha256=Eb4DS5j_EVdZW_YnsvIgjTbgWcjHd560plck2_WgrCI,9545
@@ -137,11 +137,11 @@ annofabcli/stat_visualization/write_performance_rating_csv.py,sha256=0j78z5uRULo
 annofabcli/statistics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/statistics/histogram.py,sha256=CvzDxT2cKLSnBGSqkZE6p92PayGxYYja1YyB24M4ALU,3245
 annofabcli/statistics/linegraph.py,sha256=0kr7jVBNMiM2ECYhv3Ry5RitElKerSl9ZKxbKzfiplI,12494
-annofabcli/statistics/list_annotation_area.py,sha256=nGqhqPEHLPUccnLCmA9nmwvmYbZYlh5ZxiHNszZ1ei8,12329
-annofabcli/statistics/list_annotation_attribute.py,sha256=L_wmcUGS0Lu3tnRmidDjYK3bCNdvwDjAH64r5__MQ_w,12522
-annofabcli/statistics/list_annotation_attribute_filled_count.py,sha256=g-MihJwEoA1ZnLTJOGX-dn6hI5aUdqQvh2KWbREbQ9s,29033
-annofabcli/statistics/list_annotation_count.py,sha256=cBmUTYifB7UESEFets7DMDn8_GKDBBDJ2vt1q_56fcc,52747
-annofabcli/statistics/list_annotation_duration.py,sha256=ps0UT50W_6ZL5_cZNsSo7Dp-cSx77m1IF4QMBkwRt98,31875
+annofabcli/statistics/list_annotation_area.py,sha256=RC6Pkhh_ps8fMZuDSQqhk2RdMpJ_z5TA9ax42tuJRFM,12567
+annofabcli/statistics/list_annotation_attribute.py,sha256=lmvT3b1mVX4PRGWrBUfZafCn3c_hb_hx3WKXnHGcyyk,12754
+annofabcli/statistics/list_annotation_attribute_filled_count.py,sha256=UF8wB-kfUnHCIPykb2Z2slyEcp9aHrzcbFbOs_3Z8-A,29341
+annofabcli/statistics/list_annotation_count.py,sha256=4uTRR63Db-WDGRQt3AC8mPaRfFgbG5d27A036GNG3D0,53151
+annofabcli/statistics/list_annotation_duration.py,sha256=WxHfzF4tYkveIdkaWoJZ6x7ddBMWkfz1YM_vxMub3jY,32165
 annofabcli/statistics/list_video_duration.py,sha256=OCDXPOP2z7flE8NBaQD1lDkU9JG5mn3PfACijoR-5s0,9163
 annofabcli/statistics/list_worktime.py,sha256=nr--GtFY-oyFuu8M0EsUqcVxX26gjeP09LYUcdeptyk,6456
 annofabcli/statistics/scatter.py,sha256=C3hTlm_QfGBiY4KjZ-8D_u_Rk53a9f4jszx4iNZgp9w,10945
@@ -151,30 +151,30 @@ annofabcli/statistics/summarize_task_count_by_task_id_group.py,sha256=eRPl89Oh7_
 annofabcli/statistics/summarize_task_count_by_user.py,sha256=rwhQwO6g2No9AqLEAbAfnlg_6CkgB3CRkZiaNnXCL0I,6857
 annofabcli/statistics/visualize_annotation_count.py,sha256=7OATuGa2okq80unuTe-X30CBVkrlMLDN5Y-Q_5mB6eI,22138
 annofabcli/statistics/visualize_annotation_duration.py,sha256=9JH9MirhOyCmjcChFJMtfnFIV2k4sucP9PAwNKMcbtE,21022
-annofabcli/statistics/visualize_statistics.py,sha256=Hey3LqTFoXT0zKP_KMgszaVC8xIZPpep5sxpuefWKG4,38764
-annofabcli/statistics/visualize_video_duration.py,sha256=PYiVT7CDm3g5WLNRF20s7xGluJctO1mtC6y3wNu-eK4,16651
+annofabcli/statistics/visualize_statistics.py,sha256=YiT-KCCFQNF-v56hA8WjX37b_CGjMk2Ei-NbW7aHG-k,38384
+annofabcli/statistics/visualize_video_duration.py,sha256=yY18H0-boNy4-MQWUM_xBTMzxDUQ51TrVtz8mbsB_dI,16623
 annofabcli/statistics/visualization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annofabcli/statistics/visualization/filtering_query.py,sha256=6QH0hfyg2VPeSjiJrd3ECMLbZCTZfQMH-K2fdn4rlaE,4152
-annofabcli/statistics/visualization/model.py,sha256=5LSp0u63nqeILUl3XdYEhqqi_hq2rFbzyKHYlXZo2S0,896
-annofabcli/statistics/visualization/project_dir.py,sha256=khcSS0R6X1sm1Oq8Tr7HpHPNFaHbh3jSPxaaPn9GuyA,23839
+annofabcli/statistics/visualization/filtering_query.py,sha256=kqGOa1YdQ62kTLlkiIHFiYNju4Pg9rXpsC4Cph-QjLo,4355
+annofabcli/statistics/visualization/model.py,sha256=sKk4gC7qkt6etCnbpCNZpJEhFJf5Vf7eVOG53gyfWvk,2426
+annofabcli/statistics/visualization/project_dir.py,sha256=-60n29ySvgsfRTbFgTOYr6E7LHJezVQm3FON88LQMKU,24291
 annofabcli/statistics/visualization/visualization_source_files.py,sha256=SFY7WXUtjECB8l7zP-exawocrTiZ0UI7Z5sjgq4J_g4,8641
 annofabcli/statistics/visualization/dataframe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/statistics/visualization/dataframe/actual_worktime.py,sha256=7nsHlvN5cDzXIw-u_MSAZf4nlSSY56IlunSmnODXTbY,1916
 annofabcli/statistics/visualization/dataframe/annotation_count.py,sha256=gv9iFpSLu_cB63G3Z9dGImT9jr_Q6U_mrmG8VXsxJnk,3940
-annofabcli/statistics/visualization/dataframe/cumulative_productivity.py,sha256=DyaskG9fT3K2rWR04z4QIYgdrAjR_O3YYDmsVT23NQg,16144
+annofabcli/statistics/visualization/dataframe/cumulative_productivity.py,sha256=Z9gxGCfgQra0M0LAq3bUhGxXnwRqZ8Gt-zIo2DPs6Nc,15800
 annofabcli/statistics/visualization/dataframe/custom_production_volume.py,sha256=5ELLiQJ5sNKdVKmYYVeZW4nedDg1CVGxMDdF5TUUX5c,2142
 annofabcli/statistics/visualization/dataframe/input_data_count.py,sha256=wDRFtoIWw_Gy2bPZ7LBx3eMO3LdUdjbQKS9mncXav6I,1654
 annofabcli/statistics/visualization/dataframe/inspection_comment_count.py,sha256=RxpQzRy4U2hKEpgbksUXotcxH2sKz__NO20mxpMqK1w,4382
 annofabcli/statistics/visualization/dataframe/productivity_per_date.py,sha256=_AibOSwyeGM6KeYqknN40M8vS4Tl6l45tC0ua1AHFFc,27087
 annofabcli/statistics/visualization/dataframe/project_performance.py,sha256=q480Lz1LwQD6RvyIOq-ZsXqeeKabsVpHRoM0nD_DaGI,8482
-annofabcli/statistics/visualization/dataframe/task.py,sha256=HBquPn6K17WPgb3nyeMS44M57srD5LpUm8wtOXJLkTU,24098
+annofabcli/statistics/visualization/dataframe/task.py,sha256=v5vUbKJAuqqcKeumrAc4t2PKEX7jt86xFqqko0LrI98,25044
 annofabcli/statistics/visualization/dataframe/task_history.py,sha256=FZ3MLqOiM6834fxWZKP0Hy9WDRSSLCYm6kNzdWW7-S8,2744
-annofabcli/statistics/visualization/dataframe/task_worktime_by_phase_user.py,sha256=TKdZmjr-jvnxOxsSnSCbloV9EQ3RB3nKv1tfIve2EZE,12974
+annofabcli/statistics/visualization/dataframe/task_worktime_by_phase_user.py,sha256=khXqxQ-v7Q1PBtttQmPCCbVLraeqNCPi2tkhTxxaZPg,13641
 annofabcli/statistics/visualization/dataframe/user.py,sha256=EHn7nlf6D6UX-gsVXy8m_3QaCsHsUhr0iy2rbNozOgc,1707
-annofabcli/statistics/visualization/dataframe/user_performance.py,sha256=2WX_D3I9_mn0mIPfsb2XCJINs31TmID4F9SNfIPccsM,56093
+annofabcli/statistics/visualization/dataframe/user_performance.py,sha256=X0jXV0wY8AZC8hoV62sJd9GRThqTf5RsaVciLeCvGlk,56628
 annofabcli/statistics/visualization/dataframe/whole_performance.py,sha256=kw5Cww0fwDfwriTtxiT0l3wr7YAMA9eGjvp84G9MN9I,12449
-annofabcli/statistics/visualization/dataframe/whole_productivity_per_date.py,sha256=q3I00aCztXlMX3JW4XLe7apNRS4_gQVhOynlsaYBZVY,51635
-annofabcli/statistics/visualization/dataframe/worktime_per_date.py,sha256=9_ZVtXlNDFUKYWwcb_Pd_1IE5JUpTGmZdAPAS0nl1Lo,21235
+annofabcli/statistics/visualization/dataframe/whole_productivity_per_date.py,sha256=F6KhXvzrUx61E0jqOiU2IGb6ycLH82T80JyzYVpSaC8,53683
+annofabcli/statistics/visualization/dataframe/worktime_per_date.py,sha256=wt0paPy2cVVzLUJhbV12-6bInikbQoxRFnOHY7BcI9o,21342
 annofabcli/supplementary/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/supplementary/delete_supplementary_data.py,sha256=dA4n61SSkTbDKDqjVldHIEAxbPQXyrQciwI4RDuC35U,13537
 annofabcli/supplementary/list_supplementary_data.py,sha256=Rh9aOa3PwukVxnnbXTtMG0qAASc3JkaqRt7KrMGZQRk,7635
@@ -193,7 +193,7 @@ annofabcli/task/download_task_json.py,sha256=Ocjecmdf2WV_Sq3u1InfMLIsT3XSw0ojyJm
 annofabcli/task/list_all_tasks.py,sha256=FpFzosCZs2EZNSQMHzWse4z_zjZeiVF5BFmbwb97UYg,6368
 annofabcli/task/list_all_tasks_added_task_history.py,sha256=fkdiuo64iS7xxvIfGKzSiUPPEMiCVnJjjcAtMxe2Ngs,9551
 annofabcli/task/list_tasks.py,sha256=cmfqbP2Sr1dlpvpJLJscKq31BUdXVaajr_agiecKWXg,10051
-annofabcli/task/list_tasks_added_task_history.py,sha256=c8kxh9dssOZw6WK3Zpet1lNYr311xiiPJ1JGv97u1Xs,21470
+annofabcli/task/list_tasks_added_task_history.py,sha256=JI3Rxn9MwXN07Cu2wDfaIXAzm3MlNm1kIh1SZHbxZr4,22488
 annofabcli/task/put_tasks.py,sha256=HADm-sP8zs523MlDThlwrGIVIEtR4Md2KlpJbWhCCTk,13745
 annofabcli/task/put_tasks_by_count.py,sha256=kIjvWtgZ53Smcm8N-raZedQCubx1TWoQT-BYyioYDrA,5999
 annofabcli/task/reject_tasks.py,sha256=2mRxIsP63N2xcVXQ0xeFqF0VkuUQP6C_bsFEqG-qNf0,22027
@@ -209,8 +209,8 @@ annofabcli/task_history_event/download_task_history_event_json.py,sha256=hQLVbQ0
 annofabcli/task_history_event/list_all_task_history_event.py,sha256=EeKMyPUxGwYCFtWQHHW954ZserGm8lUqrwNnV1iX9X4,6830
 annofabcli/task_history_event/list_worktime.py,sha256=Y7Pu5DP7scPf7HPt6CTiTvB1_5_Nfi1bStUIaCpkhII,15507
 annofabcli/task_history_event/subcommand_task_history_event.py,sha256=mJVJoT4RXk4HWnY7-Nrsl4If-gtaIIEXd2z7eFZwM2I,1260
-annofabcli-1.105.0.dist-info/METADATA,sha256=HJ0IsIuktrGOeyum7nYk72MiPAhXOw03g-E2wiB0Hv4,5286
-annofabcli-1.105.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-annofabcli-1.105.0.dist-info/entry_points.txt,sha256=C2uSUc-kkLJpoK_mDL5FEMAdorLEMPfwSf8VBMYnIFM,56
-annofabcli-1.105.0.dist-info/licenses/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
-annofabcli-1.105.0.dist-info/RECORD,,
+annofabcli-1.106.0.dist-info/METADATA,sha256=FqGLzIdUm7grQhd5oMncx6H3AhyuoUC0Na385BczmS4,5286
+annofabcli-1.106.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+annofabcli-1.106.0.dist-info/entry_points.txt,sha256=C2uSUc-kkLJpoK_mDL5FEMAdorLEMPfwSf8VBMYnIFM,56
+annofabcli-1.106.0.dist-info/licenses/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
+annofabcli-1.106.0.dist-info/RECORD,,