annofabcli 1.114.1__py3-none-any.whl → 1.114.3__py3-none-any.whl

annofabcli/task/update_metadata_of_task.py

@@ -63,12 +63,13 @@ class UpdateMetadataOfTaskMain(CommandLineWithConfirm):
         task_index: int | None = None,
     ) -> bool:
         logging_prefix = f"{task_index + 1} 件目" if task_index is not None else ""
+        logging_prefix += f" task_id='{task_id}' :: "
         task = self.service.wrapper.get_task_or_none(project_id, task_id)
         if task is None:
-            logger.warning(f"{logging_prefix} タスク '{task_id}' は存在しないのでスキップします。")
+            logger.warning(f"{logging_prefix}タスクは存在しないのでスキップします。")
             return False
 
-        logger.debug(f"task_id='{task_id}', metadata='{json.dumps(task['metadata'])}'")
+        logger.debug(f"{logging_prefix}現在のmetadata='{json.dumps(task['metadata'])}'")
 
         if not self.confirm_processing(self.get_confirm_message(task_id, metadata)):
             return False
@@ -81,7 +82,7 @@ class UpdateMetadataOfTaskMain(CommandLineWithConfirm):
         request_body = {task_id: new_metadata}
         self.service.api.patch_tasks_metadata(project_id, request_body=request_body)
 
-        logger.debug(f"{logging_prefix} タスク '{task_id}' のメタデータを更新しました。")
+        logger.debug(f"{logging_prefix}タスクのメタデータを更新しました。 :: 新しいmetadata={json.dumps(new_metadata)}")
         return True
 
     def set_metadata_to_task_wrapper(self, tpl: tuple[int, TaskMetadataInfo], project_id: str) -> bool:

annofabcli/task_count/list_by_phase.py

@@ -214,7 +214,7 @@ def create_df_task(
         # 入力データ数を計算
         task["input_data_count"] = len(task["input_data_id_list"])
 
-        # 動画の長さを計算（時間）
+        # 動画の長さを計算
         video_duration_hour = 0
         video_duration_minute = 0
         for input_data_id in task["input_data_id_list"]:
@@ -229,7 +229,7 @@ def create_df_task(
         # メタデータの値を抽出
         metadata = task["metadata"]
         for key in metadata_keys:
-            task[f"metadata.{key}"] = metadata[key]
+            task[f"metadata.{key}"] = metadata.get(key)
 
     columns = ["task_id", "phase", "input_data_count", "video_duration_hour", "video_duration_minute"] + [f"metadata.{key}" for key in metadata_keys] + ["task_status_for_summary"]
     df = pandas.DataFrame(task_list, columns=columns)
@@ -271,7 +271,8 @@ def aggregate_df(df: pandas.DataFrame, metadata_keys: list[str] | None = None, u
             assert_noreturn(unreachable)
 
     index_columns = ["phase", *metadata_columns]
-    df2 = df.pivot_table(values="_aggregate_value", index=index_columns, columns="task_status_for_summary", aggfunc="sum", fill_value=0)
+    # `dropna=False`を指定する理由: メタデータの値はNAである可能性があるため
+    df2 = df.pivot_table(values="_aggregate_value", index=index_columns, columns="task_status_for_summary", aggfunc="sum", fill_value=0, dropna=False)
 
     # 列数を固定する
     for status in TaskStatusForSummary:
@@ -309,6 +310,11 @@ def aggregate_df(df: pandas.DataFrame, metadata_keys: list[str] | None = None, u
         TaskStatusForSummary.COMPLETE.value,
     ]
     df2 = df2[result_columns]
+
+    # すべてのタスクステータス列が0の行を除外
+    status_columns = [status.value for status in TaskStatusForSummary]
+    df2 = df2[df2[status_columns].sum(axis=1) > 0]
+
     return df2
 
 

{annofabcli-1.114.1.dist-info → annofabcli-1.114.3.dist-info}/METADATA

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

{annofabcli-1.114.1.dist-info → annofabcli-1.114.3.dist-info}/RECORD

@@ -213,9 +213,9 @@ annofabcli/task/put_tasks.py,sha256=-v6JIXX0hGjwDWTkHLnRYr60hDHRg77Y86d-dfPymoo,
 annofabcli/task/put_tasks_by_count.py,sha256=6i7y-aH99pEDBQRWqsEQ5ESuSOL6v0SRNl3HddxLYnM,5979
 annofabcli/task/reject_tasks.py,sha256=lCpAfsU530O2TaYf8TbO4CeML7LoFgWwsCUCH6S_YC0,21924
 annofabcli/task/subcommand_task.py,sha256=vZIBXsHGc0203Q3yiSrQgNjov5MPSRyNLJ2qsFepVCA,2387
-annofabcli/task/update_metadata_of_task.py,sha256=Z0GF-LDt-brwgHhfz3aNYOsL4rHCf6qfzv-fzlnngOY,12817
+annofabcli/task/update_metadata_of_task.py,sha256=WECoFLJ_-LWdpJ1bvzDGMh459FoLUkT8gbeLDN0JCqY,12895
 annofabcli/task_count/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annofabcli/task_count/list_by_phase.py,sha256=v3EZVCvh57BgbWILbadxT4luYcnXRGZ3Z08aBMN26Ek,23826
+annofabcli/task_count/list_by_phase.py,sha256=7kSPW1Yn_DFvtQ1-grryEXIaqJKJsOvpGjrrQ2AoFtU,24124
 annofabcli/task_count/subcommand_task_count.py,sha256=DDys_Qa4TxJarqSkJQB3zjQipSvGA7-WDNoN2HA-_JQ,735
 annofabcli/task_history/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/task_history/download_task_history_json.py,sha256=mmQ0r0jGvQyeNahVeNXX8bUjOAYxP0vgBNA9Sf0QLu8,2424
@@ -227,8 +227,8 @@ annofabcli/task_history_event/download_task_history_event_json.py,sha256=lWyOoS2
 annofabcli/task_history_event/list_all_task_history_event.py,sha256=yNmvIEoNkfXXWPq9JZ3eAio82CrmELPSFg2M1yRHSzo,8017
 annofabcli/task_history_event/list_worktime.py,sha256=k6Hgy0pE2w5BtyUePN-LAyTbw0W2RMU4retwa6rC2uU,15497
 annofabcli/task_history_event/subcommand_task_history_event.py,sha256=dFllzpm8plnnwADwTV74h-R2LOA7rZW-xd2YnSkwTHo,1229
-annofabcli-1.114.1.dist-info/METADATA,sha256=YAxgPB0wyUWHZgC19UQm6HpQiTCnJkqzfVWe5uThbAU,4949
-annofabcli-1.114.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-annofabcli-1.114.1.dist-info/entry_points.txt,sha256=C2uSUc-kkLJpoK_mDL5FEMAdorLEMPfwSf8VBMYnIFM,56
-annofabcli-1.114.1.dist-info/licenses/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
-annofabcli-1.114.1.dist-info/RECORD,,
+annofabcli-1.114.3.dist-info/METADATA,sha256=XVrMwYdpaFIKjnuOaivkgN6iaqHyhdEdat5dm_dfZyg,4949
+annofabcli-1.114.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+annofabcli-1.114.3.dist-info/entry_points.txt,sha256=C2uSUc-kkLJpoK_mDL5FEMAdorLEMPfwSf8VBMYnIFM,56
+annofabcli-1.114.3.dist-info/licenses/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
+annofabcli-1.114.3.dist-info/RECORD,,