annofabcli 1.100.5__tar.gz → 1.101.0__tar.gz

{annofabcli-1.100.5 → annofabcli-1.101.0}/.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.154.0/containers/docker-existing-dockerfile
 {
-	"name": "Existing Dockerfile",
+	"name": "${localWorkspaceFolderBasename}",
 	"build": {
 		"dockerfile": "Dockerfile",
 		"context": ".",
@@ -38,7 +38,7 @@
 				"ms-python.vscode-pylance",
 				"charliermarsh.ruff",
 				"streetsidesoftware.code-spell-checker",
-				"bungcip.better-toml",
+				"tamasfe.even-better-toml",
 				"njpwerner.autodocstring",
 				"mechatroner.rainbow-csv",
 				"lextudio.restructuredtext"

{annofabcli-1.100.5 → annofabcli-1.101.0}/.github/workflows/lint-test.yml

@@ -32,7 +32,7 @@ jobs:
           # Install a specific version of uv.
           version: "0.6.14"
       - name: Install the project
-        run: uv sync
+        run: uv sync --only-group test
       - name: Test
         run: |
             uv run pytest -n auto -m "not access_webapi"
@@ -48,7 +48,7 @@ jobs:
           # Install a specific version of uv.
           version: "0.6.14"
       - name: Install the project
-        run: uv sync
+        run: uv sync --only-group linter
       - name: Lint
         run: |
             make lint

{annofabcli-1.100.5 → annofabcli-1.101.0}/.github/workflows/publish-to-pypi.yml

@@ -16,8 +16,6 @@ jobs:
         python-version: "3.12"
         # Install a specific version of uv.
         version: "0.6.14"
-    - name: Install the project
-      run: uv sync
 
     - name: Publish
       env:

{annofabcli-1.100.5 → annofabcli-1.101.0}/.github/workflows/release.yml

@@ -22,7 +22,7 @@ jobs:
           # Install a specific version of uv.
           version: "0.6.14"
       - name: Install the project
-        run: uv sync --extra publish
+        run: uv sync --only-group publish
       - name: Create executable file with pyinstaller and zip
         run: |
           uv run pyinstaller annofabcli/__main__.py  --name annofabcli --add-data "annofabcli/data:annofabcli/data"          

{annofabcli-1.100.5 → annofabcli-1.101.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annofabcli
-Version: 1.100.5
+Version: 1.101.0
 Summary: Utility Command Line Interface for AnnoFab
 Author: Kurusugawa Computer Inc.
 License: MIT
@@ -17,7 +17,7 @@ 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
@@ -30,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

{annofabcli-1.100.5 → annofabcli-1.101.0}/annofabcli/annotation/change_annotation_attributes.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import argparse
 import functools
+import json
 import logging
 import multiprocessing
 import sys
@@ -345,7 +346,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     argument_parser.add_project_id()
     argument_parser.add_task_id()
 
-    EXAMPLE_ANNOTATION_QUERY = '{"label": "car", "attributes":{"occluded" true} }'  # noqa: N806
+    EXAMPLE_ANNOTATION_QUERY = {"label": "car", "attributes": {"occluded": True}}  # noqa: N806
     parser.add_argument(
         "-aq",
         "--annotation_query",
@@ -353,7 +354,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
         required=True,
         help="変更対象のアノテーションを検索する条件をJSON形式で指定します。"
         "``file://`` を先頭に付けると、JSON形式のファイルを指定できます。"
-        f"(ex): ``{EXAMPLE_ANNOTATION_QUERY}``",
+        f"(ex): ``{json.dumps(EXAMPLE_ANNOTATION_QUERY)}``",
     )
 
     EXAMPLE_ATTRIBUTES = '{"occluded": false}'  # noqa: N806

{annofabcli-1.100.5 → annofabcli-1.101.0}/annofabcli/annotation/change_annotation_properties.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import argparse
 import functools
+import json
 import logging
 import multiprocessing
 import sys
@@ -156,7 +157,7 @@ class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
             return False
 
         logger.debug(
-            f"{logger_prefix}task_id={task_id}, phase={dict_task['phase']}, status={dict_task['status']}, "
+            f"{logger_prefix}task_id='{task_id}', phase={dict_task['phase']}, status={dict_task['status']}, "
             f"updated_datetime={dict_task['updated_datetime']}"
         )
 
@@ -202,10 +203,10 @@ class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
 
         try:
             self.change_annotation_properties(task_id, annotation_list, properties)
-            logger.info(f"{logger_prefix}task_id={task_id}: アノテーションのプロパティを変更しました。")
+            logger.info(f"{logger_prefix}task_id='{task_id}' :: アノテーションのプロパティを変更しました。")
             return True  # noqa: TRY300
         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
         finally:
             if changed_operator:
@@ -234,7 +235,7 @@ class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
                 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 change_annotation_properties_task_list(  # noqa: ANN201
@@ -277,7 +278,7 @@ class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
                     if result:
                         success_count += 1
                 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"{success_count} / {len(task_id_list)} 件のタスクに対してアノテーションのプロパティを変更しました。")
@@ -359,14 +360,14 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     argument_parser.add_project_id()
     argument_parser.add_task_id()
 
-    EXAMPLE_ANNOTATION_QUERY = '{"label": "car", "attributes":{"occluded" true} }'  # noqa: N806
+    EXAMPLE_ANNOTATION_QUERY = {"label": "car", "attributes": {"occluded": True}}  # noqa: N806
 
     parser.add_argument(
         "-aq",
         "--annotation_query",
         type=str,
         required=False,
-        help=f"変更対象のアノテーションを検索する条件をJSON形式で指定します。(ex): ``{EXAMPLE_ANNOTATION_QUERY}``",
+        help=f"変更対象のアノテーションを検索する条件をJSON形式で指定します。(ex): ``{json.dumps(EXAMPLE_ANNOTATION_QUERY)}``",
     )
 
     EXAMPLE_PROPERTIES = '{"is_protected": true}'  # noqa: N806

{annofabcli-1.100.5 → annofabcli-1.101.0}/annofabcli/annotation/copy_annotation.py

@@ -48,11 +48,11 @@ class CopyTarget(CopyTargetMixin, ABC):
 @dataclass(frozen=True)
 class CopyTargetByTask(CopyTarget):
     @property
-    def src(self):  # noqa: ANN201
+    def src(self) -> str:
         return f"{self.src_task_id}"
 
     @property
-    def dest(self):  # noqa: ANN201
+    def dest(self) -> str:
         return f"{self.dest_task_id}"
 
 
@@ -62,11 +62,11 @@ class CopyTargetByInputData(CopyTarget):
     dest_input_data_id: str
 
     @property
-    def src(self):  # noqa: ANN201
+    def src(self) -> str:
         return f"{self.src_task_id}/{self.src_input_data_id}"
 
     @property
-    def dest(self):  # noqa: ANN201
+    def dest(self) -> str:
         return f"{self.dest_task_id}/{self.dest_input_data_id}"