annofabcli 1.111.2__tar.gz → 1.112.0__tar.gz

{annofabcli-1.111.2 → annofabcli-1.112.0}/.github/copilot-instructions.md

@@ -10,7 +10,7 @@ AnnofabのCLIです。
 * ドキュメントの実行: `make docs`
 
 ## 技術スタック
-* Python 3.9 以上
+* Python 3.10 以上
 * テストフレームワーク: Pytest v8 以上
 
 ## ディレクトリ構造概要
@@ -92,6 +92,7 @@ Usage Details
 
 ## ユーザーインタフェイス
 * 複数リソースを処理するコマンドは`--parallelism`を用意する。ただし、プロジェクトに対する操作や削除処理など、間違えて処理したときの被害が大きいコマンドは`--parallelism`を用意しない。
+* CSV出力するコマンドでは、出力件数が0件でもヘッダ行を出力する。
 
 
 ## レビュー

annofabcli-1.112.0/.github/workflows/copilot-setup-steps.yml

@@ -0,0 +1,37 @@
+name: "Copilot Setup Steps"
+
+# Automatically run the setup steps when they are changed to allow for easy validation, and
+# allow manual testing through the repository's "Actions" tab
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+  pull_request:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+
+jobs:
+  # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
+  copilot-setup-steps:
+    runs-on: ubuntu-latest
+
+    # Set the permissions to the lowest permissions possible needed for your steps.
+    # Copilot will be given its own token for its operations.
+    permissions:
+      # If you want to clone the repository as part of your setup steps, for example to install dependencies, you'll need the `contents: read` permission. If you don't clone the repository in your setup steps, Copilot will do this for you automatically after the steps complete.
+      contents: read
+
+    # You can define any steps you want, and they will run before the agent starts.
+    # If you do not check out your code, Copilot will do this for you.
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v7
+        with:
+          python-version: "3.13"
+          version: "latest"
+      - name: Install the project
+        run: uv sync --only-group test

{annofabcli-1.111.2 → annofabcli-1.112.0}/.github/workflows/lint-test.yml

@@ -21,16 +21,16 @@ jobs:
     
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
 
     steps:
       - uses: actions/checkout@v4
       - name: Install uv and set the python version
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: ${{ matrix.python-version }}        
           # Install a specific version of uv.
-          version: "0.7.20"
+          version: "latest"
       - name: Install the project
         run: uv sync --only-group test
       - name: Test
@@ -42,11 +42,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install uv and set the python version
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
         with:
           python-version: 3.13
           # Install a specific version of uv.
-          version: "0.7.20"
+          version: "latest"
       - name: Install the project
         run: uv sync --only-group linter
       - name: Lint

{annofabcli-1.111.2 → annofabcli-1.112.0}/.github/workflows/publish-to-pypi.yml

@@ -11,11 +11,11 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Install uv and set the python version
-      uses: astral-sh/setup-uv@v5
+      uses: astral-sh/setup-uv@v7
       with:
         python-version: "3.12"
         # Install a specific version of uv.
-        version: "0.6.14"
+        version: "latest"
 
     - name: Publish
       env:

{annofabcli-1.111.2 → annofabcli-1.112.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annofabcli
-Version: 1.111.2
+Version: 1.112.0
 Summary: Utility Command Line Interface for AnnoFab
 Author: Kurusugawa Computer Inc.
 License: MIT
@@ -10,25 +10,28 @@ 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: Programming Language :: Python :: 3.14
 Classifier: Topic :: Utilities
-Requires-Python: >=3.9
+Requires-Python: >=3.10
+Requires-Dist: annofabapi-3dpc-extensions
 Requires-Dist: annofabapi>=1.5.1
-Requires-Dist: bokeh<3.7,>=3.3
+Requires-Dist: bokeh>=3.8
 Requires-Dist: dictdiffer
 Requires-Dist: isodate
 Requires-Dist: more-itertools
 Requires-Dist: numpy
 Requires-Dist: pandas<3,>=2
 Requires-Dist: pillow
+Requires-Dist: pydantic>=2.12; python_version >= '3.14'
 Requires-Dist: pyquery
 Requires-Dist: python-datauri
 Requires-Dist: pyyaml
 Requires-Dist: requests
+Requires-Dist: shapely
 Requires-Dist: typing-extensions>=4.5
 Requires-Dist: ulid-py>=1.1.0
 Description-Content-Type: text/markdown
@@ -58,7 +61,7 @@ Description-Content-Type: text/markdown
 * TODO
 
 # Requirements
-* Python 3.9+
+* Python 3.10+
 
 # Install
 
@@ -110,13 +113,4 @@ $ annofabcli annotation list_count --project_id prj1 --task_id file://task.txt -
 $ annofabcli task reject --project_id prj1 --task_id file://tasks.txt --cancel_acceptance \
   --comment "carラベルのoccluded属性を見直してください"
 
-```
-
-# 補足
-
-# Windowsでannofabcliを使う場合
-WindowsのコマンドプロンプトやPowerShellでannofabcliを使う場合、JSON文字列内の二重引用をエスケープする必要があります。
-
-```
-> annofabcli task list --project_id prj1  --task_query '{"\status\": \"complete\"}'
-```
+```

{annofabcli-1.111.2 → annofabcli-1.112.0}/README.md

@@ -23,7 +23,7 @@
 * TODO
 
 # Requirements
-* Python 3.9+
+* Python 3.10+
 
 # Install
 
@@ -75,13 +75,4 @@ $ annofabcli annotation list_count --project_id prj1 --task_id file://task.txt -
 $ annofabcli task reject --project_id prj1 --task_id file://tasks.txt --cancel_acceptance \
   --comment "carラベルのoccluded属性を見直してください"
 
-```
-
-# 補足
-
-# Windowsでannofabcliを使う場合
-WindowsのコマンドプロンプトやPowerShellでannofabcliを使う場合、JSON文字列内の二重引用をエスケープする必要があります。
-
-```
-> annofabcli task list --project_id prj1  --task_query '{"\status\": \"complete\"}'
-```
+```

{annofabcli-1.111.2 → annofabcli-1.112.0}/annofabcli/__main__.py

@@ -4,7 +4,6 @@ import argparse
 import copy
 import logging
 import sys
-from typing import Optional
 
 import pandas
 
@@ -65,7 +64,7 @@ def mask_sensitive_value_in_argv(argv: list[str]) -> list[str]:
     return tmp_argv
 
 
-def main(arguments: Optional[list[str]] = None) -> None:
+def main(arguments: list[str] | None = None) -> None:
     """
     annofabcliコマンドのメイン処理
     注意： `deprecated`なツールは、サブコマンド化しない。

{annofabcli-1.111.2 → annofabcli-1.112.0}/annofabcli/annotation/annotation_query.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Any, Optional, Union
+from typing import Any
 
 import more_itertools
 from annofabapi.dataclass.annotation import AdditionalDataV1
@@ -9,7 +9,7 @@ from annofabapi.models import AdditionalDataDefinitionType
 from annofabapi.util.annotation_specs import get_english_message
 from dataclasses_json import DataClassJsonMixin
 
-AttributeValue = Optional[Union[str, int, bool]]
+AttributeValue = str | int | bool | None
 """属性値の型情報"""
 
 
@@ -138,7 +138,7 @@ def _get_additional_data_v2(additional_data: dict[str, Any], attribute_value: At
     return {"definition_id": additional_data_definition_id, "value": result_value}
 
 
-def convert_attributes_from_cli_to_api(attributes: dict[str, AttributeValue], annotation_specs: dict[str, Any], *, label_id: Optional[str] = None) -> list[AdditionalDataV1]:
+def convert_attributes_from_cli_to_api(attributes: dict[str, AttributeValue], annotation_specs: dict[str, Any], *, label_id: str | None = None) -> list[AdditionalDataV1]:
     """
     CLI用の属性をAPI用の属性に変換します。
 
@@ -193,7 +193,7 @@ def convert_attributes_from_cli_to_api(attributes: dict[str, AttributeValue], an
     return attributes_for_webapi
 
 
-def convert_attributes_from_cli_to_additional_data_list_v2(attributes: dict[str, AttributeValue], annotation_specs: dict[str, Any], *, label_id: Optional[str] = None) -> list[dict[str, Any]]:
+def convert_attributes_from_cli_to_additional_data_list_v2(attributes: dict[str, AttributeValue], annotation_specs: dict[str, Any], *, label_id: str | None = None) -> list[dict[str, Any]]:
     """
     CLI用の属性情報をAPI用の `AdditionalDataV2` に相当するdictに変換します。
 
@@ -254,10 +254,10 @@ class AnnotationQueryForCLI(DataClassJsonMixin):
     CLIでアノテーションを絞り込むためのクエリ。
     """
 
-    label: Optional[str] = None
+    label: str | None = None
     """ラベル名（英語）"""
 
-    attributes: Optional[dict[str, AttributeValue]] = None
+    attributes: dict[str, AttributeValue] | None = None
     """
     keyが属性名(英語),valueが属性値のdict。
     属性が排他選択の場合、属性値は選択肢名(英語)。
@@ -279,8 +279,8 @@ class AnnotationQueryForCLI(DataClassJsonMixin):
             dict[str,Any]: WebAPIのquery_paramsに渡すdict
         """
         assert self.label is not None or self.attributes is not None
-        label_id: Optional[str] = None
-        attributes_for_webapi: Optional[list[AdditionalDataV1]] = None
+        label_id: str | None = None
+        attributes_for_webapi: list[AdditionalDataV1] | None = None
 
         if self.label is not None:
             tmp = [e for e in annotation_specs["labels"] if get_english_message(e["label_name"]) == self.label]
@@ -309,10 +309,10 @@ class AnnotationQueryForAPI(DataClassJsonMixin):
     https://annofab.com/docs/api/#tag/x-data-types/AnnotationQuery に対応しています。
     """
 
-    label_id: Optional[str] = None
+    label_id: str | None = None
     """ラベルID"""
 
-    attributes: Optional[list[AdditionalDataV1]] = None
+    attributes: list[AdditionalDataV1] | None = None
     """属性IDと属性値のList"""
 
     def __post_init__(self) -> None:

{annofabcli-1.111.2 → annofabcli-1.112.0}/annofabcli/annotation/change_annotation_attributes.py

@@ -8,7 +8,7 @@ import multiprocessing
 import sys
 from enum import Enum
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.dataclass.task import Task
@@ -58,7 +58,7 @@ class ChangeAnnotationAttributesMain(CommandLineWithConfirm):
 
         self.dump_annotation_obj = DumpAnnotationMain(service, project_id)
 
-    def change_annotation_attributes(self, annotation_list: list[dict[str, Any]], additional_data_list: list[dict[str, Any]]) -> Optional[list[dict[str, Any]]]:
+    def change_annotation_attributes(self, annotation_list: list[dict[str, Any]], additional_data_list: list[dict[str, Any]]) -> list[dict[str, Any]] | None:
         """
         アノテーション属性値を変更する。
 
@@ -112,8 +112,8 @@ class ChangeAnnotationAttributesMain(CommandLineWithConfirm):
         annotation_query: AnnotationQueryForAPI,
         additional_data_list: list[dict[str, Any]],
         *,
-        backup_dir: Optional[Path] = None,
-        task_index: Optional[int] = None,
+        backup_dir: Path | None = None,
+        task_index: int | None = None,
     ) -> tuple[bool, int]:
         """
         タスクに対してアノテーション属性値を変更する。
@@ -170,7 +170,7 @@ class ChangeAnnotationAttributesMain(CommandLineWithConfirm):
         annotation_query: AnnotationQueryForAPI,
         additional_data_list: list[dict[str, Any]],
         *,
-        backup_dir: Optional[Path] = None,
+        backup_dir: Path | None = None,
     ) -> tuple[bool, int]:
         task_index, task_id = tpl
         try:
@@ -191,8 +191,8 @@ class ChangeAnnotationAttributesMain(CommandLineWithConfirm):
         annotation_query: AnnotationQueryForAPI,
         additional_data_list: list[dict[str, Any]],
         *,
-        backup_dir: Optional[Path] = None,
-        parallelism: Optional[int] = None,
+        backup_dir: Path | None = None,
+        parallelism: int | None = None,
     ) -> None:
         """
         複数のタスクに対してアノテーションの属性値を変更します。
@@ -272,7 +272,7 @@ class ChangeAttributesOfAnnotation(CommandLine):
         return annotation_query_for_cli.to_query_for_api(annotation_specs)
 
     @classmethod
-    def get_additional_data_list_from_cli_attributes(cls, str_attributes: str, annotation_specs: dict[str, Any], label_id: Optional[str]) -> list[dict[str, Any]]:
+    def get_additional_data_list_from_cli_attributes(cls, str_attributes: str, annotation_specs: dict[str, Any], label_id: str | None) -> list[dict[str, Any]]:
         """
         CLIから受け取った`--attributes`の値から、APIに渡す属性情報(`AdditionalDataListV2`)を返します。
         """
@@ -383,7 +383,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "change_attributes"
     subcommand_help = "アノテーションの属性値を変更します。"
     description = (

{annofabcli-1.111.2 → annofabcli-1.112.0}/annofabcli/annotation/change_annotation_attributes_per_annotation.py

@@ -6,7 +6,6 @@ import logging
 import sys
 from collections import defaultdict
 from pathlib import Path
-from typing import Optional, Union
 
 import annofabapi
 import pandas
@@ -30,7 +29,7 @@ from annofabcli.common.facade import AnnofabApiFacade
 logger = logging.getLogger(__name__)
 
 
-Attributes = dict[str, Optional[Union[str, int, bool]]]
+Attributes = dict[str, str | int | bool | None]
 """属性情報"""
 
 
@@ -66,7 +65,7 @@ class ChangeAnnotationAttributesPerAnnotationMain(CommandLineWithConfirm):
         project_id: str,
         is_force: bool,
         all_yes: bool,
-        backup_dir: Optional[Path] = None,
+        backup_dir: Path | None = None,
     ) -> None:
         self.service = service
         self.project_id = project_id
@@ -314,7 +313,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "change_attributes_per_annotation"
     subcommand_help = "各アノテーションの属性値を変更します。"
     epilog = "オーナロールまたはチェッカーロールを持つユーザで実行してください。"

{annofabcli-1.111.2 → annofabcli-1.112.0}/annofabcli/annotation/change_annotation_properties.py

@@ -8,7 +8,7 @@ import multiprocessing
 import sys
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.models import ProjectMemberRole, SingleAnnotation, TaskStatus
@@ -34,7 +34,7 @@ logger = logging.getLogger(__name__)
 
 @dataclass
 class AnnotationDetailForCli(DataClassJsonMixin):
-    is_protected: Optional[bool] = None
+    is_protected: bool | None = None
 
 
 class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
@@ -113,7 +113,7 @@ class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
         for annotation in annotations:
             _to_request_body_elm(annotation)
 
-    def get_annotation_list_for_task(self, task_id: str, annotation_query: Optional[AnnotationQueryForAPI]) -> list[dict[str, Any]]:
+    def get_annotation_list_for_task(self, task_id: str, annotation_query: AnnotationQueryForAPI | None) -> list[dict[str, Any]]:
         """
         タスク内のアノテーション一覧を取得する。
 
@@ -136,9 +136,9 @@ class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
         self,
         task_id: str,
         properties: AnnotationDetailForCli,
-        annotation_query: Optional[AnnotationQueryForAPI] = None,
-        backup_dir: Optional[Path] = None,
-        task_index: Optional[int] = None,
+        annotation_query: AnnotationQueryForAPI | None = None,
+        backup_dir: Path | None = None,
+        task_index: int | None = None,
     ) -> bool:
         """
         タスクに対してアノテーションのプロパティを変更する。
@@ -162,7 +162,7 @@ class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
             logger.info(f"タスク'{task_id}'は作業中または受入完了状態のため、アノテーションプロパティの変更をスキップします。 status={dict_task['status']}")
             return False
 
-        old_account_id: Optional[str] = dict_task["account_id"]
+        old_account_id: str | None = dict_task["account_id"]
         changed_operator = False
 
         if self.is_force:
@@ -217,8 +217,8 @@ class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
         self,
         tpl: tuple[int, str],
         properties: AnnotationDetailForCli,
-        annotation_query: Optional[AnnotationQueryForAPI] = None,
-        backup_dir: Optional[Path] = None,
+        annotation_query: AnnotationQueryForAPI | None = None,
+        backup_dir: Path | None = None,
     ) -> bool:
         task_index, task_id = tpl
         try:
@@ -237,9 +237,9 @@ class ChangePropertiesOfAnnotationMain(CommandLineWithConfirm):
         self,
         task_id_list: list[str],
         properties: AnnotationDetailForCli,
-        annotation_query: Optional[AnnotationQueryForAPI] = None,
-        backup_dir: Optional[Path] = None,
-        parallelism: Optional[int] = None,
+        annotation_query: AnnotationQueryForAPI | None = None,
+        backup_dir: Path | None = None,
+        parallelism: int | None = None,
     ):
         project_title = self.facade.get_project_title(self.project_id)
         logger.info(f"プロジェクト'{project_title}'に対して、タスク{len(task_id_list)} 件のアノテーションのプロパティを変更します")
@@ -396,7 +396,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "change_properties"
     subcommand_help = "アノテーションのプロパティを変更します。"
     description = (

{annofabcli-1.111.2 → annofabcli-1.112.0}/annofabcli/annotation/copy_annotation.py

@@ -7,7 +7,7 @@ import multiprocessing
 import sys
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.models import ProjectMemberRole
@@ -79,7 +79,7 @@ def parse_copy_target(str_copy_target: str) -> CopyTarget:
     * `task1/input5:task2/input6`
     """
 
-    def _parse_with_slash(target: str) -> tuple[str, Optional[str]]:
+    def _parse_with_slash(target: str) -> tuple[str, str | None]:
         tmp = target.split("/")
         if len(tmp) == 1:
             return (tmp[0], None)
@@ -163,7 +163,7 @@ class CopyAnnotationMain(CommandLineWithConfirm):
 
         copy_count = 0
 
-        for src_input_data_id, dest_input_data_id in zip(src_input_data_id_list, dest_input_data_id_list):
+        for src_input_data_id, dest_input_data_id in zip(src_input_data_id_list, dest_input_data_id_list, strict=False):
             try:
                 result = self.copy_annotation_by_input_data(
                     CopyTargetByInputData(
@@ -304,7 +304,7 @@ class CopyAnnotationMain(CommandLineWithConfirm):
             logger.warning(f"'{copy_target.src}'のアノテーションを'{copy_target.dest}'へコピーするのに失敗しました。", exc_info=True)
             return False
 
-    def copy_annotations(self, copy_target_list: list[CopyTarget], *, parallelism: Optional[int] = None):  # noqa: ANN201
+    def copy_annotations(self, copy_target_list: list[CopyTarget], *, parallelism: int | None = None):  # noqa: ANN201
         if parallelism is not None:
             with multiprocessing.Pool(parallelism) as pool:
                 result_bool_list = pool.map(self.copy_annotation_wrapper, copy_target_list)
@@ -414,7 +414,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "copy"
     subcommand_help = "アノテーションをコピーします．"
     description = "タスク単位または入力データ単位で、アノテーションをコピーします。"

{annofabcli-1.111.2 → annofabcli-1.112.0}/annofabcli/annotation/create_classification_annotation.py

@@ -4,7 +4,7 @@ import argparse
 import logging
 import multiprocessing
 import sys
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.models import DefaultAnnotationType, ProjectMemberRole, TaskStatus
@@ -50,7 +50,7 @@ class CreateClassificationAnnotationMain(CommandLineWithConfirm):
         my_member, _ = self.service.api.get_my_member_in_project(project_id)
         self.my_project_member_role = ProjectMemberRole(my_member["member_role"])
 
-    def _validate_and_prepare_task(self, task_id: str) -> tuple[Optional[dict[str, Any]], bool, Optional[str]]:
+    def _validate_and_prepare_task(self, task_id: str) -> tuple[dict[str, Any] | None, bool, str | None]:
         """
         タスクの検証と準備を行う
 
@@ -76,7 +76,7 @@ class CreateClassificationAnnotationMain(CommandLineWithConfirm):
                 )
                 return None, False, None
 
-        old_account_id: Optional[str] = None
+        old_account_id: str | None = None
         changed_operator = False
 
         if self.is_change_operator_to_me:
@@ -216,7 +216,7 @@ class CreateClassificationAnnotationMain(CommandLineWithConfirm):
 
         return created_count
 
-    def execute_task(self, task_id: str, labels: list[str], task_index: Optional[int] = None) -> bool:
+    def execute_task(self, task_id: str, labels: list[str], task_index: int | None = None) -> bool:
         """
         1個のタスクに対して全体アノテーションを作成する。
 
@@ -260,7 +260,7 @@ class CreateClassificationAnnotationMain(CommandLineWithConfirm):
         else:
             return created_count > 0
 
-    def main(self, task_ids: list[str], labels: list[str], parallelism: Optional[int] = None) -> None:
+    def main(self, task_ids: list[str], labels: list[str], parallelism: int | None = None) -> None:
         """
         メイン処理
 
@@ -392,7 +392,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "create_classification"
     subcommand_help = "全体アノテーション（Classification）を作成します。"
     description = (

{annofabcli-1.111.2 → annofabcli-1.112.0}/annofabcli/annotation/delete_annotation.py

@@ -7,7 +7,7 @@ import sys
 from collections import defaultdict
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -87,7 +87,7 @@ class DeleteAnnotationMain(CommandLineWithConfirm):
         request_body = [_to_request_body_elm(annotation) for annotation in annotation_list]
         self.service.api.batch_update_annotations(self.project_id, request_body=request_body)
 
-    def get_annotation_list_for_task(self, task_id: str, annotation_query: Optional[AnnotationQueryForAPI]) -> list[dict[str, Any]]:
+    def get_annotation_list_for_task(self, task_id: str, annotation_query: AnnotationQueryForAPI | None) -> list[dict[str, Any]]:
         """
         タスク内のアノテーション一覧を取得する。
 
@@ -109,8 +109,8 @@ class DeleteAnnotationMain(CommandLineWithConfirm):
     def delete_annotation_for_task(
         self,
         task_id: str,
-        annotation_query: Optional[AnnotationQueryForAPI] = None,
-        backup_dir: Optional[Path] = None,
+        annotation_query: AnnotationQueryForAPI | None = None,
+        backup_dir: Path | None = None,
     ) -> None:
         """
         タスクに対してアノテーションを削除する
@@ -159,8 +159,8 @@ class DeleteAnnotationMain(CommandLineWithConfirm):
     def delete_annotation_for_task_list(
         self,
         task_id_list: list[str],
-        annotation_query: Optional[AnnotationQueryForAPI] = None,
-        backup_dir: Optional[Path] = None,
+        annotation_query: AnnotationQueryForAPI | None = None,
+        backup_dir: Path | None = None,
     ) -> None:
         project_title = self.facade.get_project_title(self.project_id)
         logger.info(f"プロジェクト'{project_title}'に対して、タスク{len(task_id_list)} 件のアノテーションを削除します。")
@@ -278,7 +278,7 @@ class DeleteAnnotationMain(CommandLineWithConfirm):
     def delete_annotation_by_id_list(
         self,
         annotation_list: list[DeletedAnnotationInfo],
-        backup_dir: Optional[Path] = None,
+        backup_dir: Path | None = None,
     ) -> None:
         """
         task_id, input_data_id, annotation_id のリストで指定されたアノテーションのみ削除する
@@ -492,7 +492,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "delete"
     subcommand_help = "アノテーションを削除します。"
     description = (

{annofabcli-1.111.2 → annofabcli-1.112.0}/annofabcli/annotation/download_annotation_zip.py

@@ -1,11 +1,9 @@
 import argparse
 import logging
 from pathlib import Path
-from typing import Optional
 
 from annofabapi.models import ProjectMemberRole
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.download import DownloadingFile
@@ -67,7 +65,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     parser.set_defaults(subcommand_func=main)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "download"
     subcommand_help = "アノテーションZIPをダウンロードします。"
     description = "アノテーションZIPをダウンロードします。"