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

annofabcli/__version__.py

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

annofabcli/annotation/merge_segmentation.py

@@ -0,0 +1,390 @@
+from __future__ import annotations
+
+import argparse
+import copy
+import logging
+import multiprocessing
+import sys
+import tempfile
+from collections.abc import Collection
+from pathlib import Path
+from typing import Any, Optional
+
+import annofabapi
+import numpy
+from annofabapi.pydantic_models.default_annotation_type import DefaultAnnotationType
+from annofabapi.pydantic_models.task_status import TaskStatus
+from annofabapi.segmentation import read_binary_image, write_binary_image
+from annofabapi.util.annotation_specs import AnnotationSpecsAccessor
+from annofabapi.utils import can_put_annotation
+
+import annofabcli
+from annofabcli.common.cli import (
+    COMMAND_LINE_ERROR_STATUS_CODE,
+    PARALLELISM_CHOICES,
+    ArgumentParser,
+    CommandLine,
+    CommandLineWithConfirm,
+    build_annofabapi_resource_and_login,
+)
+from annofabcli.common.facade import AnnofabApiFacade
+
+logger = logging.getLogger(__name__)
+
+
+def merge_binary_image_array(binary_image_array_list: list[numpy.ndarray]) -> numpy.ndarray:
+    """
+    塗りつぶし画像を読み込んだboolのndarrayのlistから、1個のndarrayを作成します。
+
+    Args:
+        binary_image_array_list: 塗りつぶし画像を読み込んだboolのndarrayのlist
+    """
+    if len(binary_image_array_list) == 0:
+        raise ValueError("'binary_image_array_list' must not be empty.")
+
+    merged_array = numpy.zeros_like(binary_image_array_list[0], dtype=bool)
+    for binary_image_array in binary_image_array_list:
+        merged_array = numpy.logical_or(merged_array, binary_image_array)
+    return merged_array
+
+
+class MergeSegmentationMain(CommandLineWithConfirm):
+    def __init__(
+        self,
+        annofab_service: annofabapi.Resource,
+        *,
+        project_id: str,
+        label_ids: Collection[str],
+        label_names: Collection[str],
+        all_yes: bool,
+        is_force: bool,
+    ) -> None:
+        self.annofab_service = annofab_service
+        self.project_id = project_id
+        self.is_force = is_force
+        self.label_ids = label_ids
+        self.label_names = label_names
+
+        super().__init__(all_yes)
+
+    def write_merged_segmentation_file(self, details: list[dict[str, Any]], output_dir: Path) -> tuple[list[str], list[str]]:
+        """
+        `getEditorAnnotation` APIで取得した`details`から、指定したラベルに対応する塗りつぶしアノテーションを1個にまとめて、
+        `output_dir`に出力します。
+        塗りつぶし画像のファイル名は`${annotation_id}.png`です。
+
+        Args:
+            details: `getEditorAnnotation` APIで取得した`details`
+            label_ids: 更新対象のアノテーションに対応するラベルIDのcollection
+            output_dir: 塗りつぶし画像の出力先のディレクトリ。
+
+        Returns:
+            tuple[0]: 更新対象の塗りつぶしアノテーションのannotation_idのlist（最前面のアノテーション）
+            tuple[1]: 削除対象の塗りつぶしアノテーションのannotation_idのlist
+        """
+
+        def func(label_id: str) -> tuple[Optional[str], list[str]]:
+            updated_annotation_id = None
+            deleted_annotation_id_list = []
+            binary_image_array_list = []
+            segmentation_details = [e for e in details if e["label_id"] == label_id]
+            if len(segmentation_details) <= 1:
+                return None, []
+
+            updated_annotation_id = segmentation_details[0]["annotation_id"]
+            deleted_annotation_id_list = [e["annotation_id"] for e in segmentation_details[1:]]
+            for detail in segmentation_details:
+                segmentation_response = self.annofab_service.wrapper.execute_http_get(detail["body"]["url"], stream=True)
+                segmentation_response.raw.decode_content = True
+                binary_image_array_list.append(read_binary_image(segmentation_response.raw))
+
+            merged_binary_image_array = merge_binary_image_array(binary_image_array_list)
+            output_file_path = output_dir / f"{updated_annotation_id}.png"
+            write_binary_image(merged_binary_image_array, output_file_path)
+            return updated_annotation_id, deleted_annotation_id_list
+
+        updated_annotation_id_list = []
+        deleted_annotation_id_list = []
+        for label_id in self.label_ids:
+            updated_annotation_id, sub_deleted_annotation_id_list = func(label_id)
+            if updated_annotation_id is not None:
+                updated_annotation_id_list.append(updated_annotation_id)
+
+            deleted_annotation_id_list.extend(sub_deleted_annotation_id_list)
+
+        return updated_annotation_id_list, deleted_annotation_id_list
+
+    def merge_segmentation_annotation(self, task_id: str, input_data_id: str, log_message_prefix: str = "") -> bool:
+        """
+        label_idに対応する複数の塗りつぶしアノテーションを1つにまとめます。
+
+        Args:
+            project_id: プロジェクトID
+            task_id: タスクID
+            annotation_id_list: 更新する塗りつぶし画像のannotation_idのlist
+        """
+        old_annotation, _ = self.annofab_service.api.get_editor_annotation(self.project_id, task_id, input_data_id, query_params={"v": "2"})
+        old_details = old_annotation["details"]
+        with tempfile.TemporaryDirectory() as temp_dir:
+            temp_dir_path = Path(temp_dir)
+            updated_annotation_id_list, deleted_annotation_id_list = self.write_merged_segmentation_file(old_details, temp_dir_path)
+            if len(updated_annotation_id_list) == 0:
+                assert len(deleted_annotation_id_list) == 0
+                logger.debug(
+                    f"{log_message_prefix}更新対象の塗りつぶしアノテーションはなかった"
+                    "（1個のラベルに塗りつぶしアノテーションは複数なかった）ので、スキップします。 :: "
+                    f"task_id='{task_id}', input_data_id='{input_data_id}'"
+                )
+                return False
+
+            logger.debug(
+                f"{log_message_prefix}{len(updated_annotation_id_list)} 件の塗りつぶしアノテーションを更新して、"
+                f"{len(deleted_annotation_id_list)} 件の塗りつぶしアノテーションを削除します。 :: "
+                f"task_id='{task_id}', input_data_id='{input_data_id}', "
+                f"更新対象のannotation_id_list={updated_annotation_id_list}, "
+                f"削除対象のannotation_id_list={deleted_annotation_id_list}"
+            )
+            new_details = []
+            for detail in old_details:
+                annotation_id = detail["annotation_id"]
+                if annotation_id in deleted_annotation_id_list:
+                    continue
+
+                new_detail = copy.deepcopy(detail)
+                new_detail["_type"] = "Update"
+                if annotation_id in updated_annotation_id_list:
+                    with (temp_dir_path / f"{annotation_id}.png").open("rb") as f:
+                        s3_path = self.annofab_service.wrapper.upload_data_to_s3(self.project_id, data=f, content_type="image/png")
+
+                    new_detail["body"]["path"] = s3_path
+
+                else:
+                    # 更新しない場合は、`body`をNoneにする
+                    new_detail["body"] = None
+
+                new_details.append(new_detail)
+
+        request_body = {
+            "project_id": self.project_id,
+            "task_id": task_id,
+            "input_data_id": input_data_id,
+            "details": new_details,
+            "format_version": "2.0.0",
+            "updated_datetime": old_annotation["updated_datetime"],
+        }
+        self.annofab_service.api.put_annotation(self.project_id, task_id, input_data_id, query_params={"v": "2"}, request_body=request_body)
+        logger.debug(
+            f"{log_message_prefix}{len(updated_annotation_id_list)} 件の塗りつぶしアノテーションを更新して、"
+            f"{len(deleted_annotation_id_list)} 件の塗りつぶしアノテーションを削除しました。 :: "
+            f"task_id='{task_id}', input_data_id='{input_data_id}'"
+        )
+        return True
+
+    def merge_segmentation_annotation_for_task(self, task_id: str, *, task_index: Optional[int] = None) -> int:
+        """
+        1個のタスクに対して、label_idに対応する複数の塗りつぶしアノテーションを1つにまとめます。
+
+        Returns:
+            アノテーションを更新した入力データ数（フレーム数）
+        """
+        log_message_prefix = f"{task_index + 1} 件目 :: " if task_index is not None else ""
+
+        task = self.annofab_service.wrapper.get_task_or_none(project_id=self.project_id, task_id=task_id)
+        if task is None:
+            logger.warning(f"{log_message_prefix}task_id='{task_id}'であるタスクは存在しません。")
+            return 0
+
+        if task["status"] in {TaskStatus.WORKING.value, TaskStatus.COMPLETE.value}:
+            logger.debug(
+                f"{log_message_prefix}task_id='{task_id}'のタスクの状態は「作業中」または「完了」であるため、"
+                f"アノテーションの更新をスキップします。  :: status='{task['status']}'"
+            )
+            return 0
+
+        if not self.confirm_processing(
+            f"task_id='{task_id}'の次のラベル名に対応する複数の塗りつぶしアノテーションを1つにまとめますか？ :: {self.label_names}"
+        ):
+            return 0
+
+        # 担当者割り当て変更チェック
+        changed_operator = False
+        original_operator_account_id = task["account_id"]
+        if not can_put_annotation(task, self.annofab_service.api.account_id):
+            if self.is_force:
+                logger.debug(f"{log_message_prefix}task_id='{task_id}' のタスクの担当者を自分自身に変更します。")
+                changed_operator = True
+                task = self.annofab_service.wrapper.change_task_operator(
+                    self.project_id,
+                    task_id,
+                    self.annofab_service.api.account_id,
+                    last_updated_datetime=task["updated_datetime"],
+                )
+            else:
+                logger.debug(
+                    f"{log_message_prefix}task_id='{task_id}' のタスクは、過去に誰かに割り当てられたタスクで、"
+                    f"現在の担当者が自分自身でないため、アノテーションの更新をスキップします。"
+                    f"担当者を自分自身に変更してアノテーションを更新する場合は、コマンドライン引数 '--force' を指定してください。"
+                )
+                return 0
+
+        success_input_data_count = 0
+        for input_data_id in task["input_data_id_list"]:
+            try:
+                result = self.merge_segmentation_annotation(task_id, input_data_id, log_message_prefix=log_message_prefix)
+                if result:
+                    success_input_data_count += 1
+            except Exception:
+                logger.warning(
+                    f"{log_message_prefix}task_id='{task_id}', input_data_id='{input_data_id}'のアノテーションの更新に失敗しました。", exc_info=True
+                )
+                continue
+
+        # 担当者を元に戻す
+        if changed_operator:
+            logger.debug(
+                f"{log_message_prefix}task_id='{task_id}' のタスクの担当者を、元の担当者（account_id='{original_operator_account_id}'）に変更します。"
+            )
+            self.annofab_service.wrapper.change_task_operator(
+                self.project_id,
+                task_id,
+                original_operator_account_id,
+                last_updated_datetime=task["updated_datetime"],
+            )
+
+        return success_input_data_count
+
+    def update_segmentation_annotation_for_task_wrapper(self, tpl: tuple[int, str]) -> int:
+        try:
+            task_index, task_id = tpl
+            return self.merge_segmentation_annotation_for_task(task_id, task_index=task_index)
+        except Exception:
+            logger.warning(f"task_id='{task_id}' のアノテーションの更新に失敗しました。", exc_info=True)
+            return 0
+
+    def main(
+        self,
+        task_ids: Collection[str],
+        parallelism: Optional[int] = None,
+    ) -> None:
+        logger.info(f"{len(task_ids)} 件のタスクに対して、複数の塗りつぶしアノテーションを1個にまとめます。")
+        success_input_data_count = 0
+        if parallelism is not None:
+            with multiprocessing.Pool(parallelism) as pool:
+                result_count_list = pool.map(self.update_segmentation_annotation_for_task_wrapper, enumerate(task_ids))
+                success_input_data_count = sum(result_count_list)
+
+        else:
+            for task_index, task_id in enumerate(task_ids):
+                try:
+                    result = self.merge_segmentation_annotation_for_task(task_id, task_index=task_index)
+                    success_input_data_count += result
+                except Exception:
+                    logger.warning(f"task_id='{task_id}' のアノテーションの更新に失敗しました。", exc_info=True)
+                    continue
+
+        logger.info(f"{len(task_ids)} 件のタスクに含まれる入力データ {success_input_data_count} 件の塗りつぶしアノテーションを更新しました。")
+
+
+class MergeSegmentation(CommandLine):
+    COMMON_MESSAGE = "annofabcli annotation merge_segmentation: error:"
+
+    def validate(self, args: argparse.Namespace) -> bool:
+        if args.parallelism is not None and not args.yes:
+            print(  # noqa: T201
+                f"{self.COMMON_MESSAGE} argument --parallelism: '--parallelism'を指定するときは、'--yes' を指定してください。",
+                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 = args.project_id
+        task_id_list = annofabcli.common.cli.get_list_from_args(args.task_id)
+        label_name_list = annofabcli.common.cli.get_list_from_args(args.label_name)
+
+        annotation_specs, _ = self.service.api.get_annotation_specs(project_id, query_params={"v": "3"})
+        accessor = AnnotationSpecsAccessor(annotation_specs)
+        label_id_list = []
+        invalid_label_name_list = []
+        for label_name in label_name_list:
+            try:
+                label = accessor.get_label(label_name=label_name)
+                if label["annotation_type"] not in {DefaultAnnotationType.SEGMENTATION.value, DefaultAnnotationType.SEGMENTATION_V2.value}:
+                    invalid_label_name_list.append(label_name)
+
+            except ValueError:
+                invalid_label_name_list.append(label_name)
+                continue
+
+            label_id_list.append(label["label_id"])
+
+        if len(invalid_label_name_list) > 0:
+            print(  # noqa: T201
+                f"{self.COMMON_MESSAGE} --label_name: 次のラベル名(英語)はアノテーション仕様に存在しないか、"
+                f"アノテーションの種類が「塗りつぶし」ではありません。 :: {invalid_label_name_list}",
+                file=sys.stderr,
+            )
+            sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
+
+        main_obj = MergeSegmentationMain(
+            self.service,
+            project_id=project_id,
+            label_ids=label_id_list,
+            label_names=label_name_list,
+            all_yes=self.all_yes,
+            is_force=args.force,
+        )
+
+        main_obj.main(task_id_list, parallelism=args.parallelism)
+
+
+def main(args: argparse.Namespace) -> None:
+    service = build_annofabapi_resource_and_login(args)
+    facade = AnnofabApiFacade(service)
+    MergeSegmentation(service, facade, args).main()
+
+
+def parse_args(parser: argparse.ArgumentParser) -> None:
+    argument_parser = ArgumentParser(parser)
+    argument_parser.add_project_id()
+    argument_parser.add_task_id()
+
+    parser.add_argument(
+        "--label_name",
+        type=str,
+        nargs="+",
+        required=True,
+        help="変更対象のアノテーションのラベル名(英語)を指定します。",
+    )
+
+    parser.add_argument(
+        "--force",
+        action="store_true",
+        help="過去に担当者を割り当てられていて、かつ現在の担当者が自分自身でない場合、タスクの担当者を一時的に自分自身に変更してからアノテーションをコピーします。",
+    )
+
+    parser.add_argument(
+        "--parallelism",
+        type=int,
+        choices=PARALLELISM_CHOICES,
+        help="並列度。指定しない場合は、逐次的に処理します。指定した場合は、``--yes`` も指定してください。",
+    )
+
+    parser.set_defaults(subcommand_func=main)
+
+
+def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+    subcommand_name = "merge_segmentation"
+    subcommand_help = "複数の塗りつぶしアノテーションを1つにまとめます。"
+    description = (
+        "複数の塗りつぶしアノテーションを1つにまとめます。"
+        "ラベルの種類を「塗りつぶし（インスタンスセグメンテーション）」から「塗りつぶしv2（セマンティックセグメンテーション）」に変更する場合などに有用です。"
+    )
+    parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help, description)
+    parse_args(parser)
+    return parser

annofabcli/annotation/remove_segmentation_overlap.py

@@ -0,0 +1,343 @@
+from __future__ import annotations
+
+import argparse
+import copy
+import logging
+import multiprocessing
+import sys
+import tempfile
+from collections.abc import Collection
+from pathlib import Path
+from typing import Any, Optional
+
+import annofabapi
+import numpy
+from annofabapi.pydantic_models.task_status import TaskStatus
+from annofabapi.segmentation import read_binary_image, write_binary_image
+from annofabapi.utils import can_put_annotation
+
+import annofabcli
+from annofabcli.common.cli import (
+    COMMAND_LINE_ERROR_STATUS_CODE,
+    PARALLELISM_CHOICES,
+    ArgumentParser,
+    CommandLine,
+    CommandLineWithConfirm,
+    build_annofabapi_resource_and_login,
+)
+from annofabcli.common.facade import AnnofabApiFacade
+
+logger = logging.getLogger(__name__)
+
+
+def remove_overlap_of_binary_image_array(
+    binary_image_array_by_annotation: dict[str, numpy.ndarray], annotation_id_list: list[str]
+) -> dict[str, numpy.ndarray]:
+    """
+    塗りつぶし画像の重なりを除去したbool配列をdictで返します。
+
+    Args:
+        binary_image_array_by_annotation: annotation_idをkeyとし、塗りつぶし画像のbool配列をvalueとするdict
+        annotation_id_list: 塗りつぶし画像のannotation_idのlist。背面から前面の順に格納されている
+
+    Returns:
+        重なりを除去した塗りつぶし画像のbool配列が格納されているdict。keyはannotation_id
+
+    """
+    assert set(binary_image_array_by_annotation.keys()) == set(annotation_id_list)
+
+    whole_2d_array = None  # 複数の塗りつぶしアノテーションを1枚に重ね合わせた状態。各要素はannotation_id
+
+    # 背面から塗りつぶしアノテーションのbool配列を重ねていく
+    for annotation_id in annotation_id_list:
+        input_binary_image_array = binary_image_array_by_annotation[annotation_id]
+        if whole_2d_array is None:
+            whole_2d_array = numpy.full(input_binary_image_array.shape, "", dtype=str)
+
+        whole_2d_array = numpy.where(input_binary_image_array, annotation_id, whole_2d_array)
+
+    output_binary_image_array_by_annotation = {}
+    for annotation_id in annotation_id_list:
+        output_binary_image_array: numpy.ndarray = whole_2d_array == annotation_id  # type: ignore[assignment]
+        output_binary_image_array_by_annotation[annotation_id] = output_binary_image_array
+
+    return output_binary_image_array_by_annotation
+
+
+class RemoveSegmentationOverlapMain(CommandLineWithConfirm):
+    def __init__(self, annofab_service: annofabapi.Resource, *, project_id: str, all_yes: bool, is_force: bool) -> None:
+        self.annofab_service = annofab_service
+        self.project_id = project_id
+        self.is_force = is_force
+        super().__init__(all_yes)
+
+    def remove_segmentation_overlap_and_save(self, details: list[dict[str, Any]], output_dir: Path) -> list[str]:
+        """
+        `getEditorAnnotation` APIで取得した`details`から、塗りつぶし画像の重なりの除去が必要な場合に、
+        重なりを除去した塗りつぶし画像を`output_dir`に出力します。
+        塗りつぶし画像のファイル名は`${annotation_id}.png`です。
+
+        Args:
+            details: `getEditorAnnotation` APIで取得した`details`
+            output_dir: 塗りつぶし画像の出力先のディレクトリ。
+
+        Returns:
+            重なりの除去が必要な塗りつぶし画像のannotation_idのlist
+        """
+        input_binary_image_array_by_annotation = {}
+        segmentation_annotation_id_list = []
+
+        for detail in details:
+            if detail["body"]["_type"] != "Outer":
+                continue
+
+            segmentation_response = self.annofab_service.wrapper.execute_http_get(detail["body"]["url"], stream=True)
+            segmentation_response.raw.decode_content = True
+            input_binary_image_array_by_annotation[detail["annotation_id"]] = read_binary_image(segmentation_response.raw)
+            segmentation_annotation_id_list.append(detail["annotation_id"])
+
+        # reversedを使っている理由:
+        # `details`には、前面から背面の順にアノテーションが格納されているため、
+        output_binary_image_array_by_annotation = remove_overlap_of_binary_image_array(
+            input_binary_image_array_by_annotation, list(reversed(segmentation_annotation_id_list))
+        )
+
+        updated_annotation_id_list = []
+        for annotation_id, output_binary_image_array in output_binary_image_array_by_annotation.items():
+            input_binary_image_array = input_binary_image_array_by_annotation[annotation_id]
+            if not numpy.array_equal(input_binary_image_array, output_binary_image_array):
+                output_file_path = output_dir / f"{annotation_id}.png"
+                write_binary_image(output_binary_image_array, output_file_path)
+                updated_annotation_id_list.append(annotation_id)
+
+        return updated_annotation_id_list
+
+    def update_segmentation_annotation(self, task_id: str, input_data_id: str, log_message_prefix: str = "") -> bool:
+        """
+        塗りつぶしアノテーションの重なりがあれば、`putAnnotation` APIを使用して重なりを除去します。
+
+        Args:
+            project_id: プロジェクトID
+            task_id: タスクID
+            annotation_id_list: 更新する塗りつぶし画像のannotation_idのlist
+        """
+        old_annotation, _ = self.annofab_service.api.get_editor_annotation(self.project_id, task_id, input_data_id, query_params={"v": "2"})
+        old_details = old_annotation["details"]
+        with tempfile.TemporaryDirectory() as temp_dir:
+            temp_dir_path = Path(temp_dir)
+            updated_annotation_id_list = self.remove_segmentation_overlap_and_save(old_details, temp_dir_path)
+            if len(updated_annotation_id_list) == 0:
+                logger.debug(
+                    f"{log_message_prefix}塗りつぶしアノテーションの重なりはなかったので、スキップします。 :: "
+                    f"task_id='{task_id}', input_data_id='{input_data_id}'"
+                )
+                return False
+
+            logger.debug(
+                f"{log_message_prefix}{len(updated_annotation_id_list)} 件の塗りつぶしアノテーションを更新します。 :: "
+                f"task_id='{task_id}', input_data_id='{input_data_id}', annotation_id_list={updated_annotation_id_list}"
+            )
+            new_details = []
+            for detail in old_details:
+                annotation_id = detail["annotation_id"]
+                new_detail = copy.deepcopy(detail)
+                new_detail["_type"] = "Update"
+                if annotation_id in updated_annotation_id_list:
+                    with (temp_dir_path / f"{annotation_id}.png").open("rb") as f:
+                        s3_path = self.annofab_service.wrapper.upload_data_to_s3(self.project_id, data=f, content_type="image/png")
+
+                    new_detail["body"]["path"] = s3_path
+
+                else:
+                    # 更新しない場合は、`body`をNoneにする
+                    new_detail["body"] = None
+
+                new_details.append(new_detail)
+
+        request_body = {
+            "project_id": self.project_id,
+            "task_id": task_id,
+            "input_data_id": input_data_id,
+            "details": new_details,
+            "format_version": "2.0.0",
+            "updated_datetime": old_annotation["updated_datetime"],
+        }
+        self.annofab_service.api.put_annotation(self.project_id, task_id, input_data_id, query_params={"v": "2"}, request_body=request_body)
+        logger.debug(
+            f"{log_message_prefix}{len(updated_annotation_id_list)} 件の塗りつぶしアノテーションを更新しました。 :: "
+            f"task_id='{task_id}', input_data_id='{input_data_id}'"
+        )
+        return True
+
+    def update_segmentation_annotation_for_task(self, task_id: str, *, task_index: Optional[int] = None) -> int:
+        """
+        1個のタスクに対して、塗りつぶしアノテーションの重なりを除去します。
+
+        Returns:
+            アノテーションを更新した入力データ数（フレーム数）
+        """
+        log_message_prefix = f"{task_index + 1} 件目 :: " if task_index is not None else ""
+
+        task = self.annofab_service.wrapper.get_task_or_none(project_id=self.project_id, task_id=task_id)
+        if task is None:
+            logger.warning(f"{log_message_prefix}task_id='{task_id}'であるタスクは存在しません。")
+            return 0
+
+        if task["status"] in {TaskStatus.WORKING.value, TaskStatus.COMPLETE.value}:
+            logger.debug(
+                f"{log_message_prefix}task_id='{task_id}'のタスクの状態は「作業中」または「完了」であるため、"
+                f"アノテーションの更新をスキップします。  :: status='{task['status']}'"
+            )
+            return 0
+
+        if not self.confirm_processing(f"task_id='{task_id}'の塗りつぶしアノテーションの重なりを除去しますか？"):
+            return 0
+
+        # 担当者割り当て変更チェック
+        changed_operator = False
+        original_operator_account_id = task["account_id"]
+        if not can_put_annotation(task, self.annofab_service.api.account_id):
+            if self.is_force:
+                logger.debug(f"{log_message_prefix}task_id='{task_id}' のタスクの担当者を自分自身に変更します。")
+                changed_operator = True
+                task = self.annofab_service.wrapper.change_task_operator(
+                    self.project_id,
+                    task_id,
+                    self.annofab_service.api.account_id,
+                    last_updated_datetime=task["updated_datetime"],
+                )
+            else:
+                logger.debug(
+                    f"{log_message_prefix}task_id='{task_id}' のタスクは、過去に誰かに割り当てられたタスクで、"
+                    f"現在の担当者が自分自身でないため、アノテーションの更新をスキップします。"
+                    f"担当者を自分自身に変更してアノテーションを更新する場合は、コマンドライン引数 '--force' を指定してください。"
+                )
+                return 0
+
+        success_input_data_count = 0
+        for input_data_id in task["input_data_id_list"]:
+            try:
+                result = self.update_segmentation_annotation(task_id, input_data_id, log_message_prefix=log_message_prefix)
+                if result:
+                    success_input_data_count += 1
+            except Exception:
+                logger.warning(
+                    f"{log_message_prefix}task_id='{task_id}', input_data_id='{input_data_id}'のアノテーションの更新に失敗しました。", exc_info=True
+                )
+                continue
+
+        # 担当者を元に戻す
+        if changed_operator:
+            logger.debug(
+                f"{log_message_prefix}task_id='{task_id}' のタスクの担当者を、元の担当者（account_id='{original_operator_account_id}'）に変更します。"
+            )
+            self.annofab_service.wrapper.change_task_operator(
+                self.project_id,
+                task_id,
+                original_operator_account_id,
+                last_updated_datetime=task["updated_datetime"],
+            )
+
+        return success_input_data_count
+
+    def update_segmentation_annotation_for_task_wrapper(self, tpl: tuple[int, str]) -> int:
+        try:
+            task_index, task_id = tpl
+            return self.update_segmentation_annotation_for_task(task_id, task_index=task_index)
+        except Exception:
+            logger.warning(f"task_id='{task_id}' のアノテーションの更新に失敗しました。", exc_info=True)
+            return 0
+
+    def main(
+        self,
+        task_ids: Collection[str],
+        parallelism: Optional[int] = None,
+    ) -> None:
+        logger.info(f"{len(task_ids)} 件のタスクの塗りつぶしアノテーションの重なりを除去します。")
+        success_input_data_count = 0
+        if parallelism is not None:
+            with multiprocessing.Pool(parallelism) as pool:
+                result_count_list = pool.map(self.update_segmentation_annotation_for_task_wrapper, enumerate(task_ids))
+                success_input_data_count = sum(result_count_list)
+
+        else:
+            for task_index, task_id in enumerate(task_ids):
+                try:
+                    result = self.update_segmentation_annotation_for_task(task_id, task_index=task_index)
+                    success_input_data_count += result
+                except Exception:
+                    logger.warning(f"task_id='{task_id}' のアノテーションの更新に失敗しました。", exc_info=True)
+                    continue
+
+        logger.info(f"{len(task_ids)} 件のタスクに含まれる入力データ {success_input_data_count} 件の塗りつぶしアノテーションを更新しました。")
+
+
+class RemoveSegmentationOverlap(CommandLine):
+    COMMON_MESSAGE = "annofabcli annotation remove_segmentation_overlap: error:"
+
+    def validate(self, args: argparse.Namespace) -> bool:
+        if args.parallelism is not None and not args.yes:
+            print(  # noqa: T201
+                f"{self.COMMON_MESSAGE} argument --parallelism: '--parallelism'を指定するときは、'--yes' を指定してください。",
+                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 = args.project_id
+        task_id_list = annofabcli.common.cli.get_list_from_args(args.task_id)
+
+        main_obj = RemoveSegmentationOverlapMain(
+            self.service,
+            project_id=project_id,
+            all_yes=self.all_yes,
+            is_force=args.force,
+        )
+
+        main_obj.main(task_id_list, parallelism=args.parallelism)
+
+
+def main(args: argparse.Namespace) -> None:
+    service = build_annofabapi_resource_and_login(args)
+    facade = AnnofabApiFacade(service)
+    RemoveSegmentationOverlap(service, facade, args).main()
+
+
+def parse_args(parser: argparse.ArgumentParser) -> None:
+    argument_parser = ArgumentParser(parser)
+    argument_parser.add_project_id()
+    argument_parser.add_task_id()
+
+    parser.add_argument(
+        "--force",
+        action="store_true",
+        help="過去に担当者を割り当てられていて、かつ現在の担当者が自分自身でない場合、タスクの担当者を一時的に自分自身に変更してからアノテーションをコピーします。",
+    )
+
+    parser.add_argument(
+        "--parallelism",
+        type=int,
+        choices=PARALLELISM_CHOICES,
+        help="並列度。指定しない場合は、逐次的に処理します。指定した場合は、``--yes`` も指定してください。",
+    )
+
+    parser.set_defaults(subcommand_func=main)
+
+
+def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+    subcommand_name = "remove_segmentation_overlap"
+    subcommand_help = "塗りつぶしアノテーションの重なりを除去します。"
+    description = (
+        "塗りつぶしアノテーションの重なりを除去します。"
+        "Annofabでインスタンスセグメンテーションは重ねることができてしまいます。"
+        "この重なりをなくしたいときに有用です。"
+    )
+    parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help, description)
+    parse_args(parser)
+    return parser

annofabcli/annotation/subcommand_annotation.py

@@ -10,6 +10,8 @@ import annofabcli.annotation.dump_annotation
 import annofabcli.annotation.import_annotation
 import annofabcli.annotation.list_annotation
 import annofabcli.annotation.list_annotation_count
+import annofabcli.annotation.merge_segmentation
+import annofabcli.annotation.remove_segmentation_overlap
 import annofabcli.annotation.restore_annotation
 import annofabcli.common.cli
 
@@ -27,6 +29,8 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.annotation.import_annotation.add_parser(subparsers)
     annofabcli.annotation.list_annotation.add_parser(subparsers)
     annofabcli.annotation.list_annotation_count.add_parser(subparsers)
+    annofabcli.annotation.merge_segmentation.add_parser(subparsers)
+    annofabcli.annotation.remove_segmentation_overlap.add_parser(subparsers)
     annofabcli.annotation.restore_annotation.add_parser(subparsers)
 
 

annofabcli/statistics/visualization/dataframe/task.py

@@ -55,14 +55,14 @@ class Task:
         Returns:
             必須の列が存在するかどうか
         """
-        return len(set(self.columns) - set(df.columns)) == 0
+        return len(set(self.required_columns) - set(df.columns)) == 0
 
-    def missing_columns(self, df: pandas.DataFrame) -> list[str]:
+    def missing_required_columns(self, df: pandas.DataFrame) -> list[str]:
         """
-        欠損している列名を取得します。
+        欠損している必須の列名を取得します。
 
         """
-        return list(set(self.columns) - set(df.columns))
+        return list(set(self.required_columns) - set(df.columns))
 
     def __init__(self, df: pandas.DataFrame, *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> None:
         self.custom_production_volume_list = custom_production_volume_list if custom_production_volume_list is not None else []
@@ -72,7 +72,8 @@ class Task:
 
         if not self.required_columns_exist(df):
             raise ValueError(
-                f"引数'df'の'columns'に次の列が存在していません。 {self.missing_columns(df)} :: 次の列が必須です。{self.columns}の列が必要です。"
+                f"引数'df'の'columns'に次の列が存在していません。 {self.missing_required_columns(df)} :: "
+                f"次の列が必須です。{self.required_columns} の列が必要です。"
             )
 
         self.df = df
@@ -97,7 +98,19 @@ class Task:
         return Task(df, custom_production_volume_list=self.custom_production_volume_list)
 
     @property
-    def columns(self) -> list[str]:
+    def optional_columns(self) -> list[str]:
+        return [
+            # 抜取検査または抜取受入によりスキップされたか
+            "inspection_is_skipped",
+            "acceptance_is_skipped",
+            # 差し戻し後の作業時間
+            "post_rejection_annotation_worktime_hour",
+            "post_rejection_inspection_worktime_hour",
+            "post_rejection_acceptance_worktime_hour",
+        ]
+
+    @property
+    def required_columns(self) -> list[str]:
         return [
             # 基本的な情報
             "project_id",
@@ -144,6 +157,10 @@ class Task:
             "acceptance_is_skipped",
         ]
 
+    @property
+    def columns(self) -> list[str]:
+        return self.required_columns + self.optional_columns
+
     @classmethod
     def from_api_content(
         cls,
@@ -502,7 +519,9 @@ class Task:
         if not self._validate_df_for_output(output_file):
             return
 
-        print_csv(self.df[self.columns], str(output_file))
+        existing_optional_columns = [col for col in self.optional_columns if col in set(self.df.columns)]
+        columns = self.required_columns + existing_optional_columns
+        print_csv(self.df[columns], str(output_file))
 
     def mask_user_info(
         self,

annofabcli/task/list_tasks_added_task_history.py

@@ -9,19 +9,90 @@ import annofabapi
 import more_itertools
 import pandas
 from annofabapi.models import Task, TaskHistory, TaskPhase, TaskStatus
+from annofabapi.util.task_history import find_rejected_task_history_indices
 from annofabapi.utils import get_task_history_index_skipped_acceptance, get_task_history_index_skipped_inspection
 
 import annofabcli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.enums import FormatArgument
 from annofabcli.common.facade import AnnofabApiFacade
-from annofabcli.common.utils import print_csv, print_json
+from annofabcli.common.utils import isoduration_to_hour, print_csv, print_json
 from annofabcli.common.visualize import AddProps
 from annofabcli.task.list_tasks import ListTasksMain
 
 logger = logging.getLogger(__name__)
 
 
+def get_post_rejection_annotation_worktime_hour(task_histories: list[TaskHistory]) -> float:
+    """
+    検査/受入フェーズでの差し戻し後の教師付作業時間を算出します。
+    指摘による修正にかかった時間を把握するのに利用できます。
+
+    Args:
+        task_histories: タスク履歴
+
+    """
+    rejected_task_history_indices = find_rejected_task_history_indices(task_histories)
+    if len(rejected_task_history_indices) == 0:
+        return 0.0
+
+    # 差し戻された履歴の直後で、教師付フェーズの作業時間を算出する
+    min_rejected_task_history_index = min(rejected_task_history_indices)
+    return sum(
+        isoduration_to_hour(history["accumulated_labor_time_milliseconds"])
+        for history in task_histories[min_rejected_task_history_index + 1 :]
+        if history["phase"] == TaskPhase.ANNOTATION.value
+    )
+
+
+def get_post_rejection_inspection_worktime_hour(task_histories: list[TaskHistory]) -> float:
+    """
+    検査/受入フェーズでの差し戻し後の検査作業時間を算出します。
+
+    Args:
+        task_histories: タスク履歴
+
+    """
+    rejected_task_history_indices = find_rejected_task_history_indices(task_histories)
+    if len(rejected_task_history_indices) == 0:
+        return 0.0
+
+    # 差し戻された履歴の直後で、検査フェーズの作業時間を算出する
+    min_rejected_task_history_index = min(rejected_task_history_indices)
+    return sum(
+        isoduration_to_hour(history["accumulated_labor_time_milliseconds"])
+        for history in task_histories[min_rejected_task_history_index + 1 :]
+        if history["phase"] == TaskPhase.INSPECTION.value
+    )
+
+
+def get_post_rejection_acceptance_worktime_hour(task_histories: list[TaskHistory]) -> float:
+    """
+    受入フェーズでの差し戻し後の受入作業時間を算出します。
+
+
+    Args:
+        task_histories: タスク履歴
+
+    """
+    rejected_task_history_indices = find_rejected_task_history_indices(task_histories)
+
+    # 検査フェーズでの差し戻しは除外する
+    # 検査フェーズでの差し戻しは、受入作業の回数に影響しないため
+    acceptance_rejected_indices = [index for index in rejected_task_history_indices if task_histories[index]["phase"] == TaskPhase.ACCEPTANCE.value]
+    if len(acceptance_rejected_indices) == 0:
+        return 0.0
+
+    min_rejected_acceptance_task_history_index = min(acceptance_rejected_indices)
+
+    # 差し戻された履歴の直後以降で、受入フェーズの作業時間を算出する
+    return sum(
+        isoduration_to_hour(history["accumulated_labor_time_milliseconds"])
+        for history in task_histories[min_rejected_acceptance_task_history_index + 1 :]
+        if history["phase"] == TaskPhase.ACCEPTANCE.value
+    )
+
+
 class AddingAdditionalInfoToTask:
     """タスクに付加的な情報を追加するためのクラス
 
@@ -210,12 +281,12 @@ class AddingAdditionalInfoToTask:
             }
         )
 
-        organization_member = self.visualize.get_project_member_from_account_id(account_id)
-        if organization_member is not None:
+        member = self.visualize.get_project_member_from_account_id(account_id)
+        if member is not None:
             task.update(
                 {
-                    f"{column_prefix}_user_id": organization_member["user_id"],
-                    f"{column_prefix}_username": organization_member["username"],
+                    f"{column_prefix}_user_id": member["user_id"],
+                    f"{column_prefix}_username": member["username"],
                 }
             )
         else:
@@ -243,7 +314,7 @@ class AddingAdditionalInfoToTask:
 
         return task
 
-    def add_additional_info_to_task(self, task: dict[str, Any]):  # noqa: ANN201
+    def add_additional_info_to_task(self, task: dict[str, Any]) -> None:
         """タスクの付加的情報を、タスクに追加する。
         以下の列を追加する。
         * user_id
@@ -298,6 +369,10 @@ class AddingAdditionalInfoToTask:
         task["inspection_is_skipped"] = self.is_inspection_phase_skipped(task_histories)
         task["acceptance_is_skipped"] = self.is_acceptance_phase_skipped(task_histories)
 
+        task["post_rejection_annotation_worktime_hour"] = get_post_rejection_annotation_worktime_hour(task_histories)
+        task["post_rejection_inspection_worktime_hour"] = get_post_rejection_inspection_worktime_hour(task_histories)
+        task["post_rejection_acceptance_worktime_hour"] = get_post_rejection_acceptance_worktime_hour(task_histories)
+
 
 class ListTasksAddedTaskHistoryMain:
     def __init__(self, service: annofabapi.Resource, project_id: str) -> None:
@@ -373,9 +448,17 @@ class TasksAddedTaskHistoryOutput:
             for info in ["user_id", "username", "started_datetime", "worktime_hour"]
         ]
 
-        return base_columns + task_history_columns
+        return (
+            base_columns
+            + task_history_columns
+            + [
+                "post_rejection_annotation_worktime_hour",
+                "post_rejection_inspection_worktime_hour",
+                "post_rejection_acceptance_worktime_hour",
+            ]
+        )
 
-    def output(self, output_path: Path, output_format: FormatArgument):  # noqa: ANN201
+    def output(self, output_path: Path, output_format: FormatArgument) -> None:
         task_list = self.task_list
         if len(task_list) == 0:
             logger.info("タスク一覧の件数が0件のため、出力しません。")

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

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

{annofabcli-1.97.0.dist-info → annofabcli-1.98.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=dqx_NARSo9UcLPvxc6zJBGKIFxXd0yc57SlNZJUxSbg,132
+annofabcli/__version__.py,sha256=dHLiPS6l0hIriGlUklNuZkVcdn7vcXe4J9YqcWD68UA,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
@@ -12,8 +12,10 @@ annofabcli/annotation/dump_annotation.py,sha256=YIl9eP6cfvMcE13CLooZO7siHzotc67b
 annofabcli/annotation/import_annotation.py,sha256=BlGAcXF9T19Ea1wtplUMPrOfiWYLBajK2XizOctdUtA,29304
 annofabcli/annotation/list_annotation.py,sha256=B8ZFI7SRQPy-TgbpaX-tzXhveViY17YuCPE9BuK9mrs,10790
 annofabcli/annotation/list_annotation_count.py,sha256=T9fbaoxWeDJIVgW_YgHRldbwrVZWiE-57lfJrDQrj80,6474
+annofabcli/annotation/merge_segmentation.py,sha256=ldEQlcyCrog0KFYn92sTkScZQ7gmTjlujuCsKBemjhU,17950
+annofabcli/annotation/remove_segmentation_overlap.py,sha256=gONYqaI0PMEGYJduB4JsmGBn3LCY9JtLSFgosWYyc3M,15957
 annofabcli/annotation/restore_annotation.py,sha256=naUEbt48ION9JSijCBR2aQdaoCrRu005tYq0vgUtyp0,14683
-annofabcli/annotation/subcommand_annotation.py,sha256=Xu4SOHLpo_kPZbvE8hQHr9NRduPTESqu7pYC4LGDlXg,1872
+annofabcli/annotation/subcommand_annotation.py,sha256=ku9mzb7zZilHcjf1MFV1E7EJ8OvfSUDHpcunM38teto,2122
 annofabcli/annotation_specs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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
@@ -150,7 +152,7 @@ annofabcli/statistics/visualization/dataframe/input_data_count.py,sha256=wDRFtoI
 annofabcli/statistics/visualization/dataframe/inspection_comment_count.py,sha256=RxpQzRy4U2hKEpgbksUXotcxH2sKz__NO20mxpMqK1w,4382
 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.py,sha256=Heb0sx7T6KI422aFVKQUCP2wqD_czpM4KMsgqb4wjVw,24269
 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
@@ -184,7 +186,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=7avkLYFErcdSNxGc8CQXr4FFIF1z9FtQJBSloD-tzBI,19675
+annofabcli/task/list_tasks_added_task_history.py,sha256=IferAd2Q-fHvXMkuzGvEOzYlpokbykm-TkvUcAlMpGY,23151
 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
@@ -200,8 +202,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.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,,
+annofabcli-1.98.0.dist-info/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
+annofabcli-1.98.0.dist-info/METADATA,sha256=QOFLl_jHIBCsV06Dj8l_UQ-ZnJ5RiVxSCuaOjHNHQFk,5630
+annofabcli-1.98.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+annofabcli-1.98.0.dist-info/entry_points.txt,sha256=A8vlN9fiMhbYRcdBfSpl7piYzAwvkMhRXIPQUAvQFUo,55
+annofabcli-1.98.0.dist-info/RECORD,,