annofabcli 1.95.0__py3-none-any.whl → 1.96.1__py3-none-any.whl

annofabcli/__version__.py

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

annofabcli/annotation_specs/export_annotation_specs.py

@@ -20,15 +20,20 @@ from annofabcli.common.utils import print_according_to_format
 logger = logging.getLogger(__name__)
 
 
-class ListAttributeRestriction(CommandLine):
+class ExportAnnotationSpecs(CommandLine):
     COMMON_MESSAGE = "annofabcli annotation_specs export: error:"
 
     def get_history_id_from_before_index(self, project_id: str, before: int) -> Optional[str]:
         histories, _ = self.service.api.get_annotation_specs_histories(project_id)
-        if before + 1 > len(histories):
-            logger.warning(f"アノテーション仕様の履歴は{len(histories)}個のため、最新より{before}個前のアノテーション仕様は見つかりませんでした。")
+        sorted_histories = sorted(histories, key=lambda x: x["updated_datetime"], reverse=True)
+
+        if before + 1 > len(sorted_histories):
+            logger.warning(
+                f"アノテーション仕様の履歴は{len(sorted_histories)}個のため、最新より{before}個前のアノテーション仕様は見つかりませんでした。"
+            )
             return None
-        history = histories[-(before + 1)]
+
+        history = sorted_histories[before]
         return history["history_id"]
 
     def get_exported_annotation_specs(self, project_id: str, history_id: Optional[str]) -> dict[str, Any]:
@@ -107,7 +112,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
 def main(args: argparse.Namespace) -> None:
     service = build_annofabapi_resource_and_login(args)
     facade = AnnofabApiFacade(service)
-    ListAttributeRestriction(service, facade, args).main()
+    ExportAnnotationSpecs(service, facade, args).main()
 
 
 def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:

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/statistics/list_annotation_attribute.py

@@ -0,0 +1,310 @@
+# pylint: disable=too-many-lines
+from __future__ import annotations
+
+import argparse
+import logging
+import sys
+import tempfile
+import zipfile
+from collections.abc import Collection, Iterator
+from pathlib import Path
+from typing import Any, Literal, Optional, Union
+
+import pandas
+import pydantic
+from annofabapi.models import ProjectMemberRole
+from annofabapi.parser import (
+    SimpleAnnotationParser,
+    lazy_parse_simple_annotation_dir,
+    lazy_parse_simple_annotation_zip,
+)
+
+import annofabcli
+import annofabcli.common.cli
+from annofabcli.common.cli import (
+    COMMAND_LINE_ERROR_STATUS_CODE,
+    ArgumentParser,
+    CommandLine,
+    build_annofabapi_resource_and_login,
+)
+from annofabcli.common.download import DownloadingFile
+from annofabcli.common.enums import FormatArgument
+from annofabcli.common.facade import (
+    AnnofabApiFacade,
+    TaskQuery,
+    match_annotation_with_task_query,
+)
+from annofabcli.common.type_util import assert_noreturn
+from annofabcli.common.utils import print_csv, print_json
+
+logger = logging.getLogger(__name__)
+
+
+def lazy_parse_simple_annotation_by_input_data(annotation_path: Path) -> Iterator[SimpleAnnotationParser]:
+    if not annotation_path.exists():
+        raise RuntimeError(f"'{annotation_path}' は存在しません。")
+
+    if annotation_path.is_dir():
+        return lazy_parse_simple_annotation_dir(annotation_path)
+    elif zipfile.is_zipfile(str(annotation_path)):
+        return lazy_parse_simple_annotation_zip(annotation_path)
+    else:
+        raise RuntimeError(f"'{annotation_path}'は、zipファイルまたはディレクトリではありません。")
+
+
+class AnnotationAttribute(pydantic.BaseModel):
+    """
+    入力データまたはタスク単位の区間アノテーションの長さ情報。
+    """
+
+    task_id: str
+    task_status: str
+    task_phase: str
+    task_phase_stage: int
+
+    input_data_id: str
+    input_data_name: str
+    annotation_id: str
+    label: str
+    attributes: dict[str, Union[str, int, bool]]
+
+
+def get_annotation_attribute_list_from_annotation_json(
+    simple_annotation: dict[str, Any], *, target_labels: Collection[str] | None = None
+) -> list[AnnotationAttribute]:
+    """
+    1個のアノテーションJSONに対して、アノテーションの属性情報を取得します。
+
+    Args:
+        simple_annotation: アノテーションJSONファイルの内容
+        target_labels: 絞り込むラベルのcollection
+    """
+    details = simple_annotation["details"]
+
+    result = []
+    for detail in details:
+        if target_labels is not None:  # noqa: SIM102
+            if detail["label"] not in target_labels:
+                continue
+
+        result.append(
+            AnnotationAttribute(
+                task_id=simple_annotation["task_id"],
+                task_status=simple_annotation["task_status"],
+                task_phase=simple_annotation["task_phase"],
+                task_phase_stage=simple_annotation["task_phase_stage"],
+                input_data_id=simple_annotation["input_data_id"],
+                input_data_name=simple_annotation["input_data_name"],
+                label=detail["label"],
+                annotation_id=detail["annotation_id"],
+                attributes=detail["attributes"],
+            )
+        )
+    return result
+
+
+def get_annotation_attribute_list_from_annotation_zipdir_path(
+    annotation_zipdir_path: Path,
+    *,
+    target_task_ids: Optional[Collection[str]] = None,
+    task_query: Optional[TaskQuery] = None,
+    target_labels: Collection[str] | None = None,
+) -> list[AnnotationAttribute]:
+    """
+    アノテーションzipまたはそれを展開したディレクトリから、アノテーションの属性のlistを取得します。
+
+    Args:
+    """
+    target_task_ids = set(target_task_ids) if target_task_ids is not None else None
+
+    iter_parser = lazy_parse_simple_annotation_by_input_data(annotation_zipdir_path)
+
+    result = []
+    logger.debug("アノテーションzipまたはディレクトリを読み込み中")
+    for index, parser in enumerate(iter_parser):
+        if (index + 1) % 1000 == 0:
+            logger.debug(f"{index + 1}  件目のJSONを読み込み中")
+
+        if target_task_ids is not None and parser.task_id not in target_task_ids:
+            continue
+
+        simple_annotation_dict = parser.load_json()
+        if task_query is not None:  # noqa: SIM102
+            if not match_annotation_with_task_query(simple_annotation_dict, task_query):
+                continue
+
+        sub_result = get_annotation_attribute_list_from_annotation_json(simple_annotation_dict, target_labels=target_labels)
+        result.extend(sub_result)
+
+    return result
+
+
+def print_annotation_attribute_list_as_csv(annotation_attribute_list: list, output_file: Optional[Path]) -> None:
+    df = pandas.json_normalize(annotation_attribute_list)
+
+    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(
+    annotation_attribute_list: list[AnnotationAttribute],
+    output_file: Path,
+    output_format: Literal[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON],
+) -> None:
+    tmp_annotation_attribute_list = [e.model_dump() for e in annotation_attribute_list]
+    if output_format == FormatArgument.CSV:
+        print_annotation_attribute_list_as_csv(tmp_annotation_attribute_list, output_file)
+    elif output_format == FormatArgument.JSON:
+        print_json(tmp_annotation_attribute_list, output=output_file, is_pretty=False)
+    elif output_format == FormatArgument.PRETTY_JSON:
+        print_json(tmp_annotation_attribute_list, output=output_file, is_pretty=True)
+    else:
+        raise assert_noreturn(output_format)
+
+
+class ListAnnotationAttribute(CommandLine):
+    COMMON_MESSAGE = "annofabcli statistics list_annotation_attribute: error:"
+
+    def validate(self, args: argparse.Namespace) -> bool:
+        if args.project_id is None and args.annotation is None:
+            print(  # noqa: T201
+                f"{self.COMMON_MESSAGE} argument --project_id: '--annotation'が未指定のときは、'--project_id' を指定してください。",
+                file=sys.stderr,
+            )
+            return False
+
+        return True
+
+    def main(self) -> None:
+        args = self.args
+
+        if not self.validate(args):
+            sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
+
+        project_id: Optional[str] = args.project_id
+        if project_id is not None:
+            super().validate_project(project_id, project_member_roles=[ProjectMemberRole.OWNER, ProjectMemberRole.TRAINING_DATA_USER])
+
+        annotation_path = Path(args.annotation) if args.annotation is not None else None
+
+        task_id_list = annofabcli.common.cli.get_list_from_args(args.task_id) if args.task_id is not None else None
+        label_name_list = annofabcli.common.cli.get_list_from_args(args.label_name) if args.label_name is not None else None
+        task_query = TaskQuery.from_dict(annofabcli.common.cli.get_json_from_args(args.task_query)) if args.task_query is not None else None
+
+        output_file: Path = args.output
+        output_format = FormatArgument(args.format)
+
+        downloading_obj = DownloadingFile(self.service)
+
+        def download_and_print_annotation_attribute_list(
+            project_id: str, temp_dir: Path, *, is_latest: bool, annotation_path: Optional[Path]
+        ) -> None:
+            if annotation_path is None:
+                annotation_path = temp_dir / f"{project_id}__annotation.zip"
+                downloading_obj.download_annotation_zip(
+                    project_id,
+                    dest_path=annotation_path,
+                    is_latest=is_latest,
+                )
+
+            annotation_attribute_list = get_annotation_attribute_list_from_annotation_zipdir_path(
+                annotation_zipdir_path=annotation_path, target_task_ids=task_id_list, task_query=task_query, target_labels=label_name_list
+            )
+            print_annotation_attribute_list(annotation_attribute_list, output_file, output_format)  # type: ignore[arg-type]
+
+        if project_id is not None:
+            if args.temp_dir is not None:
+                download_and_print_annotation_attribute_list(
+                    project_id=project_id, temp_dir=args.temp_dir, is_latest=args.latest, annotation_path=annotation_path
+                )
+            else:
+                # `NamedTemporaryFile`を使わない理由: Windowsで`PermissionError`が発生するため
+                # https://qiita.com/yuji38kwmt/items/c6f50e1fc03dafdcdda0 参考
+                with tempfile.TemporaryDirectory() as str_temp_dir:
+                    download_and_print_annotation_attribute_list(
+                        project_id=project_id, temp_dir=Path(str_temp_dir), is_latest=args.latest, annotation_path=annotation_path
+                    )
+        else:
+            assert annotation_path is not None
+            annotation_attribute_list = get_annotation_attribute_list_from_annotation_zipdir_path(
+                annotation_zipdir_path=annotation_path, target_task_ids=task_id_list, task_query=task_query, target_labels=label_name_list
+            )
+            print_annotation_attribute_list(annotation_attribute_list, output_file, output_format)  # type: ignore[arg-type]
+
+
+def parse_args(parser: argparse.ArgumentParser) -> None:
+    argument_parser = ArgumentParser(parser)
+
+    annotation_group = parser.add_mutually_exclusive_group(required=True)
+    annotation_group.add_argument(
+        "--annotation",
+        type=str,
+        help="アノテーションzip、またはzipを展開したディレクトリを指定します。指定しない場合はAnnofabからダウンロードします。",
+    )
+
+    annotation_group.add_argument("-p", "--project_id", type=str, help="対象プロジェクトの project_id")
+
+    argument_parser.add_format(
+        choices=[FormatArgument.CSV, FormatArgument.JSON, FormatArgument.PRETTY_JSON],
+        default=FormatArgument.CSV,
+    )
+
+    argument_parser.add_output()
+
+    parser.add_argument(
+        "-tq",
+        "--task_query",
+        type=str,
+        help="集計対象タスクを絞り込むためのクエリ条件をJSON形式で指定します。使用できるキーは task_id, status, phase, phase_stage です。"
+        " ``file://`` を先頭に付けると、JSON形式のファイルを指定できます。",
+    )
+    argument_parser.add_task_id(required=False)
+
+    parser.add_argument(
+        "--label_name",
+        type=str,
+        nargs="+",
+        required=False,
+        help="出力対象のアノテーションのラベル名(英語)を指定します。指定しない場合はラベル名で絞り込みません。"
+        " ``file://`` を先頭に付けると、ラベル名の一覧が記載されたファイルを指定できます。",
+    )
+
+    parser.add_argument(
+        "--latest",
+        action="store_true",
+        help="``--annotation`` を指定しないとき、最新のアノテーションzipを参照します。このオプションを指定すると、アノテーションzipを更新するのに数分待ちます。",  # noqa: E501
+    )
+
+    parser.add_argument(
+        "--temp_dir",
+        type=Path,
+        help="指定したディレクトリに、アノテーションZIPなどの一時ファイルをダウンロードします。",
+    )
+
+    parser.set_defaults(subcommand_func=main)
+
+
+def main(args: argparse.Namespace) -> None:
+    service = build_annofabapi_resource_and_login(args)
+    facade = AnnofabApiFacade(service)
+    ListAnnotationAttribute(service, facade, args).main()
+
+
+def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+    subcommand_name = "list_annotation_attribute"
+    subcommand_help = "アノテーションZIPを読み込み、アノテーションの属性値の一覧を出力します。"
+    epilog = "オーナロールまたはアノテーションユーザロールを持つユーザで実行してください。"
+    parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help, description=subcommand_help, epilog=epilog)
+    parse_args(parser)
+    return parser

annofabcli/statistics/subcommand_statistics.py

@@ -4,6 +4,7 @@ from typing import Optional
 import annofabcli
 import annofabcli.common.cli
 import annofabcli.stat_visualization.merge_visualization_dir
+import annofabcli.statistics.list_annotation_attribute
 import annofabcli.statistics.list_annotation_count
 import annofabcli.statistics.list_annotation_duration
 import annofabcli.statistics.list_video_duration
@@ -21,6 +22,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     subparsers = parser.add_subparsers(dest="subcommand_name")
 
     # サブコマンドの定義
+    annofabcli.statistics.list_annotation_attribute.add_parser(subparsers)
     annofabcli.statistics.list_annotation_count.add_parser(subparsers)
     annofabcli.statistics.list_annotation_duration.add_parser(subparsers)
     annofabcli.statistics.list_video_duration.add_parser(subparsers)

annofabcli/supplementary/delete_supplementary_data.py

@@ -92,14 +92,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,17 +107,17 @@ 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
@@ -128,9 +128,8 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
         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,15 +154,15 @@ 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
 
@@ -174,7 +173,7 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
         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 +201,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)} 件の入力データに紐づく補助情報を削除しました。")
 

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,6 +32,14 @@ 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):
     """
@@ -71,13 +79,13 @@ class SubPutSupplementaryData:
         all_yes:
     """
 
-    def __init__(self, service: annofabapi.Resource, facade: AnnofabApiFacade, all_yes: bool = False) -> None:  # noqa: FBT001, FBT002
+    def __init__(self, service: annofabapi.Resource, facade: AnnofabApiFacade, *, all_yes: bool = False) -> None:
         self.service = service
         self.facade = facade
         self.all_yes = all_yes
         self.supplementary_data_cache: dict[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 +97,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,10 +154,20 @@ 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: CsvSupplementaryData, 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} を上書きします。"
+            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}'の補助情報を登録しますか？"
+            )
+
         return self.confirm_processing(message_for_confirm)
 
     def get_supplementary_data_list_cached(self, project_id: str, input_data_id: str) -> list[SupplementaryData]:
@@ -158,14 +181,14 @@ class SubPutSupplementaryData:
         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)
 
-    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)
-
-    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_supplementary_data: CsvSupplementaryData, *, 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_id = (
+            csv_supplementary_data.supplementary_data_id
+            if csv_supplementary_data.supplementary_data_id is not None
+            else convert_supplementary_data_name_to_supplementary_data_id(csv_supplementary_data.supplementary_data_name)
+        )
         supplementary_data_path = csv_supplementary_data.supplementary_data_path
 
         # input_data_idの存在確認
@@ -173,21 +196,20 @@ class SubPutSupplementaryData:
             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)
-        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())
+        old_supplementary_data = self.get_supplementary_data_by_id(project_id, input_data_id, supplementary_data_id)
 
         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_supplementary_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_supplementary_data.supplementary_data_name}'"
+                )
                 return False
 
         file_path = get_file_scheme_path(supplementary_data_path)
@@ -197,7 +219,7 @@ class SubPutSupplementaryData:
                 logger.warning(f"'{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_supplementary_data, supplementary_data_id, already_exists=last_updated_datetime is not None):
             return False
 
         # 補助情報を登録
@@ -213,8 +235,8 @@ class SubPutSupplementaryData:
         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 +244,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}'",
@@ -240,7 +262,8 @@ class PutSupplementaryData(CommandLine):
         self,
         project_id: str,
         supplementary_data_list: list[CsvSupplementaryData],
-        overwrite: bool = False,  # noqa: FBT001, FBT002
+        *,
+        overwrite: bool = False,
         parallelism: Optional[int] = None,
     ) -> None:
         """
@@ -280,7 +303,7 @@ class PutSupplementaryData(CommandLine):
 
     @staticmethod
     def get_supplementary_data_list_from_csv(csv_path: Path) -> list[CsvSupplementaryData]:
-        def create_supplementary_data(e: Any):  # noqa: ANN202, ANN401
+        def create_supplementary_data(e: Any) -> CsvSupplementaryData:  # noqa: 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(

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-1.95.0.dist-info → annofabcli-1.96.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: annofabcli
-Version: 1.95.0
+Version: 1.96.1
 Summary: Utility Command Line Interface for AnnoFab
 Home-page: https://github.com/kurusugawa-computer/annofab-cli
 License: MIT

{annofabcli-1.95.0.dist-info → annofabcli-1.96.1.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=qh48jc0AerpxMn6bU6jgOxQqy6_nPvZpVTJ5jCGYCDI,132
+annofabcli/__version__.py,sha256=fRMeiNR_DG_Pyx4KmlvY_dwyMYU17Xi-HyO9fioFt3g,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
@@ -15,7 +15,7 @@ annofabcli/annotation/list_annotation_count.py,sha256=T9fbaoxWeDJIVgW_YgHRldbwrV
 annofabcli/annotation/restore_annotation.py,sha256=naUEbt48ION9JSijCBR2aQdaoCrRu005tYq0vgUtyp0,14683
 annofabcli/annotation/subcommand_annotation.py,sha256=Xu4SOHLpo_kPZbvE8hQHr9NRduPTESqu7pYC4LGDlXg,1872
 annofabcli/annotation_specs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-annofabcli/annotation_specs/export_annotation_specs.py,sha256=CGmcyP8DbfFUcWnJgJSgxYS9FkV3mW15zZPDab7LNBE,4685
+annofabcli/annotation_specs/export_annotation_specs.py,sha256=eZF5fj2P5U22_5UKgbpsUhZEUvVPMPerMpN4miIcnSA,4821
 annofabcli/annotation_specs/get_annotation_specs_with_attribute_id_replaced.py,sha256=L0H0M31Amnm3ZEg9JdQe2A1vprsCLPTpj0LUFnP6GDY,8330
 annofabcli/annotation_specs/get_annotation_specs_with_choice_id_replaced.py,sha256=mISJAgRTBMvISPk5__0w0MmhTkyQCcGPDin8K97x5Eg,6943
 annofabcli/annotation_specs/get_annotation_specs_with_label_id_replaced.py,sha256=5tlvSdUXAUn8uQ1BXNWxkR2MIKnV6AJoxveiwD21IAo,7114
@@ -75,7 +75,7 @@ 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
@@ -130,12 +130,13 @@ 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=87jjNCOXJUbWnmswMCLN7GTjGsBfqpFJ6hViWmnj8Y4,12557
 annofabcli/statistics/list_annotation_count.py,sha256=xsqXxRO21MW7Wbs96PEa8gHb3i7bxjQvoMHLB2eT-0g,50360
 annofabcli/statistics/list_annotation_duration.py,sha256=9PCg1IA_g4HoHHSfsMVb2zBMLfLJ3u9Id8Qa9L8Qhko,31923
 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
-annofabcli/statistics/subcommand_statistics.py,sha256=Exf7fpOnz8jezBEDKdTwVN7_upN0jzwDt8g0kS9H0Hw,2129
+annofabcli/statistics/subcommand_statistics.py,sha256=JPixzhJGClQYVH6Tgby3KTD85df-aEJKvLAjfJCv-1E,2259
 annofabcli/statistics/summarize_task_count.py,sha256=8OH6BBRYRjHJkWRTjU0A0OfXa7f3NIRHrxPNFlRt_hM,9707
 annofabcli/statistics/summarize_task_count_by_task_id_group.py,sha256=TSSmcFv615NLcq6uqXmg3ilYqSHl3A5qp90msVQM1gE,8646
 annofabcli/statistics/summarize_task_count_by_user.py,sha256=TRoJXpt2HOVb8QO2YtRejkOAxyK80_NsPt3Vk9es9C8,6948
@@ -166,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=QeOohZ6RnsxC9rKSPi0JJqJXmj99ZL17psulTqlEQFU,13738
 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=FwFRszjcsJt-UrT2RCRAs4zzYea03CbDoiKBUZQW0zc,19581
 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
@@ -183,7 +184,7 @@ 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
@@ -199,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.95.0.dist-info/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
-annofabcli-1.95.0.dist-info/METADATA,sha256=iAatfNNAeWskgaipQQ13ZHVSsEVHvmDTes41DtynbCQ,5626
-annofabcli-1.95.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-annofabcli-1.95.0.dist-info/entry_points.txt,sha256=A8vlN9fiMhbYRcdBfSpl7piYzAwvkMhRXIPQUAvQFUo,55
-annofabcli-1.95.0.dist-info/RECORD,,
+annofabcli-1.96.1.dist-info/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
+annofabcli-1.96.1.dist-info/METADATA,sha256=u94b-Jzx5b2TOxFlJeBqtJbcbkkBxEgCtLomabfLhP4,5626
+annofabcli-1.96.1.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+annofabcli-1.96.1.dist-info/entry_points.txt,sha256=A8vlN9fiMhbYRcdBfSpl7piYzAwvkMhRXIPQUAvQFUo,55
+annofabcli-1.96.1.dist-info/RECORD,,