annofabcli 1.114.1__tar.gz → 1.114.2__tar.gz

{annofabcli-1.114.1 → annofabcli-1.114.2}/PKG-INFO

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

{annofabcli-1.114.1 → annofabcli-1.114.2}/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-1.114.1 → annofabcli-1.114.2}/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)

{annofabcli-1.114.1 → annofabcli-1.114.2}/docs/command_reference/task_count/list_by_phase.rst

@@ -65,12 +65,11 @@ Examples
 入力データ数で集計
 --------------------------
 
-``--unit input_data`` を指定すると、タスク数ではなく入力データ数で集計します。
+``--unit input_data_count`` を指定すると、タスク数ではなく入力データ数で集計します。
 
 .. code-block::
 
-    $ annofabcli task_count list_by_phase --project_id prj1 --unit input_data --output out.csv
-
+    $ annofabcli task_count list_by_phase --project_id prj1 --unit input_data_count --output out.csv
 
 .. csv-table::
    :header: phase,never_worked.unassigned,never_worked.assigned,worked.not_rejected,worked.rejected,on_hold,complete

{annofabcli-1.114.1 → annofabcli-1.114.2}/tests/task_count/test_list_by_phase.py

@@ -17,6 +17,7 @@ inifile.read("./pytest.ini", "UTF-8")
 annofab_config = dict(inifile.items("annofab"))
 
 project_id = annofab_config["project_id"]
+video_project_id = annofab_config["video_project_id"]
 service = annofabapi.build()
 
 
@@ -37,7 +38,7 @@ class TestCommandLine:
         )
 
     def test_list_by_phase_with_input_data_unit(self):
-        out_file = str(out_dir / "list_by_phase_input_data.csv")
+        out_file = str(out_dir / "list_by_phase_input_data_count.csv")
         main(
             [
                 self.command_name,
@@ -45,7 +46,7 @@ class TestCommandLine:
                 "--project_id",
                 project_id,
                 "--unit",
-                "input_data",
+                "input_data_count",
                 "--output",
                 out_file,
             ]
@@ -58,7 +59,7 @@ class TestCommandLine:
                 self.command_name,
                 "list_by_phase",
                 "--project_id",
-                project_id,
+                video_project_id,
                 "--unit",
                 "video_duration_hour",
                 "--output",
@@ -73,7 +74,7 @@ class TestCommandLine:
                 self.command_name,
                 "list_by_phase",
                 "--project_id",
-                project_id,
+                video_project_id,
                 "--unit",
                 "video_duration_minute",
                 "--output",