annofabcli 1.111.0__py3-none-any.whl → 1.111.1__py3-none-any.whl

annofabcli/annotation/import_annotation.py

@@ -254,8 +254,8 @@ class AnnotationConverter:
         for attribute_name, attribute_value in attributes.items():
             try:
                 specs_additional_data = self.annotation_specs_accessor.get_attribute(attribute_name=attribute_name, label=label)
-            except ValueError:
-                logger.warning(f"アノテーション仕様に属性名(英語)が'{attribute_name}'である属性情報が存在しないか、複数存在します。 :: {log_message_suffix}")
+            except ValueError as e:
+                logger.warning(f"アノテーション仕様に属性名(英語)が'{attribute_name}'である属性情報が存在しないか、複数存在します。 :: {log_message_suffix} :: error={e}")
                 if self.is_strict:
                     raise
                 continue
@@ -298,12 +298,11 @@ class AnnotationConverter:
             ValueError: 存在しないラベル名が指定された場合（`self.is_strict`がFalseでもraiseされる９
 
         """
-        log_message_suffix = f"task_id='{parser.task_id}', input_data_id='{parser.input_data_id}', label_name='{detail.label}', annotation_id='{detail.annotation_id}'"
 
         try:
             label_info = self.annotation_specs_accessor.get_label(label_name=detail.label)
-        except ValueError:
-            logger.warning(f"アノテーション仕様にラベル名(英語)が'{detail.label}'であるラベル情報が存在しないか、または複数存在します。 :: {log_message_suffix}")
+        except ValueError as e:
+            logger.warning(f"アノテーション仕様にラベル名(英語)が'{detail.label}'であるラベル情報が存在しないか、または複数存在します。 :: {log_message_suffix} :: error={e}")
             raise
 
         if detail.attributes is not None:
@@ -361,9 +360,12 @@ class AnnotationConverter:
             old_dict_detail[old_detail["annotation_id"]] = old_detail
 
         new_request_details: list[dict[str, Any]] = []
-        for detail in details:
+        for detail_index, detail in enumerate(details):
             try:
-                log_message_suffix = f"task_id='{parser.task_id}', input_data_id='{parser.input_data_id}', label_name='{detail.label}', annotation_id='{detail.annotation_id}'"
+                # detail_indexを出力する理由: annotation_idはNoneだとどれが問題なのか分からないため
+                log_message_suffix = (
+                    f"task_id='{parser.task_id}', input_data_id='{parser.input_data_id}', label_name='{detail.label}', annotation_id='{detail.annotation_id}', detail_index={detail_index}"
+                )
 
                 request_detail = self.convert_annotation_detail(parser, detail, log_message_suffix=log_message_suffix)
             except Exception as e:

annofabcli/statistics/visualization/dataframe/whole_productivity_per_date.py

@@ -141,7 +141,7 @@ class WholeProductivityPerCompletedDate:
         return pandas.DataFrame(index=[e.strftime("%Y-%m-%d") for e in pandas.date_range(start_date, end_date)])
 
     @classmethod
-    def from_df_wrapper(cls, task: Task, worktime_per_date: WorktimePerDate, task_completion_criteria: TaskCompletionCriteria) -> WholeProductivityPerCompletedDate:
+    def from_df_wrapper(cls, task: Task, worktime_per_date: WorktimePerDate, task_completion_criteria: TaskCompletionCriteria) -> WholeProductivityPerCompletedDate:  # noqa: PLR0912
         """
         完了日毎の全体の生産量、生産性を算出する。
 
@@ -172,6 +172,8 @@ class WholeProductivityPerCompletedDate:
             datetime_column = "first_acceptance_reached_datetime"
         elif task_completion_criteria == TaskCompletionCriteria.INSPECTION_REACHED:
             datetime_column = "first_inspection_reached_datetime"
+        elif task_completion_criteria == TaskCompletionCriteria.ANNOTATION_STARTED:
+            datetime_column = "first_annotation_started_datetime"
         else:
             assert_noreturn(task_completion_criteria)
 
@@ -280,6 +282,8 @@ class WholeProductivityPerCompletedDate:
             str_task = "受入フェーズに到達した"
         elif self.task_completion_criteria == TaskCompletionCriteria.INSPECTION_REACHED:
             str_task = "検査フェーズに到達した"
+        elif self.task_completion_criteria == TaskCompletionCriteria.ANNOTATION_STARTED:
+            str_task = "教師付フェーズが着手された"
         else:
             assert_noreturn(self.task_completion_criteria)
 
@@ -884,6 +888,9 @@ class WholeProductivityPerFirstAnnotationStartedDate:
             df_sub_task = df_task[df_task["phase"] == TaskPhase.ACCEPTANCE.value]
         elif task_completion_criteria == TaskCompletionCriteria.INSPECTION_REACHED:
             df_sub_task = df_task[df_task["phase"].isin([TaskPhase.INSPECTION.value, TaskPhase.ACCEPTANCE.value])]
+        elif task_completion_criteria == TaskCompletionCriteria.ANNOTATION_STARTED:
+            # 教師付フェーズが着手されたタスク（first_annotation_started_datetimeがNoneでない）を抽出する
+            df_sub_task = df_task[df_task["first_annotation_started_datetime"].notna()]
         else:
             assert_noreturn(task_completion_criteria)
 
@@ -1013,6 +1020,8 @@ class WholeProductivityPerFirstAnnotationStartedDate:
                 str_task = "受入フェーズ"
             elif self.task_completion_criteria == TaskCompletionCriteria.INSPECTION_REACHED:
                 str_task = "検査フェーズまたは受入フェーズ"
+            elif self.task_completion_criteria == TaskCompletionCriteria.ANNOTATION_STARTED:
+                str_task = "教師付フェーズが着手されたタスク"
             else:
                 assert_noreturn(self.task_completion_criteria)
 

annofabcli/statistics/visualization/model.py

@@ -40,6 +40,8 @@ class TaskCompletionCriteria(Enum):
     """タスクが受入フェーズに到達したら「タスクの完了」とみなす"""
     INSPECTION_REACHED = "inspection_reached"
     """タスクが検査フェーズに到達したら「タスクの完了」とみなす"""
+    ANNOTATION_STARTED = "annotation_started"
+    """教師付フェーズが着手されたら「タスクの完了」とみなす"""
 
     def is_task_completed(self, task: dict[str, Any]) -> bool:
         """指定したタスクが、タスクの完了条件に合致するかどうかを判定します。
@@ -48,6 +50,7 @@ class TaskCompletionCriteria(Enum):
             task: タスク情報。以下のキーを参照します。
                 * phase
                 * status
+                * work_time_span (ANNOTATION_STARTEDの場合のみ)
 
         Returns:
             タスクの完了条件に合致する場合はTrue、そうでない場合はFalse
@@ -62,5 +65,10 @@ class TaskCompletionCriteria(Enum):
             # 受入フェーズも含む理由：検査フェーズに到達したタスクを「完了」とみなすならば、検査フェーズより後段フェーズである受入フェーズも「完了」とみなせるため
             return task["phase"] in {TaskPhase.INSPECTION.value, TaskPhase.ACCEPTANCE.value}
 
+        elif self == TaskCompletionCriteria.ANNOTATION_STARTED:
+            # 教師付フェーズが着手されたタスクを「完了」とみなす
+            # work_time_span > 0 であれば教師付フェーズが着手されたとみなす
+            return task["work_time_span"] > 0
+
         else:
             assert_noreturn(self)

annofabcli/statistics/visualization/project_dir.py

@@ -42,7 +42,7 @@ class ProjectDir(DataClassJsonMixin):
         - acceptance_completed: 受入フェーズの完了状態
         - acceptance_reached: 受入フェーズに到達
         - inspection_reached: 検査フェーズまたは受入フェーズに到達
-        - annotation_started: 教師付フェーズを着手
+        - annotation_started: 教師付フェーズが着手された
     """
 
     FILENAME_WHOLE_PERFORMANCE = "全体の生産性と品質.csv"

annofabcli/statistics/visualize_statistics.py

@@ -710,7 +710,9 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         default=TaskCompletionCriteria.ACCEPTANCE_COMPLETED.value,
         help="タスクの完了条件を指定します。\n"
         "* ``acceptance_completed``: タスクが受入フェーズの完了状態であれば「タスクの完了」とみなす\n"
-        "* ``acceptance_reached``: タスクが受入フェーズに到達したら「タスクの完了」とみなす\n",
+        "* ``acceptance_reached``: タスクが受入フェーズに到達したら「タスクの完了」とみなす\n"
+        "* ``inspection_reached``: タスクが検査フェーズに到達したら「タスクの完了」とみなす\n"
+        "* ``annotation_started``: 教師付フェーズが着手されたら「タスクの完了」とみなす\n",
     )
 
     parser.add_argument(

{annofabcli-1.111.0.dist-info → annofabcli-1.111.1.dist-info}/METADATA

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

{annofabcli-1.111.0.dist-info → annofabcli-1.111.1.dist-info}/RECORD

@@ -11,7 +11,7 @@ annofabcli/annotation/create_classification_annotation.py,sha256=Ex9kSVNHZu71UbL
 annofabcli/annotation/delete_annotation.py,sha256=bU87ov7NhYFPe-Cldn3nBSK_CY9A9x3mSLN1Ame-cKk,25144
 annofabcli/annotation/download_annotation_zip.py,sha256=SMtfxt6NKkpHGRDoKRCjPqpQB5DBpQ-PD2_3ts51h0Q,3314
 annofabcli/annotation/dump_annotation.py,sha256=Q-p6f5XBs7khDgrfY5Q3CGLBMKEerJWO_CQ8_73UXVM,9972
-annofabcli/annotation/import_annotation.py,sha256=maaxlje3VZ7oN94gdtZFgfZnAQlBfYmljgGJzMcI9HE,35811
+annofabcli/annotation/import_annotation.py,sha256=M0osVbY06Xs2DXkQLwCKx7WmK9cPc9EFuvHbAKMKv-0,35898
 annofabcli/annotation/list_annotation.py,sha256=uKcOuGC7lzd6vVbzizkiZtYdXJ7EzY0iifuiqKl2wQM,10707
 annofabcli/annotation/list_annotation_count.py,sha256=T9fbaoxWeDJIVgW_YgHRldbwrVZWiE-57lfJrDQrj80,6474
 annofabcli/annotation/merge_segmentation.py,sha256=kIsCeXtJxzd6nobQPpi0fscaRDlTx3tg1qpy5PDfSJI,18107
@@ -162,12 +162,12 @@ annofabcli/statistics/summarize_task_count_by_task_id_group.py,sha256=K4FFED1pza
 annofabcli/statistics/summarize_task_count_by_user.py,sha256=KUGVUwn_KO4RSA2twAz60nX1OQE1pd5TL5gBmL1bgMA,7421
 annofabcli/statistics/visualize_annotation_count.py,sha256=7OATuGa2okq80unuTe-X30CBVkrlMLDN5Y-Q_5mB6eI,22138
 annofabcli/statistics/visualize_annotation_duration.py,sha256=9JH9MirhOyCmjcChFJMtfnFIV2k4sucP9PAwNKMcbtE,21022
-annofabcli/statistics/visualize_statistics.py,sha256=iwGhrYylBTsK-DT_MU-eYkFgZI0ITt9r59BbiaSbfQE,44041
+annofabcli/statistics/visualize_statistics.py,sha256=njhjbHBhhQ5ksJmOWrcLYh2pLHZdn0uAk8dCufjtfAI,44281
 annofabcli/statistics/visualize_video_duration.py,sha256=yY18H0-boNy4-MQWUM_xBTMzxDUQ51TrVtz8mbsB_dI,16623
 annofabcli/statistics/visualization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/statistics/visualization/filtering_query.py,sha256=kqGOa1YdQ62kTLlkiIHFiYNju4Pg9rXpsC4Cph-QjLo,4355
-annofabcli/statistics/visualization/model.py,sha256=sKk4gC7qkt6etCnbpCNZpJEhFJf5Vf7eVOG53gyfWvk,2426
-annofabcli/statistics/visualization/project_dir.py,sha256=-60n29ySvgsfRTbFgTOYr6E7LHJezVQm3FON88LQMKU,24291
+annofabcli/statistics/visualization/model.py,sha256=LXFuelx9_6n1mU418Mw5FOCBQTlnNBlOijZ7oUIfQ_Q,2928
+annofabcli/statistics/visualization/project_dir.py,sha256=g1Jb9-CW32BcuwS3Z2dTgJ9bo3_Edlc7wWtrKhLzFcc,24300
 annofabcli/statistics/visualization/visualization_source_files.py,sha256=SFY7WXUtjECB8l7zP-exawocrTiZ0UI7Z5sjgq4J_g4,8641
 annofabcli/statistics/visualization/dataframe/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/statistics/visualization/dataframe/actual_worktime.py,sha256=7nsHlvN5cDzXIw-u_MSAZf4nlSSY56IlunSmnODXTbY,1916
@@ -185,7 +185,7 @@ annofabcli/statistics/visualization/dataframe/task_worktime_by_phase_user.py,sha
 annofabcli/statistics/visualization/dataframe/user.py,sha256=EHn7nlf6D6UX-gsVXy8m_3QaCsHsUhr0iy2rbNozOgc,1707
 annofabcli/statistics/visualization/dataframe/user_performance.py,sha256=X0jXV0wY8AZC8hoV62sJd9GRThqTf5RsaVciLeCvGlk,56628
 annofabcli/statistics/visualization/dataframe/whole_performance.py,sha256=kw5Cww0fwDfwriTtxiT0l3wr7YAMA9eGjvp84G9MN9I,12449
-annofabcli/statistics/visualization/dataframe/whole_productivity_per_date.py,sha256=F6KhXvzrUx61E0jqOiU2IGb6ycLH82T80JyzYVpSaC8,53683
+annofabcli/statistics/visualization/dataframe/whole_productivity_per_date.py,sha256=J-QW2Mvt-hGTpDUGGJKFvo0REzIWwrbDAzcMf9iqx_U,54480
 annofabcli/statistics/visualization/dataframe/worktime_per_date.py,sha256=wt0paPy2cVVzLUJhbV12-6bInikbQoxRFnOHY7BcI9o,21342
 annofabcli/supplementary/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/supplementary/delete_supplementary_data.py,sha256=dA4n61SSkTbDKDqjVldHIEAxbPQXyrQciwI4RDuC35U,13537
@@ -221,8 +221,8 @@ annofabcli/task_history_event/download_task_history_event_json.py,sha256=hQLVbQ0
 annofabcli/task_history_event/list_all_task_history_event.py,sha256=EeKMyPUxGwYCFtWQHHW954ZserGm8lUqrwNnV1iX9X4,6830
 annofabcli/task_history_event/list_worktime.py,sha256=Y7Pu5DP7scPf7HPt6CTiTvB1_5_Nfi1bStUIaCpkhII,15507
 annofabcli/task_history_event/subcommand_task_history_event.py,sha256=mJVJoT4RXk4HWnY7-Nrsl4If-gtaIIEXd2z7eFZwM2I,1260
-annofabcli-1.111.0.dist-info/METADATA,sha256=8icfwwpFiUk3CLmu_RvCrllfkQnP93ITWhkKwEY_adg,5134
-annofabcli-1.111.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-annofabcli-1.111.0.dist-info/entry_points.txt,sha256=C2uSUc-kkLJpoK_mDL5FEMAdorLEMPfwSf8VBMYnIFM,56
-annofabcli-1.111.0.dist-info/licenses/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
-annofabcli-1.111.0.dist-info/RECORD,,
+annofabcli-1.111.1.dist-info/METADATA,sha256=_p6y1IWSFtptJzWmxklxObVfFZSZEEYeai7Xrl5fC-A,5134
+annofabcli-1.111.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+annofabcli-1.111.1.dist-info/entry_points.txt,sha256=C2uSUc-kkLJpoK_mDL5FEMAdorLEMPfwSf8VBMYnIFM,56
+annofabcli-1.111.1.dist-info/licenses/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
+annofabcli-1.111.1.dist-info/RECORD,,