annofabcli 1.113.0__py3-none-any.whl → 1.113.1__py3-none-any.whl

annofabcli/annotation/dump_annotation.py

@@ -68,7 +68,7 @@ class DumpAnnotationMain:
         json_path = task_dir / f"{input_data_id}.json"
         self.dump_editor_annotation(editor_annotation=editor_annotation, json_path=json_path)
 
-    def dump_annotation_for_task(self, task_id: str, output_dir: Path, *, task_index: int | None = None, task_history_index: int | None = None) -> bool:
+    def dump_annotation_for_task(self, task_id: str, output_dir: Path, *, task_index: int | None = None, task_history_index: int | None = None, task_history_id: str | None = None) -> bool:
         """
         タスク配下のアノテーションをファイルに保存する。
 
@@ -85,23 +85,23 @@ class DumpAnnotationMain:
             logger.warning(f"task_id = '{task_id}' のタスクは存在しません。スキップします。")
             return False
 
-        task_history_id: str | None = None
+        actual_task_history_id: str | None = task_history_id
         if task_history_index is not None:
             task_histories, _ = self.service.api.get_task_histories(self.project_id, task_id)
             if task_history_index >= len(task_histories):
                 logger.warning(f"task_id='{task_id}' :: task_history_index='{task_history_index}'のタスク履歴は存在しません。タスク履歴は{len(task_histories)}件です。スキップします。")
                 return False
-            task_history_id = task_histories[task_history_index]["task_history_id"]
+            actual_task_history_id = task_histories[task_history_index]["task_history_id"]
 
         input_data_id_list = task["input_data_id_list"]
         task_dir = output_dir / task_id
         task_dir.mkdir(exist_ok=True, parents=True)
-        logger.debug(f"{logger_prefix}task_id = '{task_id}' のアノテーション情報を '{task_dir}' ディレクトリに保存します。 :: task_history_id='{task_history_id}'")
+        logger.debug(f"{logger_prefix}task_id = '{task_id}' のアノテーション情報を '{task_dir}' ディレクトリに保存します。 :: task_history_id='{actual_task_history_id}'")
 
         is_failure = False
         for input_data_id in input_data_id_list:
             try:
-                self.dump_annotation_for_input_data(task_id, input_data_id, task_dir=task_dir, task_history_id=task_history_id)
+                self.dump_annotation_for_input_data(task_id, input_data_id, task_dir=task_dir, task_history_id=actual_task_history_id)
             except Exception:
                 logger.warning(f"タスク'{task_id}', 入力データ'{input_data_id}' のアノテーション情報のダンプに失敗しました。", exc_info=True)
                 is_failure = True
@@ -109,15 +109,15 @@ class DumpAnnotationMain:
 
         return not is_failure
 
-    def dump_annotation_for_task_wrapper(self, tpl: tuple[int, str], output_dir: Path, *, task_history_index: int | None = None) -> bool:
+    def dump_annotation_for_task_wrapper(self, tpl: tuple[int, str], output_dir: Path, *, task_history_index: int | None = None, task_history_id: str | None = None) -> bool:
         task_index, task_id = tpl
         try:
-            return self.dump_annotation_for_task(task_id, output_dir=output_dir, task_index=task_index, task_history_index=task_history_index)
+            return self.dump_annotation_for_task(task_id, output_dir=output_dir, task_index=task_index, task_history_index=task_history_index, task_history_id=task_history_id)
         except Exception:  # pylint: disable=broad-except
             logger.warning(f"タスク'{task_id}'のアノテーション情報のダンプに失敗しました。", exc_info=True)
             return False
 
-    def dump_annotation(self, task_id_list: list[str], output_dir: Path, *, task_history_index: int | None = None, parallelism: int | None = None) -> None:
+    def dump_annotation(self, task_id_list: list[str], output_dir: Path, *, task_history_index: int | None = None, task_history_id: str | None = None, parallelism: int | None = None) -> None:
         project_title = self.facade.get_project_title(self.project_id)
         logger.info(f"プロジェクト'{project_title}'に対して、タスク{len(task_id_list)} 件のアノテーションをファイルに保存します。")
 
@@ -126,7 +126,7 @@ class DumpAnnotationMain:
         success_count = 0
 
         if parallelism is not None:
-            func = functools.partial(self.dump_annotation_for_task_wrapper, task_history_index=task_history_index, output_dir=output_dir)
+            func = functools.partial(self.dump_annotation_for_task_wrapper, task_history_index=task_history_index, task_history_id=task_history_id, output_dir=output_dir)
             with multiprocessing.Pool(parallelism) as pool:
                 result_bool_list = pool.map(func, enumerate(task_id_list))
                 success_count = len([e for e in result_bool_list if e])
@@ -134,7 +134,7 @@ class DumpAnnotationMain:
         else:
             for task_index, task_id in enumerate(task_id_list):
                 try:
-                    result = self.dump_annotation_for_task(task_id, output_dir=output_dir, task_history_index=task_history_index, task_index=task_index)
+                    result = self.dump_annotation_for_task(task_id, output_dir=output_dir, task_history_index=task_history_index, task_history_id=task_history_id, task_index=task_index)
                     if result:
                         success_count += 1
                 except Exception:
@@ -157,7 +157,7 @@ class DumpAnnotation(CommandLine):
         super().validate_project(project_id, project_member_roles=None)
 
         main_obj = DumpAnnotationMain(self.service, project_id)
-        main_obj.dump_annotation(task_id_list, output_dir=output_dir, parallelism=args.parallelism, task_history_index=args.task_history_index)
+        main_obj.dump_annotation(task_id_list, output_dir=output_dir, parallelism=args.parallelism, task_history_index=args.task_history_index, task_history_id=args.task_history_id)
 
 
 def main(args: argparse.Namespace) -> None:
@@ -174,12 +174,19 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
 
     parser.add_argument("-o", "--output_dir", type=str, required=True, help="出力先ディレクトリのパス")
 
-    parser.add_argument(
+    task_history_group = parser.add_mutually_exclusive_group()
+    task_history_group.add_argument(
         "--task_history_index",
         type=int,
         help="指定したタスク履歴のインデックス（ゼロ始まり）で付与されたアノテーション情報をダンプします。過去のアノテーション結果をダンプする場合に指定します。"
         "ただし、過去のアノテーションデータは30日間しか保持されません。30日より前に更新されたアノテーションをダンプした場合は、アノテーションが0件の状態でダンプされます。",
     )
+    task_history_group.add_argument(
+        "--task_history_id",
+        type=str,
+        help="指定したタスク履歴IDで付与されたアノテーション情報をダンプします。過去のアノテーション結果をダンプする場合に指定します。"
+        "ただし、過去のアノテーションデータは30日間しか保持されません。30日より前に更新されたアノテーションをダンプした場合は、アノテーションが0件の状態でダンプされます。",
+    )
 
     parser.add_argument(
         "--parallelism",

annofabcli/annotation_zip/list_annotation_3d_bounding_box.py

@@ -1,5 +1,6 @@
 import argparse
 import logging
+import math
 import sys
 import tempfile
 from collections.abc import Collection
@@ -65,6 +66,9 @@ class Annotation3DBoundingBoxInfo(DataClassJsonMixin):
     top_z: float
     """天面のZ座標（location.z + height/2）。回転は考慮していない。"""
 
+    horizontal_distance: float
+    """原点(0, 0)からのXY平面上の距離（sqrt(location.x² + location.y²)）"""
+
     attributes: dict[str, str | int | bool]
     """属性情報"""
 
@@ -96,6 +100,7 @@ def get_annotation_3d_bounding_box_info_list(simple_annotation: dict[str, Any],
         footprint_area = width * depth
         bottom_z = location.z - height / 2
         top_z = location.z + height / 2
+        horizontal_distance = math.hypot(location.x, location.y)
 
         result.append(
             Annotation3DBoundingBoxInfo(
@@ -116,6 +121,7 @@ def get_annotation_3d_bounding_box_info_list(simple_annotation: dict[str, Any],
                 footprint_area=footprint_area,
                 bottom_z=bottom_z,
                 top_z=top_z,
+                horizontal_distance=horizontal_distance,
                 attributes=detail["attributes"],
                 updated_datetime=simple_annotation["updated_datetime"],
             )
@@ -177,6 +183,7 @@ def create_df(
         "footprint_area",
         "bottom_z",
         "top_z",
+        "horizontal_distance",
     ]
 
     if len(tmp_annotation_bbox_list) == 0:

{annofabcli-1.113.0.dist-info → annofabcli-1.113.1.dist-info}/METADATA

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

{annofabcli-1.113.0.dist-info → annofabcli-1.113.1.dist-info}/RECORD

@@ -10,7 +10,7 @@ annofabcli/annotation/copy_annotation.py,sha256=8ayliCb3XCsswEW_E_blmSR1aLt00Swf
 annofabcli/annotation/create_classification_annotation.py,sha256=OVMFyL-CrZH444V1EkaTt068cEG834LIfdMDAspn3PA,18577
 annofabcli/annotation/delete_annotation.py,sha256=NCA8e9FQsqaCVcQmteRQcLoNrzAcoRdpFoiWjZhswSY,25124
 annofabcli/annotation/download_annotation_zip.py,sha256=o2p2TfK8-jz15TWrkWxhX9eAnoATHjxkTy44q-BbI14,3265
-annofabcli/annotation/dump_annotation.py,sha256=60oxLofG9nXh6813HxN9JjAFbEiCaAgb55KU92j_khE,9949
+annofabcli/annotation/dump_annotation.py,sha256=AWEAR4Q38Oo9yA6plo51F7_ZSxwfuaxQeFDZ66gsiIA,10844
 annofabcli/annotation/import_annotation.py,sha256=cbTLD2BZjZ2xCDvRriCHkVz2Twdnbm0r2igtLHw9tMI,35849
 annofabcli/annotation/list_annotation.py,sha256=ymxek1dTntctXaoe6KmcKwzdcRmAZllM81lnsK2J7U8,10687
 annofabcli/annotation/list_annotation_count.py,sha256=4WjvwyB8rXS9gxtRI-kDbezDEBjptybEl7k_lbRiGWk,6454
@@ -35,7 +35,7 @@ annofabcli/annotation_specs/list_label_color.py,sha256=bWiuNvqHuw6-Jh_q43-Y-46sr
 annofabcli/annotation_specs/put_label_color.py,sha256=3op1Kck5TBn-ORIDmQOGgZGmfm_c4nmRuJy4g0vkEGQ,5956
 annofabcli/annotation_specs/subcommand_annotation_specs.py,sha256=jOPgWLEmb721kxknmzlXLIFuvWwlaX17PJATfQDH5lo,2643
 annofabcli/annotation_zip/__init__.py,sha256=wAeKgkUYvgzdGFS3iJ3h0WogWbg9i-0c4xSg-mzbBpY,64
-annofabcli/annotation_zip/list_annotation_3d_bounding_box.py,sha256=VbUL-h8VUEaitLQE966wG2El9xa_debaHU-Z1tlcHP4,14450
+annofabcli/annotation_zip/list_annotation_3d_bounding_box.py,sha256=UtPA1WQ348_3CasK6BhVsYuYPo2J94idMpq2qapeKvA,14738
 annofabcli/annotation_zip/list_annotation_bounding_box_2d.py,sha256=05Et3MOTRShY-h9TLWD4LtMGTaw_2Sd2AFcL5wddOAI,13435
 annofabcli/annotation_zip/list_polygon_annotation.py,sha256=SZ00hSaDpDm9dfY8kayLtgibBRT0ocrYCBY3OQIeTqc,15580
 annofabcli/annotation_zip/list_polyline_annotation.py,sha256=0xTXr5jdOGnKhb_afGj40u3e4QEyX3tVFdRqViBj4-k,15835
@@ -224,8 +224,8 @@ annofabcli/task_history_event/download_task_history_event_json.py,sha256=lWyOoS2
 annofabcli/task_history_event/list_all_task_history_event.py,sha256=M8FEeZpgIb1QK01feZRHPvAAoR6K3Ztif7GICGjZoV0,6813
 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.113.0.dist-info/METADATA,sha256=_lKgu_x8NnCzOdPmMGBuDqD6azydU-3-g9FP4Vd8peA,4949
-annofabcli-1.113.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-annofabcli-1.113.0.dist-info/entry_points.txt,sha256=C2uSUc-kkLJpoK_mDL5FEMAdorLEMPfwSf8VBMYnIFM,56
-annofabcli-1.113.0.dist-info/licenses/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
-annofabcli-1.113.0.dist-info/RECORD,,
+annofabcli-1.113.1.dist-info/METADATA,sha256=Hv4z7jgkKuMPnAHF4jp-ecpL63KheapP0LR8_Gt-r0g,4949
+annofabcli-1.113.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+annofabcli-1.113.1.dist-info/entry_points.txt,sha256=C2uSUc-kkLJpoK_mDL5FEMAdorLEMPfwSf8VBMYnIFM,56
+annofabcli-1.113.1.dist-info/licenses/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
+annofabcli-1.113.1.dist-info/RECORD,,