annofabcli 1.96.1__py3-none-any.whl → 1.98.0__py3-none-any.whl

annofabcli/statistics/visualization/dataframe/task.py

@@ -55,14 +55,14 @@ class Task:
         Returns:
             必須の列が存在するかどうか
         """
-        return len(set(self.columns) - set(df.columns)) == 0
+        return len(set(self.required_columns) - set(df.columns)) == 0
 
-    def missing_columns(self, df: pandas.DataFrame) -> list[str]:
+    def missing_required_columns(self, df: pandas.DataFrame) -> list[str]:
         """
-        欠損している列名を取得します。
+        欠損している必須の列名を取得します。
 
         """
-        return list(set(self.columns) - set(df.columns))
+        return list(set(self.required_columns) - set(df.columns))
 
     def __init__(self, df: pandas.DataFrame, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> None:
         self.custom_production_volume_list = custom_production_volume_list if custom_production_volume_list is not None else []
@@ -72,7 +72,8 @@ class Task:
 
         if not self.required_columns_exist(df):
             raise ValueError(
-                f"引数'df'の'columns'に次の列が存在していません。 {self.missing_columns(df)} :: 次の列が必須です。{self.columns}の列が必要です。"
+                f"引数'df'の'columns'に次の列が存在していません。 {self.missing_required_columns(df)} :: "
+                f"次の列が必須です。{self.required_columns} の列が必要です。"
             )
 
         self.df = df
@@ -97,7 +98,19 @@ class Task:
         return Task(df, custom_production_volume_list=self.custom_production_volume_list)
 
     @property
-    def columns(self) -> list[str]:
+    def optional_columns(self) -> list[str]:
+        return [
+            # 抜取検査または抜取受入によりスキップされたか
+            "inspection_is_skipped",
+            "acceptance_is_skipped",
+            # 差し戻し後の作業時間
+            "post_rejection_annotation_worktime_hour",
+            "post_rejection_inspection_worktime_hour",
+            "post_rejection_acceptance_worktime_hour",
+        ]
+
+    @property
+    def required_columns(self) -> list[str]:
         return [
             # 基本的な情報
             "project_id",
@@ -144,6 +157,10 @@ class Task:
             "acceptance_is_skipped",
         ]
 
+    @property
+    def columns(self) -> list[str]:
+        return self.required_columns + self.optional_columns
+
     @classmethod
     def from_api_content(
         cls,
@@ -502,7 +519,9 @@ class Task:
         if not self._validate_df_for_output(output_file):
             return
 
-        print_csv(self.df[self.columns], str(output_file))
+        existing_optional_columns = [col for col in self.optional_columns if col in set(self.df.columns)]
+        columns = self.required_columns + existing_optional_columns
+        print_csv(self.df[columns], str(output_file))
 
     def mask_user_info(
         self,

annofabcli/statistics/visualization/dataframe/user_performance.py

@@ -571,7 +571,7 @@ class UserPerformance:
             level0_columns = ["monitored_worktime_hour", *task_worktime_by_phase_user.quantity_columns]
             columns = [(c0, c1) for c0, c1 in df.columns if c0 in level0_columns]
 
-            return df.fillna({col: 0 for col in columns})
+            return df.fillna(dict.fromkeys(columns, 0))
 
         if task_completion_criteria == TaskCompletionCriteria.ACCEPTANCE_REACHED:
             # 受入フェーズに到達したらタスクの作業が完了したとみなす場合、
@@ -634,8 +634,8 @@ class UserPerformance:
         ]
 
         value_columns = columns - set(basic_columns)
-        dtypes = {col: "string" for col in basic_columns}
-        dtypes.update({col: "float64" for col in value_columns})
+        dtypes = dict.fromkeys(basic_columns, "string")
+        dtypes.update(dict.fromkeys(value_columns, "float64"))
         return df.astype(dtypes)
 
     def _validate_df_for_output(self, output_file: Path) -> bool:

annofabcli/statistics/visualization/dataframe/whole_performance.py

@@ -197,8 +197,8 @@ class WholePerformance:
             ("working_days", ""),
         ]
 
-        data: dict[tuple[str, str], float] = {key: 0 for key in worktime_columns + count_columns}
-        data.update({key: numpy.nan for key in ratio_columns + stdev_columns + date_columns})
+        data: dict[tuple[str, str], float] = dict.fromkeys(worktime_columns + count_columns, 0)
+        data.update(dict.fromkeys(ratio_columns + stdev_columns + date_columns, numpy.nan))
 
         return cls(pandas.Series(data), task_completion_criteria, custom_production_volume_list=custom_production_volume_list)
 

annofabcli/statistics/visualization/dataframe/whole_productivity_per_date.py

@@ -187,7 +187,7 @@ class WholeProductivityPerCompletedDate:
             df_agg_sub_task["task_count"] = df_sub_task.pivot_table(values=["task_id"], index=date_column, aggfunc="count").fillna(0)
         else:
             # 列だけ作る
-            df_agg_sub_task = df_agg_sub_task.assign(**{key: 0 for key in production_volume_columns}, task_count=0)
+            df_agg_sub_task = df_agg_sub_task.assign(**dict.fromkeys(production_volume_columns, 0), task_count=0)
 
         df_worktime = worktime_per_date.df
         if len(df_worktime) > 0:
@@ -929,7 +929,7 @@ class WholeProductivityPerFirstAnnotationStartedDate:
             ).fillna(0)
         else:
             # 列だけ作る
-            df_agg_sub_task = df_agg_sub_task.assign(**{key: 0 for key in value_columns}, task_count=0)
+            df_agg_sub_task = df_agg_sub_task.assign(**dict.fromkeys(value_columns, 0), task_count=0)
 
         # 日付の一覧を生成
         if len(df_agg_sub_task) > 0:

annofabcli/statistics/visualization/dataframe/worktime_per_date.py

@@ -200,7 +200,7 @@ class WorktimePerDate:
             "monitored_inspection_worktime_hour",
             "monitored_acceptance_worktime_hour",
         ]
-        df.fillna({c: 0 for c in value_columns}, inplace=True)
+        df.fillna(dict.fromkeys(value_columns, 0), inplace=True)
 
         df = df.merge(df_member, how="left", on="account_id")
         return df[

annofabcli/supplementary/delete_supplementary_data.py

@@ -31,18 +31,11 @@ key: input_data_id, value: supplementary_data_idのList
 
 
 def get_input_data_supplementary_data_dict_from_csv(csv_path: Path) -> InputDataSupplementaryDataDict:
-    df = pandas.read_csv(
-        str(csv_path),
-        sep=",",
-        header=None,
-        names=[
-            "input_data_id",
-            "supplementary_data_id",
-        ],
-        # IDは必ず文字列として読み込むようにする
-        dtype={"input_data_id": str, "supplementary_data_id": str},
+    df: pandas.DataFrame = pandas.read_csv(
+        csv_path,
+        dtype={"input_data_id": "string", "supplementary_data_id": "string"},
     )
-    input_data_dict = defaultdict(list)
+    input_data_dict: InputDataSupplementaryDataDict = defaultdict(list)
     for input_data_id, supplementary_data_id in zip(df["input_data_id"], df["supplementary_data_id"]):
         input_data_dict[input_data_id].append(supplementary_data_id)
     return input_data_dict
@@ -58,7 +51,7 @@ def get_input_data_supplementary_data_dict_from_list(supplementary_data_list: li
 
 
 class DeleteSupplementaryDataMain(CommandLineWithConfirm):
-    def __init__(self, service: annofabapi.Resource, all_yes: bool = False) -> None:  # noqa: FBT001, FBT002
+    def __init__(self, service: annofabapi.Resource, *, all_yes: bool = False) -> None:
         self.service = service
         self.facade = AnnofabApiFacade(service)
         CommandLineWithConfirm.__init__(self, all_yes)
@@ -82,7 +75,7 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
 
         input_data = self.service.wrapper.get_input_data_or_none(project_id, input_data_id)
         if input_data is None:
-            logger.warning(f"input_data_id={input_data_id} の入力データは存在しないのでスキップします。")
+            logger.warning(f"input_data_id='{input_data_id}' の入力データは存在しないのでスキップします。")
             return 0
 
         supplementary_data_list, _ = self.service.api.get_supplementary_data_list(project_id, input_data_id)
@@ -122,7 +115,7 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
                 continue
         return deleted_count
 
-    def delete_supplementary_data_list(self, project_id: str, input_data_dict: InputDataSupplementaryDataDict):  # noqa: ANN201
+    def delete_supplementary_data_list(self, project_id: str, input_data_dict: InputDataSupplementaryDataDict) -> None:
         deleted_count = 0
         total_count = sum(len(e) for e in input_data_dict.values())
         for input_data_id, supplementary_data_id_list in input_data_dict.items():
@@ -168,7 +161,7 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
 
         return deleted_count
 
-    def delete_supplementary_data_list_by_input_data_id(self, project_id: str, input_data_id_list: list[str]):  # noqa: ANN201
+    def delete_supplementary_data_list_by_input_data_id(self, project_id: str, input_data_id_list: list[str]) -> None:
         dict_deleted_count: dict[str, int] = {}
         for input_data_id in input_data_id_list:
             input_data = self.service.wrapper.get_input_data_or_none(project_id, input_data_id)
@@ -261,9 +254,9 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
             "削除する補助情報が記載されたCSVファイルのパスを指定してください。\n"
             "CSVのフォーマットは以下の通りです。"
             "詳細は https://annofab-cli.readthedocs.io/ja/latest/command_reference/supplementary/delete.html を参照してください。\n"
-            " * ヘッダ行なし, カンマ区切り\n"
-            " * 1列目: input_data_id (required)\n"
-            " * 2列目: supplementary_data_id (required)\n"
+            " * ヘッダ行あり, カンマ区切り\n"
+            " * input_data_id (required)\n"
+            " * supplementary_data_id (required)\n"
         ),
     )
 

annofabcli/supplementary/put_supplementary_data.py

@@ -41,17 +41,17 @@ def convert_supplementary_data_name_to_supplementary_data_id(supplementary_data_
 
 
 @dataclass
-class CsvSupplementaryData(DataClassJsonMixin):
+class CliSupplementaryData(DataClassJsonMixin):
     """
-    CSVに記載されている補助情報
+    コマンドラインから指定された（`--csv`または`--json`）補助情報
     """
 
     input_data_id: str
-    supplementary_data_number: int
     supplementary_data_name: str
     supplementary_data_path: str
     supplementary_data_id: Optional[str] = None
     supplementary_data_type: Optional[str] = None
+    supplementary_data_number: Optional[int] = None
 
 
 @dataclass
@@ -75,15 +75,13 @@ class SubPutSupplementaryData:
 
     Args:
         service:
-        facade:
         all_yes:
     """
 
-    def __init__(self, service: annofabapi.Resource, facade: AnnofabApiFacade, *, all_yes: bool = False) -> None:
+    def __init__(self, service: annofabapi.Resource, *, all_yes: bool = False) -> None:
         self.service = service
-        self.facade = facade
         self.all_yes = all_yes
-        self.supplementary_data_cache: dict[str, list[SupplementaryData]] = {}
+        self.supplementary_data_cache: dict[tuple[str, str], list[SupplementaryData]] = {}
 
     def put_supplementary_data(self, project_id: str, supplementary_data: SupplementaryDataForPut) -> None:
         file_path = get_file_scheme_path(supplementary_data.supplementary_data_path)
@@ -155,7 +153,7 @@ class SubPutSupplementaryData:
         return yes
 
     def confirm_put_supplementary_data(
-        self, csv_supplementary_data: CsvSupplementaryData, supplementary_data_id: str, *, already_exists: bool = False
+        self, csv_supplementary_data: CliSupplementaryData, supplementary_data_id: str, *, already_exists: bool = False
     ) -> bool:
         if already_exists:
             message_for_confirm = (
@@ -170,66 +168,63 @@ class SubPutSupplementaryData:
 
         return self.confirm_processing(message_for_confirm)
 
-    def get_supplementary_data_list_cached(self, project_id: str, input_data_id: str) -> list[SupplementaryData]:
-        key = f"{project_id},{input_data_id}"
-        if key not in self.supplementary_data_cache:
-            supplementary_data_list, _ = self.service.api.get_supplementary_data_list(project_id, input_data_id)
-            self.supplementary_data_cache[key] = supplementary_data_list if supplementary_data_list is not None else []
-        return self.supplementary_data_cache[key]
-
-    def get_supplementary_data_by_id(self, project_id: str, input_data_id: str, supplementary_data_id: str) -> Optional[SupplementaryData]:
-        cached_list = self.get_supplementary_data_list_cached(project_id, input_data_id)
-        return first_true(cached_list, pred=lambda e: e["supplementary_data_id"] == supplementary_data_id)
-
-    def put_supplementary_data_main(self, project_id: str, csv_supplementary_data: CsvSupplementaryData, *, overwrite: bool = False) -> bool:
+    def put_supplementary_data_main(self, project_id: str, csv_data: CliSupplementaryData, *, overwrite: bool = False) -> bool:
         last_updated_datetime = None
-        input_data_id = csv_supplementary_data.input_data_id
+        input_data_id = csv_data.input_data_id
         supplementary_data_id = (
-            csv_supplementary_data.supplementary_data_id
-            if csv_supplementary_data.supplementary_data_id is not None
-            else convert_supplementary_data_name_to_supplementary_data_id(csv_supplementary_data.supplementary_data_name)
+            csv_data.supplementary_data_id
+            if csv_data.supplementary_data_id is not None
+            else convert_supplementary_data_name_to_supplementary_data_id(csv_data.supplementary_data_name)
         )
-        supplementary_data_path = csv_supplementary_data.supplementary_data_path
 
-        # input_data_idの存在確認
-        if self.service.wrapper.get_input_data_or_none(project_id, input_data_id) is None:
+        supplementary_data_list = self.service.wrapper.get_supplementary_data_list_or_none(project_id, input_data_id)
+        if supplementary_data_list is None:
+            # 入力データが存在しない場合は、`supplementary_data_list`はNoneになる
             logger.warning(f"input_data_id='{input_data_id}'である入力データは存在しないため、補助情報の登録をスキップします。")
             return False
 
-        old_supplementary_data = self.get_supplementary_data_by_id(project_id, input_data_id, supplementary_data_id)
+        old_supplementary_data = first_true(supplementary_data_list, pred=lambda e: e["supplementary_data_id"] == supplementary_data_id)
+
+        # 補助情報numberが未指定の場合は、既存の補助情報numberの最大値+1にする
+        max_supplementary_data_number = max((e["supplementary_data_number"] for e in supplementary_data_list), default=0)
+        if csv_data.supplementary_data_number is not None:
+            supplementary_data_number = csv_data.supplementary_data_number
+        elif old_supplementary_data is not None:
+            supplementary_data_number = old_supplementary_data["supplementary_data_number"]
+        else:
+            supplementary_data_number = max_supplementary_data_number + 1
 
         if old_supplementary_data is not None:
             if overwrite:
                 logger.debug(
                     f"supplementary_data_id='{supplementary_data_id}'である補助情報がすでに存在します。 :: "
-                    f"input_data_id='{input_data_id}', supplementary_data_name='{csv_supplementary_data.supplementary_data_name}'"
+                    f"input_data_id='{input_data_id}', supplementary_data_name='{csv_data.supplementary_data_name}'"
                 )
                 last_updated_datetime = old_supplementary_data["updated_datetime"]
             else:
                 logger.debug(
                     f"supplementary_data_id='{supplementary_data_id}'である補助情報がすでに存在するので、補助情報の登録をスキップします。 :: "
-                    f"input_data_id='{input_data_id}', supplementary_data_name='{csv_supplementary_data.supplementary_data_name}'"
+                    f"input_data_id='{input_data_id}', supplementary_data_name='{csv_data.supplementary_data_name}'"
                 )
                 return False
 
-        file_path = get_file_scheme_path(supplementary_data_path)
-        logger.debug(f"csv_supplementary_data='{csv_supplementary_data}'")
+        file_path = get_file_scheme_path(csv_data.supplementary_data_path)
         if file_path is not None:  # noqa: SIM102
             if not Path(file_path).exists():
-                logger.warning(f"'{supplementary_data_path}' は存在しません。")
+                logger.warning(f"'{csv_data.supplementary_data_path}' は存在しません。補助情報の登録をスキップします。")
                 return False
 
-        if not self.confirm_put_supplementary_data(csv_supplementary_data, supplementary_data_id, already_exists=last_updated_datetime is not None):
+        if not self.confirm_put_supplementary_data(csv_data, supplementary_data_id, already_exists=last_updated_datetime is not None):
             return False
 
         # 補助情報を登録
         supplementary_data_for_put = SupplementaryDataForPut(
-            input_data_id=csv_supplementary_data.input_data_id,
+            input_data_id=csv_data.input_data_id,
             supplementary_data_id=supplementary_data_id,
-            supplementary_data_name=csv_supplementary_data.supplementary_data_name,
-            supplementary_data_path=csv_supplementary_data.supplementary_data_path,
-            supplementary_data_type=csv_supplementary_data.supplementary_data_type,
-            supplementary_data_number=csv_supplementary_data.supplementary_data_number,
+            supplementary_data_name=csv_data.supplementary_data_name,
+            supplementary_data_path=csv_data.supplementary_data_path,
+            supplementary_data_type=csv_data.supplementary_data_type,
+            supplementary_data_number=supplementary_data_number,
             last_updated_datetime=last_updated_datetime,
         )
         try:
@@ -261,7 +256,7 @@ class PutSupplementaryData(CommandLine):
     def put_supplementary_data_list(
         self,
         project_id: str,
-        supplementary_data_list: list[CsvSupplementaryData],
+        supplementary_data_list: list[CliSupplementaryData],
         *,
         overwrite: bool = False,
         parallelism: Optional[int] = None,
@@ -282,7 +277,7 @@ class PutSupplementaryData(CommandLine):
 
         count_put_supplementary_data = 0
 
-        obj = SubPutSupplementaryData(service=self.service, facade=self.facade, all_yes=self.all_yes)
+        obj = SubPutSupplementaryData(service=self.service, all_yes=self.all_yes)
         if parallelism is not None:
             partial_func = partial(obj.put_supplementary_data_main, project_id, overwrite=overwrite)
             with Pool(parallelism) as pool:
@@ -291,46 +286,29 @@ class PutSupplementaryData(CommandLine):
 
         else:
             for csv_supplementary_data in supplementary_data_list:
-                result = obj.put_supplementary_data_main(project_id, csv_supplementary_data=csv_supplementary_data, overwrite=overwrite)
+                result = obj.put_supplementary_data_main(project_id, csv_data=csv_supplementary_data, overwrite=overwrite)
                 if result:
                     count_put_supplementary_data += 1
 
         logger.info(f"{project_title} に、{count_put_supplementary_data} / {len(supplementary_data_list)} 件の補助情報を登録しました。")
 
     @staticmethod
-    def get_supplementary_data_list_from_dict(supplementary_data_dict_list: list[dict[str, Any]]) -> list[CsvSupplementaryData]:
-        return [CsvSupplementaryData.from_dict(e) for e in supplementary_data_dict_list]
+    def get_supplementary_data_list_from_dict(supplementary_data_dict_list: list[dict[str, Any]]) -> list[CliSupplementaryData]:
+        return [CliSupplementaryData.from_dict(e) for e in supplementary_data_dict_list]
 
     @staticmethod
-    def get_supplementary_data_list_from_csv(csv_path: Path) -> list[CsvSupplementaryData]:
-        def create_supplementary_data(e: Any) -> CsvSupplementaryData:  # noqa: ANN401
-            supplementary_data_id = e.supplementary_data_id if not pandas.isna(e.supplementary_data_id) else None
-            supplementary_data_type = e.supplementary_data_type if not pandas.isna(e.supplementary_data_type) else None
-            return CsvSupplementaryData(
-                input_data_id=e.input_data_id,
-                supplementary_data_number=e.supplementary_data_number,
-                supplementary_data_name=e.supplementary_data_name,
-                supplementary_data_path=e.supplementary_data_path,
-                supplementary_data_id=supplementary_data_id,
-                supplementary_data_type=supplementary_data_type,
-            )
-
+    def get_supplementary_data_list_from_csv(csv_path: Path) -> list[CliSupplementaryData]:
         df = pandas.read_csv(
             str(csv_path),
-            sep=",",
-            header=None,
-            names=(
-                "input_data_id",
-                "supplementary_data_number",
-                "supplementary_data_name",
-                "supplementary_data_path",
-                "supplementary_data_id",
-                "supplementary_data_type",
-            ),
-            # IDは必ず文字列として読み込むようにする
-            dtype={"input_data_id": str, "supplementary_data_id": str, "supplementary_data_name": str},
+            dtype={
+                "input_data_id": "string",
+                "supplementary_data_id": "string",
+                "supplementary_data_name": "string",
+                "supplementary_data_path": "string",
+                "supplementary_data_number": "Int64",
+            },
         )
-        supplementary_data_list = [create_supplementary_data(e) for e in df.itertuples()]
+        supplementary_data_list = [CliSupplementaryData.from_dict(e) for e in df.to_dict("records")]
         return supplementary_data_list
 
     COMMON_MESSAGE = "annofabcli supplementary_data put: error:"
@@ -393,15 +371,15 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         "--csv",
         type=str,
         help=(
-            "補助情報が記載されたCVファイルのパスを指定してください。CSVのフォーマットは、以下の通りです。\n"
+            "補助情報が記載されたCSVファイルのパスを指定してください。CSVのフォーマットは、以下の通りです。\n"
             "\n"
-            " * ヘッダ行なし, カンマ区切り\n"
-            " * 1列目: input_data_id (required)\n"
-            " * 2列目: supplementary_data_number (required)\n"
-            " * 3列目: supplementary_data_name (required)\n"
-            " * 4列目: supplementary_data_path (required)\n"
-            " * 5列目: supplementary_data_id\n"
-            " * 6列目: supplementary_data_type\n"
+            " * ヘッダ行あり, カンマ区切り\n"
+            " * input_data_id (required)\n"
+            " * supplementary_data_name (required)\n"
+            " * supplementary_data_path (required)\n"
+            " * supplementary_data_id\n"
+            " * supplementary_data_type\n"
+            " * supplementary_data_number\n"
             "\n"
             "各項目の詳細は https://annofab-cli.readthedocs.io/ja/latest/command_reference/supplementary/put.html を参照してください。"
         ),
@@ -410,7 +388,6 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     JSON_SAMPLE = [  # noqa: N806
         {
             "input_data_id": "input1",
-            "supplementary_data_number": 1,
             "supplementary_data_name": "foo",
             "supplementary_data_path": "file://foo.jpg",
         }
@@ -431,7 +408,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.add_argument(
         "--overwrite",
         action="store_true",
-        help="指定した場合、supplementary_data_id（省略時はsupplementary_data_number）がすでに存在していたら上書きします。指定しなければ、スキップします。",
+        help="指定した場合、supplementary_data_idがすでに存在していたら上書きします。指定しなければ、スキップします。",
     )
 
     parser.add_argument(
@@ -448,7 +425,7 @@ def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argpa
     subcommand_name = "put"
     subcommand_help = "補助情報を登録します。"
     description = "補助情報を登録します。"
-    epilog = "オーナロールを持つユーザで実行してください。"
+    epilog = "オーナーロールを持つユーザで実行してください。"
 
     parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help, description, epilog=epilog)
     parse_args(parser)

annofabcli/task/list_tasks_added_task_history.py

@@ -9,19 +9,90 @@ import annofabapi
 import more_itertools
 import pandas
 from annofabapi.models import Task, TaskHistory, TaskPhase, TaskStatus
+from annofabapi.util.task_history import find_rejected_task_history_indices
 from annofabapi.utils import get_task_history_index_skipped_acceptance, get_task_history_index_skipped_inspection
 
 import annofabcli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.enums import FormatArgument
 from annofabcli.common.facade import AnnofabApiFacade
-from annofabcli.common.utils import print_csv, print_json
+from annofabcli.common.utils import isoduration_to_hour, print_csv, print_json
 from annofabcli.common.visualize import AddProps
 from annofabcli.task.list_tasks import ListTasksMain
 
 logger = logging.getLogger(__name__)
 
 
+def get_post_rejection_annotation_worktime_hour(task_histories: list[TaskHistory]) -> float:
+    """
+    検査/受入フェーズでの差し戻し後の教師付作業時間を算出します。
+    指摘による修正にかかった時間を把握するのに利用できます。
+
+    Args:
+        task_histories: タスク履歴
+
+    """
+    rejected_task_history_indices = find_rejected_task_history_indices(task_histories)
+    if len(rejected_task_history_indices) == 0:
+        return 0.0
+
+    # 差し戻された履歴の直後で、教師付フェーズの作業時間を算出する
+    min_rejected_task_history_index = min(rejected_task_history_indices)
+    return sum(
+        isoduration_to_hour(history["accumulated_labor_time_milliseconds"])
+        for history in task_histories[min_rejected_task_history_index + 1 :]
+        if history["phase"] == TaskPhase.ANNOTATION.value
+    )
+
+
+def get_post_rejection_inspection_worktime_hour(task_histories: list[TaskHistory]) -> float:
+    """
+    検査/受入フェーズでの差し戻し後の検査作業時間を算出します。
+
+    Args:
+        task_histories: タスク履歴
+
+    """
+    rejected_task_history_indices = find_rejected_task_history_indices(task_histories)
+    if len(rejected_task_history_indices) == 0:
+        return 0.0
+
+    # 差し戻された履歴の直後で、検査フェーズの作業時間を算出する
+    min_rejected_task_history_index = min(rejected_task_history_indices)
+    return sum(
+        isoduration_to_hour(history["accumulated_labor_time_milliseconds"])
+        for history in task_histories[min_rejected_task_history_index + 1 :]
+        if history["phase"] == TaskPhase.INSPECTION.value
+    )
+
+
+def get_post_rejection_acceptance_worktime_hour(task_histories: list[TaskHistory]) -> float:
+    """
+    受入フェーズでの差し戻し後の受入作業時間を算出します。
+
+
+    Args:
+        task_histories: タスク履歴
+
+    """
+    rejected_task_history_indices = find_rejected_task_history_indices(task_histories)
+
+    # 検査フェーズでの差し戻しは除外する
+    # 検査フェーズでの差し戻しは、受入作業の回数に影響しないため
+    acceptance_rejected_indices = [index for index in rejected_task_history_indices if task_histories[index]["phase"] == TaskPhase.ACCEPTANCE.value]
+    if len(acceptance_rejected_indices) == 0:
+        return 0.0
+
+    min_rejected_acceptance_task_history_index = min(acceptance_rejected_indices)
+
+    # 差し戻された履歴の直後以降で、受入フェーズの作業時間を算出する
+    return sum(
+        isoduration_to_hour(history["accumulated_labor_time_milliseconds"])
+        for history in task_histories[min_rejected_acceptance_task_history_index + 1 :]
+        if history["phase"] == TaskPhase.ACCEPTANCE.value
+    )
+
+
 class AddingAdditionalInfoToTask:
     """タスクに付加的な情報を追加するためのクラス
 
@@ -210,12 +281,12 @@ class AddingAdditionalInfoToTask:
             }
         )
 
-        organization_member = self.visualize.get_project_member_from_account_id(account_id)
-        if organization_member is not None:
+        member = self.visualize.get_project_member_from_account_id(account_id)
+        if member is not None:
             task.update(
                 {
-                    f"{column_prefix}_user_id": organization_member["user_id"],
-                    f"{column_prefix}_username": organization_member["username"],
+                    f"{column_prefix}_user_id": member["user_id"],
+                    f"{column_prefix}_username": member["username"],
                 }
             )
         else:
@@ -243,7 +314,7 @@ class AddingAdditionalInfoToTask:
 
         return task
 
-    def add_additional_info_to_task(self, task: dict[str, Any]):  # noqa: ANN201
+    def add_additional_info_to_task(self, task: dict[str, Any]) -> None:
         """タスクの付加的情報を、タスクに追加する。
         以下の列を追加する。
         * user_id
@@ -298,6 +369,10 @@ class AddingAdditionalInfoToTask:
         task["inspection_is_skipped"] = self.is_inspection_phase_skipped(task_histories)
         task["acceptance_is_skipped"] = self.is_acceptance_phase_skipped(task_histories)
 
+        task["post_rejection_annotation_worktime_hour"] = get_post_rejection_annotation_worktime_hour(task_histories)
+        task["post_rejection_inspection_worktime_hour"] = get_post_rejection_inspection_worktime_hour(task_histories)
+        task["post_rejection_acceptance_worktime_hour"] = get_post_rejection_acceptance_worktime_hour(task_histories)
+
 
 class ListTasksAddedTaskHistoryMain:
     def __init__(self, service: annofabapi.Resource, project_id: str) -> None:
@@ -373,9 +448,17 @@ class TasksAddedTaskHistoryOutput:
             for info in ["user_id", "username", "started_datetime", "worktime_hour"]
         ]
 
-        return base_columns + task_history_columns
+        return (
+            base_columns
+            + task_history_columns
+            + [
+                "post_rejection_annotation_worktime_hour",
+                "post_rejection_inspection_worktime_hour",
+                "post_rejection_acceptance_worktime_hour",
+            ]
+        )
 
-    def output(self, output_path: Path, output_format: FormatArgument):  # noqa: ANN201
+    def output(self, output_path: Path, output_format: FormatArgument) -> None:
         task_list = self.task_list
         if len(task_list) == 0:
             logger.info("タスク一覧の件数が0件のため、出力しません。")

annofabcli/task/update_metadata_of_task.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import argparse
+import copy
 import json
 import logging
 import multiprocessing
@@ -212,7 +213,7 @@ class UpdateMetadataOfTask(CommandLine):
         if args.metadata is not None:
             metadata = annofabcli.common.cli.get_json_from_args(args.metadata)
             assert task_id_list is not None, "'--metadata'を指定したときは'--task_id'は必須です。"
-            metadata_by_task_id = {task_id: metadata for task_id in task_id_list}
+            metadata_by_task_id = {task_id: copy.deepcopy(metadata) for task_id in task_id_list}
         elif args.metadata_by_task_id is not None:
             metadata_by_task_id = annofabcli.common.cli.get_json_from_args(args.metadata_by_task_id)
             if task_id_list is not None:

{annofabcli-1.96.1.dist-info → annofabcli-1.98.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annofabcli
-Version: 1.96.1
+Version: 1.98.0
 Summary: Utility Command Line Interface for AnnoFab
 Home-page: https://github.com/kurusugawa-computer/annofab-cli
 License: MIT
@@ -19,8 +19,8 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Utilities
 Requires-Dist: Pillow
-Requires-Dist: annofabapi (>=1.1,<2.0)
-Requires-Dist: bokeh (>=3.3,<4.0)
+Requires-Dist: annofabapi (>=1.4.1,<2.0.0)
+Requires-Dist: bokeh (>=3.3,<3.7)
 Requires-Dist: dictdiffer
 Requires-Dist: isodate
 Requires-Dist: jmespath