annofabcli 1.96.0__py3-none-any.whl → 1.97.0__py3-none-any.whl

annofabcli/__version__.py

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

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/input_data/put_input_data.py

@@ -1,7 +1,7 @@
 import argparse
 import logging
+import re
 import sys
-import uuid
 from dataclasses import dataclass
 from functools import partial
 from multiprocessing import Pool
@@ -25,14 +25,11 @@ from annofabcli.common.cli import (
     get_json_from_args,
     prompt_yesnoall,
 )
-from annofabcli.common.dataclasses import WaitOptions
 from annofabcli.common.facade import AnnofabApiFacade
 from annofabcli.common.utils import get_file_scheme_path
 
 logger = logging.getLogger(__name__)
 
-DEFAULT_WAIT_OPTIONS = WaitOptions(interval=60, max_tries=360)
-
 
 @dataclass
 class CsvInputData(DataClassJsonMixin):
@@ -43,7 +40,6 @@ class CsvInputData(DataClassJsonMixin):
     input_data_name: str
     input_data_path: str
     input_data_id: Optional[str] = None
-    sign_required: Optional[bool] = None
 
 
 @dataclass
@@ -55,7 +51,14 @@ class InputDataForPut(DataClassJsonMixin):
     input_data_name: str
     input_data_path: str
     input_data_id: str
-    sign_required: Optional[bool]
+
+
+def convert_input_data_name_to_input_data_id(input_data_name: str) -> str:
+    """
+    入力データ名から、入力データIDを生成します。
+    * IDに使えない文字以外は`__`に変換する。
+    """
+    return re.sub(r"[^a-zA-Z0-9_.-]", "__", input_data_name)
 
 
 def read_input_data_csv(csv_file: Path) -> pandas.DataFrame:
@@ -64,7 +67,6 @@ def read_input_data_csv(csv_file: Path) -> pandas.DataFrame:
     * input_data_name
     * input_data_path
     * input_data_id
-    * sign_required
 
     Args:
         csv_file (Path): CSVファイルのパス
@@ -76,6 +78,12 @@ def read_input_data_csv(csv_file: Path) -> pandas.DataFrame:
         str(csv_file),
         sep=",",
         header=None,
+        # names引数に"sign_required"を指定している理由：
+        # v1.96.0以前では、`sign_required`列を読み込んでいた。したがって、4列のCSVを使っているユーザーは存在する
+        # CSVの列数が`names`引数で指定した列数より大きい場合、右側から列名が割り当てられる。
+        # （https://qiita.com/yuji38kwmt/items/ac46c3d0ccac109410ba）
+        # したがって、"sign_required"がないと4列のCSVは読み込めない。
+        # 4列のCSVもしばらくサポートするため、"sign_required"を指定している。
         names=("input_data_name", "input_data_path", "input_data_id", "sign_required"),
         # IDと名前は必ず文字列として読み込むようにする
         dtype={"input_data_id": str, "input_data_name": str},
@@ -126,8 +134,8 @@ class SubPutInputData:
 
         file_path = get_file_scheme_path(csv_input_data.input_data_path)
         if file_path is not None:
-            request_body.update({"input_data_name": csv_input_data.input_data_name, "sign_required": csv_input_data.sign_required})
-            logger.debug(f"'{file_path}'を入力データとして登録します。input_data_name={csv_input_data.input_data_name}")
+            request_body.update({"input_data_name": csv_input_data.input_data_name})
+            logger.debug(f"'{file_path}'を入力データとして登録します。input_data_name='{csv_input_data.input_data_name}'")
             self.service.wrapper.put_input_data_from_file(
                 project_id, input_data_id=csv_input_data.input_data_id, file_path=file_path, request_body=request_body
             )
@@ -137,7 +145,6 @@ class SubPutInputData:
                 {
                     "input_data_name": csv_input_data.input_data_name,
                     "input_data_path": csv_input_data.input_data_path,
-                    "sign_required": csv_input_data.sign_required,
                 }
             )
 
@@ -181,12 +188,13 @@ class SubPutInputData:
 
         return self.confirm_processing(message_for_confirm)
 
-    def put_input_data_main(self, project_id: str, csv_input_data: CsvInputData, overwrite: bool = False) -> bool:  # noqa: FBT001, FBT002
+    def put_input_data_main(self, project_id: str, csv_input_data: CsvInputData, *, overwrite: bool = False) -> bool:
         input_data = InputDataForPut(
             input_data_name=csv_input_data.input_data_name,
             input_data_path=csv_input_data.input_data_path,
-            input_data_id=csv_input_data.input_data_id if csv_input_data.input_data_id is not None else str(uuid.uuid4()),
-            sign_required=csv_input_data.sign_required,
+            input_data_id=csv_input_data.input_data_id
+            if csv_input_data.input_data_id is not None
+            else convert_input_data_name_to_input_data_id(csv_input_data.input_data_name),
         )
 
         last_updated_datetime = None
@@ -194,10 +202,10 @@ class SubPutInputData:
 
         if dict_input_data is not None:
             if overwrite:
-                logger.debug(f"input_data_id={input_data.input_data_id} はすでに存在します。")
+                logger.debug(f"input_data_id='{input_data.input_data_id}' はすでに存在します。")
                 last_updated_datetime = dict_input_data["updated_datetime"]
             else:
-                logger.debug(f"input_data_id={input_data.input_data_id} がすでに存在するのでスキップします。")
+                logger.debug(f"input_data_id='{input_data.input_data_id}' がすでに存在するのでスキップします。")
                 return False
 
         file_path = get_file_scheme_path(input_data.input_data_path)
@@ -278,14 +286,12 @@ class PutInputData(CommandLine):
 
     @staticmethod
     def get_input_data_list_from_df(df: pandas.DataFrame) -> list[CsvInputData]:
-        def create_input_data(e: Any):  # noqa: ANN202, ANN401
+        def create_input_data(e: Any) -> CsvInputData:  # noqa: ANN401
             input_data_id = e.input_data_id if not pandas.isna(e.input_data_id) else None
-            sign_required: Optional[bool] = e.sign_required if pandas.notna(e.sign_required) else None
             return CsvInputData(
                 input_data_name=e.input_data_name,
                 input_data_path=e.input_data_path,
                 input_data_id=input_data_id,
-                sign_required=sign_required,
             )
 
         input_data_list = [create_input_data(e) for e in df.itertuples()]
@@ -381,7 +387,6 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
             " * 1列目: input_data_name (required)\n"
             " * 2列目: input_data_path (required)\n"
             " * 3列目: input_data_id\n"
-            " * 4列目: sign_required (bool)\n"
         ),
     )
 
@@ -400,25 +405,20 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.add_argument(
         "--overwrite",
         action="store_true",
-        help="指定した場合、input_data_idがすでに存在していたら上書きします。指定しなければ、スキップします。"
-        " ``--csv`` , ``--json`` を指定したときのみ有効なオプションです。",
+        help="指定した場合、input_data_idがすでに存在していたら上書きします。指定しなければ、スキップします。",
     )
 
     parser.add_argument(
         "--allow_duplicated_input_data",
         action="store_true",
-        help=(
-            "``--csv`` , ``--json`` に渡した入力データの重複（input_data_name, input_data_path）を許可します。\n"
-            "``--csv`` , ``--json`` を指定したときのみ有効なオプションです。"
-        ),
+        help=("``--csv`` , ``--json`` に渡した入力データの重複（input_data_name, input_data_path）を許可します。\n"),
     )
 
     parser.add_argument(
         "--parallelism",
         type=int,
         choices=PARALLELISM_CHOICES,
-        help="並列度。指定しない場合は、逐次的に処理します。"
-        "``--csv`` , ``--json`` を指定したときのみ有効なオプションです。また、必ず ``--yes`` を指定してください。",
+        help="並列度。指定しない場合は、逐次的に処理します。指定する場合は、 ``--yes`` も指定してください。",
     )
 
     parser.set_defaults(subcommand_func=main)
@@ -427,9 +427,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
 def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
     subcommand_name = "put"
     subcommand_help = "入力データを登録します。"
-    description = "CSVに記載された情報から、入力データを登録します。"
     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/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/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/statistics/list_annotation_attribute.py

@@ -142,19 +142,19 @@ def get_annotation_attribute_list_from_annotation_zipdir_path(
 def print_annotation_attribute_list_as_csv(annotation_attribute_list: list, output_file: Optional[Path]) -> None:
     df = pandas.json_normalize(annotation_attribute_list)
 
-    # columns = [
-    #     "task_id",
-    #     "task_status"
-    #     "task_phase",
-    #     "task_phase_stage",
-    #     "input_data_id",
-    #     "input_data_name",
-    #     "annotation_id",
-    #     "label",
-
-    # ]
-
-    print_csv(df, output_file)
+    base_columns = [
+        "task_id",
+        "task_status",
+        "task_phase",
+        "task_phase_stage",
+        "input_data_id",
+        "input_data_name",
+        "annotation_id",
+        "label",
+    ]
+    attribute_columns = [col for col in df.columns if col.startswith("attributes.")]
+    columns = base_columns + attribute_columns
+    print_csv(df[columns], output_file)
 
 
 def print_annotation_attribute_list(

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/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/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/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/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/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/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/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)
@@ -92,14 +85,14 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
             supplementary_data = _get_supplementary_data_list(supplementary_data_id)
             if supplementary_data is None:
                 logger.warning(
-                    f"input_data_id={input_data_id} の入力データに、"
-                    f"supplementary_data_id={supplementary_data_id} の補助情報は存在しないのでスキップします。"
+                    f"input_data_id='{input_data_id}' の入力データに、"
+                    f"supplementary_data_id='{supplementary_data_id}' の補助情報は存在しないのでスキップします。"
                 )
                 continue
 
             message_for_confirm = (
-                f"補助情報 supplementary_data_id={supplementary_data_id}, "
-                f"supplementary_data_name={supplementary_data['supplementary_data_name']} を削除しますか？"
+                f"補助情報 supplementary_data_id='{supplementary_data_id}', "
+                f"supplementary_data_name='{supplementary_data['supplementary_data_name']}' を削除しますか？"
             )
             if not self.confirm_processing(message_for_confirm):
                 continue
@@ -107,30 +100,29 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
             try:
                 self.service.api.delete_supplementary_data(project_id, input_data_id=input_data_id, supplementary_data_id=supplementary_data_id)
                 logger.debug(
-                    f"補助情報 supplementary_data_id={supplementary_data_id}, "
-                    f"supplementary_data_name={supplementary_data['supplementary_data_name']} を削除しました。"
-                    f"(入力データ input_data_id={input_data_id}, "
-                    f"input_data_name={input_data['input_data_name']} に紐付いている)"
+                    f"補助情報 supplementary_data_id='{supplementary_data_id}', "
+                    f"supplementary_data_name='{supplementary_data['supplementary_data_name']}' を削除しました。"
+                    f"(入力データ input_data_id='{input_data_id}', "
+                    f"input_data_name='{input_data['input_data_name']}' に紐付いている)"
                 )
                 deleted_count += 1
-            except requests.HTTPError as e:
-                logger.warning(e)
+            except requests.HTTPError:
                 logger.warning(
-                    f"補助情報 supplementary_data_id={supplementary_data_id}, "
-                    f"supplementary_data_name={supplementary_data['supplementary_data_name']} の削除に失敗しました。"
+                    f"補助情報 supplementary_data_id='{supplementary_data_id}', "
+                    f"supplementary_data_name='{supplementary_data['supplementary_data_name']}' の削除に失敗しました。",
+                    exc_info=True,
                 )
                 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():
             try:
                 deleted_count += self.delete_supplementary_data_list_for_input_data(project_id, input_data_id, supplementary_data_id_list)
-            except Exception as e:  # pylint: disable=broad-except
-                logger.warning(e)
-                logger.warning(f"入力データ(input_data_id={input_data_id})配下の補助情報の削除に失敗しました。")
+            except Exception:  # pylint: disable=broad-except
+                logger.warning(f"入力データ(input_data_id='{input_data_id}')配下の補助情報の削除に失敗しました。", exc_info=True)
 
         logger.info(f"{deleted_count} / {total_count} 件の補助情報を削除しました。")
 
@@ -155,26 +147,26 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
             try:
                 self.service.api.delete_supplementary_data(project_id, input_data_id=input_data_id, supplementary_data_id=supplementary_data_id)
                 logger.debug(
-                    f"補助情報を削除しました。input_data_id={input_data_id}, supplementary_data_id={supplementary_data_id}, "
+                    f"補助情報を削除しました。input_data_id='{input_data_id}', supplementary_data_id='{supplementary_data_id}', "
                     f"supplementary_data_name={supplementary_data['supplementary_data_name']}"
                 )
                 deleted_count += 1
-            except requests.HTTPError as e:
-                logger.warning(e)
+            except requests.HTTPError:
                 logger.warning(
-                    f"補助情報の削除に失敗しました。input_data_id={input_data_id}, supplementary_data_id={supplementary_data_id}, "
-                    f"supplementary_data_name={supplementary_data['supplementary_data_name']}"
+                    f"補助情報の削除に失敗しました。input_data_id='{input_data_id}', supplementary_data_id='{supplementary_data_id}', "
+                    f"supplementary_data_name='{supplementary_data['supplementary_data_name']}'",
+                    exc_info=True,
                 )
                 continue
 
         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)
             if input_data is None:
-                logger.warning(f"input_data_id={input_data_id} の入力データは存在しないので、補助情報の削除をスキップします。")
+                logger.warning(f"input_data_id='{input_data_id}' の入力データは存在しないので、補助情報の削除をスキップします。")
                 continue
             input_data_name = input_data["input_data_name"]
 
@@ -202,9 +194,8 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
                     f"input_data_name='{input_data_name}') "
                 )
 
-            except Exception as e:  # pylint: disable=broad-except
-                logger.warning(e)
-                logger.warning(f"入力データ(input_data_id={input_data_id})配下の補助情報の削除に失敗しました。")
+            except Exception:  # pylint: disable=broad-except
+                logger.warning(f"入力データ(input_data_id='{input_data_id}')配下の補助情報の削除に失敗しました。", exc_info=True)
 
         logger.info(f"{len(dict_deleted_count)} / {len(input_data_id_list)} 件の入力データに紐づく補助情報を削除しました。")
 
@@ -263,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"
         ),
     )
 

annofabcli/supplementary/put_supplementary_data.py

@@ -1,8 +1,8 @@
 import argparse
 import json
 import logging
+import re
 import sys
-import uuid
 from dataclasses import dataclass
 from functools import partial
 from multiprocessing import Pool
@@ -32,18 +32,26 @@ from annofabcli.common.utils import get_file_scheme_path
 logger = logging.getLogger(__name__)
 
 
+def convert_supplementary_data_name_to_supplementary_data_id(supplementary_data_name: str) -> str:
+    """
+    補助情報データ名から、補助情報データIDを生成します。
+    * IDに使えない文字以外は`__`に変換する。
+    """
+    return re.sub(r"[^a-zA-Z0-9_.-]", "__", supplementary_data_name)
+
+
 @dataclass
-class CsvSupplementaryData(DataClassJsonMixin):
+class CliSupplementaryData(DataClassJsonMixin):
     """
-    CSVに記載されている補助情報
+    コマンドラインから指定された（`--csv`または`--json`）補助情報
     """
 
     input_data_id: str
-    supplementary_data_number: int
     supplementary_data_name: str
     supplementary_data_path: str
     supplementary_data_id: Optional[str] = None
     supplementary_data_type: Optional[str] = None
+    supplementary_data_number: Optional[int] = None
 
 
 @dataclass
@@ -67,17 +75,15 @@ class SubPutSupplementaryData:
 
     Args:
         service:
-        facade:
         all_yes:
     """
 
-    def __init__(self, service: annofabapi.Resource, facade: AnnofabApiFacade, all_yes: bool = False) -> None:  # noqa: FBT001, FBT002
+    def __init__(self, service: annofabapi.Resource, *, all_yes: bool = False) -> None:
         self.service = service
-        self.facade = facade
         self.all_yes = all_yes
-        self.supplementary_data_cache: dict[str, list[SupplementaryData]] = {}
+        self.supplementary_data_cache: dict[tuple[str, str], list[SupplementaryData]] = {}
 
-    def put_supplementary_data(self, project_id: str, supplementary_data: SupplementaryDataForPut):  # noqa: ANN201
+    def put_supplementary_data(self, project_id: str, supplementary_data: SupplementaryDataForPut) -> None:
         file_path = get_file_scheme_path(supplementary_data.supplementary_data_path)
         if file_path is not None:
             request_body = {
@@ -89,7 +95,12 @@ class SubPutSupplementaryData:
             if supplementary_data.supplementary_data_type is not None:
                 request_body.update({"supplementary_data_type": supplementary_data.supplementary_data_type})
 
-            logger.debug(f"'{file_path}'を補助情報として登録します。supplementary_data_name='{supplementary_data.supplementary_data_name}'")
+            logger.debug(
+                f"'{file_path}'を補助情報として登録します。 :: "
+                f"input_data_id='{supplementary_data.input_data_id}', "
+                f"supplementary_data_id='{supplementary_data.supplementary_data_id}', "
+                f"supplementary_data_name='{supplementary_data.supplementary_data_name}'"
+            )
             self.service.wrapper.put_supplementary_data_from_file(
                 project_id,
                 input_data_id=supplementary_data.input_data_id,
@@ -141,80 +152,86 @@ class SubPutSupplementaryData:
 
         return yes
 
-    def confirm_put_supplementary_data(self, csv_supplementary_data: CsvSupplementaryData, already_exists: bool = False) -> bool:  # noqa: FBT001, FBT002
-        message_for_confirm = f"supplementary_data_name='{csv_supplementary_data.supplementary_data_name}' の補助情報を登録しますか？"
+    def confirm_put_supplementary_data(
+        self, csv_supplementary_data: CliSupplementaryData, supplementary_data_id: str, *, already_exists: bool = False
+    ) -> bool:
         if already_exists:
-            message_for_confirm += f"supplementary_data_id={csv_supplementary_data.supplementary_data_id} を上書きします。"
-        return self.confirm_processing(message_for_confirm)
-
-    def get_supplementary_data_list_cached(self, project_id: str, input_data_id: str) -> list[SupplementaryData]:
-        key = f"{project_id},{input_data_id}"
-        if key not in self.supplementary_data_cache:
-            supplementary_data_list, _ = self.service.api.get_supplementary_data_list(project_id, input_data_id)
-            self.supplementary_data_cache[key] = supplementary_data_list if supplementary_data_list is not None else []
-        return self.supplementary_data_cache[key]
-
-    def get_supplementary_data_by_id(self, project_id: str, input_data_id: str, supplementary_data_id: str) -> Optional[SupplementaryData]:
-        cached_list = self.get_supplementary_data_list_cached(project_id, input_data_id)
-        return first_true(cached_list, pred=lambda e: e["supplementary_data_id"] == supplementary_data_id)
+            message_for_confirm = (
+                f"supplementary_data_name='{csv_supplementary_data.supplementary_data_name}', "
+                f"supplementary_data_id='{supplementary_data_id}'の補助情報を更新しますか？"
+            )
+        else:
+            message_for_confirm = (
+                f"supplementary_data_name='{csv_supplementary_data.supplementary_data_name}', "
+                f"supplementary_data_id='{supplementary_data_id}'の補助情報を登録しますか？"
+            )
 
-    def get_supplementary_data_by_number(self, project_id: str, input_data_id: str, supplementary_data_number: int) -> Optional[SupplementaryData]:
-        cached_list = self.get_supplementary_data_list_cached(project_id, input_data_id)
-        return first_true(cached_list, pred=lambda e: e["supplementary_data_number"] == supplementary_data_number)
+        return self.confirm_processing(message_for_confirm)
 
-    def put_supplementary_data_main(self, project_id: str, csv_supplementary_data: CsvSupplementaryData, overwrite: bool = False) -> bool:  # noqa: FBT001, FBT002
+    def put_supplementary_data_main(self, project_id: str, csv_data: CliSupplementaryData, *, overwrite: bool = False) -> bool:
         last_updated_datetime = None
-        input_data_id = csv_supplementary_data.input_data_id
-        supplementary_data_id = csv_supplementary_data.supplementary_data_id
-        supplementary_data_path = csv_supplementary_data.supplementary_data_path
+        input_data_id = csv_data.input_data_id
+        supplementary_data_id = (
+            csv_data.supplementary_data_id
+            if csv_data.supplementary_data_id is not None
+            else convert_supplementary_data_name_to_supplementary_data_id(csv_data.supplementary_data_name)
+        )
 
-        # input_data_idの存在確認
-        if self.service.wrapper.get_input_data_or_none(project_id, input_data_id) is None:
+        supplementary_data_list = self.service.wrapper.get_supplementary_data_list_or_none(project_id, input_data_id)
+        if supplementary_data_list is None:
+            # 入力データが存在しない場合は、`supplementary_data_list`はNoneになる
             logger.warning(f"input_data_id='{input_data_id}'である入力データは存在しないため、補助情報の登録をスキップします。")
             return False
 
-        if supplementary_data_id is not None:
-            old_supplementary_data_key = f"supplementary_data_id={supplementary_data_id}"
-            old_supplementary_data = self.get_supplementary_data_by_id(project_id, input_data_id, supplementary_data_id)
+        old_supplementary_data = first_true(supplementary_data_list, pred=lambda e: e["supplementary_data_id"] == supplementary_data_id)
+
+        # 補助情報numberが未指定の場合は、既存の補助情報numberの最大値+1にする
+        max_supplementary_data_number = max((e["supplementary_data_number"] for e in supplementary_data_list), default=0)
+        if csv_data.supplementary_data_number is not None:
+            supplementary_data_number = csv_data.supplementary_data_number
+        elif old_supplementary_data is not None:
+            supplementary_data_number = old_supplementary_data["supplementary_data_number"]
         else:
-            supplementary_data_number = csv_supplementary_data.supplementary_data_number
-            old_supplementary_data_key = f"input_data_id={input_data_id}, supplementary_data_number={supplementary_data_number}"
-            old_supplementary_data = self.get_supplementary_data_by_number(project_id, input_data_id, supplementary_data_number)
-            supplementary_data_id = old_supplementary_data["supplementary_data_id"] if old_supplementary_data is not None else str(uuid.uuid4())
+            supplementary_data_number = max_supplementary_data_number + 1
 
         if old_supplementary_data is not None:
             if overwrite:
-                logger.debug(f"'{old_supplementary_data_key}' はすでに存在します。")
+                logger.debug(
+                    f"supplementary_data_id='{supplementary_data_id}'である補助情報がすでに存在します。 :: "
+                    f"input_data_id='{input_data_id}', supplementary_data_name='{csv_data.supplementary_data_name}'"
+                )
                 last_updated_datetime = old_supplementary_data["updated_datetime"]
             else:
-                logger.debug(f"'{old_supplementary_data_key}' がすでに存在するのでスキップします。")
+                logger.debug(
+                    f"supplementary_data_id='{supplementary_data_id}'である補助情報がすでに存在するので、補助情報の登録をスキップします。 :: "
+                    f"input_data_id='{input_data_id}', supplementary_data_name='{csv_data.supplementary_data_name}'"
+                )
                 return False
 
-        file_path = get_file_scheme_path(supplementary_data_path)
-        logger.debug(f"csv_supplementary_data='{csv_supplementary_data}'")
+        file_path = get_file_scheme_path(csv_data.supplementary_data_path)
         if file_path is not None:  # noqa: SIM102
             if not Path(file_path).exists():
-                logger.warning(f"'{supplementary_data_path}' は存在しません。")
+                logger.warning(f"'{csv_data.supplementary_data_path}' は存在しません。補助情報の登録をスキップします。")
                 return False
 
-        if not self.confirm_put_supplementary_data(csv_supplementary_data, already_exists=last_updated_datetime is not None):
+        if not self.confirm_put_supplementary_data(csv_data, supplementary_data_id, already_exists=last_updated_datetime is not None):
             return False
 
         # 補助情報を登録
         supplementary_data_for_put = SupplementaryDataForPut(
-            input_data_id=csv_supplementary_data.input_data_id,
+            input_data_id=csv_data.input_data_id,
             supplementary_data_id=supplementary_data_id,
-            supplementary_data_name=csv_supplementary_data.supplementary_data_name,
-            supplementary_data_path=csv_supplementary_data.supplementary_data_path,
-            supplementary_data_type=csv_supplementary_data.supplementary_data_type,
-            supplementary_data_number=csv_supplementary_data.supplementary_data_number,
+            supplementary_data_name=csv_data.supplementary_data_name,
+            supplementary_data_path=csv_data.supplementary_data_path,
+            supplementary_data_type=csv_data.supplementary_data_type,
+            supplementary_data_number=supplementary_data_number,
             last_updated_datetime=last_updated_datetime,
         )
         try:
             self.put_supplementary_data(project_id, supplementary_data_for_put)
             logger.debug(
-                f"補助情報を登録しました。"
-                f"input_data_id='{supplementary_data_for_put.input_data_id}',"
+                f"補助情報を登録しました。 :: "
+                f"input_data_id='{supplementary_data_for_put.input_data_id}', "
                 f"supplementary_data_id='{supplementary_data_for_put.supplementary_data_id}', "
                 f"supplementary_data_name='{supplementary_data_for_put.supplementary_data_name}'"
             )
@@ -222,7 +239,7 @@ class SubPutSupplementaryData:
 
         except requests.exceptions.HTTPError:
             logger.warning(
-                f"補助情報の登録に失敗しました。"
+                f"補助情報の登録に失敗しました。 ::"
                 f"input_data_id='{supplementary_data_for_put.input_data_id}',"
                 f"supplementary_data_id='{supplementary_data_for_put.supplementary_data_id}', "
                 f"supplementary_data_name='{supplementary_data_for_put.supplementary_data_name}'",
@@ -239,8 +256,9 @@ class PutSupplementaryData(CommandLine):
     def put_supplementary_data_list(
         self,
         project_id: str,
-        supplementary_data_list: list[CsvSupplementaryData],
-        overwrite: bool = False,  # noqa: FBT001, FBT002
+        supplementary_data_list: list[CliSupplementaryData],
+        *,
+        overwrite: bool = False,
         parallelism: Optional[int] = None,
     ) -> None:
         """
@@ -259,7 +277,7 @@ class PutSupplementaryData(CommandLine):
 
         count_put_supplementary_data = 0
 
-        obj = SubPutSupplementaryData(service=self.service, facade=self.facade, all_yes=self.all_yes)
+        obj = SubPutSupplementaryData(service=self.service, all_yes=self.all_yes)
         if parallelism is not None:
             partial_func = partial(obj.put_supplementary_data_main, project_id, overwrite=overwrite)
             with Pool(parallelism) as pool:
@@ -268,46 +286,29 @@ class PutSupplementaryData(CommandLine):
 
         else:
             for csv_supplementary_data in supplementary_data_list:
-                result = obj.put_supplementary_data_main(project_id, csv_supplementary_data=csv_supplementary_data, overwrite=overwrite)
+                result = obj.put_supplementary_data_main(project_id, csv_data=csv_supplementary_data, overwrite=overwrite)
                 if result:
                     count_put_supplementary_data += 1
 
         logger.info(f"{project_title} に、{count_put_supplementary_data} / {len(supplementary_data_list)} 件の補助情報を登録しました。")
 
     @staticmethod
-    def get_supplementary_data_list_from_dict(supplementary_data_dict_list: list[dict[str, Any]]) -> list[CsvSupplementaryData]:
-        return [CsvSupplementaryData.from_dict(e) for e in supplementary_data_dict_list]
+    def get_supplementary_data_list_from_dict(supplementary_data_dict_list: list[dict[str, Any]]) -> list[CliSupplementaryData]:
+        return [CliSupplementaryData.from_dict(e) for e in supplementary_data_dict_list]
 
     @staticmethod
-    def get_supplementary_data_list_from_csv(csv_path: Path) -> list[CsvSupplementaryData]:
-        def create_supplementary_data(e: Any):  # noqa: ANN202, ANN401
-            supplementary_data_id = e.supplementary_data_id if not pandas.isna(e.supplementary_data_id) else None
-            supplementary_data_type = e.supplementary_data_type if not pandas.isna(e.supplementary_data_type) else None
-            return CsvSupplementaryData(
-                input_data_id=e.input_data_id,
-                supplementary_data_number=e.supplementary_data_number,
-                supplementary_data_name=e.supplementary_data_name,
-                supplementary_data_path=e.supplementary_data_path,
-                supplementary_data_id=supplementary_data_id,
-                supplementary_data_type=supplementary_data_type,
-            )
-
+    def get_supplementary_data_list_from_csv(csv_path: Path) -> list[CliSupplementaryData]:
         df = pandas.read_csv(
             str(csv_path),
-            sep=",",
-            header=None,
-            names=(
-                "input_data_id",
-                "supplementary_data_number",
-                "supplementary_data_name",
-                "supplementary_data_path",
-                "supplementary_data_id",
-                "supplementary_data_type",
-            ),
-            # IDは必ず文字列として読み込むようにする
-            dtype={"input_data_id": str, "supplementary_data_id": str, "supplementary_data_name": str},
+            dtype={
+                "input_data_id": "string",
+                "supplementary_data_id": "string",
+                "supplementary_data_name": "string",
+                "supplementary_data_path": "string",
+                "supplementary_data_number": "Int64",
+            },
         )
-        supplementary_data_list = [create_supplementary_data(e) for e in df.itertuples()]
+        supplementary_data_list = [CliSupplementaryData.from_dict(e) for e in df.to_dict("records")]
         return supplementary_data_list
 
     COMMON_MESSAGE = "annofabcli supplementary_data put: error:"
@@ -370,15 +371,15 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         "--csv",
         type=str,
         help=(
-            "補助情報が記載されたCVファイルのパスを指定してください。CSVのフォーマットは、以下の通りです。\n"
+            "補助情報が記載されたCSVファイルのパスを指定してください。CSVのフォーマットは、以下の通りです。\n"
             "\n"
-            " * ヘッダ行なし, カンマ区切り\n"
-            " * 1列目: input_data_id (required)\n"
-            " * 2列目: supplementary_data_number (required)\n"
-            " * 3列目: supplementary_data_name (required)\n"
-            " * 4列目: supplementary_data_path (required)\n"
-            " * 5列目: supplementary_data_id\n"
-            " * 6列目: supplementary_data_type\n"
+            " * ヘッダ行あり, カンマ区切り\n"
+            " * input_data_id (required)\n"
+            " * supplementary_data_name (required)\n"
+            " * supplementary_data_path (required)\n"
+            " * supplementary_data_id\n"
+            " * supplementary_data_type\n"
+            " * supplementary_data_number\n"
             "\n"
             "各項目の詳細は https://annofab-cli.readthedocs.io/ja/latest/command_reference/supplementary/put.html を参照してください。"
         ),
@@ -387,7 +388,6 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     JSON_SAMPLE = [  # noqa: N806
         {
             "input_data_id": "input1",
-            "supplementary_data_number": 1,
             "supplementary_data_name": "foo",
             "supplementary_data_path": "file://foo.jpg",
         }
@@ -408,7 +408,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.add_argument(
         "--overwrite",
         action="store_true",
-        help="指定した場合、supplementary_data_id（省略時はsupplementary_data_number）がすでに存在していたら上書きします。指定しなければ、スキップします。",
+        help="指定した場合、supplementary_data_idがすでに存在していたら上書きします。指定しなければ、スキップします。",
     )
 
     parser.add_argument(
@@ -425,7 +425,7 @@ def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argpa
     subcommand_name = "put"
     subcommand_help = "補助情報を登録します。"
     description = "補助情報を登録します。"
-    epilog = "オーナロールを持つユーザで実行してください。"
+    epilog = "オーナーロールを持つユーザで実行してください。"
 
     parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help, description, epilog=epilog)
     parse_args(parser)

annofabcli/task/list_tasks_added_task_history.py

@@ -309,9 +309,10 @@ class ListTasksAddedTaskHistoryMain:
         task_list = list_task_obj.get_task_list(self.project_id, task_id_list=task_id_list, task_query=task_query)
 
         obj = AddingAdditionalInfoToTask(self.service, project_id=self.project_id)
+        logger.info(f"{len(task_list)} 件のタスクの履歴情報を取得します。")
 
         for index, task in enumerate(task_list):
-            if (index + 1) % 1000 == 0:
+            if (index + 1) % 100 == 0:
                 logger.debug(f"{index + 1} 件目のタスク履歴情報を取得します。")
 
             obj.add_additional_info_to_task(task)

annofabcli/task/update_metadata_of_task.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import argparse
+import copy
 import json
 import logging
 import multiprocessing
@@ -212,7 +213,7 @@ class UpdateMetadataOfTask(CommandLine):
         if args.metadata is not None:
             metadata = annofabcli.common.cli.get_json_from_args(args.metadata)
             assert task_id_list is not None, "'--metadata'を指定したときは'--task_id'は必須です。"
-            metadata_by_task_id = {task_id: metadata for task_id in task_id_list}
+            metadata_by_task_id = {task_id: copy.deepcopy(metadata) for task_id in task_id_list}
         elif args.metadata_by_task_id is not None:
             metadata_by_task_id = annofabcli.common.cli.get_json_from_args(args.metadata_by_task_id)
             if task_id_list is not None:

{annofabcli-1.96.0.dist-info → annofabcli-1.97.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annofabcli
-Version: 1.96.0
+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.0.dist-info → annofabcli-1.97.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
 annofabcli/__init__.py,sha256=NMA7kFxmLlCiILQPHJa9mEuqXxtLALw_dwyXYsvz4VM,71
 annofabcli/__main__.py,sha256=JzfycqVG9ENhWOCxTouZwpHwWTSrI-grLsaMudxjyBM,5283
-annofabcli/__version__.py,sha256=vUosqVW-MeQrE_vPK0xlTVGwdsd_pcLlczOaCRqUXgg,132
+annofabcli/__version__.py,sha256=dqx_NARSo9UcLPvxc6zJBGKIFxXd0yc57SlNZJUxSbg,132
 annofabcli/annotation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/annotation/annotation_query.py,sha256=ke3W3RT1-WfFzwt-TXcQwGmghG34vcKJkM_jxgbNKjU,15922
 annofabcli/annotation/change_annotation_attributes.py,sha256=zHXyENZfbMGL_15xiK7Cy4cQ2sV0GjSVmKuPm3sOX7Y,17173
@@ -67,7 +67,7 @@ annofabcli/filesystem/mask_user_info.py,sha256=Evmr9QhSpMG900bbOXbJNHwXHapUlNfvV
 annofabcli/filesystem/merge_annotation.py,sha256=MkGy1T9F-1tHq_BS_L_mTtgKpOMmXscrydzfSc0JKAo,10588
 annofabcli/filesystem/subcommand_filesystem.py,sha256=ZM2td5iZYIQ3TCI-9xAue8LugFlIc3WMRXrJqnjJ8-s,1186
 annofabcli/input_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annofabcli/input_data/change_input_data_name.py,sha256=8SMgSZbwYFl5Qvs7H6knQXi8yOc_dQuwd7xUvEcHYac,9751
+annofabcli/input_data/change_input_data_name.py,sha256=vhii3jHaEE_J8jcJ2bW66VxC9k-jtWN4tSD9vnatON4,9665
 annofabcli/input_data/copy_input_data.py,sha256=Lbyq2aW5lmJCPB8-WHdOI93a2ND5E0qOWrhBHRluQyw,14656
 annofabcli/input_data/delete_input_data.py,sha256=GLg58XNz9_Njq9eq2sc2BAzfLy9tJefcDYL6J4TOim4,8836
 annofabcli/input_data/delete_metadata_key_of_input_data.py,sha256=PVv9HXQVFLKQh-4RSHas_ckFxDxtqAzWnXnWYFFYy08,8464
@@ -75,10 +75,10 @@ annofabcli/input_data/download_input_data_json.py,sha256=vxGoeM3ZEggQbWiWsrDK0_G
 annofabcli/input_data/list_all_input_data.py,sha256=Kq261WCkma5UNKfMDT7O6Z-dzzqp-KP1wL0DvHe5fH8,9879
 annofabcli/input_data/list_all_input_data_merged_task.py,sha256=UaBJW-nMHytmQ4okg69Ew1jhC2vMNnRMgl2lEBabtUI,12850
 annofabcli/input_data/list_input_data.py,sha256=RBxsHyKg1bVIEQUFDkfrq-nJmEdEYNoCjJ2L2GgSfeU,11519
-annofabcli/input_data/put_input_data.py,sha256=bEbo6rmLkmYTUp-ynoGUXpZoYLdBDLaZYcrxqEm74tw,17951
+annofabcli/input_data/put_input_data.py,sha256=x54C-rLJVzr1YF2GlMR0w0HJReOE3E7YKiBeuh0RsTI,17934
 annofabcli/input_data/put_input_data_with_zip.py,sha256=SA4aMAwMBFgc9Lh0zmRCbmkXG4AMrcBqd5zeTSdr8lc,5566
 annofabcli/input_data/subcommand_input_data.py,sha256=X8EoxsF6PMiKrvk_r7PIe2D0WZuaPlgLJRuTiljPIdM,2048
-annofabcli/input_data/update_metadata_of_input_data.py,sha256=txdliirBrtoTabGEyWYLPclZC_DarEpRAY3MTsbViPA,11556
+annofabcli/input_data/update_metadata_of_input_data.py,sha256=_cZh0GYGK6Lx5arKuTjblolkXsRdTlwuKcIHa8Nm5yQ,11583
 annofabcli/input_data/utils.py,sha256=F3mYbWmRwXfEtiIo9dvSysfuZUdyQzJmmq94eM-C5IY,723
 annofabcli/instruction/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/instruction/copy_instruction.py,sha256=24zBMkelSI2mpJq7Esgzo3uB_f1Z3hitBeX68HFqV00,6704
@@ -117,7 +117,7 @@ annofabcli/project_member/copy_project_members.py,sha256=-ybJ6ftcbRq0Pl092aag5ku
 annofabcli/project_member/drop_project_members.py,sha256=t_Jqoc89JtnrIpZc1fECjO6s-qttDmsgHHTz03zJTF0,5856
 annofabcli/project_member/invite_project_members.py,sha256=bxciqakeSrAX5xjE6KwmhcHj4EU1haETcQ_0BYkR6O4,6377
 annofabcli/project_member/list_users.py,sha256=BoavUdDRoRIQjI7q_sQEZjDMcLmUwWOCZdJsR7JimJ8,4844
-annofabcli/project_member/put_project_members.py,sha256=0YZIUJYeblL-cHETnCC9R1oWUm_bLNN6LIIIlXH8G7c,9741
+annofabcli/project_member/put_project_members.py,sha256=-2T-XlZw-I6Am4HDf9dsNDEmaflMDvmJvMzStiya_Fc,9183
 annofabcli/project_member/subcommand_project_member.py,sha256=6cOoMiZJ82j94rSSp1GzmYggGSm1egk3S9e_YYgzhe8,1466
 annofabcli/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/stat_visualization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -130,9 +130,9 @@ annofabcli/stat_visualization/write_performance_rating_csv.py,sha256=TDn7-poyFt2
 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_attribute.py,sha256=WM0-Zw0Pm35olqrSXvbHnrb4mbC02qcjshLCrbPE3zg,12432
-annofabcli/statistics/list_annotation_count.py,sha256=xsqXxRO21MW7Wbs96PEa8gHb3i7bxjQvoMHLB2eT-0g,50360
-annofabcli/statistics/list_annotation_duration.py,sha256=9PCg1IA_g4HoHHSfsMVb2zBMLfLJ3u9Id8Qa9L8Qhko,31923
+annofabcli/statistics/list_annotation_attribute.py,sha256=87jjNCOXJUbWnmswMCLN7GTjGsBfqpFJ6hViWmnj8Y4,12557
+annofabcli/statistics/list_annotation_count.py,sha256=GVlYYubWqjNLJD7GGxv1WivCYv0rMgYxRLeZsM3Y8hA,50344
+annofabcli/statistics/list_annotation_duration.py,sha256=1OFvhi5QQJDcUO4iHi3lV2fDFK8ZFaAP8vlbGpVR2s0,31907
 annofabcli/statistics/list_video_duration.py,sha256=uNeMteRBX2JG_AWmcgMJj0Jzbq_qF7bvAwr25GmeIiw,9124
 annofabcli/statistics/list_worktime.py,sha256=C7Yu3IOW2EvhkJJv6gY3hNdS9_TOLmT_9LZsB7vLJ1o,6493
 annofabcli/statistics/scatter.py,sha256=IUCwXix9GbZb6V82wjjb5q2eamrT5HQsU_bzDTjAFnM,11011
@@ -148,16 +148,16 @@ annofabcli/statistics/visualization/dataframe/cumulative_productivity.py,sha256=
 annofabcli/statistics/visualization/dataframe/custom_production_volume.py,sha256=5ELLiQJ5sNKdVKmYYVeZW4nedDg1CVGxMDdF5TUUX5c,2142
 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=KH4vUBLpC-M41EnGroeaOXdwVZz8j0u4HpvLitFbtaA,27250
+annofabcli/statistics/visualization/dataframe/productivity_per_date.py,sha256=tMap7E3z7hibon1zJnZRJnbMmtzqh04ocoV0oxBpssU,27249
 annofabcli/statistics/visualization/dataframe/project_performance.py,sha256=hdTMPvLfGDMZFjpIl58GtTEOopsOvitbdaj5hQAEp8o,8496
 annofabcli/statistics/visualization/dataframe/task.py,sha256=KanuLy67ZGORdLry21eN7uSNzkoJvIre1JN7Bq-fRlg,23452
 annofabcli/statistics/visualization/dataframe/task_history.py,sha256=3b9e4ok6yKE5x647KzRqvp01P33XMAHLEEbLJ5GCmRo,2760
 annofabcli/statistics/visualization/dataframe/task_worktime_by_phase_user.py,sha256=AtlbeNIkttjLtuxtZYCyZin4eVKRvcYEMnLzEZtZUlY,13134
 annofabcli/statistics/visualization/dataframe/user.py,sha256=EHn7nlf6D6UX-gsVXy8m_3QaCsHsUhr0iy2rbNozOgc,1707
-annofabcli/statistics/visualization/dataframe/user_performance.py,sha256=8o0BB4uPzW6O2rReXyjEZfmGYzYidoWZLEQBm12qnng,57029
-annofabcli/statistics/visualization/dataframe/whole_performance.py,sha256=u_fuRUMCwuLjmCSKHJVeThGcbwBFQFmm2XgeLqnTgEE,12565
-annofabcli/statistics/visualization/dataframe/whole_productivity_per_date.py,sha256=uECDfdRxt0d9iQRpX9TISSd0q9SZ4XVzuY5FMu7X2kw,52145
-annofabcli/statistics/visualization/dataframe/worktime_per_date.py,sha256=2FnyZFSZBfedkIMmRuAdx026deblT7GT3r2qe2Fg71M,21319
+annofabcli/statistics/visualization/dataframe/user_performance.py,sha256=JXJg0oNpURa9HCF3zFYqynOFtNRKD5h9YNuLOq0_h00,57023
+annofabcli/statistics/visualization/dataframe/whole_performance.py,sha256=qcQALkflNSX6QvvtOc9QEZnmQ-TtkjsQkT1vmZ3k0_M,12561
+annofabcli/statistics/visualization/dataframe/whole_productivity_per_date.py,sha256=W8g9_4WcUHxvPw31gUY_MVheBfllsHHY6g-M0FKScUk,52141
+annofabcli/statistics/visualization/dataframe/worktime_per_date.py,sha256=56izC5flXOiu_lKPSk0s0aNGgqr-FiVA4t6pBWSNuwk,21321
 annofabcli/statistics/visualization/filtering_query.py,sha256=0_3QcS1weGIC9THH7NGqjYCb4rDLiftnmA-2MVgeNDI,4174
 annofabcli/statistics/visualization/model.py,sha256=5LSp0u63nqeILUl3XdYEhqqi_hq2rFbzyKHYlXZo2S0,896
 annofabcli/statistics/visualization/project_dir.py,sha256=ijwuGngRaK8TczAaDQoI2VnPvsmiaT-xoGWMHFCLVgo,24071
@@ -167,9 +167,9 @@ annofabcli/statistics/visualize_annotation_duration.py,sha256=J4Z3Ql1sdiTraMnRaR
 annofabcli/statistics/visualize_statistics.py,sha256=3bP9WRALADkAxPePa1Ix49apahi1V_qjAL6Dbrwtxd0,39550
 annofabcli/statistics/visualize_video_duration.py,sha256=A6Q91aWx7GO4F0TGxbiQI0za8BFr7IqiUaYyw3__BgY,16842
 annofabcli/supplementary/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annofabcli/supplementary/delete_supplementary_data.py,sha256=StHGH7qB6mEtuD75FKRQRFdTY2Lfhnl6s4u1Jq8b-MA,13756
+annofabcli/supplementary/delete_supplementary_data.py,sha256=BZ5NzEQ7CdOIxfCHY7vTLG5vutueXNPh6Teyno9NY-U,13542
 annofabcli/supplementary/list_supplementary_data.py,sha256=F4iJnQi_4W7S_d7ahqxWFSFcnfiKYhNuysC28v0QUWA,7649
-annofabcli/supplementary/put_supplementary_data.py,sha256=KLGFUIYfHmB39U7qhj6y6exU9D6XMDmYpYBKzkIxqiU,19130
+annofabcli/supplementary/put_supplementary_data.py,sha256=-ZfqdmirgXFyTNZ8t38IWatPzIL7X4s805xFY5Szar8,18073
 annofabcli/supplementary/subcommand_supplementary.py,sha256=F8qfuNQzgW5HV1QKB4h0DWN7-kPVQcoFQwPfW_vjZVk,1079
 annofabcli/task/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/task/cancel_acceptance.py,sha256=rHKmAzQE1a25szVWb7dexokeW32V12bkyDIYM_oIl5U,13899
@@ -184,12 +184,12 @@ annofabcli/task/download_task_json.py,sha256=Ocjecmdf2WV_Sq3u1InfMLIsT3XSw0ojyJm
 annofabcli/task/list_all_tasks.py,sha256=F9GpzzgWffF3lUeGrFIvjweq-iEwJ1c-g8usskO_2dE,6506
 annofabcli/task/list_all_tasks_added_task_history.py,sha256=fkdiuo64iS7xxvIfGKzSiUPPEMiCVnJjjcAtMxe2Ngs,9551
 annofabcli/task/list_tasks.py,sha256=O4jjp_zdmurcGNWXFp9JXHJsH4nhlR5e3ok96YnD1SI,10237
-annofabcli/task/list_tasks_added_task_history.py,sha256=TVyHODV5lQuB6ALs8Xd4UUm4FYf0F6kycv7ajbm0MkQ,19583
+annofabcli/task/list_tasks_added_task_history.py,sha256=7avkLYFErcdSNxGc8CQXr4FFIF1z9FtQJBSloD-tzBI,19675
 annofabcli/task/put_tasks.py,sha256=hT2xPowJmcNJhjxoAm-MFiKTw_RFcJUYlpeanegVrAU,13400
 annofabcli/task/put_tasks_by_count.py,sha256=MUHfWhqtSAXnB3O36p3bMSSgQ_3Zek9GT5qRvHGx8Lo,6041
 annofabcli/task/reject_tasks.py,sha256=5ByAN6VnKwvU5BT_cfsHwA1jLDl74bonqk3bwtnrkPU,23139
 annofabcli/task/subcommand_task.py,sha256=L_5Dwe58eblrtOrUYxjJAvkSmu6savRUxIqGjsFq-R4,2436
-annofabcli/task/update_metadata_of_task.py,sha256=3_BxVm9UPsJH9h3CiFoPaxQEx801Uehlsvzz1HOzKM4,12783
+annofabcli/task/update_metadata_of_task.py,sha256=n8RmegF3A1r-ZDOzn6SzNoHuqNuzsSJM9xUJ6EXvTf0,12810
 annofabcli/task_history/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/task_history/download_task_history_json.py,sha256=xZnGNKkPYT6RXIUd_wUqZfPiVpGdW5MTBUSpNKbOAC4,2370
 annofabcli/task_history/list_all_task_history.py,sha256=VY99AEHTSG71O2HQXS81oPX6AAusbT1scika9QoUZEU,6780
@@ -200,8 +200,8 @@ annofabcli/task_history_event/download_task_history_event_json.py,sha256=hQLVbQ0
 annofabcli/task_history_event/list_all_task_history_event.py,sha256=JQEgwOIXbbTIfeX23AVaoySHViOR9UGm9uoXuhVEBqo,6446
 annofabcli/task_history_event/list_worktime.py,sha256=9jsRYa2C9bva8E1Aqxv9CCKDuCP0MvbiaIyQFTDpjqY,13150
 annofabcli/task_history_event/subcommand_task_history_event.py,sha256=mJVJoT4RXk4HWnY7-Nrsl4If-gtaIIEXd2z7eFZwM2I,1260
-annofabcli-1.96.0.dist-info/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
-annofabcli-1.96.0.dist-info/METADATA,sha256=kHn5yPXYeuO3FK-MKUhhRcZ5vAhUakxbnLEOlqM6KsY,5626
-annofabcli-1.96.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-annofabcli-1.96.0.dist-info/entry_points.txt,sha256=A8vlN9fiMhbYRcdBfSpl7piYzAwvkMhRXIPQUAvQFUo,55
-annofabcli-1.96.0.dist-info/RECORD,,
+annofabcli-1.97.0.dist-info/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
+annofabcli-1.97.0.dist-info/METADATA,sha256=71xtnSNlS97JSBeUVYWYcoas9gqXjL9v735krW5zioc,5626
+annofabcli-1.97.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+annofabcli-1.97.0.dist-info/entry_points.txt,sha256=A8vlN9fiMhbYRcdBfSpl7piYzAwvkMhRXIPQUAvQFUo,55
+annofabcli-1.97.0.dist-info/RECORD,,