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

annofabcli/statistics/list_annotation_count.py

@@ -20,7 +20,7 @@ from typing import Any, Optional, Union
 
 import annofabapi
 import pandas
-from annofabapi.models import AdditionalDataDefinitionType, ProjectMemberRole, TaskPhase, TaskStatus
+from annofabapi.models import ProjectMemberRole, TaskPhase, TaskStatus
 from annofabapi.parser import (
     SimpleAnnotationParser,
     SimpleAnnotationParserByTask,
@@ -29,6 +29,7 @@ from annofabapi.parser import (
     lazy_parse_simple_annotation_zip,
     lazy_parse_simple_annotation_zip_by_task,
 )
+from annofabapi.pydantic_models.additional_data_definition_type import AdditionalDataDefinitionType
 from dataclasses_json import DataClassJsonMixin, config
 
 import annofabcli
@@ -115,18 +116,18 @@ class AnnotationCounter(abc.ABC):
 @dataclass(frozen=True)
 class AnnotationCounterByTask(AnnotationCounter, DataClassJsonMixin):
     task_id: str
-    status: TaskStatus
-    phase: TaskPhase
-    phase_stage: int
+    task_status: TaskStatus
+    task_phase: TaskPhase
+    task_phase_stage: int
     input_data_count: int
 
 
 @dataclass(frozen=True)
 class AnnotationCounterByInputData(AnnotationCounter, DataClassJsonMixin):
     task_id: str
-    status: TaskStatus
-    phase: TaskPhase
-    phase_stage: int
+    task_status: TaskStatus
+    task_phase: TaskPhase
+    task_phase_stage: int
 
     input_data_id: str
     input_data_name: str
@@ -258,9 +259,9 @@ class ListAnnotationCounterByInputData:
 
         return AnnotationCounterByInputData(
             task_id=simple_annotation["task_id"],
-            phase=TaskPhase(simple_annotation["task_phase"]),
-            phase_stage=simple_annotation["task_phase_stage"],
-            status=TaskStatus(simple_annotation["task_status"]),
+            task_phase=TaskPhase(simple_annotation["task_phase"]),
+            task_phase_stage=simple_annotation["task_phase_stage"],
+            task_status=TaskStatus(simple_annotation["task_status"]),
             input_data_id=simple_annotation["input_data_id"],
             input_data_name=simple_annotation["input_data_name"],
             annotation_count=sum(annotation_count_by_label.values()),
@@ -355,9 +356,9 @@ class ListAnnotationCounterByTask:
 
         return AnnotationCounterByTask(
             task_id=last_simple_annotation["task_id"],
-            status=TaskStatus(last_simple_annotation["task_status"]),
-            phase=TaskPhase(last_simple_annotation["task_phase"]),
-            phase_stage=last_simple_annotation["task_phase_stage"],
+            task_status=TaskStatus(last_simple_annotation["task_status"]),
+            task_phase=TaskPhase(last_simple_annotation["task_phase"]),
+            task_phase_stage=last_simple_annotation["task_phase_stage"],
             input_data_count=input_data_count,
             annotation_count=sum(annotation_count_by_label.values()),
             annotation_count_by_label=annotation_count_by_label,
@@ -483,9 +484,9 @@ class AttributeCountCsv:
         def get_columns() -> list[AttributeValueKey]:
             basic_columns = [
                 ("task_id", "", ""),
-                ("status", "", ""),
-                ("phase", "", ""),
-                ("phase_stage", "", ""),
+                ("task_status", "", ""),
+                ("task_phase", "", ""),
+                ("task_phase_stage", "", ""),
                 ("input_data_count", "", ""),
                 ("annotation_count", "", ""),
             ]
@@ -495,9 +496,9 @@ class AttributeCountCsv:
         def to_cell(c: AnnotationCounterByTask) -> dict[AttributeValueKey, Any]:
             cell = {
                 ("task_id", "", ""): c.task_id,
-                ("status", "", ""): c.status.value,
-                ("phase", "", ""): c.phase.value,
-                ("phase_stage", "", ""): c.phase_stage,
+                ("task_status", "", ""): c.task_status.value,
+                ("task_phase", "", ""): c.task_phase.value,
+                ("task_phase_stage", "", ""): c.task_phase_stage,
                 ("input_data_count", "", ""): c.input_data_count,
                 ("annotation_count", "", ""): c.annotation_count,
             }
@@ -521,9 +522,9 @@ class AttributeCountCsv:
         def get_columns() -> list[AttributeValueKey]:
             basic_columns = [
                 ("task_id", "", ""),
-                ("status", "", ""),
-                ("phase", "", ""),
-                ("phase_stage", "", ""),
+                ("task_status", "", ""),
+                ("task_phase", "", ""),
+                ("task_phase_stage", "", ""),
                 ("input_data_id", "", ""),
                 ("input_data_name", "", ""),
                 ("frame_no", "", ""),
@@ -538,9 +539,9 @@ class AttributeCountCsv:
                 ("input_data_name", "", ""): c.input_data_name,
                 ("frame_no", "", ""): c.frame_no,
                 ("task_id", "", ""): c.task_id,
-                ("status", "", ""): c.status.value,
-                ("phase", "", ""): c.phase.value,
-                ("phase_stage", "", ""): c.phase_stage,
+                ("task_status", "", ""): c.task_status.value,
+                ("task_phase", "", ""): c.task_phase.value,
+                ("task_phase_stage", "", ""): c.task_phase_stage,
                 ("annotation_count", "", ""): c.annotation_count,
             }
             cell.update(c.annotation_count_by_attribute)
@@ -587,9 +588,9 @@ class LabelCountCsv:
         def get_columns() -> list[str]:
             basic_columns = [
                 "task_id",
-                "status",
-                "phase",
-                "phase_stage",
+                "task_status",
+                "task_phase",
+                "task_phase_stage",
                 "input_data_count",
                 "annotation_count",
             ]
@@ -599,9 +600,9 @@ class LabelCountCsv:
         def to_dict(c: AnnotationCounterByTask) -> dict[str, Any]:
             d = {
                 "task_id": c.task_id,
-                "status": c.status.value,
-                "phase": c.phase.value,
-                "phase_stage": c.phase_stage,
+                "task_status": c.task_status.value,
+                "task_phase": c.task_phase.value,
+                "task_phase_stage": c.task_phase_stage,
                 "input_data_count": c.input_data_count,
                 "annotation_count": c.annotation_count,
             }
@@ -625,9 +626,9 @@ class LabelCountCsv:
         def get_columns() -> list[str]:
             basic_columns = [
                 "task_id",
-                "status",
-                "phase",
-                "phase_stage",
+                "task_status",
+                "task_phase",
+                "task_phase_stage",
                 "input_data_id",
                 "input_data_name",
                 "frame_no",
@@ -642,9 +643,9 @@ class LabelCountCsv:
                 "input_data_name": c.input_data_name,
                 "frame_no": c.frame_no,
                 "task_id": c.task_id,
-                "status": c.status.value,
-                "phase": c.phase.value,
-                "phase_stage": c.phase_stage,
+                "task_status": c.task_status.value,
+                "task_phase": c.task_phase.value,
+                "task_phase_stage": c.task_phase_stage,
                 "annotation_count": c.annotation_count,
             }
             d.update(c.annotation_count_by_label)
@@ -697,6 +698,48 @@ class AnnotationSpecs:
             )
         return result
 
+    def attribute_name_keys(
+        self,
+        excluded_attribute_types: Optional[Collection[AdditionalDataDefinitionType]] = None,
+        include_attribute_types: Optional[Collection[AdditionalDataDefinitionType]] = None,
+    ) -> list[tuple[str, str]]:
+        """
+        属性名の一覧を取得します。
+
+        Args:
+            include_attribute_types: 指定した属性の種類に合致した属性名の一覧を取得します。
+            excluded_attribute_types: 指定した属性の種類に合致していない属性名の一覧を取得します。
+
+        Raise:
+            ValueError: `include_attribute_types`と`excluded_attribute_types`の両方が指定された場合に発生します。
+        """
+        if excluded_attribute_types is not None and include_attribute_types is not None:
+            raise ValueError("`include_attribute_types`と`excluded_attribute_types`の両方が指定されています。")
+
+        result = []
+        for label in self._labels_v1:
+            label_name_en = AddProps.get_message(label["label_name"], MessageLocale.EN)
+            assert label_name_en is not None
+
+            for attribute in label["additional_data_definitions"]:
+                if excluded_attribute_types is not None and AdditionalDataDefinitionType(attribute["type"]) in excluded_attribute_types:
+                    continue
+
+                if include_attribute_types is not None and AdditionalDataDefinitionType(attribute["type"]) not in include_attribute_types:
+                    continue
+
+                attribute_name_en = AddProps.get_message(attribute["name"], MessageLocale.EN)
+                assert attribute_name_en is not None
+                result.append((label_name_en, attribute_name_en))
+
+        duplicated_attribute_names = [key for key, value in collections.Counter(result).items() if value > 1]
+        if len(duplicated_attribute_names) > 0:
+            logger.warning(
+                f"アノテーション仕様の属性情報（ラベル英語名、属性英語名）が重複しています。アノテーション個数が正しく算出できない可能性があります。:: {duplicated_attribute_names}"  # noqa: E501
+            )
+
+        return result
+
     def selective_attribute_value_keys(self) -> list[AttributeValueKey]:
         """
         選択系の属性の属性値のキーの一覧。

annofabcli/statistics/list_annotation_duration.py

@@ -109,9 +109,9 @@ class AnnotationDuration(DataClassJsonMixin):
     """
 
     task_id: str
-    status: TaskStatus
-    phase: TaskPhase
-    phase_stage: int
+    task_status: TaskStatus
+    task_phase: TaskPhase
+    task_phase_stage: int
 
     input_data_id: str
     input_data_name: str
@@ -239,9 +239,9 @@ class ListAnnotationDurationByInputData:
 
         return AnnotationDuration(
             task_id=simple_annotation["task_id"],
-            phase=TaskPhase(simple_annotation["task_phase"]),
-            phase_stage=simple_annotation["task_phase_stage"],
-            status=TaskStatus(simple_annotation["task_status"]),
+            task_phase=TaskPhase(simple_annotation["task_phase"]),
+            task_phase_stage=simple_annotation["task_phase_stage"],
+            task_status=TaskStatus(simple_annotation["task_status"]),
             input_data_id=simple_annotation["input_data_id"],
             input_data_name=simple_annotation["input_data_name"],
             video_duration_second=video_duration_second,
@@ -375,9 +375,9 @@ class AnnotationDurationCsvByAttribute:
     ) -> list[AttributeValueKey]:
         basic_columns = [
             ("task_id", "", ""),
-            ("status", "", ""),
-            ("phase", "", ""),
-            ("phase_stage", "", ""),
+            ("task_status", "", ""),
+            ("task_phase", "", ""),
+            ("task_phase_stage", "", ""),
             ("input_data_id", "", ""),
             ("input_data_name", "", ""),
             ("video_duration_second", "", ""),
@@ -396,9 +396,9 @@ class AnnotationDurationCsvByAttribute:
                 ("input_data_id", "", ""): c.input_data_id,
                 ("input_data_name", "", ""): c.input_data_name,
                 ("task_id", "", ""): c.task_id,
-                ("status", "", ""): c.status.value,
-                ("phase", "", ""): c.phase.value,
-                ("phase_stage", "", ""): c.phase_stage,
+                ("task_status", "", ""): c.task_status.value,
+                ("task_phase", "", ""): c.task_phase.value,
+                ("task_phase_stage", "", ""): c.task_phase_stage,
                 ("video_duration_second", "", ""): c.video_duration_second,
                 ("annotation_duration_second", "", ""): c.annotation_duration_second,
             }
@@ -438,9 +438,9 @@ class AnnotationDurationCsvByLabel:
     ) -> list[str]:
         basic_columns = [
             "task_id",
-            "status",
-            "phase",
-            "phase_stage",
+            "task_status",
+            "task_phase",
+            "task_phase_stage",
             "input_data_id",
             "input_data_name",
             "video_duration_second",
@@ -459,9 +459,9 @@ class AnnotationDurationCsvByLabel:
                 "input_data_id": c.input_data_id,
                 "input_data_name": c.input_data_name,
                 "task_id": c.task_id,
-                "status": c.status.value,
-                "phase": c.phase.value,
-                "phase_stage": c.phase_stage,
+                "task_status": c.task_status.value,
+                "task_phase": c.task_phase.value,
+                "task_phase_stage": c.task_phase_stage,
                 "video_duration_second": c.video_duration_second,
                 "annotation_duration_second": c.annotation_duration_second,
             }

annofabcli/statistics/subcommand_statistics.py

@@ -5,6 +5,7 @@ import annofabcli
 import annofabcli.common.cli
 import annofabcli.stat_visualization.merge_visualization_dir
 import annofabcli.statistics.list_annotation_attribute
+import annofabcli.statistics.list_annotation_attribute_filled_count
 import annofabcli.statistics.list_annotation_count
 import annofabcli.statistics.list_annotation_duration
 import annofabcli.statistics.list_video_duration
@@ -23,8 +24,10 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
 
     # サブコマンドの定義
     annofabcli.statistics.list_annotation_attribute.add_parser(subparsers)
+    annofabcli.statistics.list_annotation_attribute_filled_count.add_parser(subparsers)
     annofabcli.statistics.list_annotation_count.add_parser(subparsers)
     annofabcli.statistics.list_annotation_duration.add_parser(subparsers)
+
     annofabcli.statistics.list_video_duration.add_parser(subparsers)
     annofabcli.statistics.list_worktime.add_parser(subparsers)
     annofabcli.statistics.summarize_task_count.add_parser(subparsers)