annofabcli 1.100.4__py3-none-any.whl → 1.101.0__py3-none-any.whl

annofabcli/annotation/restore_annotation.py

@@ -70,7 +70,7 @@ class RestoreAnnotationMain(CommandLineWithConfirm):
                     s3_path = self.service.wrapper.upload_data_to_s3(self.project_id, f, content_type="image/png")
                     detail.path = s3_path
             else:
-                logger.warning(f"annotation_id={detail.annotation_id}: data_holding_typeが'outer'なのにpathがNoneです。")
+                logger.warning(f"annotation_id='{detail.annotation_id}' :: data_holding_typeが'outer'なのにpathがNoneです。")
 
         return detail
 
@@ -100,7 +100,7 @@ class RestoreAnnotationMain(CommandLineWithConfirm):
 
         old_annotation, _ = self.service.api.get_editor_annotation(self.project_id, task_id, input_data_id)
 
-        logger.info(f"task_id={task_id}, input_data_id={input_data_id} : アノテーションをリストアします。")
+        logger.info(f"task_id='{task_id}', input_data_id='{input_data_id}' :: アノテーションをリストアします。")
         request_body = self.parser_to_request_body(parser)
 
         updated_datetime = old_annotation["updated_datetime"] if old_annotation is not None else None
@@ -118,7 +118,7 @@ class RestoreAnnotationMain(CommandLineWithConfirm):
                     success_count += 1
             except Exception:  # pylint: disable=broad-except
                 logger.warning(
-                    f"task_id={parser.task_id}, input_data_id={parser.input_data_id} のアノテーションのリストアに失敗しました。",
+                    f"task_id='{parser.task_id}', input_data_id='{parser.input_data_id}' のアノテーションのリストアに失敗しました。",
                     exc_info=True,
                 )
 
@@ -139,10 +139,10 @@ class RestoreAnnotationMain(CommandLineWithConfirm):
         """
         logger_prefix = f"{task_index + 1!s} 件目: " if task_index is not None else ""
         task_id = task_parser.task_id
-        if not self.confirm_processing(f"task_id={task_id} のアノテーションをリストアしますか？"):
+        if not self.confirm_processing(f"task_id='{task_id}' のアノテーションをリストアしますか？"):
             return False
 
-        logger.info(f"{logger_prefix}task_id={task_id} に対して処理します。")
+        logger.info(f"{logger_prefix}task_id='{task_id}' に対して処理します。")
 
         task = self.service.wrapper.get_task_or_none(self.project_id, task_id)
         if task is None:
@@ -197,7 +197,7 @@ class RestoreAnnotationMain(CommandLineWithConfirm):
         try:
             return self.execute_task(task_parser, task_index=task_index)
         except Exception:  # pylint: disable=broad-except
-            logger.warning(f"task_id={task_parser.task_id} のアノテーションのリストアに失敗しました。", exc_info=True)
+            logger.warning(f"task_id='{task_parser.task_id}' のアノテーションのリストアに失敗しました。", exc_info=True)
             return False
 
     def main(  # noqa: ANN201
@@ -246,7 +246,7 @@ class RestoreAnnotationMain(CommandLineWithConfirm):
                     if result:
                         success_count += 1
                 except Exception:
-                    logger.warning(f"task_id={task_parser.task_id} のアノテーションのリストアに失敗しました。", exc_info=True)
+                    logger.warning(f"task_id='{task_parser.task_id}' :: アノテーションのリストアに失敗しました。", exc_info=True)
                     continue
                 finally:
                     task_count += 1

annofabcli/annotation_specs/list_annotation_specs_attribute.py

@@ -162,7 +162,7 @@ class PrintAnnotationSpecsAttribute(CommandLine):
             return None
         history = histories[-(before + 1)]
         logger.info(
-            f"{history['updated_datetime']}のアノテーション仕様を出力します。history_id={history['history_id']}, comment={history['comment']}"
+            f"{history['updated_datetime']}のアノテーション仕様を出力します。 :: history_id='{history['history_id']}', comment='{history['comment']}'"
         )
         return history["history_id"]
 

annofabcli/annotation_specs/list_annotation_specs_choice.py

@@ -134,7 +134,7 @@ class PrintAnnotationSpecsAttribute(CommandLine):
             return None
         history = histories[-(before + 1)]
         logger.info(
-            f"{history['updated_datetime']}のアノテーション仕様を出力します。history_id={history['history_id']}, comment={history['comment']}"
+            f"{history['updated_datetime']}のアノテーション仕様を出力します。 :: history_id='{history['history_id']}', comment='{history['comment']}'"
         )
         return history["history_id"]
 

annofabcli/annotation_specs/list_annotation_specs_label.py

@@ -120,7 +120,7 @@ class PrintAnnotationSpecsLabel(CommandLine):
             return None
         history = histories[-(before + 1)]
         logger.info(
-            f"{history['updated_datetime']}のアノテーション仕様を出力します。history_id={history['history_id']}, comment={history['comment']}"
+            f"{history['updated_datetime']}のアノテーション仕様を出力します。 :: history_id='{history['history_id']}', comment='{history['comment']}'"
         )
         return history["history_id"]
 

annofabcli/annotation_specs/list_annotation_specs_label_attribute.py

@@ -122,7 +122,7 @@ class PrintAnnotationSpecsLabelAndAttribute(CommandLine):
             return None
         history = histories[-(before + 1)]
         logger.info(
-            f"{history['updated_datetime']}のアノテーション仕様を出力します。history_id={history['history_id']}, comment={history['comment']}"
+            f"{history['updated_datetime']}のアノテーション仕様を出力します。 :: history_id='{history['history_id']}', comment='{history['comment']}'"
         )
         return history["history_id"]
 

annofabcli/comment/delete_comment.py

@@ -61,7 +61,7 @@ class DeleteCommentMain(CommandLineWithConfirm):
         for comment_id in comment_ids:
             if comment_id not in old_comment_ids:
                 logger.warning(
-                    f"task_id={task['task_id']}, input_data_id={input_data_id}: comment_id='{comment_id}'のコメントは存在しません。",
+                    f"task_id='{task['task_id']}', input_data_id='{input_data_id}' :: comment_id='{comment_id}'のコメントは存在しません。",
                 )
                 continue
             request_body.append(_convert(comment_id))
@@ -152,14 +152,16 @@ class DeleteCommentMain(CommandLineWithConfirm):
                     self.service.api.batch_update_comments(self.project_id, task_id, input_data_id, request_body=request_body)
                     added_comments_count += 1
                     logger.debug(
-                        f"{logging_prefix} : task_id={task_id}, input_data_id={input_data_id}: {len(request_body)}件のコメントを削除しました。"
+                        f"{logging_prefix} :: task_id='{task_id}', input_data_id='{input_data_id}' :: {len(request_body)}件のコメントを削除しました。"
                     )
                 else:
-                    logger.warning(f"{logging_prefix} : task_id={task_id}, input_data_id={input_data_id}: 削除できるコメントは存在しませんでした。")
+                    logger.warning(
+                        f"{logging_prefix} :: task_id='{task_id}', input_data_id='{input_data_id}' :: 削除できるコメントは存在しませんでした。"
+                    )
 
             except Exception:  # pylint: disable=broad-except
                 logger.warning(
-                    f"{logging_prefix} : task_id={task_id}, input_data_id={input_data_id}: コメントの削除に失敗しました。",
+                    f"{logging_prefix} :: task_id='{task_id}', input_data_id='{input_data_id}' :: コメントの削除に失敗しました。",
                     exc_info=True,
                 )
 
@@ -198,7 +200,7 @@ class DeleteCommentMain(CommandLineWithConfirm):
                     )
                     added_comments_count += result
                 except Exception:  # pylint: disable=broad-except
-                    logger.warning(f"task_id={task_id}: コメントの削除に失敗しました。", exc_info=True)
+                    logger.warning(f"task_id='{task_id}' :: コメントの削除に失敗しました。", exc_info=True)
                     continue
 
         logger.info(f"{added_comments_count} / {comments_count} 件の入力データからコメントを削除しました。")

annofabcli/comment/put_comment.py

@@ -189,7 +189,7 @@ class PutCommentMain(CommandLineWithConfirm):
                     )
             except Exception:  # pylint: disable=broad-except
                 logger.warning(
-                    f"{logging_prefix} :: task_id={task_id}, input_data_id={input_data_id}: コメントの付与に失敗しました。",
+                    f"{logging_prefix} :: task_id='{task_id}', input_data_id='{input_data_id}' :: コメントの付与に失敗しました。",
                     exc_info=True,
                 )
 

annofabcli/comment/put_comment_simply.py

@@ -144,24 +144,26 @@ class PutCommentSimplyMain(CommandLineWithConfirm):
             # コメントを付与する
             request_body = self._create_request_body(task=changed_task, comment_info=comment_info)
             self.service.api.batch_update_comments(self.project_id, task_id, input_data_id, request_body=request_body)
-            logger.debug(f"{logging_prefix} : task_id={task_id} のタスクにコメントを付与しました。")
+            logger.debug(f"{logging_prefix} :: task_id='{task_id}' のタスクにコメントを付与しました。")
             return True  # noqa: TRY300
         except Exception:  # pylint: disable=broad-except
-            logger.warning(f"{logging_prefix} : task_id={task_id}, input_data_id={input_data_id}: コメントの付与に失敗しました。", exc_info=True)
+            logger.warning(
+                f"{logging_prefix} :: task_id='{task_id}', input_data_id='{input_data_id}' :: コメントの付与に失敗しました。", exc_info=True
+            )
             return False
         finally:
             self.service.wrapper.change_task_status_to_break(self.project_id, task_id)
             # 担当者が変えている場合は、元に戻す
             if task["account_id"] != changed_task["account_id"]:
                 self.service.wrapper.change_task_operator(self.project_id, task_id, task["account_id"])
-                logger.debug(f"{task_id}: 担当者を元のユーザ( account_id={task['account_id']}）に戻しました。")
+                logger.debug(f"task_id'{task_id}' :: 担当者を元のユーザ( account_id='{task['account_id']}'）に戻しました。")
 
     def add_comments_for_task_wrapper(self, tpl: tuple[int, str], comment_info: AddedSimpleComment) -> bool:
         task_index, task_id = tpl
         try:
             return self.put_comment_for_task(task_id=task_id, comment_info=comment_info, task_index=task_index)
         except Exception:  # pylint: disable=broad-except
-            logger.warning(f"task_id={task_id}: コメントの付与に失敗しました。", exc_info=True)
+            logger.warning(f"task_id='{task_id}' :: コメントの付与に失敗しました。", exc_info=True)
             return False
 
     def put_comment_for_task_list(
@@ -191,7 +193,7 @@ class PutCommentSimplyMain(CommandLineWithConfirm):
                     if result:
                         success_count += 1
                 except Exception:  # pylint: disable=broad-except
-                    logger.warning(f"task_id={task_id}: {self.comment_type_name}の付与に失敗しました。", exc_info=True)
+                    logger.warning(f"task_id='{task_id}' :: {self.comment_type_name}の付与に失敗しました。", exc_info=True)
                     continue
 
         logger.info(f"{success_count} / {len(task_ids)} 件のタスクに{self.comment_type_name}を付与しました。")

annofabcli/common/cli.py

@@ -397,7 +397,7 @@ class ArgumentParser:
     def __init__(self, parser: argparse.ArgumentParser) -> None:
         self.parser = parser
 
-    def add_project_id(self, help_message: Optional[str] = None):  # noqa: ANN201
+    def add_project_id(self, help_message: Optional[str] = None) -> None:
         """
         '--project_id` 引数を追加
         """
@@ -406,7 +406,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-p", "--project_id", type=str, required=True, help=help_message)
 
-    def add_task_id(self, required: bool = True, help_message: Optional[str] = None):  # noqa: ANN201, FBT001, FBT002
+    def add_task_id(self, *, required: bool = True, help_message: Optional[str] = None) -> None:
         """
         '--task_id` 引数を追加
         """
@@ -415,7 +415,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-t", "--task_id", type=str, required=required, nargs="+", help=help_message)
 
-    def add_input_data_id(self, required: bool = True, help_message: Optional[str] = None):  # noqa: ANN201, FBT001, FBT002
+    def add_input_data_id(self, *, required: bool = True, help_message: Optional[str] = None) -> None:
         """
         '--input_data_id` 引数を追加
         """
@@ -426,7 +426,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-i", "--input_data_id", type=str, required=required, nargs="+", help=help_message)
 
-    def add_format(self, choices: list[FormatArgument], default: FormatArgument, help_message: Optional[str] = None):  # noqa: ANN201
+    def add_format(self, choices: list[FormatArgument], default: FormatArgument, help_message: Optional[str] = None) -> None:
         """
         '--format` 引数を追加
         """
@@ -435,7 +435,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-f", "--format", type=str, choices=[e.value for e in choices], default=default.value, help=help_message)
 
-    def add_csv_format(self, help_message: Optional[str] = None):  # noqa: ANN201
+    def add_csv_format(self, help_message: Optional[str] = None) -> None:
         """
         '--csv_format` 引数を追加
         """
@@ -448,7 +448,7 @@ class ArgumentParser:
 
         self.parser.add_argument("--csv_format", type=str, help=help_message)
 
-    def add_output(self, required: bool = False, help_message: Optional[str] = None):  # noqa: ANN201, FBT001, FBT002
+    def add_output(self, *, required: bool = False, help_message: Optional[str] = None) -> None:
         """
         '--output` 引数を追加
         """
@@ -457,7 +457,7 @@ class ArgumentParser:
 
         self.parser.add_argument("-o", "--output", type=str, required=required, help=help_message)
 
-    def add_task_query(self, required: bool = False, help_message: Optional[str] = None):  # noqa: ANN201, FBT001, FBT002
+    def add_task_query(self, *, required: bool = False, help_message: Optional[str] = None) -> None:
         if help_message is None:
             help_message = (
                 "タスクを絞り込むためのクエリ条件をJSON形式で指定します。"
@@ -520,7 +520,7 @@ class CommandLineWithoutWebapi:
         self.args = args
         self.process_common_args(args)
 
-    def process_common_args(self, args: argparse.Namespace):  # noqa: ANN201
+    def process_common_args(self, args: argparse.Namespace) -> None:
         """
         共通のコマンドライン引数を処理する。
         Args:
@@ -637,12 +637,12 @@ class CommandLine(CommandLineWithoutWebapi):
         self.facade = facade
         super().__init__(args)
 
-    def validate_project(  # noqa: ANN201
+    def validate_project(
         self,
         project_id: str,
         project_member_roles: Optional[list[ProjectMemberRole]] = None,
         organization_member_roles: Optional[list[OrganizationMemberRole]] = None,
-    ):
+    ) -> None:
         """
         プロジェクト or 組織に対して、必要な権限が付与されているかを確認する。
 

annofabcli/common/download.py

@@ -60,26 +60,25 @@ class DownloadingFile:
         if not result:
             raise UpdatedFileForDownloadingError(f"{filetype}の更新処理が{max_wait_minutes}分以内に完了しない、または更新処理に失敗しました。")
 
-    async def download_annotation_zip_with_async(  # noqa: ANN201
+    async def download_annotation_zip_with_async(
         self,
         project_id: str,
         dest_path: Union[str, Path],
         is_latest: bool = False,  # noqa: FBT001, FBT002
         wait_options: Optional[WaitOptions] = None,
-    ):
+    ) -> None:
         loop = asyncio.get_event_loop()
         partial_func = partial(self.download_annotation_zip, project_id, dest_path, is_latest, wait_options)
-        result = await loop.run_in_executor(None, partial_func)
-        return result
+        await loop.run_in_executor(None, partial_func)
 
-    def download_annotation_zip(  # noqa: ANN201
+    def download_annotation_zip(
         self,
         project_id: str,
         dest_path: Union[str, Path],
         is_latest: bool = False,  # noqa: FBT001, FBT002
         wait_options: Optional[WaitOptions] = None,
         should_download_full_annotation: bool = False,  # noqa: FBT001, FBT002
-    ):
+    ) -> None:
         """アノテーションZIPをダウンロードします。"""
 
         def download_annotation_zip():  # noqa: ANN202
@@ -103,7 +102,7 @@ class DownloadingFile:
                 else:
                     raise e  # noqa: TRY201
 
-    def wait_until_updated_annotation_zip(self, project_id: str, wait_options: Optional[WaitOptions] = None):  # noqa: ANN201
+    def wait_until_updated_annotation_zip(self, project_id: str, wait_options: Optional[WaitOptions] = None) -> None:
         job_id = None
         try:
             job = self.service.api.post_annotation_archive_update(project_id)[0]["job"]
@@ -120,25 +119,24 @@ class DownloadingFile:
 
         self._wait_for_completion(project_id, job_type=ProjectJobType.GEN_ANNOTATION, wait_options=wait_options, job_id=job_id)
 
-    async def download_input_data_json_with_async(  # noqa: ANN201
+    async def download_input_data_json_with_async(
         self,
         project_id: str,
         dest_path: Union[str, Path],
         is_latest: bool = False,  # noqa: FBT001, FBT002
         wait_options: Optional[WaitOptions] = None,
-    ):
+    ) -> None:
         loop = asyncio.get_event_loop()
         partial_func = partial(self.download_input_data_json, project_id, dest_path, is_latest, wait_options)
-        result = await loop.run_in_executor(None, partial_func)
-        return result
+        await loop.run_in_executor(None, partial_func)
 
-    def download_input_data_json(  # noqa: ANN201
+    def download_input_data_json(
         self,
         project_id: str,
         dest_path: Union[str, Path],
         is_latest: bool = False,  # noqa: FBT001, FBT002
         wait_options: Optional[WaitOptions] = None,
-    ):
+    ) -> None:
         if is_latest:
             self.wait_until_updated_input_data_json(project_id, wait_options)
             self.service.wrapper.download_project_inputs_url(project_id, dest_path)
@@ -154,7 +152,7 @@ class DownloadingFile:
                 else:
                     raise e  # noqa: TRY201
 
-    def wait_until_updated_input_data_json(self, project_id: str, wait_options: Optional[WaitOptions] = None):  # noqa: ANN201
+    def wait_until_updated_input_data_json(self, project_id: str, wait_options: Optional[WaitOptions] = None) -> None:
         job_id = None
         try:
             job = self.service.api.post_project_inputs_update(project_id)[0]["job"]
@@ -170,19 +168,20 @@ class DownloadingFile:
 
         self._wait_for_completion(project_id, job_type=ProjectJobType.GEN_INPUTS_LIST, wait_options=wait_options, job_id=job_id)
 
-    async def download_task_json_with_async(  # noqa: ANN201
+    async def download_task_json_with_async(
         self,
         project_id: str,
         dest_path: Union[str, Path],
         is_latest: bool = False,  # noqa: FBT001, FBT002
         wait_options: Optional[WaitOptions] = None,
-    ):
+    ) -> None:
         loop = asyncio.get_event_loop()
-        partial_func = partial(self.download_task_json, project_id, dest_path, is_latest, wait_options)
-        result = await loop.run_in_executor(None, partial_func)
-        return result
+        partial_func = partial(self.download_task_json, project_id, dest_path, is_latest=is_latest, wait_options=wait_options)
+        await loop.run_in_executor(None, partial_func)
 
-    def download_task_json(self, project_id: str, dest_path: Union[str, Path], is_latest: bool = False, wait_options: Optional[WaitOptions] = None):  # noqa: ANN201, FBT001, FBT002
+    def download_task_json(
+        self, project_id: str, dest_path: Union[str, Path], *, is_latest: bool = False, wait_options: Optional[WaitOptions] = None
+    ) -> None:
         if is_latest:
             self.wait_until_updated_task_json(project_id, wait_options)
             self.service.wrapper.download_project_tasks_url(project_id, dest_path)
@@ -198,7 +197,7 @@ class DownloadingFile:
                 else:
                     raise e  # noqa: TRY201
 
-    def wait_until_updated_task_json(self, project_id: str, wait_options: Optional[WaitOptions] = None):  # noqa: ANN201
+    def wait_until_updated_task_json(self, project_id: str, wait_options: Optional[WaitOptions] = None) -> None:
         job_id = None
         try:
             job = self.service.api.post_project_tasks_update(project_id)[0]["job"]
@@ -214,7 +213,7 @@ class DownloadingFile:
 
         self._wait_for_completion(project_id, job_type=ProjectJobType.GEN_TASKS_LIST, wait_options=wait_options, job_id=job_id)
 
-    async def download_task_history_json_with_async(self, project_id: str, dest_path: Union[str, Path]):  # noqa: ANN201
+    async def download_task_history_json_with_async(self, project_id: str, dest_path: Union[str, Path]) -> None:
         """
         非同期でタスク履歴全件ファイルをダウンロードする。
 
@@ -223,7 +222,7 @@ class DownloadingFile:
         """
         return self.download_task_history_json(project_id, dest_path=dest_path)
 
-    def download_task_history_json(self, project_id: str, dest_path: Union[str, Path]):  # noqa: ANN201
+    def download_task_history_json(self, project_id: str, dest_path: Union[str, Path]) -> None:
         """
         タスク履歴全件ファイルをダウンロードする。
 
@@ -243,7 +242,7 @@ class DownloadingFile:
                 ) from e
             raise e  # noqa: TRY201
 
-    def download_task_history_event_json(self, project_id: str, dest_path: Union[str, Path]):  # noqa: ANN201
+    def download_task_history_event_json(self, project_id: str, dest_path: Union[str, Path]) -> None:
         """
         タスク履歴イベント全件ファイルをダウンロードする。
 
@@ -263,7 +262,7 @@ class DownloadingFile:
                 ) from e
             raise e  # noqa: TRY201
 
-    async def download_task_history_event_json_with_async(self, project_id: str, dest_path: Union[str, Path]):  # noqa: ANN201
+    async def download_task_history_event_json_with_async(self, project_id: str, dest_path: Union[str, Path]) -> None:
         """
         非同期でタスク履歴全件ファイルをダウンロードする。
 
@@ -273,7 +272,7 @@ class DownloadingFile:
         """
         return self.download_task_history_event_json(project_id, dest_path=dest_path)
 
-    async def download_inspection_json_with_async(self, project_id: str, dest_path: Union[str, Path]):  # noqa: ANN201
+    async def download_inspection_json_with_async(self, project_id: str, dest_path: Union[str, Path]) -> None:
         """
         非同期で検査コメント全件ファイルをダウンロードする。
 
@@ -283,7 +282,7 @@ class DownloadingFile:
 
         return self.download_inspection_comment_json(project_id, dest_path=dest_path)
 
-    def download_inspection_comment_json(self, project_id: str, dest_path: Union[str, Path]):  # noqa: ANN201
+    def download_inspection_comment_json(self, project_id: str, dest_path: Union[str, Path]) -> None:
         """
         検査コメント全件ファイルをダウンロードする。
 
@@ -300,7 +299,7 @@ class DownloadingFile:
                 ) from e
             raise e  # noqa: TRY201
 
-    async def download_comment_json_with_async(self, project_id: str, dest_path: Union[str, Path]):  # noqa: ANN201
+    async def download_comment_json_with_async(self, project_id: str, dest_path: Union[str, Path]) -> None:
         """
         非同期でコメント全件ファイルをダウンロードする。
 
@@ -310,7 +309,7 @@ class DownloadingFile:
 
         return self.download_comment_json(project_id, dest_path=dest_path)
 
-    def download_comment_json(self, project_id: str, dest_path: Union[str, Path]):  # noqa: ANN201
+    def download_comment_json(self, project_id: str, dest_path: Union[str, Path]) -> None:
         """
         コメント全件ファイルをダウンロードする。
 

annofabcli/common/image.py

@@ -306,7 +306,9 @@ def write_annotation_images_from_path(
             if original_resolution is not None and (original_resolution.get("width") is not None and original_resolution.get("height") is not None):
                 return original_resolution.get("width"), original_resolution.get("height")
             else:
-                logger.warning(f"input_data_id={input_data_id}のプロパティ`system_metadata.original_resolution`には画像サイズが設定されていません。")
+                logger.warning(
+                    f"input_data_id='{input_data_id}'のプロパティ`system_metadata.original_resolution`には画像サイズが設定されていません。"
+                )
                 return None
 
         if image_size is not None:
@@ -314,7 +316,7 @@ def write_annotation_images_from_path(
         elif input_data_dict is not None:
             input_data = input_data_dict.get(input_data_id)
             if input_data is None:
-                logger.warning(f"input_data_id={input_data_id}の入力データは存在しなかったので、スキップします。")
+                logger.warning(f"input_data_id='{input_data_id}'の入力データは存在しなかったので、スキップします。")
                 return None
 
             return _get_image_size_from_system_metadata(input_data)

annofabcli/input_data/delete_input_data.py

@@ -38,14 +38,14 @@ class DeleteInputData(CommandLine):
             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"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']}'"
                 )
                 deleted_count += 1
             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

annofabcli/input_data/update_metadata_of_input_data.py

@@ -64,7 +64,7 @@ class UpdateMetadataMain(CommandLineWithConfirm):
 
         input_data = self.service.wrapper.get_input_data_or_none(project_id, input_data_id)
         if input_data is None:
-            logger.warning(f"{logging_prefix} 入力データは存在しないのでスキップします。input_data_id={input_data_id}")
+            logger.warning(f"{logging_prefix} 入力データは存在しないのでスキップします。 :: input_data_id='{input_data_id}'")
             return False
 
         logger.debug(

annofabcli/instruction/upload_instruction.py

@@ -51,7 +51,7 @@ class UploadInstruction(CommandLine):
     作業ガイドをアップロードする
     """
 
-    def upload_html_to_instruction(self, project_id: str, html_path: Path, temp_dir: Path):  # noqa: ANN201, PLR0912
+    def upload_html_to_instruction(self, project_id: str, html_path: Path, temp_dir: Path) -> None:  # noqa: PLR0912
         with html_path.open(encoding="utf-8") as f:
             file_content = f.read()
         pq_html = pyquery.PyQuery(file_content)
@@ -106,7 +106,7 @@ class UploadInstruction(CommandLine):
         self.update_instruction(project_id, html_data)
         logger.info("作業ガイドを更新しました。")
 
-    def update_instruction(self, project_id: str, html_data: str):  # noqa: ANN201
+    def update_instruction(self, project_id: str, html_data: str) -> None:
         histories, _ = self.service.api.get_instruction_history(project_id)
         if len(histories) > 0:  # noqa: SIM108
             last_updated_datetime = histories[0]["updated_datetime"]

annofabcli/statistics/visualize_statistics.py

@@ -4,7 +4,6 @@ import argparse
 import functools
 import json
 import logging.handlers
-import re
 import sys
 import tempfile
 from multiprocessing import Pool
@@ -64,10 +63,6 @@ from annofabcli.statistics.visualization.visualization_source_files import Visua
 logger = logging.getLogger(__name__)
 
 
-def get_project_output_dir(project_title: str) -> str:
-    return re.sub(r'[\\/:*?"<>|]+', "__", project_title)
-
-
 class WriteCsvGraph:
     def __init__(  # noqa: PLR0913
         self,
@@ -408,8 +403,7 @@ class VisualizingStatisticsMain:
         root_output_dir: Path,
     ) -> Optional[Path]:
         try:
-            project_title = self.facade.get_project_title(project_id)
-            output_project_dir = root_output_dir / get_project_output_dir(project_title)
+            output_project_dir = root_output_dir / project_id
             self.visualize_statistics(
                 project_id=project_id,
                 output_project_dir=output_project_dir,

annofabcli/supplementary/delete_supplementary_data.py

@@ -201,12 +201,12 @@ class DeleteSupplementaryDataMain(CommandLineWithConfirm):
 
 
 class DeleteSupplementaryData(CommandLine):
-    @staticmethod
-    def validate(args: argparse.Namespace) -> bool:
-        COMMON_MESSAGE = "annofabcli supplementary_data put: error:"  # noqa: N806
+    COMMON_MESSAGE = "annofabcli supplementary_data delete: error:"
+
+    def validate(self, args: argparse.Namespace) -> bool:
         if args.csv is not None:  # noqa: SIM102
             if not Path(args.csv).exists():
-                print(f"{COMMON_MESSAGE} argument --csv: ファイルパスが存在しません。 '{args.csv}'", file=sys.stderr)  # noqa: T201
+                print(f"{self.COMMON_MESSAGE} argument --csv: ファイルパスが存在しません。 '{args.csv}'", file=sys.stderr)  # noqa: T201
                 return False
 
         return True
@@ -227,6 +227,10 @@ class DeleteSupplementaryData(CommandLine):
 
         elif args.json is not None:
             supplementary_data_list = annofabcli.common.cli.get_json_from_args(args.json)
+            if not isinstance(supplementary_data_list, list):
+                print(f"{self.COMMON_MESSAGE} argument --json: JSON形式が不正です。オブジェクトの配列を指定してください。", file=sys.stderr)  # noqa: T201
+                sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
+
             input_data_dict = get_input_data_supplementary_data_dict_from_list(supplementary_data_list)
             main_obj.delete_supplementary_data_list(project_id, input_data_dict)
 

{annofabcli-1.100.4.dist-info → annofabcli-1.101.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annofabcli
-Version: 1.100.4
+Version: 1.101.0
 Summary: Utility Command Line Interface for AnnoFab
 Author: Kurusugawa Computer Inc.
 License: MIT
@@ -10,9 +10,14 @@ Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Utilities
 Requires-Python: >=3.9
-Requires-Dist: annofabapi>=1.4.1
+Requires-Dist: annofabapi>=1.4.7
 Requires-Dist: bokeh<3.7,>=3.3
 Requires-Dist: dictdiffer
 Requires-Dist: isodate
@@ -25,6 +30,7 @@ Requires-Dist: python-datauri
 Requires-Dist: pyyaml
 Requires-Dist: requests
 Requires-Dist: typing-extensions>=4.5
+Requires-Dist: ulid-py>=1.1.0
 Description-Content-Type: text/markdown
 
 # annofab-cli