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

annofabcli/annotation/change_annotation_attributes.py

@@ -14,7 +14,7 @@ import annofabapi
 from annofabapi.dataclass.task import Task
 from annofabapi.models import ProjectMemberRole, TaskStatus
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.annotation.annotation_query import (
     AnnotationQueryForAPI,
     AnnotationQueryForCLI,

annofabcli/annotation/change_annotation_attributes_per_annotation.py

@@ -13,7 +13,7 @@ from annofabapi.models import ProjectMemberRole
 from annofabapi.pydantic_models.task_status import TaskStatus
 from pydantic import BaseModel
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.annotation.annotation_query import convert_attributes_from_cli_to_additional_data_list_v2
 from annofabcli.annotation.dump_annotation import DumpAnnotationMain
 from annofabcli.common.cli import (

annofabcli/annotation/change_annotation_properties.py

@@ -15,7 +15,7 @@ from annofabapi.models import ProjectMemberRole, SingleAnnotation, TaskStatus
 from annofabapi.utils import can_put_annotation, str_now
 from dataclasses_json import DataClassJsonMixin
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.annotation.annotation_query import AnnotationQueryForAPI, AnnotationQueryForCLI
 from annofabcli.annotation.dump_annotation import DumpAnnotationMain
 from annofabcli.common.cli import (

annofabcli/annotation/copy_annotation.py

@@ -13,7 +13,7 @@ import annofabapi
 from annofabapi.models import ProjectMemberRole
 from annofabapi.utils import can_put_annotation
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     PARALLELISM_CHOICES,

annofabcli/annotation/create_classification_annotation.py

@@ -11,7 +11,7 @@ from annofabapi.models import DefaultAnnotationType, ProjectMemberRole, TaskStat
 from annofabapi.util.annotation_specs import AnnotationSpecsAccessor
 from annofabapi.utils import can_put_annotation
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     PARALLELISM_CHOICES,

annofabcli/annotation/delete_annotation.py

@@ -15,7 +15,7 @@ import requests
 from annofabapi.dataclass.task import Task
 from annofabapi.models import ProjectMemberRole, TaskStatus
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.annotation.annotation_query import AnnotationQueryForAPI, AnnotationQueryForCLI
 from annofabcli.annotation.dump_annotation import DumpAnnotationMain
 from annofabcli.common.cli import (

annofabcli/annotation/dump_annotation.py

@@ -11,7 +11,7 @@ from typing import Any
 import annofabapi
 from annofabapi.models import AnnotationDataHoldingType
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import PARALLELISM_CHOICES, ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.facade import AnnofabApiFacade
 
@@ -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/import_annotation.py

@@ -32,7 +32,7 @@ from annofabapi.util.annotation_specs import AnnotationSpecsAccessor, get_choice
 from annofabapi.utils import can_put_annotation
 from dataclasses_json import DataClassJsonMixin
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     PARALLELISM_CHOICES,

annofabcli/annotation/list_annotation.py

@@ -9,7 +9,7 @@ import annofabapi
 import pandas
 from annofabapi.models import SingleAnnotation
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.annotation.annotation_query import AnnotationQueryForAPI, AnnotationQueryForCLI
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,

annofabcli/annotation/list_annotation_count.py

@@ -9,7 +9,7 @@ import annofabapi
 import pandas
 from annofabapi.models import SingleAnnotation
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.annotation.annotation_query import AnnotationQueryForCLI
 from annofabcli.annotation.list_annotation import ListAnnotationMain
 from annofabcli.common.cli import (

annofabcli/annotation/merge_segmentation.py

@@ -19,7 +19,7 @@ from annofabapi.segmentation import read_binary_image, write_binary_image
 from annofabapi.util.annotation_specs import AnnotationSpecsAccessor
 from annofabapi.utils import can_put_annotation
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     PARALLELISM_CHOICES,

annofabcli/annotation/remove_segmentation_overlap.py

@@ -17,7 +17,7 @@ from annofabapi.pydantic_models.task_status import TaskStatus
 from annofabapi.segmentation import read_binary_image, write_binary_image
 from annofabapi.utils import can_put_annotation
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     PARALLELISM_CHOICES,

annofabcli/annotation/restore_annotation.py

@@ -19,7 +19,7 @@ from annofabapi.parser import (
 )
 from annofabapi.utils import can_put_annotation
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     PARALLELISM_CHOICES,

annofabcli/annotation_specs/list_annotation_specs_history.py

@@ -4,7 +4,7 @@ from typing import Any
 
 import annofabapi
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.enums import FormatArgument
 from annofabcli.common.facade import AnnofabApiFacade

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:
@@ -331,7 +338,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.add_argument(
         "--label_name",
         type=str,
-        nargs="*",
+        nargs="+",
         help="指定したラベル名の3Dバウンディングボックスアノテーションのみを対象にします。複数指定できます。",
     )
 

annofabcli/annotation_zip/list_annotation_bounding_box_2d.py

@@ -46,8 +46,13 @@ class AnnotationBoundingBoxInfo(DataClassJsonMixin):
     annotation_id: str
     left_top: dict[str, int]
     right_bottom: dict[str, int]
+    center: dict[str, float]
+    """バウンディングボックスの中心座標"""
     width: int
     height: int
+    area: int
+    """バウンディングボックスの面積"""
+    attributes: dict[str, str | int | bool]
 
 
 def get_annotation_bounding_box_info_list(simple_annotation: dict[str, Any], *, target_label_names: Collection[str] | None = None) -> list[AnnotationBoundingBoxInfo]:
@@ -64,6 +69,9 @@ def get_annotation_bounding_box_info_list(simple_annotation: dict[str, Any], *,
             right_bottom = detail["data"]["right_bottom"]
             width = abs(right_bottom["x"] - left_top["x"])
             height = abs(right_bottom["y"] - left_top["y"])
+            center_x = (left_top["x"] + right_bottom["x"]) / 2
+            center_y = (left_top["y"] + right_bottom["y"]) / 2
+            area = width * height
 
             result.append(
                 AnnotationBoundingBoxInfo(
@@ -78,9 +86,12 @@ def get_annotation_bounding_box_info_list(simple_annotation: dict[str, Any], *,
                     annotation_id=detail["annotation_id"],
                     left_top=left_top,
                     right_bottom=right_bottom,
+                    center={"x": center_x, "y": center_y},
                     width=width,
                     height=height,
+                    area=area,
                     updated_datetime=simple_annotation["updated_datetime"],
+                    attributes=detail["attributes"],
                 )
             )
 
@@ -114,7 +125,7 @@ def get_annotation_bounding_box_info_list_from_annotation_path(
 def create_df(
     annotation_bbox_list: list[AnnotationBoundingBoxInfo],
 ) -> pandas.DataFrame:
-    columns = [
+    base_columns = [
         "project_id",
         "task_id",
         "task_status",
@@ -129,33 +140,22 @@ def create_df(
         "left_top.y",
         "right_bottom.x",
         "right_bottom.y",
+        "center.x",
+        "center.y",
         "width",
         "height",
+        "area",
     ]
-    df = pandas.DataFrame(
-        [
-            {
-                "project_id": e.project_id,
-                "task_id": e.task_id,
-                "task_status": e.task_status,
-                "task_phase": e.task_phase,
-                "task_phase_stage": e.task_phase_stage,
-                "input_data_id": e.input_data_id,
-                "input_data_name": e.input_data_name,
-                "updated_datetime": e.updated_datetime,
-                "label": e.label,
-                "annotation_id": e.annotation_id,
-                "left_top.x": e.left_top["x"],
-                "left_top.y": e.left_top["y"],
-                "right_bottom.x": e.right_bottom["x"],
-                "right_bottom.y": e.right_bottom["y"],
-                "width": e.width,
-                "height": e.height,
-            }
-            for e in annotation_bbox_list
-        ],
-        columns=columns,
-    )
+
+    if not annotation_bbox_list:
+        # 空のリストの場合は、base_columnsのみで空のDataFrameを返す
+        return pandas.DataFrame(columns=base_columns)
+
+    tmp_annotation_bbox_list = [e.to_dict(encode_json=True) for e in annotation_bbox_list]
+    df = pandas.json_normalize(tmp_annotation_bbox_list)
+
+    attribute_columns = sorted(col for col in df.columns if col.startswith("attributes."))
+    columns = base_columns + attribute_columns
 
     return df[columns]
 
@@ -301,7 +301,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.add_argument(
         "--label_name",
         type=str,
-        nargs="*",
+        nargs="+",
         help="指定したラベル名のバウンディングボックスアノテーションのみを対象にします。複数指定できます。",
     )