annofabcli 1.104.0__py3-none-any.whl → 1.104.1__py3-none-any.whl

annofabcli/statistics/list_annotation_area.py

@@ -55,6 +55,7 @@ def lazy_parse_simple_annotation_by_input_data(annotation_path: Path) -> Iterato
 
 @dataclass(frozen=True)
 class AnnotationAreaInfo(DataClassJsonMixin):
+    project_id: str
     task_id: str
     task_status: str
     task_phase: str
@@ -92,6 +93,7 @@ def get_annotation_area_info_list(parser: SimpleAnnotationParser, simple_annotat
 
         result.append(
             AnnotationAreaInfo(
+                project_id=simple_annotation["project_id"],
                 task_id=simple_annotation["task_id"],
                 task_phase=simple_annotation["task_phase"],
                 task_phase_stage=simple_annotation["task_phase_stage"],
@@ -135,6 +137,7 @@ def create_df(
     annotation_area_list: list[AnnotationAreaInfo],
 ) -> pandas.DataFrame:
     columns = [
+        "project_id",
         "task_id",
         "task_status",
         "task_phase",

annofabcli/statistics/list_annotation_attribute.py

@@ -57,6 +57,7 @@ class AnnotationAttribute(pydantic.BaseModel):
     入力データまたはタスク単位の区間アノテーションの長さ情報。
     """
 
+    project_id: str
     task_id: str
     task_status: str
     task_phase: str
@@ -87,6 +88,7 @@ def get_annotation_attribute_list_from_annotation_json(simple_annotation: dict[s
 
         result.append(
             AnnotationAttribute(
+                project_id=simple_annotation["project_id"],
                 task_id=simple_annotation["task_id"],
                 task_status=simple_annotation["task_status"],
                 task_phase=simple_annotation["task_phase"],
@@ -141,6 +143,7 @@ def print_annotation_attribute_list_as_csv(annotation_attribute_list: list, outp
     df = pandas.json_normalize(annotation_attribute_list)
 
     base_columns = [
+        "project_id",
         "task_id",
         "task_status",
         "task_phase",

annofabcli/statistics/list_annotation_attribute_filled_count.py

@@ -100,6 +100,7 @@ class AnnotationCountByInputData(DataClassJsonMixin, HasAnnotationAttributeCount
     入力データ単位のアノテーション数の情報。
     """
 
+    project_id: str
     task_id: str
     task_status: TaskStatus
     task_phase: TaskPhase
@@ -126,6 +127,7 @@ class AnnotationCountByTask(DataClassJsonMixin, HasAnnotationAttributeCounts):
     タスク単位のアノテーション数の情報。
     """
 
+    project_id: str
     task_id: str
     task_status: TaskStatus
     task_phase: TaskPhase
@@ -174,6 +176,7 @@ def convert_annotation_count_list_by_input_data_to_by_task(annotation_count_list
 
         result.append(
             AnnotationCountByTask(
+                project_id=first_elm.project_id,
                 task_id=task_id,
                 task_status=first_elm.task_status,
                 task_phase=first_elm.task_phase,
@@ -263,6 +266,7 @@ class ListAnnotationCounterByInputData:
             frame_no = self.frame_no_map.get((simple_annotation["task_id"], simple_annotation["input_data_id"]))
 
         return AnnotationCountByInputData(
+            project_id=simple_annotation["project_id"],
             task_id=simple_annotation["task_id"],
             task_phase=TaskPhase(simple_annotation["task_phase"]),
             task_phase_stage=simple_annotation["task_phase_stage"],
@@ -343,6 +347,7 @@ class AnnotationCountCsvByAttribute:
         prior_attribute_columns: Optional[list[tuple[str, str, str]]] = None,
     ) -> list[tuple[str, str, str]]:
         basic_columns = [
+            ("project_id", "", ""),
             ("task_id", "", ""),
             ("task_status", "", ""),
             ("task_phase", "", ""),
@@ -360,6 +365,7 @@ class AnnotationCountCsvByAttribute:
         prior_attribute_columns: Optional[list[tuple[str, str, str]]] = None,
     ) -> list[tuple[str, str, str]]:
         basic_columns = [
+            ("project_id", "", ""),
             ("task_id", "", ""),
             ("task_status", "", ""),
             ("task_phase", "", ""),
@@ -377,6 +383,7 @@ class AnnotationCountCsvByAttribute:
     ) -> pandas.DataFrame:
         def to_cell(c: AnnotationCountByInputData) -> dict[tuple[str, str, str], Any]:
             cell: dict[tuple[str, str, str], Any] = {
+                ("project_id", "", ""): c.project_id,
                 ("task_id", "", ""): c.task_id,
                 ("task_status", "", ""): c.task_status.value,
                 ("task_phase", "", ""): c.task_phase.value,
@@ -405,6 +412,7 @@ class AnnotationCountCsvByAttribute:
     ) -> pandas.DataFrame:
         def to_cell(c: AnnotationCountByTask) -> dict[tuple[str, str, str], Any]:
             cell: dict[tuple[str, str, str], Any] = {
+                ("project_id", "", ""): c.project_id,
                 ("task_id", "", ""): c.task_id,
                 ("task_status", "", ""): c.task_status.value,
                 ("task_phase", "", ""): c.task_phase.value,

annofabcli/statistics/list_annotation_count.py

@@ -115,6 +115,7 @@ class AnnotationCounter(abc.ABC):
 
 @dataclass(frozen=True)
 class AnnotationCounterByTask(AnnotationCounter, DataClassJsonMixin):
+    project_id: str
     task_id: str
     task_status: TaskStatus
     task_phase: TaskPhase
@@ -124,6 +125,7 @@ class AnnotationCounterByTask(AnnotationCounter, DataClassJsonMixin):
 
 @dataclass(frozen=True)
 class AnnotationCounterByInputData(AnnotationCounter, DataClassJsonMixin):
+    project_id: str
     task_id: str
     task_status: TaskStatus
     task_phase: TaskPhase
@@ -254,6 +256,7 @@ class ListAnnotationCounterByInputData:
             frame_no = self.frame_no_map.get((task_id, input_data_id))
 
         return AnnotationCounterByInputData(
+            project_id=simple_annotation["project_id"],
             task_id=simple_annotation["task_id"],
             task_phase=TaskPhase(simple_annotation["task_phase"]),
             task_phase_stage=simple_annotation["task_phase_stage"],
@@ -351,6 +354,7 @@ class ListAnnotationCounterByTask:
             raise RuntimeError(f"{task_parser.task_id} ディレクトリにはjsonファイルが1つも含まれていません。")
 
         return AnnotationCounterByTask(
+            project_id=last_simple_annotation["project_id"],
             task_id=last_simple_annotation["task_id"],
             task_status=TaskStatus(last_simple_annotation["task_status"]),
             task_phase=TaskPhase(last_simple_annotation["task_phase"]),
@@ -468,6 +472,7 @@ class AttributeCountCsv:
     ) -> None:
         def get_columns() -> list[AttributeValueKey]:
             basic_columns = [
+                ("project_id", "", ""),
                 ("task_id", "", ""),
                 ("task_status", "", ""),
                 ("task_phase", "", ""),
@@ -480,6 +485,7 @@ class AttributeCountCsv:
 
         def to_cell(c: AnnotationCounterByTask) -> dict[AttributeValueKey, Any]:
             cell = {
+                ("project_id", "", ""): c.project_id,
                 ("task_id", "", ""): c.task_id,
                 ("task_status", "", ""): c.task_status.value,
                 ("task_phase", "", ""): c.task_phase.value,
@@ -506,6 +512,7 @@ class AttributeCountCsv:
     ) -> None:
         def get_columns() -> list[AttributeValueKey]:
             basic_columns = [
+                ("project_id", "", ""),
                 ("task_id", "", ""),
                 ("task_status", "", ""),
                 ("task_phase", "", ""),
@@ -520,6 +527,7 @@ class AttributeCountCsv:
 
         def to_cell(c: AnnotationCounterByInputData) -> dict[tuple[str, str, str], Any]:
             cell = {
+                ("project_id", "", ""): c.project_id,
                 ("input_data_id", "", ""): c.input_data_id,
                 ("input_data_name", "", ""): c.input_data_name,
                 ("frame_no", "", ""): c.frame_no,
@@ -569,6 +577,7 @@ class LabelCountCsv:
     ) -> None:
         def get_columns() -> list[str]:
             basic_columns = [
+                "project_id",
                 "task_id",
                 "task_status",
                 "task_phase",
@@ -581,6 +590,7 @@ class LabelCountCsv:
 
         def to_dict(c: AnnotationCounterByTask) -> dict[str, Any]:
             d = {
+                "project_id": c.project_id,
                 "task_id": c.task_id,
                 "task_status": c.task_status.value,
                 "task_phase": c.task_phase.value,
@@ -607,6 +617,7 @@ class LabelCountCsv:
     ) -> None:
         def get_columns() -> list[str]:
             basic_columns = [
+                "project_id",
                 "task_id",
                 "task_status",
                 "task_phase",
@@ -621,6 +632,7 @@ class LabelCountCsv:
 
         def to_dict(c: AnnotationCounterByInputData) -> dict[str, Any]:
             d = {
+                "project_id": c.project_id,
                 "input_data_id": c.input_data_id,
                 "input_data_name": c.input_data_name,
                 "frame_no": c.frame_no,

annofabcli/statistics/list_annotation_duration.py

@@ -108,6 +108,7 @@ class AnnotationDuration(DataClassJsonMixin):
     入力データまたはタスク単位の区間アノテーションの長さ情報。
     """
 
+    project_id: str
     task_id: str
     task_status: TaskStatus
     task_phase: TaskPhase
@@ -234,6 +235,7 @@ class ListAnnotationDurationByInputData:
             }
 
         return AnnotationDuration(
+            project_id=simple_annotation["project_id"],
             task_id=simple_annotation["task_id"],
             task_phase=TaskPhase(simple_annotation["task_phase"]),
             task_phase_stage=simple_annotation["task_phase_stage"],
@@ -360,6 +362,7 @@ class AnnotationDurationCsvByAttribute:
         prior_attribute_columns: Optional[list[AttributeValueKey]] = None,
     ) -> list[AttributeValueKey]:
         basic_columns = [
+            ("project_id", "", ""),
             ("task_id", "", ""),
             ("task_status", "", ""),
             ("task_phase", "", ""),
@@ -379,6 +382,7 @@ class AnnotationDurationCsvByAttribute:
     ) -> pandas.DataFrame:
         def to_cell(c: AnnotationDuration) -> dict[tuple[str, str, str], Any]:
             cell: dict[AttributeValueKey, Any] = {
+                ("project_id", "", ""): c.project_id,
                 ("input_data_id", "", ""): c.input_data_id,
                 ("input_data_name", "", ""): c.input_data_name,
                 ("task_id", "", ""): c.task_id,
@@ -423,6 +427,7 @@ class AnnotationDurationCsvByLabel:
         prior_label_columns: Optional[list[str]] = None,
     ) -> list[str]:
         basic_columns = [
+            "project_id",
             "task_id",
             "task_status",
             "task_phase",
@@ -442,6 +447,7 @@ class AnnotationDurationCsvByLabel:
     ) -> pandas.DataFrame:
         def to_dict(c: AnnotationDuration) -> dict[str, Any]:
             d: dict[str, Any] = {
+                "project_id": c.project_id,
                 "input_data_id": c.input_data_id,
                 "input_data_name": c.input_data_name,
                 "task_id": c.task_id,

annofabcli/statistics/list_video_duration.py

@@ -38,7 +38,7 @@ def get_video_duration_list(task_list: list[dict[str, Any]], input_data_list: li
     result = []
     for task in task_list:
         task_id = task["task_id"]
-        elm = {"task_id": task_id, "task_status": task["status"], "task_phase": task["phase"], "task_phase_stage": task["phase_stage"]}
+        elm = {"project_id": task["project_id"], "task_id": task_id, "task_status": task["status"], "task_phase": task["phase"], "task_phase_stage": task["phase_stage"]}
         input_data_id_list = task["input_data_id_list"]
         assert len(input_data_id_list) == 1, f"task_id='{task_id}'には複数の入力データが含まれています。"
         input_data_id = input_data_id_list[0]
@@ -94,6 +94,7 @@ class ListVideoDuration(CommandLine):
         logger.info(f"{len(video_duration_list)} 件のタスクの動画長さを出力します。")
         if output_format == FormatArgument.CSV:
             columns = [
+                "project_id",
                 "task_id",
                 "task_status",
                 "task_phase",

{annofabcli-1.104.0.dist-info → annofabcli-1.104.1.dist-info}/METADATA

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

{annofabcli-1.104.0.dist-info → annofabcli-1.104.1.dist-info}/RECORD

@@ -136,12 +136,12 @@ annofabcli/stat_visualization/write_performance_rating_csv.py,sha256=0j78z5uRULo
 annofabcli/statistics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/statistics/histogram.py,sha256=CvzDxT2cKLSnBGSqkZE6p92PayGxYYja1YyB24M4ALU,3245
 annofabcli/statistics/linegraph.py,sha256=0kr7jVBNMiM2ECYhv3Ry5RitElKerSl9ZKxbKzfiplI,12494
-annofabcli/statistics/list_annotation_area.py,sha256=K1V1w7eNXv-6P_7v3SXqO6VQx8FF6Yjl7OL0IeWiDO4,12227
-annofabcli/statistics/list_annotation_attribute.py,sha256=aq3wU2edygRygd3uydhh7dPBUQlyX5zQK3H4b3RiARI,12420
-annofabcli/statistics/list_annotation_attribute_filled_count.py,sha256=ryDLtFIdW2G5YDqYZWU2-p7L8oGAXSE6_OknSVoZLy0,28708
-annofabcli/statistics/list_annotation_count.py,sha256=sYepVd6UDqy2O3jUO4f6QqSRCUzTi_HorydKJcL4g5Q,52254
-annofabcli/statistics/list_annotation_duration.py,sha256=ZW_sSQQdUAyv14wAIKghGzUe_g1vxusWK_P2e9oGa8s,31639
-annofabcli/statistics/list_video_duration.py,sha256=WGM4Onucw4Z8az8how5FvpN5u-YQaxAEnIJblKY7gl8,9099
+annofabcli/statistics/list_annotation_area.py,sha256=nGqhqPEHLPUccnLCmA9nmwvmYbZYlh5ZxiHNszZ1ei8,12329
+annofabcli/statistics/list_annotation_attribute.py,sha256=L_wmcUGS0Lu3tnRmidDjYK3bCNdvwDjAH64r5__MQ_w,12522
+annofabcli/statistics/list_annotation_attribute_filled_count.py,sha256=g-MihJwEoA1ZnLTJOGX-dn6hI5aUdqQvh2KWbREbQ9s,29033
+annofabcli/statistics/list_annotation_count.py,sha256=cBmUTYifB7UESEFets7DMDn8_GKDBBDJ2vt1q_56fcc,52747
+annofabcli/statistics/list_annotation_duration.py,sha256=ps0UT50W_6ZL5_cZNsSo7Dp-cSx77m1IF4QMBkwRt98,31875
+annofabcli/statistics/list_video_duration.py,sha256=OCDXPOP2z7flE8NBaQD1lDkU9JG5mn3PfACijoR-5s0,9163
 annofabcli/statistics/list_worktime.py,sha256=nr--GtFY-oyFuu8M0EsUqcVxX26gjeP09LYUcdeptyk,6456
 annofabcli/statistics/scatter.py,sha256=C3hTlm_QfGBiY4KjZ-8D_u_Rk53a9f4jszx4iNZgp9w,10945
 annofabcli/statistics/subcommand_statistics.py,sha256=Pvd7s0vvDU9tSpAphPrv94IDhhR1p8iFH2tjdt7I7ZU,2536
@@ -208,8 +208,8 @@ annofabcli/task_history_event/download_task_history_event_json.py,sha256=hQLVbQ0
 annofabcli/task_history_event/list_all_task_history_event.py,sha256=mzFqOS1WjC4_QEz6Yyp1ZvU5h-kU_PU82CtnnjQRSlY,6345
 annofabcli/task_history_event/list_worktime.py,sha256=J18uLrQwZuaatkA4dAr83Rz_qAF2xsx2gOFDp6ysimI,12968
 annofabcli/task_history_event/subcommand_task_history_event.py,sha256=mJVJoT4RXk4HWnY7-Nrsl4If-gtaIIEXd2z7eFZwM2I,1260
-annofabcli-1.104.0.dist-info/METADATA,sha256=QfZgIqtN2dKAfkARjsETvHWWcbG63dUGdi1p2yDAjB4,5286
-annofabcli-1.104.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-annofabcli-1.104.0.dist-info/entry_points.txt,sha256=C2uSUc-kkLJpoK_mDL5FEMAdorLEMPfwSf8VBMYnIFM,56
-annofabcli-1.104.0.dist-info/licenses/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
-annofabcli-1.104.0.dist-info/RECORD,,
+annofabcli-1.104.1.dist-info/METADATA,sha256=sgCezmhchWq4KIhpkiYl40lgFwg0rkPEg4aip9wgPqw,5286
+annofabcli-1.104.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+annofabcli-1.104.1.dist-info/entry_points.txt,sha256=C2uSUc-kkLJpoK_mDL5FEMAdorLEMPfwSf8VBMYnIFM,56
+annofabcli-1.104.1.dist-info/licenses/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
+annofabcli-1.104.1.dist-info/RECORD,,