annofabcli 1.111.2__py3-none-any.whl → 1.112.0__py3-none-any.whl

annofabcli/common/utils.py

@@ -1,11 +1,11 @@
 import json
 import logging
-import logging.config
 import os
 import re
 import sys
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Callable, Optional, TypeVar, Union
+from typing import Any, TypeVar
 
 import dateutil.parser
 import isodate
@@ -46,7 +46,7 @@ def duplicated_set(target_list: list[T]) -> set[T]:
     return {x for x in set(target_list) if target_list.count(x) > 1}
 
 
-def output_string(target: str, output: Optional[Union[str, Path]] = None) -> None:
+def output_string(target: str, output: str | Path | None = None) -> None:
     """
     文字列を出力する。
 
@@ -64,7 +64,7 @@ def output_string(target: str, output: Optional[Union[str, Path]] = None) -> Non
             logger.info(f"'{output}'を出力しました。")
 
 
-def print_json(target: Any, is_pretty: bool = False, output: Optional[Union[str, Path]] = None) -> None:  # noqa: ANN401, FBT001, FBT002
+def print_json(target: Any, is_pretty: bool = False, output: str | Path | None = None) -> None:  # noqa: ANN401, FBT001, FBT002
     """
     JSONを出力する。
 
@@ -80,7 +80,7 @@ def print_json(target: Any, is_pretty: bool = False, output: Optional[Union[str,
         output_string(json.dumps(target, ensure_ascii=False), output)
 
 
-def print_csv(df: pandas.DataFrame, output: Optional[Union[str, Path]] = None, to_csv_kwargs: Optional[dict[str, Any]] = None) -> None:
+def print_csv(df: pandas.DataFrame, output: str | Path | None = None, to_csv_kwargs: dict[str, Any] | None = None) -> None:
     if output is not None:
         Path(output).parent.mkdir(parents=True, exist_ok=True)
 
@@ -98,7 +98,7 @@ def print_csv(df: pandas.DataFrame, output: Optional[Union[str, Path]] = None, t
         logger.info(f"'{output}'を出力しました。")
 
 
-def print_id_list(id_list: list[Any], output: Optional[Union[str, Path]]) -> None:
+def print_id_list(id_list: list[Any], output: str | Path | None) -> None:
     s = "\n".join(id_list)
     output_string(s, output)
 
@@ -106,7 +106,7 @@ def print_id_list(id_list: list[Any], output: Optional[Union[str, Path]]) -> Non
 def print_according_to_format(
     target: Any,  # noqa: ANN401
     format: FormatArgument,  # noqa: A002
-    output: Optional[Union[str, Path]] = None,
+    output: str | Path | None = None,
 ) -> None:
     """
     コマンドライン引数 ``--format`` の値にしたがって、内容を出力する。
@@ -171,7 +171,7 @@ def is_file_scheme(str_value: str) -> bool:
     return str_value.startswith("file://")
 
 
-def get_file_scheme_path(str_value: str) -> Optional[str]:
+def get_file_scheme_path(str_value: str) -> str | None:
     """
     file schemaのパスを取得する。file schemeでない場合は、Noneを返す
 

annofabcli/common/visualize.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import enum
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import more_itertools
@@ -32,15 +32,15 @@ class AddProps:
     """
 
     #: 組織メンバ一覧のキャッシュ
-    _organization_members: Optional[list[OrganizationMember]] = None
-    _project_member_list: Optional[list[ProjectMember]] = None
+    _organization_members: list[OrganizationMember] | None = None
+    _project_member_list: list[ProjectMember] | None = None
 
     def __init__(self, service: annofabapi.Resource, project_id: str) -> None:
         self.service = service
         self.project_id = project_id
 
-        self._specs_labels: Optional[list[dict[str, Any]]] = None
-        self._specs_inspection_phrases: Optional[list[dict[str, Any]]] = None
+        self._specs_labels: list[dict[str, Any]] | None = None
+        self._specs_inspection_phrases: list[dict[str, Any]] | None = None
 
     def _set_annotation_specs(self):  # noqa: ANN202
         """
@@ -84,7 +84,7 @@ class AddProps:
         return millisecond / 1000 / 3600
 
     @staticmethod
-    def get_message(i18n_messages: dict[str, Any], locale: MessageLocale) -> Optional[str]:
+    def get_message(i18n_messages: dict[str, Any], locale: MessageLocale) -> str | None:
         messages: list[dict[str, Any]] = i18n_messages["messages"]
         dict_message = more_itertools.first_true(messages, pred=lambda e: e["lang"] == locale.value)
         if dict_message is not None:
@@ -112,7 +112,7 @@ class AddProps:
         target["username"] = username
         return target
 
-    def get_project_member_from_account_id(self, account_id: str) -> Optional[ProjectMember]:
+    def get_project_member_from_account_id(self, account_id: str) -> ProjectMember | None:
         if self._project_member_list is None:
             project_member_list = self.service.wrapper.get_all_project_members(self.project_id, query_params={"include_inactive_member": True})
             self._project_member_list = project_member_list
@@ -128,22 +128,22 @@ class AddProps:
         organization, _ = self.service.api.get_organization_of_project(project_id)
         return organization["organization_name"]
 
-    def get_phrase_name(self, phrase_id: str, locale: MessageLocale) -> Optional[str]:
-        phrase: Optional[dict[str, Any]] = more_itertools.first_true(self.specs_inspection_phrases, pred=lambda e: e["id"] == phrase_id)
+    def get_phrase_name(self, phrase_id: str, locale: MessageLocale) -> str | None:
+        phrase: dict[str, Any] | None = more_itertools.first_true(self.specs_inspection_phrases, pred=lambda e: e["id"] == phrase_id)
         if phrase is None:
             return None
 
         return self.get_message(phrase["text"], locale)
 
-    def get_label_name(self, label_id: str, locale: MessageLocale) -> Optional[str]:
+    def get_label_name(self, label_id: str, locale: MessageLocale) -> str | None:
         label = more_itertools.first_true(self.specs_labels, pred=lambda e: e["label_id"] == label_id)
         if label is None:
             return None
 
         return self.get_message(label["label_name"], locale)
 
-    def get_additional_data_name(self, additional_data_definition_id: str, locale: MessageLocale, label_id: Optional[str] = None) -> Optional[str]:
-        def _get_additional_data_name(arg_additional_data_definitions: list[dict[str, Any]]) -> Optional[str]:
+    def get_additional_data_name(self, additional_data_definition_id: str, locale: MessageLocale, label_id: str | None = None) -> str | None:
+        def _get_additional_data_name(arg_additional_data_definitions: list[dict[str, Any]]) -> str | None:
             additional_data = more_itertools.first_true(
                 arg_additional_data_definitions,
                 pred=lambda e: e["additional_data_definition_id"] == additional_data_definition_id,
@@ -194,7 +194,7 @@ class AddProps:
         """
         return self._add_user_info(instruction_history)
 
-    def add_properties_to_inspection(self, inspection: Inspection, detail: Optional[dict[str, Any]] = None) -> Inspection:
+    def add_properties_to_inspection(self, inspection: Inspection, detail: dict[str, Any] | None = None) -> Inspection:
         """
         検査コメントに、以下のキーを追加する.
         commenter_user_id

annofabcli/experimental/list_out_of_range_annotation_for_movie.py

@@ -4,13 +4,12 @@ import json
 import logging
 import zipfile
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
 from annofabapi.parser import SimpleAnnotationZipParser
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.download import DownloadingFile
@@ -59,7 +58,7 @@ class ListOutOfRangeAnnotationForMovieMain:
         project_id: str,
         task_list: list[dict[str, Any]],
         input_data_list: list[dict[str, Any]],
-        annotation_zip: Optional[Path],
+        annotation_zip: Path | None,
     ) -> pandas.DataFrame:
         if annotation_zip is None:
             logger.info(f"{len(task_list)} 件のアノテーション情報をWebAPIで取得します。")
@@ -123,7 +122,7 @@ class ListOutOfRangeAnnotationForMovieMain:
     def list_out_of_range_annotation_for_movie(
         self,
         project_id: str,
-        task_id_list: Optional[list[str]],
+        task_id_list: list[str] | None,
         parse_annotation_zip: bool = False,  # noqa: FBT001, FBT002
     ) -> pandas.DataFrame:
         cache_dir = annofabcli.common.utils.get_cache_dir()

annofabcli/experimental/subcommand_experimental.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.experimental import list_out_of_range_annotation_for_movie
 
@@ -13,7 +11,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     list_out_of_range_annotation_for_movie.add_parser(subparsers)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "experimental"
     subcommand_help = "アルファ版のサブコマンド"
     description = "アルファ版のサブコマンド。予告なしに削除されたり、コマンドライン引数が変わったりします。"

annofabcli/filesystem/draw_annotation.py

@@ -4,10 +4,10 @@ import argparse
 import json
 import logging
 import sys
-from collections.abc import Collection, Iterator
+from collections.abc import Callable, Collection, Iterator
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Callable, Optional, Union
+from typing import Any
 
 import pandas
 from annofabapi.parser import SimpleAnnotationParser, lazy_parse_simple_annotation_dir, lazy_parse_simple_annotation_zip
@@ -27,7 +27,7 @@ from annofabcli.common.facade import TaskQuery, match_annotation_with_task_query
 logger = logging.getLogger(__name__)
 
 
-Color = Union[str, tuple[int, int, int]]
+Color = str | tuple[int, int, int]
 IsParserFunc = Callable[[SimpleAnnotationParser], bool]
 
 
@@ -59,10 +59,10 @@ class DrawingAnnotationForOneImage:
 
     def __init__(
         self,
-        label_color_dict: Optional[dict[str, Color]] = None,
-        target_label_names: Optional[Collection[str]] = None,
-        polyline_labels: Optional[Collection[str]] = None,
-        drawing_options: Optional[DrawingOptions] = None,
+        label_color_dict: dict[str, Color] | None = None,
+        target_label_names: Collection[str] | None = None,
+        polyline_labels: Collection[str] | None = None,
+        drawing_options: DrawingOptions | None = None,
     ) -> None:
         self.label_color_dict = label_color_dict if label_color_dict is not None else {}
         self.target_label_names = set(target_label_names) if target_label_names is not None else None
@@ -161,9 +161,9 @@ class DrawingAnnotationForOneImage:
     def main(  # noqa: ANN201
         self,
         parser: SimpleAnnotationParser,
-        image_file: Optional[Path],
+        image_file: Path | None,
         output_file: Path,
-        image_size: Optional[tuple[int, int]] = None,
+        image_size: tuple[int, int] | None = None,
     ):
         """画像にアノテーションを描画したファイルを出力する。
 
@@ -190,9 +190,9 @@ class DrawingAnnotationForOneImage:
 
 
 def create_is_target_parser_func(
-    task_ids: Optional[Collection[str]] = None,
-    task_query: Optional[TaskQuery] = None,
-) -> Optional[IsParserFunc]:
+    task_ids: Collection[str] | None = None,
+    task_query: TaskQuery | None = None,
+) -> IsParserFunc | None:
     if task_ids is None and task_query is None:
         return None
 
@@ -215,17 +215,17 @@ def create_is_target_parser_func(
 
 def draw_annotation_all(  # noqa: ANN201, PLR0913
     iter_parser: Iterator[SimpleAnnotationParser],
-    image_dir: Optional[Path],
-    input_data_id_relation_dict: Optional[dict[str, str]],
+    image_dir: Path | None,
+    input_data_id_relation_dict: dict[str, str] | None,
     output_dir: Path,
     *,
-    target_task_ids: Optional[Collection[str]] = None,
-    task_query: Optional[TaskQuery] = None,
-    label_color_dict: Optional[dict[str, Color]] = None,
-    target_label_names: Optional[Collection[str]] = None,
-    polyline_labels: Optional[Collection[str]] = None,
-    drawing_options: Optional[DrawingOptions] = None,
-    default_image_size: Optional[tuple[int, int]] = None,
+    target_task_ids: Collection[str] | None = None,
+    task_query: TaskQuery | None = None,
+    label_color_dict: dict[str, Color] | None = None,
+    target_label_names: Collection[str] | None = None,
+    polyline_labels: Collection[str] | None = None,
+    drawing_options: DrawingOptions | None = None,
+    default_image_size: tuple[int, int] | None = None,
 ):
     drawing = DrawingAnnotationForOneImage(
         label_color_dict=label_color_dict,
@@ -251,7 +251,7 @@ def draw_annotation_all(  # noqa: ANN201, PLR0913
                 logger.warning(f"input_data_id='{input_data_id}'に対応する画像ファイルのパスが見つかりませんでした。")
                 continue
 
-        image_file: Optional[Path] = None
+        image_file: Path | None = None
         if image_dir is not None and input_data_id_relation_dict is not None:
             image_file = image_dir / input_data_id_relation_dict[input_data_id]
             if not image_file.exists():
@@ -291,7 +291,7 @@ class DrawAnnotation(CommandLineWithoutWebapi):
     def main(self) -> None:
         args = self.args
 
-        default_image_size: Optional[tuple[int, int]] = None
+        default_image_size: tuple[int, int] | None = None
         if args.default_image_size is not None:
             default_image_size = annofabcli.common.cli.get_input_data_size(args.default_image_size)
             if default_image_size is None:
@@ -322,7 +322,7 @@ class DrawAnnotation(CommandLineWithoutWebapi):
         else:
             iter_parser = lazy_parse_simple_annotation_dir(annotation_path)
 
-        input_data_id_relation_dict: Optional[dict[str, str]] = None
+        input_data_id_relation_dict: dict[str, str] | None = None
         if args.input_data_id_csv is not None:
             df = pandas.read_csv(
                 args.input_data_id_csv,
@@ -330,7 +330,7 @@ class DrawAnnotation(CommandLineWithoutWebapi):
                 header=None,
                 names=("input_data_id", "image_path"),
             )
-            input_data_id_relation_dict = dict(zip(df["input_data_id"], df["image_path"]))
+            input_data_id_relation_dict = dict(zip(df["input_data_id"], df["image_path"], strict=False))
 
         task_query = TaskQuery.from_dict(annofabcli.common.cli.get_json_from_args(args.task_query)) if args.task_query is not None else None
 
@@ -439,7 +439,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 = "draw_annotation"
 
     subcommand_help = "画像にアノテーションを描画します。"

annofabcli/filesystem/filter_annotation.py

@@ -7,11 +7,10 @@ import zipfile
 from collections import defaultdict
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 from annofabapi.parser import lazy_parse_simple_annotation_dir, lazy_parse_simple_annotation_zip
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import COMMAND_LINE_ERROR_STATUS_CODE
 from annofabcli.common.facade import TaskQuery, match_annotation_with_task_query
@@ -21,13 +20,13 @@ logger = logging.getLogger(__name__)
 
 @dataclass
 class FilterQuery:
-    task_query: Optional[TaskQuery] = None
-    task_id_set: Optional[set[str]] = None
-    exclude_task_id_set: Optional[set[str]] = None
-    input_data_id_set: Optional[set[str]] = None
-    exclude_input_data_id_set: Optional[set[str]] = None
-    input_data_name_set: Optional[set[str]] = None
-    exclude_input_data_name_set: Optional[set[str]] = None
+    task_query: TaskQuery | None = None
+    task_id_set: set[str] | None = None
+    exclude_task_id_set: set[str] | None = None
+    input_data_id_set: set[str] | None = None
+    exclude_input_data_id_set: set[str] | None = None
+    input_data_name_set: set[str] | None = None
+    exclude_input_data_name_set: set[str] | None = None
 
 
 def match_query(  # pylint: disable=too-many-return-statements  # noqa: PLR0911
@@ -220,7 +219,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 = "filter_annotation"
 
     subcommand_help = "アノテーションzipから特定のファイルを絞り込んで、zip展開します。"

annofabcli/filesystem/mask_user_info.py

@@ -2,7 +2,7 @@ import argparse
 import logging
 from functools import partial
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any
 
 import numpy
 import pandas
@@ -98,7 +98,7 @@ def create_masked_name(name: str) -> str:
     return _num2alpha(hash_value)
 
 
-def get_replaced_user_id_set_from_biography(df: pandas.DataFrame, not_masked_location_set: Optional[set[str]] = None) -> set[str]:
+def get_replaced_user_id_set_from_biography(df: pandas.DataFrame, not_masked_location_set: set[str] | None = None) -> set[str]:
     if not_masked_location_set is None:
         filtered_df = df
     else:
@@ -115,7 +115,7 @@ def _get_header_row_count(df: pandas.DataFrame) -> int:
         return 1
 
 
-def _get_tuple_column(df: pandas.DataFrame, column: str) -> Union[str, tuple]:
+def _get_tuple_column(df: pandas.DataFrame, column: str) -> str | tuple:
     """
     列名を返します。ヘッダ行が複数行の場合は、タプルで返します。
 
@@ -136,8 +136,8 @@ def _get_tuple_column(df: pandas.DataFrame, column: str) -> Union[str, tuple]:
 def replace_by_columns(  # noqa: ANN201
     df: pandas.DataFrame,
     replacement_dict: dict[str, str],
-    main_column: Union[str, tuple],
-    sub_columns: Optional[list[Any]] = None,
+    main_column: str | tuple,
+    sub_columns: list[Any] | None = None,
 ):
     """引数dfの中のユーザ情報を、指定した列名を元に置換します。
 
@@ -148,7 +148,7 @@ def replace_by_columns(  # noqa: ANN201
         sub_column: main_columnと同じ値で置換する列(ex: username)
     """
 
-    def _get_username(row: pandas.Series, main_column: Union[str, tuple], sub_column: Union[str, tuple]) -> str:
+    def _get_username(row: pandas.Series, main_column: str | tuple, sub_column: str | tuple) -> str:
         if row[main_column] in replacement_dict:
             return replacement_dict[row[main_column]]
         else:
@@ -196,7 +196,7 @@ def get_masked_account_id(df: pandas.DataFrame, replace_dict_by_user_id: dict[st
     return df.apply(_get_account_id, axis=1)
 
 
-def get_replaced_biography_set(df: pandas.DataFrame, not_masked_location_set: Optional[set[str]] = None) -> set[str]:
+def get_replaced_biography_set(df: pandas.DataFrame, not_masked_location_set: set[str] | None = None) -> set[str]:
     biography_set = set(df["biography"].dropna())
 
     if not_masked_location_set is None:
@@ -209,8 +209,8 @@ def get_replaced_biography_set(df: pandas.DataFrame, not_masked_location_set: Op
 
 def create_replacement_dict_by_user_id(
     df: pandas.DataFrame,
-    not_masked_biography_set: Optional[set[str]] = None,
-    not_masked_user_id_set: Optional[set[str]] = None,
+    not_masked_biography_set: set[str] | None = None,
+    not_masked_user_id_set: set[str] | None = None,
 ) -> dict[str, str]:
     """
     keyが置換対象のuser_id、valueが置換後のマスクされたuser_idであるdictを作成する。
@@ -227,7 +227,7 @@ def create_replacement_dict_by_user_id(
 
 def create_replacement_dict_by_biography(
     df: pandas.DataFrame,
-    not_masked_biography_set: Optional[set[str]] = None,
+    not_masked_biography_set: set[str] | None = None,
 ) -> dict[str, str]:
     """
     keyが置換対象のbiography、valueが置換後のマスクされた biography であるdictを作成する。
@@ -270,7 +270,7 @@ def replace_biography(df: pandas.DataFrame, replacement_dict_by_user_id: dict[st
     user_id_column = _get_tuple_column(df, "user_id")
     biography_column = _get_tuple_column(df, "biography")
 
-    def _get_biography(row: pandas.Series, user_id_column: Union[str, tuple], biography_column: Union[str, tuple]) -> str:
+    def _get_biography(row: pandas.Series, user_id_column: str | tuple, biography_column: str | tuple) -> str:
         if row[user_id_column] in replacement_dict_by_user_id:
             # マスク対象のユーザなら biographyをマスクする
             biography = row[biography_column]
@@ -288,8 +288,8 @@ def replace_biography(df: pandas.DataFrame, replacement_dict_by_user_id: dict[st
 def create_masked_user_info_df(
     df: pandas.DataFrame,
     *,
-    not_masked_biography_set: Optional[set[str]] = None,
-    not_masked_user_id_set: Optional[set[str]] = None,
+    not_masked_biography_set: set[str] | None = None,
+    not_masked_user_id_set: set[str] | None = None,
 ) -> pandas.DataFrame:
     if "user_id" not in df:
         logger.warning("引数`df`に`user_id`列が存在しないため、ユーザ情報をマスクできません。")
@@ -360,7 +360,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 = "mask_user_info"
     subcommand_help = "CSVに記載されたユーザ情報をマスクします。"
     description = "CSVに記載されたユーザ情報をマスクします。CSVの`user_id`,`username`,`biography`,`account_id` 列をマスクします。"

annofabcli/filesystem/merge_annotation.py

@@ -3,9 +3,9 @@ import json
 import logging
 import sys
 import zipfile
-from collections.abc import Collection, Iterator
+from collections.abc import Callable, Collection, Iterator
 from pathlib import Path
-from typing import Any, Callable, Optional
+from typing import Any
 
 from annofabapi.parser import (
     SimpleAnnotationDirParser,
@@ -110,7 +110,7 @@ class MergeAnnotationMain:
             json.dump(simple_annotation, f, ensure_ascii=False)
 
     @staticmethod
-    def _get_parser(annotation_path: Path, zip_file: Optional[zipfile.ZipFile], json_path: Path) -> Optional[SimpleAnnotationParser]:
+    def _get_parser(annotation_path: Path, zip_file: zipfile.ZipFile | None, json_path: Path) -> SimpleAnnotationParser | None:
         if annotation_path.is_dir():
             if (annotation_path / json_path).exists():
                 return SimpleAnnotationDirParser(annotation_path / json_path)
@@ -126,8 +126,8 @@ class MergeAnnotationMain:
 
     @staticmethod
     def create_is_target_parser_func(
-        task_ids: Optional[Collection[str]] = None,
-    ) -> Optional[IsParserFunc]:
+        task_ids: Collection[str] | None = None,
+    ) -> IsParserFunc | None:
         if task_ids is None:
             return None
 
@@ -147,13 +147,13 @@ class MergeAnnotationMain:
         annotation_path1: Path,
         annotation_path2: Path,
         output_dir: Path,
-        target_task_ids: Optional[Collection[str]] = None,
+        target_task_ids: Collection[str] | None = None,
     ):
         is_target_parser_func = self.create_is_target_parser_func(target_task_ids)
 
         iter_parser1 = self.create_iter_parser(annotation_path1)
 
-        zip_file2: Optional[zipfile.ZipFile] = None
+        zip_file2: zipfile.ZipFile | None = None
         if annotation_path2.is_file():
             zip_file2 = zipfile.ZipFile(str(annotation_path2), "r")  # pylint: disable=consider-using-with
 
@@ -244,7 +244,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 = "merge_annotation"
 
     subcommand_help = "2つのアノテーションzip（またはzipを展開したディレクトリ）をマージします。"

annofabcli/filesystem/subcommand_filesystem.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
 import annofabcli.filesystem.draw_annotation
 import annofabcli.filesystem.filter_annotation
@@ -19,7 +17,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.filesystem.merge_annotation.add_parser(subparsers)
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "filesystem"
     subcommand_help = "ファイル操作関係（Web APIにアクセスしない）のサブコマンド"
     description = "ファイル操作関係（Web APIにアクセスしない）のサブコマンド"

annofabcli/input_data/copy_input_data.py

@@ -7,13 +7,12 @@ import multiprocessing
 import sys
 import tempfile
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import more_itertools
 from annofabapi.models import ProjectMemberRole
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -49,7 +48,7 @@ class CopyInputDataMain(CommandLineWithConfirm):
 
         CommandLineWithConfirm.__init__(self, all_yes)
 
-    def copy_supplementary_data(self, src_supplementary_data: dict[str, Any], last_updated_datetime: Optional[str]) -> dict[str, Any]:
+    def copy_supplementary_data(self, src_supplementary_data: dict[str, Any], last_updated_datetime: str | None) -> dict[str, Any]:
         request_body = {
             "supplementary_data_name": src_supplementary_data["supplementary_data_name"],
             "supplementary_data_path": src_supplementary_data["supplementary_data_path"],
@@ -70,7 +69,7 @@ class CopyInputDataMain(CommandLineWithConfirm):
         src_supplementary_data_list: list[dict[str, Any]],
         dest_supplementary_data_list: list[dict[str, Any]],
         *,
-        logging_prefix: Optional[str] = None,
+        logging_prefix: str | None = None,
     ) -> None:
         for src_supplementary_data in src_supplementary_data_list:
             dest_supplementary_data = more_itertools.first_true(
@@ -93,7 +92,7 @@ class CopyInputDataMain(CommandLineWithConfirm):
             f"src_project_id='{self.src_project_id}', dest_project_id='{self.dest_project_id}'"
         )
 
-    def copy_input_data(self, src_input_data: dict[str, Any], last_updated_datetime: Optional[str]) -> dict[str, Any]:
+    def copy_input_data(self, src_input_data: dict[str, Any], last_updated_datetime: str | None) -> dict[str, Any]:
         request_body = {
             "input_data_name": src_input_data["input_data_name"],
             "input_data_path": src_input_data["input_data_path"],
@@ -108,7 +107,7 @@ class CopyInputDataMain(CommandLineWithConfirm):
         self,
         input_data_id: str,
         *,
-        input_data_index: Optional[int] = None,
+        input_data_index: int | None = None,
     ) -> bool:
         def get_confirm_message(supplementary_data_count: int, *, exists_in_dest_project: bool) -> str:
             message = f"入力データ(input_data_id='{input_data_id}')と補助情報{supplementary_data_count}件をコピーしますか？"
@@ -181,9 +180,9 @@ class CopyInputDataMain(CommandLineWithConfirm):
 
     def copy_input_data_list(
         self,
-        input_data_id_list: Optional[list[str]],
+        input_data_id_list: list[str] | None,
         *,
-        parallelism: Optional[int] = None,
+        parallelism: int | None = None,
     ) -> None:
         if input_data_id_list is None:
             input_data_id_list = self.get_all_input_data_id_list(self.src_project_id)
@@ -298,7 +297,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/input_data/delete_input_data.py

@@ -1,6 +1,6 @@
 import argparse
 import logging
-from typing import Any, Optional
+from typing import Any
 
 import requests
 from annofabapi.models import ProjectMemberRole
@@ -164,7 +164,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 = "入力データを削除します。"