annofabcli 1.96.1__tar.gz → 1.97.0__tar.gz

{annofabcli-1.96.1 → annofabcli-1.97.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annofabcli
-Version: 1.96.1
+Version: 1.97.0
 Summary: Utility Command Line Interface for AnnoFab
 Home-page: https://github.com/kurusugawa-computer/annofab-cli
 License: MIT
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Utilities
 Requires-Dist: Pillow
 Requires-Dist: annofabapi (>=1.1,<2.0)
-Requires-Dist: bokeh (>=3.3,<4.0)
+Requires-Dist: bokeh (>=3.3,<3.7)
 Requires-Dist: dictdiffer
 Requires-Dist: isodate
 Requires-Dist: jmespath

{annofabcli-1.96.1 → annofabcli-1.97.0}/annofabcli/__version__.py

@@ -1 +1 @@
-__version__ = "1.96.1"  # `poetry-dynamic-versioning`を使ってGitHubのバージョンタグを取得している。変更不要
+__version__ = "1.97.0"  # `poetry-dynamic-versioning`を使ってGitHubのバージョンタグを取得している。変更不要

{annofabcli-1.96.1 → annofabcli-1.97.0}/annofabcli/input_data/change_input_data_name.py

@@ -143,11 +143,9 @@ def create_changed_input_data_list_from_csv(csv_file: Path) -> list[ChangedInput
         変更対象の入力データのlist
     """
     df_input_data = pandas.read_csv(
-        str(csv_file),
-        header=None,
-        names=("input_data_id", "input_data_name"),
+        csv_file,
         # 文字列として読み込むようにする
-        dtype={"input_data_id": str, "input_data_name": str},
+        dtype={"input_data_id": "string", "input_data_name": "string"},
     )
 
     input_data_dict_list = df_input_data.to_dict("records")
@@ -211,9 +209,9 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
             "変更対象の入力データが記載されたCSVファイルのパスを指定してください。\n"
             "CSVのフォーマットは以下の通りです。"
             "\n"
-            " * ヘッダ行なし, カンマ区切り\n"
-            " * 1列目: input_data_id (required)\n"
-            " * 2列目: input_data_name (required)\n"
+            " * ヘッダ行あり, カンマ区切り\n"
+            " * input_data_id (required)\n"
+            " * input_data_name (required)\n"
         ),
     )
 

{annofabcli-1.96.1 → annofabcli-1.97.0}/annofabcli/input_data/update_metadata_of_input_data.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import argparse
+import copy
 import json
 import logging
 import multiprocessing
@@ -182,7 +183,7 @@ class UpdateMetadata(CommandLine):
                 sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
 
             assert input_data_id_list is not None, "'--metadata'を指定したときは'--input_data_id'は必須です。"
-            metadata_by_input_data_id = {input_data_id: metadata for input_data_id in input_data_id_list}
+            metadata_by_input_data_id = {input_data_id: copy.deepcopy(metadata) for input_data_id in input_data_id_list}
 
         elif args.metadata_by_input_data_id is not None:
             metadata_by_input_data_id = annofabcli.common.cli.get_json_from_args(args.metadata_by_input_data_id)

{annofabcli-1.96.1 → annofabcli-1.97.0}/annofabcli/project_member/put_project_members.py

@@ -5,7 +5,6 @@ from pathlib import Path
 from typing import Any, Optional
 
 import more_itertools
-import numpy
 import pandas
 import requests
 from annofabapi.models import ProjectMemberRole, ProjectMemberStatus
@@ -26,8 +25,8 @@ class Member(DataClassJsonMixin):
 
     user_id: str
     member_role: ProjectMemberRole
-    sampling_inspection_rate: Optional[int]
-    sampling_acceptance_rate: Optional[int]
+    sampling_inspection_rate: Optional[int] = None
+    sampling_acceptance_rate: Optional[int] = None
 
 
 class PutProjectMembers(CommandLine):
@@ -44,7 +43,7 @@ class PutProjectMembers(CommandLine):
     def member_exists(members: list[dict[str, Any]], user_id: str) -> bool:
         return PutProjectMembers.find_member(members, user_id) is not None
 
-    def invite_project_member(self, project_id: str, member: Member, old_project_members: list[dict[str, Any]]):  # noqa: ANN201
+    def invite_project_member(self, project_id: str, member: Member, old_project_members: list[dict[str, Any]]) -> dict[str, Any]:
         old_member = self.find_member(old_project_members, member.user_id)
         last_updated_datetime = old_member["updated_datetime"] if old_member is not None else None
 
@@ -58,7 +57,7 @@ class PutProjectMembers(CommandLine):
         updated_project_member = self.service.api.put_project_member(project_id, member.user_id, request_body=request_body)[0]
         return updated_project_member
 
-    def delete_project_member(self, project_id: str, deleted_member: dict[str, Any]):  # noqa: ANN201
+    def delete_project_member(self, project_id: str, deleted_member: dict[str, Any]) -> dict[str, Any]:
         request_body = {
             "member_status": ProjectMemberStatus.INACTIVE.value,
             "member_role": deleted_member["member_role"],
@@ -67,7 +66,7 @@ class PutProjectMembers(CommandLine):
         updated_project_member = self.service.api.put_project_member(project_id, deleted_member["user_id"], request_body=request_body)[0]
         return updated_project_member
 
-    def put_project_members(self, project_id: str, members: list[Member], delete: bool = False):  # noqa: ANN201, FBT001, FBT002
+    def put_project_members(self, project_id: str, members: list[Member], *, delete: bool = False) -> None:
         """
         プロジェクトメンバを一括で登録する。
 
@@ -88,7 +87,7 @@ class PutProjectMembers(CommandLine):
 
         count_invite_members = 0
         # プロジェクトメンバを登録
-        logger.info(f"{project_title} に、{len(members)} 件のプロジェクトメンバを登録します。")
+        logger.info(f"プロジェクト '{project_title}' に、{len(members)} 件のプロジェクトメンバを登録します。")
         for member in members:
             if member.user_id == self.service.api.login_user_id:
                 logger.debug(f"ユーザ '{member.user_id}'は自分自身なので、登録しません。")
@@ -99,7 +98,7 @@ class PutProjectMembers(CommandLine):
                 continue
 
             message_for_confirm = (
-                f"ユーザ '{member.user_id}'を、{project_title} プロジェクトのメンバに登録しますか？member_role={member.member_role.value}"
+                f"ユーザ '{member.user_id}'を、プロジェクト'{project_title}'のメンバーに登録しますか？ member_role='{member.member_role.value}'"
             )
             if not self.confirm_processing(message_for_confirm):
                 continue
@@ -107,14 +106,15 @@ class PutProjectMembers(CommandLine):
             # メンバを登録
             try:
                 self.invite_project_member(project_id, member, old_project_members)
-                logger.debug(f"user_id = {member.user_id}, member_role = {member.member_role.value} のユーザをプロジェクトメンバに登録しました。")
+                logger.debug(f"user_id = '{member.user_id}', member_role = '{member.member_role.value}' のユーザをプロジェクトメンバに登録しました。")
                 count_invite_members += 1
 
-            except requests.exceptions.HTTPError as e:
-                logger.warning(e)
-                logger.warning(f"プロジェクトメンバの登録に失敗しました。user_id = {member.user_id}, member_role = {member.member_role.value}")
+            except requests.exceptions.HTTPError:
+                logger.warning(
+                    f"プロジェクトメンバの登録に失敗しました。user_id = '{member.user_id}', member_role = '{member.member_role.value}'", exc_info=True
+                )
 
-        logger.info(f"{project_title} に、{count_invite_members} / {len(members)} 件のプロジェクトメンバを登録しました。")
+        logger.info(f"プロジェクト'{project_title}' に、{count_invite_members} / {len(members)} 件のプロジェクトメンバを登録しました。")
 
         # プロジェクトメンバを削除
         if delete:
@@ -125,7 +125,7 @@ class PutProjectMembers(CommandLine):
             ]
 
             count_delete_members = 0
-            logger.info(f"{project_title} から、{len(deleted_members)} 件のプロジェクトメンバを削除します。")
+            logger.info(f"プロジェクト '{project_title}' から、{len(deleted_members)} 件のプロジェクトメンバを削除します。")
             for deleted_member in deleted_members:
                 message_for_confirm = f"ユーザ '{deleted_member['user_id']}'を、{project_title} のプロジェクトメンバから削除しますか？"
                 if not self.confirm_processing(message_for_confirm):
@@ -135,31 +135,18 @@ class PutProjectMembers(CommandLine):
                     self.delete_project_member(project_id, deleted_member)
                     logger.debug(f"ユーザ '{deleted_member['user_id']}' をプロジェクトメンバから削除しました。")
                     count_delete_members += 1
-                except requests.exceptions.HTTPError as e:
-                    logger.warning(e)
-                    logger.warning(f"プロジェクトメンバの削除に失敗しました。user_id = '{deleted_member['user_id']}' ")
+                except requests.exceptions.HTTPError:
+                    logger.warning(f"プロジェクトメンバの削除に失敗しました。user_id = '{deleted_member['user_id']}' ", exc_info=True)
 
-            logger.info(f"{project_title} から {count_delete_members} / {len(deleted_members)} 件のプロジェクトメンバを削除しました。")
+            logger.info(f"プロジェクト '{project_title}' から {count_delete_members} / {len(deleted_members)} 件のプロジェクトメンバを削除しました。")
 
     @staticmethod
     def get_members_from_csv(csv_path: Path) -> list[Member]:
-        def create_member(e):  # noqa: ANN001, ANN202
-            return Member(
-                user_id=e.user_id,
-                member_role=ProjectMemberRole(e.member_role),
-                sampling_inspection_rate=e.sampling_inspection_rate,
-                sampling_acceptance_rate=e.sampling_acceptance_rate,
-            )
-
         df = pandas.read_csv(
-            str(csv_path),
-            sep=",",
-            header=None,
-            names=("user_id", "member_role", "sampling_inspection_rate", "sampling_acceptance_rate"),
-            # IDは必ず文字列として読み込むようにする
-            dtype={"user_id": str},
-        ).replace({numpy.nan: None})
-        members = [create_member(e) for e in df.itertuples()]
+            csv_path,
+            dtype={"user_id": "string", "member_role": "string", "sampling_inspection_rate": "Int64", "sampling_acceptance_rate": "Int64"},
+        )
+        members = [Member.from_dict(e) for e in df.to_dict("records")]
         return members
 
     def main(self) -> None:
@@ -184,12 +171,14 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         type=str,
         required=True,
         help=(
-            "プロジェクトメンバが記載されたCVファイルのパスを指定してください。"
-            "CSVのフォーマットは、「1列目:user_id(required), 2列目:member_role(required), "
-            "3列目:sampling_inspection_rate, 4列目:sampling_acceptance_rate, ヘッダ行なし, カンマ区切り」です。"
-            "member_roleは ``owner``, ``worker``, ``accepter``, ``training_data_user`` のいずれかです。"
-            "sampling_inspection_rate, sampling_acceptance_rate を省略した場合は未設定になります。"
-            "ただし自分自身は登録しません。"
+            "プロジェクトメンバが記載されたCSVファイルのパスを指定してください。"
+            "CSVのフォーマットは、ヘッダあり、カンマ区切りです。\n"
+            " * user_id (required)\n"
+            " * member_role (required)\n"
+            " * sampling_inspection_rate\n"
+            " * sampling_acceptance_rate\n"
+            "member_roleには ``owner``, ``worker``, ``accepter``, ``training_data_user`` のいずれかを指定します。\n"
+            "自分自身は登録できません。"
         ),
     )
 
@@ -202,10 +191,9 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
 
 def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
     subcommand_name = "put"
-    subcommand_help = "プロジェクトメンバを登録する。"
-    description = "プロジェクトメンバを登録する。"
-    epilog = "オーナロールを持つユーザで実行してください。"
+    subcommand_help = "プロジェクトメンバを登録します。"
+    epilog = "オーナーロールを持つユーザで実行してください。"
 
-    parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help, description, epilog=epilog)
+    parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help, epilog=epilog)
     parse_args(parser)
     return parser

{annofabcli-1.96.1 → annofabcli-1.97.0}/annofabcli/statistics/list_annotation_count.py

@@ -552,7 +552,7 @@ class AttributeCountCsv:
 
         # アノテーション数の列のNaNを0に変換する
         value_columns = self._value_columns(counter_list, prior_attribute_columns)
-        df = df.fillna({column: 0 for column in value_columns})
+        df = df.fillna(dict.fromkeys(value_columns, 0))
 
         print_csv(df, output=str(output_file), to_csv_kwargs=self.csv_format)
 
@@ -655,7 +655,7 @@ class LabelCountCsv:
 
         # アノテーション数列のNaNを0に変換する
         value_columns = self._value_columns(counter_list, prior_label_columns)
-        df = df.fillna({column: 0 for column in value_columns})
+        df = df.fillna(dict.fromkeys(value_columns, 0))
 
         print_csv(df, output=str(output_file), to_csv_kwargs=self.csv_format)
 

{annofabcli-1.96.1 → annofabcli-1.97.0}/annofabcli/statistics/list_annotation_duration.py

@@ -411,7 +411,7 @@ class AnnotationDurationCsvByAttribute:
 
         # アノテーション数の列のNaNを0に変換する
         value_columns = self._value_columns(annotation_duration_list, prior_attribute_columns)
-        df = df.fillna({column: 0 for column in value_columns})
+        df = df.fillna(dict.fromkeys(value_columns, 0))
         return df
 
 
@@ -473,7 +473,7 @@ class AnnotationDurationCsvByLabel:
 
         # アノテーション数列のNaNを0に変換する
         value_columns = self._value_columns(annotation_duration_list, prior_label_columns)
-        df = df.fillna({column: 0 for column in value_columns})
+        df = df.fillna(dict.fromkeys(value_columns, 0))
 
         return df
 

{annofabcli-1.96.1 → annofabcli-1.97.0}/annofabcli/statistics/visualization/dataframe/productivity_per_date.py

@@ -181,17 +181,17 @@ class AbstractPhaseProductivityPerDate(abc.ABC):
 
         # その他の欠損値（作業時間や生産量）を0で埋める
         df2 = df2.fillna(
-            {
-                col: 0
-                for col in [
+            dict.fromkeys(
+                [
                     "annotation_worktime_hour",
                     "inspection_worktime_hour",
                     "acceptance_worktime_hour",
                     "task_count",
                     "inspection_comment_count",
                     *self.production_volume_columns,
-                ]
-            }
+                ],
+                0,
+            )
         )
 
         return df2

{annofabcli-1.96.1 → annofabcli-1.97.0}/annofabcli/statistics/visualization/dataframe/user_performance.py

@@ -571,7 +571,7 @@ class UserPerformance:
             level0_columns = ["monitored_worktime_hour", *task_worktime_by_phase_user.quantity_columns]
             columns = [(c0, c1) for c0, c1 in df.columns if c0 in level0_columns]
 
-            return df.fillna({col: 0 for col in columns})
+            return df.fillna(dict.fromkeys(columns, 0))
 
         if task_completion_criteria == TaskCompletionCriteria.ACCEPTANCE_REACHED:
             # 受入フェーズに到達したらタスクの作業が完了したとみなす場合、
@@ -634,8 +634,8 @@ class UserPerformance:
         ]
 
         value_columns = columns - set(basic_columns)
-        dtypes = {col: "string" for col in basic_columns}
-        dtypes.update({col: "float64" for col in value_columns})
+        dtypes = dict.fromkeys(basic_columns, "string")
+        dtypes.update(dict.fromkeys(value_columns, "float64"))
         return df.astype(dtypes)
 
     def _validate_df_for_output(self, output_file: Path) -> bool:

{annofabcli-1.96.1 → annofabcli-1.97.0}/annofabcli/statistics/visualization/dataframe/whole_performance.py

@@ -197,8 +197,8 @@ class WholePerformance:
             ("working_days", ""),
         ]
 
-        data: dict[tuple[str, str], float] = {key: 0 for key in worktime_columns + count_columns}
-        data.update({key: numpy.nan for key in ratio_columns + stdev_columns + date_columns})
+        data: dict[tuple[str, str], float] = dict.fromkeys(worktime_columns + count_columns, 0)
+        data.update(dict.fromkeys(ratio_columns + stdev_columns + date_columns, numpy.nan))
 
         return cls(pandas.Series(data), task_completion_criteria, custom_production_volume_list=custom_production_volume_list)
 

{annofabcli-1.96.1 → annofabcli-1.97.0}/annofabcli/statistics/visualization/dataframe/whole_productivity_per_date.py

@@ -187,7 +187,7 @@ class WholeProductivityPerCompletedDate:
             df_agg_sub_task["task_count"] = df_sub_task.pivot_table(values=["task_id"], index=date_column, aggfunc="count").fillna(0)
         else:
             # 列だけ作る
-            df_agg_sub_task = df_agg_sub_task.assign(**{key: 0 for key in production_volume_columns}, task_count=0)
+            df_agg_sub_task = df_agg_sub_task.assign(**dict.fromkeys(production_volume_columns, 0), task_count=0)
 
         df_worktime = worktime_per_date.df
         if len(df_worktime) > 0:
@@ -929,7 +929,7 @@ class WholeProductivityPerFirstAnnotationStartedDate:
             ).fillna(0)
         else:
             # 列だけ作る
-            df_agg_sub_task = df_agg_sub_task.assign(**{key: 0 for key in value_columns}, task_count=0)
+            df_agg_sub_task = df_agg_sub_task.assign(**dict.fromkeys(value_columns, 0), task_count=0)
 
         # 日付の一覧を生成
         if len(df_agg_sub_task) > 0:

{annofabcli-1.96.1 → annofabcli-1.97.0}/annofabcli/statistics/visualization/dataframe/worktime_per_date.py

@@ -200,7 +200,7 @@ class WorktimePerDate:
             "monitored_inspection_worktime_hour",
             "monitored_acceptance_worktime_hour",
         ]
-        df.fillna({c: 0 for c in value_columns}, inplace=True)
+        df.fillna(dict.fromkeys(value_columns, 0), inplace=True)
 
         df = df.merge(df_member, how="left", on="account_id")
         return df[

{annofabcli-1.96.1 → annofabcli-1.97.0}/annofabcli/supplementary/delete_supplementary_data.py

@@ -31,18 +31,11 @@ key: input_data_id, value: supplementary_data_idのList
 
 
 def get_input_data_supplementary_data_dict_from_csv(csv_path: Path) -> InputDataSupplementaryDataDict:
-    df = pandas.read_csv(
-        str(csv_path),
-        sep=",",
-        header=None,
-        names=[
-            "input_data_id",
-            "supplementary_data_id",
-        ],
-        # IDは必ず文字列として読み込むようにする
-        dtype={"input_data_id": str, "supplementary_data_id": str},
+    df: pandas.DataFrame = pandas.read_csv(
+        csv_path,
+        dtype={"input_data_id": "string", "supplementary_data_id": "string"},
     )
-    input_data_dict = defaultdict(list)
+    input_data_dict: InputDataSupplementaryDataDict = defaultdict(list)
     for input_data_id, supplementary_data_id in zip(df["input_data_id"], df["supplementary_data_id"]):
         input_data_dict[input_data_id].append(supplementary_data_id)
     return input_data_dict
@@ -58,7 +51,7 @@ def get_input_data_supplementary_data_dict_from_list(supplementary_data_list: li
 
 
 class DeleteSupplementaryDataMain(CommandLineWithConfirm):
-    def __init__(self, service: annofabapi.Resource, all_yes: bool = False) -> None:  # noqa: FBT001, FBT002
+    def __init__(self, service: annofabapi.Resource, *, all_yes: bool = False) -> None:
         self.service = service
         self.facade = AnnofabApiFacade(service)
         CommandLineWithConfirm.__init__(self, all_yes)
@@ -82,7 +75,7 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
 
         input_data = self.service.wrapper.get_input_data_or_none(project_id, input_data_id)
         if input_data is None:
-            logger.warning(f"input_data_id={input_data_id} の入力データは存在しないのでスキップします。")
+            logger.warning(f"input_data_id='{input_data_id}' の入力データは存在しないのでスキップします。")
             return 0
 
         supplementary_data_list, _ = self.service.api.get_supplementary_data_list(project_id, input_data_id)
@@ -122,7 +115,7 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
                 continue
         return deleted_count
 
-    def delete_supplementary_data_list(self, project_id: str, input_data_dict: InputDataSupplementaryDataDict):  # noqa: ANN201
+    def delete_supplementary_data_list(self, project_id: str, input_data_dict: InputDataSupplementaryDataDict) -> None:
         deleted_count = 0
         total_count = sum(len(e) for e in input_data_dict.values())
         for input_data_id, supplementary_data_id_list in input_data_dict.items():
@@ -168,7 +161,7 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
 
         return deleted_count
 
-    def delete_supplementary_data_list_by_input_data_id(self, project_id: str, input_data_id_list: list[str]):  # noqa: ANN201
+    def delete_supplementary_data_list_by_input_data_id(self, project_id: str, input_data_id_list: list[str]) -> None:
         dict_deleted_count: dict[str, int] = {}
         for input_data_id in input_data_id_list:
             input_data = self.service.wrapper.get_input_data_or_none(project_id, input_data_id)
@@ -261,9 +254,9 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
             "削除する補助情報が記載されたCSVファイルのパスを指定してください。\n"
             "CSVのフォーマットは以下の通りです。"
             "詳細は https://annofab-cli.readthedocs.io/ja/latest/command_reference/supplementary/delete.html を参照してください。\n"
-            " * ヘッダ行なし, カンマ区切り\n"
-            " * 1列目: input_data_id (required)\n"
-            " * 2列目: supplementary_data_id (required)\n"
+            " * ヘッダ行あり, カンマ区切り\n"
+            " * input_data_id (required)\n"
+            " * supplementary_data_id (required)\n"
         ),
     )