annofabcli 1.106.3__py3-none-any.whl → 1.106.5__py3-none-any.whl

annofabcli/annotation_specs/attribute_restriction.py

@@ -74,21 +74,26 @@ class AttributeRestrictionMessage:
         属性の種類がドロップダウンかセレクトボックスのときは、選択肢の名前を返す。
 
         Args:
-            value (str): _description_
-            attribute (Optional[dict[str,Any]]): _description_
+            value: 制約条件の値
+            attribute: 属性情報
 
         Returns:
-            str: _description_
+            valueが'foo'の場合：
+            -  属性の種類が排他選択でない場合： `'foo'` （valueを返す）
+            -  属性の種類が排他選択である場合： `'FOO'` （選択肢の名前を返す）
+            -  `OutputFormat.DETAILED_TEXT` AND 属性の種類が排他選択である場合： `'FOO' (id='foo')` （選択肢の名前とIDを返す）
+
         """
         if attribute is not None and attribute["type"] in ["choice", "select"]:
             # ラジオボタンかドロップダウンのとき
             choices = attribute["choices"]
             choice = first_true(choices, pred=lambda e: e["choice_id"] == value)
-            if choice is not None:
-                choice_name = AnnofabApiFacade.get_choice_name_en(choice)
-                tmp = f"'{value}'"
+            if value == "" or choice is not None:
+                # `value == ""`を判定条件に加える理由：「排他選択属性が空である/空でない」という制約の場合、`value`は空文字列になるため。
+                choice_name = AnnofabApiFacade.get_choice_name_en(choice) if choice is not None else ""
+                tmp = f"'{choice_name}'"
                 if self.output_format == OutputFormat.DETAILED_TEXT:
-                    tmp = f"{tmp} (name='{choice_name}')"
+                    tmp = f"{tmp} (id='{value}')"
                 return tmp
 
             else:

annofabcli/stat_visualization/write_performance_rating_csv.py

@@ -178,10 +178,10 @@ class CollectingPerformanceInfo:
         self.productivity_indicator_by_directory = productivity_indicator_by_directory if productivity_indicator_by_directory is not None else {}
         self.quality_indicator_by_directory = quality_indicator_by_directory if quality_indicator_by_directory is not None else {}
 
-    def get_threshold_info(self, project_title: str, productivity_type: ProductivityType) -> ThresholdInfo:
+    def get_threshold_info(self, dirname: str, productivity_type: ProductivityType) -> ThresholdInfo:
         """指定したプロジェクト名に対応する、閾値情報を取得する。"""
         global_info = self.threshold_info
-        local_info = self.threshold_infos_by_directory.get((project_title, productivity_type))
+        local_info = self.threshold_infos_by_directory.get((dirname, productivity_type))
         if local_info is None:
             return global_info
 
@@ -190,7 +190,7 @@ class CollectingPerformanceInfo:
 
         return ThresholdInfo(threshold_worktime=worktime, threshold_task_count=task_count)
 
-    def filter_df_with_threshold(self, df: pandas.DataFrame, phase: TaskPhase, project_title: str):  # noqa: ANN201
+    def filter_df_with_threshold(self, df: pandas.DataFrame, phase: TaskPhase, dirname: str):  # noqa: ANN201
         """
         引数`df`をインタンスとして持っている閾値情報でフィルタリングする。
         """
@@ -201,7 +201,7 @@ class CollectingPerformanceInfo:
         else:
             raise RuntimeError(f"未対応のフェーズです。phase={phase}")
 
-        threshold_info = self.get_threshold_info(project_title, productivity_type)
+        threshold_info = self.get_threshold_info(dirname, productivity_type)
         if threshold_info.threshold_worktime is not None:
             df = df[df[(self.productivity_indicator.worktime_type.value, phase.value)] > threshold_info.threshold_worktime]
 
@@ -210,42 +210,44 @@ class CollectingPerformanceInfo:
 
         return df
 
-    def join_annotation_productivity(self, df: pandas.DataFrame, df_performance: pandas.DataFrame, project_title: str) -> pandas.DataFrame:
+    def join_annotation_productivity(self, df: pandas.DataFrame, df_performance: pandas.DataFrame, dirname: str, project_title: str) -> pandas.DataFrame:
         """
         引数`df_performance`から教師付生産性を抽出して引数`df`にjoinした結果を返す
 
         Args:
             df: 教師付生産性が格納されたDataFrame。行方向にユーザー、列方向にプロジェクトが並んでいる。
-            project_title: 引数`df`にjoinする対象のプロジェクト名。列名に使用する。
-            df_performance: 引数`project_title`のユーザーごとの生産性と品質が格納されたDataFrame。
+            dirname: 引数`df`にjoinする対象のプロジェクト名。列名に使用する。
+            df_performance: 引数`dirname`のユーザーごとの生産性と品質が格納されたDataFrame。
         """
         phase = TaskPhase.ANNOTATION
 
         df_joined = df_performance
 
-        df_joined = self.filter_df_with_threshold(df_joined, phase, project_title=project_title)
+        df_joined = self.filter_df_with_threshold(df_joined, phase, dirname=dirname)
 
-        productivity_indicator = self.productivity_indicator_by_directory.get(project_title, self.productivity_indicator)
+        productivity_indicator = self.productivity_indicator_by_directory.get(dirname, self.productivity_indicator)
         column = (productivity_indicator.column, phase.value)
         if column in df_joined.columns:
             df_tmp = df_joined[[column]]
         else:
-            logger.warning(f"'{project_title}'に生産性の指標である'{column}'の列が存在しませんでした。")
+            logger.warning(f"'{dirname}'に生産性の指標である'{column}'の列が存在しませんでした。")
             df_tmp = pandas.DataFrame(index=df_joined.index, columns=[column])
-        df_tmp.columns = pandas.MultiIndex.from_tuples([(project_title, f"{productivity_indicator.column}__{phase.value}")])
+        df_tmp.columns = pandas.MultiIndex.from_tuples([(dirname, project_title, f"{productivity_indicator.column}__{phase.value}")])
+
         return df.join(df_tmp)
 
-    def join_inspection_acceptance_productivity(self, df: pandas.DataFrame, df_performance: pandas.DataFrame, project_title: str) -> pandas.DataFrame:
+    def join_inspection_acceptance_productivity(self, df: pandas.DataFrame, df_performance: pandas.DataFrame, dirname: str, project_title: str) -> pandas.DataFrame:
         """
         引数`df_performance`から検査/受入の生産性を抽出して引数`df`にjoinした結果を返す
 
         Args:
             df: 検査/受入の生産性が格納されたDataFrame。行方向にユーザー、列方向にプロジェクトが並んでいる。
-            project_title: 引数`df`にjoinする対象のプロジェクト名。列名に使用する。
-            df_performance: 引数`project_title`のユーザーごとの生産性と品質が格納されたDataFrame。
+            dirname: 引数`df`にjoinする対象のプロジェクト名。列名に使用する。
+            project_title: プロジェクトのタイトル。列名に使用する。
+            df_performance: 引数`dirname`のユーザーごとの生産性と品質が格納されたDataFrame。
         """
 
-        productivity_indicator = self.productivity_indicator_by_directory.get(project_title, self.productivity_indicator)
+        productivity_indicator = self.productivity_indicator_by_directory.get(dirname, self.productivity_indicator)
 
         def _join_inspection() -> pandas.DataFrame:
             phase = TaskPhase.INSPECTION
@@ -253,10 +255,10 @@ class CollectingPerformanceInfo:
                 return df
 
             df_joined = df_performance
-            df_joined = self.filter_df_with_threshold(df_joined, phase, project_title=project_title)
+            df_joined = self.filter_df_with_threshold(df_joined, phase, dirname=dirname)
 
             df_tmp = df_joined[[(productivity_indicator.column, phase.value)]]
-            df_tmp.columns = pandas.MultiIndex.from_tuples([(project_title, f"{productivity_indicator.column}__{phase.value}")])
+            df_tmp.columns = pandas.MultiIndex.from_tuples([(dirname, project_title, f"{productivity_indicator.column}__{phase.value}")])
 
             return df.join(df_tmp)
 
@@ -266,10 +268,10 @@ class CollectingPerformanceInfo:
                 return df
 
             df_joined = df_performance
-            df_joined = self.filter_df_with_threshold(df_joined, phase, project_title=project_title)
+            df_joined = self.filter_df_with_threshold(df_joined, phase, dirname=dirname)
 
             df_tmp = df_joined[[(productivity_indicator.column, phase.value)]]
-            df_tmp.columns = pandas.MultiIndex.from_tuples([(project_title, f"{productivity_indicator.column}__{phase.value}")])
+            df_tmp.columns = pandas.MultiIndex.from_tuples([(dirname, project_title, f"{productivity_indicator.column}__{phase.value}")])
 
             return df.join(df_tmp)
 
@@ -278,30 +280,31 @@ class CollectingPerformanceInfo:
 
         return df
 
-    def join_annotation_quality(self, df: pandas.DataFrame, df_performance: pandas.DataFrame, project_title: str) -> pandas.DataFrame:
+    def join_annotation_quality(self, df: pandas.DataFrame, df_performance: pandas.DataFrame, dirname: str, project_title: str) -> pandas.DataFrame:
         """
         引数`df_performance`から教師付の品質を抽出して引数`df`にjoinした結果を返す
 
         Args:
             df: 教師付の品質が格納されたDataFrame。行方向にユーザー、列方向にプロジェクトが並んでいる。
-            project_title: 引数`df`にjoinする対象のプロジェクト名。列名に使用する。
-            df_performance: 引数`project_title`のユーザーごとの生産性と品質が格納されたDataFrame。
+            dirname: 引数`df`にjoinする対象のプロジェクト名。列名に使用する。
+            project_title: プロジェクトのタイトル。列名に使用する。
+            df_performance: 引数`dirname`のユーザーごとの生産性と品質が格納されたDataFrame。
         """
         phase = TaskPhase.ANNOTATION
         df_joined = df_performance
 
-        df_joined = self.filter_df_with_threshold(df_joined, phase=TaskPhase.ANNOTATION, project_title=project_title)
+        df_joined = self.filter_df_with_threshold(df_joined, phase=TaskPhase.ANNOTATION, dirname=dirname)
 
-        quality_indicator = self.quality_indicator_by_directory.get(project_title, self.quality_indicator)
+        quality_indicator = self.quality_indicator_by_directory.get(dirname, self.quality_indicator)
 
         column = (quality_indicator.column, phase.value)
         if column in df_joined.columns:
             df_tmp = df_joined[[column]]
         else:
-            logger.warning(f"'{project_title}'に品質の指標である'{column}'の列が存在しませんでした。")
+            logger.warning(f"'{dirname}'に品質の指標である'{column}'の列が存在しませんでした。")
             df_tmp = pandas.DataFrame(index=df_joined.index, columns=[column])
 
-        df_tmp.columns = pandas.MultiIndex.from_tuples([(project_title, f"{quality_indicator.column}__{phase.value}")])
+        df_tmp.columns = pandas.MultiIndex.from_tuples([(dirname, project_title, f"{quality_indicator.column}__{phase.value}")])
         return df.join(df_tmp)
 
     def create_rating_df(
@@ -321,7 +324,7 @@ class CollectingPerformanceInfo:
                 continue
 
             custom_production_volume_list = custom_production_volume_list_by_directory.get(p_project_dir.name) if custom_production_volume_list_by_directory is not None else None
-            project_title = p_project_dir.name
+            dirname = p_project_dir.name
             project_dir = ProjectDir(
                 p_project_dir,
                 task_completion_criteria=TaskCompletionCriteria.ACCEPTANCE_COMPLETED,
@@ -329,6 +332,14 @@ class CollectingPerformanceInfo:
             )
             project_dir_list.append(project_dir)
 
+            try:
+                project_info = project_dir.read_project_info()
+                project_title = project_info.project_title
+            except Exception:
+                # 複数のプロジェクトをマージして生産性情報を出力した場合は、`project_info.json`は存在しないので、このブロックに入る
+                logger.info(f"'{project_dir}'からプロジェクト情報を読み込むのに失敗しました。project_titleは空文字にします。", exc_info=True)
+                project_title = ""
+
             try:
                 user_performance = project_dir.read_user_performance()
             except Exception:
@@ -341,23 +352,11 @@ class CollectingPerformanceInfo:
             df_performance = user_performance.df.copy()
             df_performance.set_index("user_id", inplace=True)
 
-            df_annotation_productivity = self.join_annotation_productivity(
-                df_annotation_productivity,
-                df_performance,
-                project_title=project_title,
-            )
+            df_annotation_productivity = self.join_annotation_productivity(df_annotation_productivity, df_performance, dirname=dirname, project_title=project_title)
 
-            df_annotation_quality = self.join_annotation_quality(
-                df_annotation_quality,
-                df_performance,
-                project_title=project_title,
-            )
+            df_annotation_quality = self.join_annotation_quality(df_annotation_quality, df_performance, dirname=dirname, project_title=project_title)
 
-            df_inspection_acceptance_productivity = self.join_inspection_acceptance_productivity(
-                df_inspection_acceptance_productivity,
-                df_performance,
-                project_title=project_title,
-            )
+            df_inspection_acceptance_productivity = self.join_inspection_acceptance_productivity(df_inspection_acceptance_productivity, df_performance, dirname=dirname, project_title=project_title)
 
         # プロジェクトの生産性と品質のDataFrameを生成する
         project_performance = ProjectPerformance.from_project_dirs(project_dir_list)
@@ -443,9 +442,9 @@ def create_deviation_df(
 
     df_rank["mean_of_deviation"] = df_rank[project_columns].mean(axis=1)
     df_rank["count_of_project"] = df_rank[project_columns].count(axis=1)
-    df = df_rank[[*list(user_columns), ("mean_of_deviation", ""), ("count_of_project", ""), *list(project_columns)]]
+    df = df_rank[[*list(user_columns), ("mean_of_deviation", "", ""), ("count_of_project", "", ""), *list(project_columns)]]
     if user_ids is not None:
-        return df[df[("user_id", "")].isin(user_ids)]
+        return df[df[("user_id", "", "")].isin(user_ids)]
     else:
         return df
 
@@ -463,7 +462,7 @@ def create_user_df(target_dir: Path) -> pandas.DataFrame:
         target_dir:
 
     Returns:
-        ユーザのDataFrame. columnは("username", ""), ("biography", "") , indexが"user_id"
+        ユーザのDataFrame. columnは("username", "", ""), ("biography", "", "") , indexが"user_id"
 
     """
     all_user_list: list[dict[str, Any]] = []
@@ -486,10 +485,12 @@ def create_user_df(target_dir: Path) -> pandas.DataFrame:
         tmp_df_user = user_performance.df[[("user_id", ""), ("username", ""), ("biography", "")]].copy()
         all_user_list.extend(tmp_df_user.to_dict("records"))
 
-    index = pandas.MultiIndex.from_tuples([("user_id", ""), ("username", ""), ("biography", "")])
-    df_user = pandas.DataFrame(all_user_list, columns=index)
+    df_user = pandas.DataFrame(all_user_list, columns=pandas.MultiIndex.from_tuples([("user_id", ""), ("username", ""), ("biography", "")]))
+
     df_user.drop_duplicates(inplace=True)
-    return df_user.sort_values("user_id").set_index("user_id")
+    # 出力結果のCSV列に合わせて3行の列名に変更する
+    df_user.columns = pandas.MultiIndex.from_tuples([("user_id", "", ""), ("username", "", ""), ("biography", "", "")])
+    return df_user.sort_values(("user_id", "", "")).set_index(("user_id", "", ""))
 
 
 def create_custom_production_volume_by_directory(cli_value: str) -> dict[str, list[ProductionVolumeColumn]]:

annofabcli/statistics/visualization/dataframe/project_performance.py

@@ -139,6 +139,15 @@ class ProjectWorktimePerMonth:
         new_index = [str(dt)[0:7] for dt in series.index]
         result = pandas.Series(series.values, index=new_index)
         result["dirname"] = project_dir.project_dir.name
+
+        try:
+            project_info = project_dir.read_project_info()
+            project_title = project_info.project_title
+        except Exception:
+            # 複数のプロジェクトをマージして生産性情報を出力した場合は、`project_info.json`は存在しないので、このブロックに入る
+            logger.info(f"'{project_dir}'からプロジェクト情報を読み込むのに失敗しました。project_titleは空文字にします。", exc_info=True)
+            project_title = ""
+        result["project_title"] = project_title
         return result
 
     @classmethod
@@ -170,7 +179,7 @@ class ProjectWorktimePerMonth:
         if not self._validate_df_for_output(output_file):
             return
 
-        header_columns = ["dirname"]
+        header_columns = ["dirname", "project_title"]
         remain_columns = list(self.df.columns)
         for col in header_columns:
             remain_columns.remove(col)

{annofabcli-1.106.3.dist-info → annofabcli-1.106.5.dist-info}/METADATA

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

{annofabcli-1.106.3.dist-info → annofabcli-1.106.5.dist-info}/RECORD

@@ -19,7 +19,7 @@ annofabcli/annotation/restore_annotation.py,sha256=F0_p1k0Yzx0YVOuLYOS48OWutsN5y
 annofabcli/annotation/subcommand_annotation.py,sha256=PfiU4G_Col3quCXKbZpqWoUXGi5p2uB1XI9BKMwaq1I,2288
 annofabcli/annotation_specs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/annotation_specs/add_attribute_restriction.py,sha256=jVA7ltharabR94bf71QuW0x0yVgu6-A7PHn7Dq3kUfg,6825
-annofabcli/annotation_specs/attribute_restriction.py,sha256=tXcCLWVUdmmLWFHLjtSERcgxwFhqk7_zyKZzps0oyso,10123
+annofabcli/annotation_specs/attribute_restriction.py,sha256=Ximx5BHK28raHC2WRwP2W6FfuPvCmHu3PGife9MoZHQ,10687
 annofabcli/annotation_specs/export_annotation_specs.py,sha256=hPDkkzVl1alhSEmRim6w9Vcz5_30fRY0np8GmCEkpcY,4791
 annofabcli/annotation_specs/get_annotation_specs_with_attribute_id_replaced.py,sha256=pJxr90AvE3bd4vg6A4yhq-wjT86ACBxGZu1Lt-Xw08k,8200
 annofabcli/annotation_specs/get_annotation_specs_with_choice_id_replaced.py,sha256=QrF4k_isyFPN6OKNafl_7rbHhlkQp8ITkfOh39NZizg,6797
@@ -133,7 +133,7 @@ annofabcli/stat_visualization/merge_visualization_dir.py,sha256=7rOluAY7X5rcukWs
 annofabcli/stat_visualization/subcommand_stat_visualization.py,sha256=vk-LPAjhfkTaGHC-pDLhwLCc0opF3hMz-0af3yichuA,1484
 annofabcli/stat_visualization/summarize_whole_performance_csv.py,sha256=gPldqPECBqC61IdTw7JPAscUVRz76YluDiF3QOVnSEk,3099
 annofabcli/stat_visualization/write_graph.py,sha256=gRO0LcZ6x7Jgln9ALUUM3BHTMaAt1H15PB4_0bRo8TI,9101
-annofabcli/stat_visualization/write_performance_rating_csv.py,sha256=0j78z5uRULomVtKYLiEIklsq0m1xoV3QMIifvyDPjyc,30519
+annofabcli/stat_visualization/write_performance_rating_csv.py,sha256=OfKounf4eQW7pzNrFxUtySPX9fdRaFQKRvtL0-v-wE8,31265
 annofabcli/statistics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/statistics/histogram.py,sha256=CvzDxT2cKLSnBGSqkZE6p92PayGxYYja1YyB24M4ALU,3245
 annofabcli/statistics/linegraph.py,sha256=0kr7jVBNMiM2ECYhv3Ry5RitElKerSl9ZKxbKzfiplI,12494
@@ -166,7 +166,7 @@ annofabcli/statistics/visualization/dataframe/custom_production_volume.py,sha256
 annofabcli/statistics/visualization/dataframe/input_data_count.py,sha256=wDRFtoIWw_Gy2bPZ7LBx3eMO3LdUdjbQKS9mncXav6I,1654
 annofabcli/statistics/visualization/dataframe/inspection_comment_count.py,sha256=RxpQzRy4U2hKEpgbksUXotcxH2sKz__NO20mxpMqK1w,4382
 annofabcli/statistics/visualization/dataframe/productivity_per_date.py,sha256=_AibOSwyeGM6KeYqknN40M8vS4Tl6l45tC0ua1AHFFc,27087
-annofabcli/statistics/visualization/dataframe/project_performance.py,sha256=q480Lz1LwQD6RvyIOq-ZsXqeeKabsVpHRoM0nD_DaGI,8482
+annofabcli/statistics/visualization/dataframe/project_performance.py,sha256=YYv_vWjtB9RBPInp-_jCg1fJIFHeKDgk1w5VEhdtlBU,9078
 annofabcli/statistics/visualization/dataframe/task.py,sha256=v5vUbKJAuqqcKeumrAc4t2PKEX7jt86xFqqko0LrI98,25044
 annofabcli/statistics/visualization/dataframe/task_history.py,sha256=FZ3MLqOiM6834fxWZKP0Hy9WDRSSLCYm6kNzdWW7-S8,2744
 annofabcli/statistics/visualization/dataframe/task_worktime_by_phase_user.py,sha256=khXqxQ-v7Q1PBtttQmPCCbVLraeqNCPi2tkhTxxaZPg,13641
@@ -209,8 +209,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.106.3.dist-info/METADATA,sha256=LbAdYDBRhLmbDAO51FlNar220liORAfuTYJiTYyZGRQ,5286
-annofabcli-1.106.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-annofabcli-1.106.3.dist-info/entry_points.txt,sha256=C2uSUc-kkLJpoK_mDL5FEMAdorLEMPfwSf8VBMYnIFM,56
-annofabcli-1.106.3.dist-info/licenses/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
-annofabcli-1.106.3.dist-info/RECORD,,
+annofabcli-1.106.5.dist-info/METADATA,sha256=pyB9yiLXILXx5FOgB9-ovYSkWROiJJOrX1L7bctwmQo,5286
+annofabcli-1.106.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+annofabcli-1.106.5.dist-info/entry_points.txt,sha256=C2uSUc-kkLJpoK_mDL5FEMAdorLEMPfwSf8VBMYnIFM,56
+annofabcli-1.106.5.dist-info/licenses/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
+annofabcli-1.106.5.dist-info/RECORD,,