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

annofabcli/statistics/list_annotation_attribute.py

@@ -8,7 +8,7 @@ import tempfile
 import zipfile
 from collections.abc import Collection, Iterator
 from pathlib import Path
-from typing import Any, Literal, Optional, Union
+from typing import Any, Literal
 
 import pandas
 import pydantic
@@ -19,7 +19,6 @@ from annofabapi.parser import (
     lazy_parse_simple_annotation_zip,
 )
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -65,11 +64,11 @@ class AnnotationAttribute(pydantic.BaseModel):
 
     input_data_id: str
     input_data_name: str
-    updated_datetime: Optional[str]
+    updated_datetime: str | None
     """アノテーションJSONに格納されているアノテーションの更新日時"""
     annotation_id: str
     label: str
-    attributes: dict[str, Union[str, int, bool]]
+    attributes: dict[str, str | int | bool]
 
 
 def get_annotation_attribute_list_from_annotation_json(simple_annotation: dict[str, Any], *, target_labels: Collection[str] | None = None) -> list[AnnotationAttribute]:
@@ -109,8 +108,8 @@ def get_annotation_attribute_list_from_annotation_json(simple_annotation: dict[s
 def get_annotation_attribute_list_from_annotation_zipdir_path(
     annotation_zipdir_path: Path,
     *,
-    target_task_ids: Optional[Collection[str]] = None,
-    task_query: Optional[TaskQuery] = None,
+    target_task_ids: Collection[str] | None = None,
+    task_query: TaskQuery | None = None,
     target_labels: Collection[str] | None = None,
 ) -> list[AnnotationAttribute]:
     """
@@ -142,7 +141,7 @@ def get_annotation_attribute_list_from_annotation_zipdir_path(
     return result
 
 
-def print_annotation_attribute_list_as_csv(annotation_attribute_list: list, output_file: Optional[Path]) -> None:
+def print_annotation_attribute_list_as_csv(annotation_attribute_list: list, output_file: Path | None) -> None:
     df = pandas.json_normalize(annotation_attribute_list)
 
     base_columns = [
@@ -197,7 +196,7 @@ class ListAnnotationAttribute(CommandLine):
         if not self.validate(args):
             sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
 
-        project_id: Optional[str] = args.project_id
+        project_id: str | None = args.project_id
         if project_id is not None:
             super().validate_project(project_id, project_member_roles=[ProjectMemberRole.OWNER, ProjectMemberRole.TRAINING_DATA_USER])
 
@@ -212,7 +211,7 @@ class ListAnnotationAttribute(CommandLine):
 
         downloading_obj = DownloadingFile(self.service)
 
-        def download_and_print_annotation_attribute_list(project_id: str, temp_dir: Path, *, is_latest: bool, annotation_path: Optional[Path]) -> None:
+        def download_and_print_annotation_attribute_list(project_id: str, temp_dir: Path, *, is_latest: bool, annotation_path: Path | None) -> None:
             if annotation_path is None:
                 annotation_path = temp_dir / f"{project_id}__annotation.zip"
                 downloading_obj.download_annotation_zip(
@@ -299,7 +298,7 @@ def main(args: argparse.Namespace) -> None:
     ListAnnotationAttribute(service, facade, args).main()
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "list_annotation_attribute"
     subcommand_help = "アノテーションZIPを読み込み、アノテーションの属性値の一覧を出力します。"
     epilog = "オーナロールまたはアノテーションユーザロールを持つユーザで実行してください。"

annofabcli/statistics/list_annotation_attribute_filled_count.py

@@ -13,7 +13,7 @@ from dataclasses import dataclass, field
 from enum import Enum
 from functools import partial
 from pathlib import Path
-from typing import Any, Literal, Optional, Protocol, Union
+from typing import Any, Literal, Protocol
 
 import annofabapi
 import pandas
@@ -28,7 +28,6 @@ from annofabapi.pydantic_models.task_phase import TaskPhase
 from annofabapi.pydantic_models.task_status import TaskStatus
 from dataclasses_json import DataClassJsonMixin, config
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -108,7 +107,7 @@ class AnnotationCountByInputData(DataClassJsonMixin, HasAnnotationAttributeCount
 
     input_data_id: str
     input_data_name: str
-    updated_datetime: Optional[str]
+    updated_datetime: str | None
     """アノテーションJSONに格納されているアノテーションの更新日時"""
 
     annotation_attribute_counts: dict[AttributeValueKey, int] = field(
@@ -119,7 +118,7 @@ class AnnotationCountByInputData(DataClassJsonMixin, HasAnnotationAttributeCount
     """属性値ごとのアノテーションの個数
     key: tuple[ラベル名(英語),属性名(英語),属性値の種類], value: アノテーション数
     """
-    frame_no: Optional[int] = None
+    frame_no: int | None = None
     """フレーム番号（1始まり）。アノテーションJSONには含まれていない情報なので、Optionalにする"""
 
 
@@ -204,11 +203,11 @@ class ListAnnotationCounterByInputData:
     def __init__(
         self,
         *,
-        target_labels: Optional[Collection[str]] = None,
-        non_target_labels: Optional[Collection[str]] = None,
-        target_attribute_names: Optional[Collection[AttributeNameKey]] = None,
-        non_target_attribute_names: Optional[Collection[AttributeNameKey]] = None,
-        frame_no_map: Optional[dict[tuple[str, str], int]] = None,
+        target_labels: Collection[str] | None = None,
+        non_target_labels: Collection[str] | None = None,
+        target_attribute_names: Collection[AttributeNameKey] | None = None,
+        non_target_attribute_names: Collection[AttributeNameKey] | None = None,
+        frame_no_map: dict[tuple[str, str], int] | None = None,
     ) -> None:
         self.target_labels = set(target_labels) if target_labels is not None else None
         self.target_attribute_names = set(target_attribute_names) if target_attribute_names is not None else None
@@ -225,7 +224,7 @@ class ListAnnotationCounterByInputData:
 
         """
 
-        def convert_attribute_value_to_type(value: Optional[Union[bool, str, float]]) -> AttributeValueType:  # noqa: FBT001
+        def convert_attribute_value_to_type(value: bool | str | float | None) -> AttributeValueType:  # noqa: FBT001
             """
             アノテーションJSONに格納されている属性値を、dict用のkeyに変換する。
 
@@ -263,7 +262,7 @@ class ListAnnotationCounterByInputData:
                 attribute_key = (label, attribute_name, convert_attribute_value_to_type(attribute_value))
                 annotation_count_by_attribute[attribute_key] += 1
 
-        frame_no: Optional[int] = None
+        frame_no: int | None = None
         if self.frame_no_map is not None:
             frame_no = self.frame_no_map.get((simple_annotation["task_id"], simple_annotation["input_data_id"]))
 
@@ -284,8 +283,8 @@ class ListAnnotationCounterByInputData:
         self,
         annotation_path: Path,
         *,
-        target_task_ids: Optional[Collection[str]] = None,
-        task_query: Optional[TaskQuery] = None,
+        target_task_ids: Collection[str] | None = None,
+        task_query: TaskQuery | None = None,
     ) -> list[AnnotationCountByInputData]:
         """
         アノテーションzipまたはそれを展開したディレクトリから、属性値ごとのアノテーション数を取得する。
@@ -328,7 +327,7 @@ class AnnotationCountCsvByAttribute:
     def __init__(self, selective_attribute_value_max_count: int = 20) -> None:
         self.selective_attribute_value_max_count = selective_attribute_value_max_count
 
-    def _value_columns(self, annotation_count_list: Collection[HasAnnotationAttributeCounts], *, prior_attribute_columns: Optional[list[tuple[str, str, str]]]) -> list[tuple[str, str, str]]:
+    def _value_columns(self, annotation_count_list: Collection[HasAnnotationAttributeCounts], *, prior_attribute_columns: list[tuple[str, str, str]] | None) -> list[tuple[str, str, str]]:
         """
         CSVの数値列を取得します。
         """
@@ -347,7 +346,7 @@ class AnnotationCountCsvByAttribute:
     def get_columns_by_input_data(
         self,
         annotation_count_list: list[AnnotationCountByInputData],
-        prior_attribute_columns: Optional[list[tuple[str, str, str]]] = None,
+        prior_attribute_columns: list[tuple[str, str, str]] | None = None,
     ) -> list[tuple[str, str, str]]:
         basic_columns = [
             ("project_id", "", ""),
@@ -366,7 +365,7 @@ class AnnotationCountCsvByAttribute:
     def get_columns_by_task(
         self,
         annotation_count_list: list[AnnotationCountByTask],
-        prior_attribute_columns: Optional[list[tuple[str, str, str]]] = None,
+        prior_attribute_columns: list[tuple[str, str, str]] | None = None,
     ) -> list[tuple[str, str, str]]:
         basic_columns = [
             ("project_id", "", ""),
@@ -383,7 +382,7 @@ class AnnotationCountCsvByAttribute:
         self,
         annotation_count_list: list[AnnotationCountByInputData],
         *,
-        prior_attribute_columns: Optional[list[tuple[str, str, str]]] = None,
+        prior_attribute_columns: list[tuple[str, str, str]] | None = None,
     ) -> pandas.DataFrame:
         def to_cell(c: AnnotationCountByInputData) -> dict[tuple[str, str, str], Any]:
             cell: dict[tuple[str, str, str], Any] = {
@@ -413,7 +412,7 @@ class AnnotationCountCsvByAttribute:
         self,
         annotation_count_list: list[AnnotationCountByTask],
         *,
-        prior_attribute_columns: Optional[list[tuple[str, str, str]]] = None,
+        prior_attribute_columns: list[tuple[str, str, str]] | None = None,
     ) -> pandas.DataFrame:
         def to_cell(c: AnnotationCountByTask) -> dict[tuple[str, str, str], Any]:
             cell: dict[tuple[str, str, str], Any] = {
@@ -460,16 +459,16 @@ class ListAnnotationAttributeFilledCountMain:
     def __init__(self, service: annofabapi.Resource) -> None:
         self.service = service
 
-    def print_annotation_count_csv_by_input_data(self, annotation_count_list: list[AnnotationCountByInputData], output_file: Path, *, attribute_names: Optional[list[tuple[str, str]]]) -> None:
-        attribute_columns: Optional[list[tuple[str, str, str]]] = None
+    def print_annotation_count_csv_by_input_data(self, annotation_count_list: list[AnnotationCountByInputData], output_file: Path, *, attribute_names: list[tuple[str, str]] | None) -> None:
+        attribute_columns: list[tuple[str, str, str]] | None = None
         if attribute_names is not None:
             attribute_columns = get_attribute_columns(attribute_names)
 
         df = AnnotationCountCsvByAttribute().create_df_by_input_data(annotation_count_list, prior_attribute_columns=attribute_columns)
         print_csv(df, output_file)
 
-    def print_annotation_count_csv_by_task(self, annotation_count_list: list[AnnotationCountByTask], output_file: Path, *, attribute_names: Optional[list[tuple[str, str]]]) -> None:
-        attribute_columns: Optional[list[tuple[str, str, str]]] = None
+    def print_annotation_count_csv_by_task(self, annotation_count_list: list[AnnotationCountByTask], output_file: Path, *, attribute_names: list[tuple[str, str]] | None) -> None:
+        attribute_columns: list[tuple[str, str, str]] | None = None
         if attribute_names is not None:
             attribute_columns = get_attribute_columns(attribute_names)
 
@@ -483,14 +482,14 @@ class ListAnnotationAttributeFilledCountMain:
         group_by: GroupBy,
         output_format: FormatArgument,
         *,
-        project_id: Optional[str] = None,
+        project_id: str | None = None,
         include_flag_attribute: bool = False,
-        task_json_path: Optional[Path] = None,
-        target_task_ids: Optional[Collection[str]] = None,
-        task_query: Optional[TaskQuery] = None,
+        task_json_path: Path | None = None,
+        target_task_ids: Collection[str] | None = None,
+        task_query: TaskQuery | None = None,
     ) -> None:
-        annotation_specs: Optional[AnnotationSpecs] = None
-        target_attribute_names: Optional[list[AttributeNameKey]] = None
+        annotation_specs: AnnotationSpecs | None = None
+        target_attribute_names: list[AttributeNameKey] | None = None
         if project_id is not None:
             annotation_specs = AnnotationSpecs(self.service, project_id)
             if not include_flag_attribute:
@@ -555,7 +554,7 @@ class ListAnnotationAttributeFilledCount(CommandLine):
         if not self.validate(args):
             sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
 
-        project_id: Optional[str] = args.project_id
+        project_id: str | None = args.project_id
         if project_id is not None:
             super().validate_project(project_id, project_member_roles=[ProjectMemberRole.OWNER, ProjectMemberRole.TRAINING_DATA_USER])
 
@@ -571,7 +570,7 @@ class ListAnnotationAttributeFilledCount(CommandLine):
 
         downloading_obj = DownloadingFile(self.service)
 
-        def download_and_process_annotation(temp_dir: Path, *, is_latest: bool, annotation_path: Optional[Path]) -> None:
+        def download_and_process_annotation(temp_dir: Path, *, is_latest: bool, annotation_path: Path | None) -> None:
             # タスク全件ファイルは、フレーム番号を参照するのに利用する
             if project_id is not None and group_by == GroupBy.INPUT_DATA_ID:
                 # group_byで条件を絞り込んでいる理由：
@@ -699,7 +698,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 = "list_annotation_attribute_filled_count"
     subcommand_help = "値が入力されている属性の個数を、タスクごとまたは入力データごとに集計します。"
 

annofabcli/statistics/list_annotation_count.py

@@ -16,7 +16,7 @@ from dataclasses import dataclass, field
 from enum import Enum
 from functools import partial
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any
 
 import annofabapi
 import pandas
@@ -32,7 +32,6 @@ from annofabapi.parser import (
 from annofabapi.pydantic_models.additional_data_definition_type import AdditionalDataDefinitionType
 from dataclasses_json import DataClassJsonMixin, config
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -133,9 +132,9 @@ class AnnotationCounterByInputData(AnnotationCounter, DataClassJsonMixin):
 
     input_data_id: str
     input_data_name: str
-    updated_datetime: Optional[str]
+    updated_datetime: str | None
     """アノテーションJSONに格納されているアノテーションの更新日時"""
-    frame_no: Optional[int] = None
+    frame_no: int | None = None
     """アノテーションJSONには含まれていない情報なので、Optionalにする"""
 
 
@@ -178,11 +177,11 @@ class ListAnnotationCounterByInputData:
     def __init__(
         self,
         *,
-        target_labels: Optional[Collection[str]] = None,
-        non_target_labels: Optional[Collection[str]] = None,
-        target_attribute_names: Optional[Collection[AttributeNameKey]] = None,
-        non_target_attribute_names: Optional[Collection[AttributeNameKey]] = None,
-        frame_no_map: Optional[dict[tuple[str, str], int]] = None,
+        target_labels: Collection[str] | None = None,
+        non_target_labels: Collection[str] | None = None,
+        target_attribute_names: Collection[AttributeNameKey] | None = None,
+        non_target_attribute_names: Collection[AttributeNameKey] | None = None,
+        frame_no_map: dict[tuple[str, str], int] | None = None,
     ) -> None:
         self.target_labels = set(target_labels) if target_labels is not None else None
         self.target_attribute_names = set(target_attribute_names) if target_attribute_names is not None else None
@@ -201,7 +200,7 @@ class ListAnnotationCounterByInputData:
             simple_annotation: JSONファイルの内容
         """
 
-        def convert_attribute_value_to_key(value: Union[bool, str, float]) -> str:  # noqa: FBT001
+        def convert_attribute_value_to_key(value: bool | str | float) -> str:  # noqa: FBT001
             """
             アノテーションJSONに格納されている属性値を、dict用のkeyに変換する。
 
@@ -253,7 +252,7 @@ class ListAnnotationCounterByInputData:
 
         task_id = simple_annotation["task_id"]
         input_data_id = simple_annotation["input_data_id"]
-        frame_no: Optional[int] = None
+        frame_no: int | None = None
         if self.frame_no_map is not None:
             frame_no = self.frame_no_map.get((task_id, input_data_id))
 
@@ -276,8 +275,8 @@ class ListAnnotationCounterByInputData:
         self,
         annotation_path: Path,
         *,
-        target_task_ids: Optional[Collection[str]] = None,
-        task_query: Optional[TaskQuery] = None,
+        target_task_ids: Collection[str] | None = None,
+        task_query: TaskQuery | None = None,
     ) -> list[AnnotationCounterByInputData]:
         """
         アノテーションzipまたはそれを展開したディレクトリから、ラベルごと/属性ごとのアノテーション数を集計情報を取得する。
@@ -315,10 +314,10 @@ class ListAnnotationCounterByTask:
     def __init__(
         self,
         *,
-        target_labels: Optional[Collection[str]] = None,
-        non_target_labels: Optional[Collection[str]] = None,
-        target_attribute_names: Optional[Collection[AttributeNameKey]] = None,
-        non_target_attribute_names: Optional[Collection[AttributeNameKey]] = None,
+        target_labels: Collection[str] | None = None,
+        non_target_labels: Collection[str] | None = None,
+        target_attribute_names: Collection[AttributeNameKey] | None = None,
+        non_target_attribute_names: Collection[AttributeNameKey] | None = None,
     ) -> None:
         self.counter_by_input_data = ListAnnotationCounterByInputData(
             target_labels=target_labels,
@@ -372,8 +371,8 @@ class ListAnnotationCounterByTask:
         self,
         annotation_path: Path,
         *,
-        target_task_ids: Optional[Collection[str]] = None,
-        task_query: Optional[TaskQuery] = None,
+        target_task_ids: Collection[str] | None = None,
+        task_query: TaskQuery | None = None,
     ) -> list[AnnotationCounterByTask]:
         """
         アノテーションzipまたはそれを展開したディレクトリから、ラベルごと/属性ごとのアノテーション数を集計情報を取得する。
@@ -437,7 +436,7 @@ class AttributeCountCsv:
 
         return [(label, attribute_name, attribute_value) for (label, attribute_name, attribute_value) in columns if (label, attribute_name) not in non_selective_attribute_names]
 
-    def _value_columns(self, counter_list: Collection[AnnotationCounter], prior_attribute_columns: Optional[list[AttributeValueKey]]) -> list[AttributeValueKey]:
+    def _value_columns(self, counter_list: Collection[AnnotationCounter], prior_attribute_columns: list[AttributeValueKey] | None) -> list[AttributeValueKey]:
         all_attr_key_set = {attr_key for c in counter_list for attr_key in c.annotation_count_by_attribute}
         if prior_attribute_columns is not None:
             remaining_columns = sorted(all_attr_key_set - set(prior_attribute_columns))
@@ -471,7 +470,7 @@ class AttributeCountCsv:
         self,
         counter_list: list[AnnotationCounterByTask],
         output_file: Path,
-        prior_attribute_columns: Optional[list[AttributeValueKey]] = None,
+        prior_attribute_columns: list[AttributeValueKey] | None = None,
     ) -> None:
         def get_columns() -> list[AttributeValueKey]:
             basic_columns = [
@@ -511,7 +510,7 @@ class AttributeCountCsv:
         self,
         counter_list: list[AnnotationCounterByInputData],
         output_file: Path,
-        prior_attribute_columns: Optional[list[AttributeValueKey]] = None,
+        prior_attribute_columns: list[AttributeValueKey] | None = None,
     ) -> None:
         def get_columns() -> list[AttributeValueKey]:
             basic_columns = [
@@ -563,7 +562,7 @@ class LabelCountCsv:
 
     """
 
-    def _value_columns(self, counter_list: Collection[AnnotationCounter], prior_label_columns: Optional[list[str]]) -> list[str]:
+    def _value_columns(self, counter_list: Collection[AnnotationCounter], prior_label_columns: list[str] | None) -> list[str]:
         all_attr_key_set = {attr_key for c in counter_list for attr_key in c.annotation_count_by_label}
         if prior_label_columns is not None:
             remaining_columns = sorted(all_attr_key_set - set(prior_label_columns))
@@ -578,7 +577,7 @@ class LabelCountCsv:
         self,
         counter_list: list[AnnotationCounterByTask],
         output_file: Path,
-        prior_label_columns: Optional[list[str]] = None,
+        prior_label_columns: list[str] | None = None,
     ) -> None:
         def get_columns() -> list[str]:
             basic_columns = [
@@ -618,7 +617,7 @@ class LabelCountCsv:
         self,
         counter_list: list[AnnotationCounterByInputData],
         output_file: Path,
-        prior_label_columns: Optional[list[str]] = None,
+        prior_label_columns: list[str] | None = None,
     ) -> None:
         def get_columns() -> list[str]:
             basic_columns = [
@@ -670,7 +669,7 @@ class AnnotationSpecs:
 
     """
 
-    def __init__(self, service: annofabapi.Resource, project_id: str, *, annotation_type: Optional[str] = None) -> None:
+    def __init__(self, service: annofabapi.Resource, project_id: str, *, annotation_type: str | None = None) -> None:
         self.service = service
         self.project_id = project_id
 
@@ -699,8 +698,8 @@ class AnnotationSpecs:
 
     def attribute_name_keys(
         self,
-        excluded_attribute_types: Optional[Collection[AdditionalDataDefinitionType]] = None,
-        include_attribute_types: Optional[Collection[AdditionalDataDefinitionType]] = None,
+        excluded_attribute_types: Collection[AdditionalDataDefinitionType] | None = None,
+        include_attribute_types: Collection[AdditionalDataDefinitionType] | None = None,
     ) -> list[tuple[str, str]]:
         """
         属性名の一覧を取得します。
@@ -858,14 +857,14 @@ class ListAnnotationCountMain:
         csv_type: CsvType,
         output_file: Path,
         *,
-        project_id: Optional[str] = None,
-        task_json_path: Optional[Path] = None,
-        target_task_ids: Optional[Collection[str]] = None,
-        task_query: Optional[TaskQuery] = None,
+        project_id: str | None = None,
+        task_json_path: Path | None = None,
+        target_task_ids: Collection[str] | None = None,
+        task_query: TaskQuery | None = None,
     ) -> None:
         # アノテーション仕様の非選択系の属性は、集計しないようにする。集計しても意味がないため。
-        annotation_specs: Optional[AnnotationSpecs] = None
-        non_selective_attribute_name_keys: Optional[list[AttributeNameKey]] = None
+        annotation_specs: AnnotationSpecs | None = None
+        non_selective_attribute_name_keys: list[AttributeNameKey] | None = None
         if project_id is not None:
             annotation_specs = AnnotationSpecs(self.service, project_id)
             non_selective_attribute_name_keys = annotation_specs.non_selective_attribute_name_keys()
@@ -880,13 +879,13 @@ class ListAnnotationCountMain:
 
         if csv_type == CsvType.LABEL:
             # ラベル名の列順が、アノテーション仕様にあるラベル名の順番に対応するようにする。
-            label_columns: Optional[list[str]] = None
+            label_columns: list[str] | None = None
             if annotation_specs is not None:
                 label_columns = annotation_specs.label_keys()
 
             LabelCountCsv().print_csv_by_input_data(counter_list_by_input_data, output_file, prior_label_columns=label_columns)
         elif csv_type == CsvType.ATTRIBUTE:
-            attribute_columns: Optional[list[AttributeValueKey]] = None
+            attribute_columns: list[AttributeValueKey] | None = None
             if annotation_specs is not None:
                 attribute_columns = annotation_specs.selective_attribute_value_keys()
 
@@ -898,13 +897,13 @@ class ListAnnotationCountMain:
         csv_type: CsvType,
         output_file: Path,
         *,
-        project_id: Optional[str] = None,
-        target_task_ids: Optional[Collection[str]] = None,
-        task_query: Optional[TaskQuery] = None,
+        project_id: str | None = None,
+        target_task_ids: Collection[str] | None = None,
+        task_query: TaskQuery | None = None,
     ) -> None:
         # アノテーション仕様の非選択系の属性は、集計しないようにする。集計しても意味がないため。
-        annotation_specs: Optional[AnnotationSpecs] = None
-        non_selective_attribute_name_keys: Optional[list[AttributeNameKey]] = None
+        annotation_specs: AnnotationSpecs | None = None
+        non_selective_attribute_name_keys: list[AttributeNameKey] | None = None
         if project_id is not None:
             annotation_specs = AnnotationSpecs(self.service, project_id)
             non_selective_attribute_name_keys = annotation_specs.non_selective_attribute_name_keys()
@@ -917,7 +916,7 @@ class ListAnnotationCountMain:
 
         if csv_type == CsvType.LABEL:
             # 列順が、アノテーション仕様にあるラベル名の順番に対応するようにする。
-            label_columns: Optional[list[str]] = None
+            label_columns: list[str] | None = None
             if annotation_specs is not None:
                 label_columns = annotation_specs.label_keys()
 
@@ -925,7 +924,7 @@ class ListAnnotationCountMain:
 
         elif csv_type == CsvType.ATTRIBUTE:
             # 列順が、アノテーション仕様にある属性名と属性値の順番に対応するようにする。
-            attribute_columns: Optional[list[AttributeValueKey]] = None
+            attribute_columns: list[AttributeValueKey] | None = None
             if annotation_specs is not None:
                 attribute_columns = annotation_specs.selective_attribute_value_keys()
 
@@ -936,10 +935,10 @@ class ListAnnotationCountMain:
         annotation_path: Path,
         output_file: Path,
         *,
-        project_id: Optional[str] = None,
-        task_json_path: Optional[Path] = None,
-        target_task_ids: Optional[Collection[str]] = None,
-        task_query: Optional[TaskQuery] = None,
+        project_id: str | None = None,
+        task_json_path: Path | None = None,
+        target_task_ids: Collection[str] | None = None,
+        task_query: TaskQuery | None = None,
         json_is_pretty: bool = False,
     ) -> None:
         """ラベルごと/属性ごとのアノテーション数を入力データ単位でJSONファイルに出力します。"""
@@ -969,9 +968,9 @@ class ListAnnotationCountMain:
         annotation_path: Path,
         output_file: Path,
         *,
-        project_id: Optional[str] = None,
-        target_task_ids: Optional[Collection[str]] = None,
-        task_query: Optional[TaskQuery] = None,
+        project_id: str | None = None,
+        target_task_ids: Collection[str] | None = None,
+        task_query: TaskQuery | None = None,
         json_is_pretty: bool = False,
     ) -> None:
         """ラベルごと/属性ごとのアノテーション数をタスク単位でJSONファイルに出力します。"""
@@ -1004,11 +1003,11 @@ class ListAnnotationCountMain:
         output_file: Path,
         arg_format: FormatArgument,
         *,
-        project_id: Optional[str] = None,
-        task_json_path: Optional[Path] = None,
-        target_task_ids: Optional[Collection[str]] = None,
-        task_query: Optional[TaskQuery] = None,
-        csv_type: Optional[CsvType] = None,
+        project_id: str | None = None,
+        task_json_path: Path | None = None,
+        target_task_ids: Collection[str] | None = None,
+        task_query: TaskQuery | None = None,
+        csv_type: CsvType | None = None,
     ) -> None:
         """ラベルごと/属性ごとのアノテーション数を出力します。"""
         if arg_format == FormatArgument.CSV:
@@ -1082,7 +1081,7 @@ class ListAnnotationCount(CommandLine):
         if not self.validate(args):
             sys.exit(COMMAND_LINE_ERROR_STATUS_CODE)
 
-        project_id: Optional[str] = args.project_id
+        project_id: str | None = args.project_id
         if project_id is not None:
             super().validate_project(project_id, project_member_roles=[ProjectMemberRole.OWNER, ProjectMemberRole.TRAINING_DATA_USER])
 
@@ -1099,7 +1098,7 @@ class ListAnnotationCount(CommandLine):
 
         downloading_obj = DownloadingFile(self.service)
 
-        def download_and_process_annotation(temp_dir: Path, *, is_latest: bool, annotation_path: Optional[Path]) -> None:
+        def download_and_process_annotation(temp_dir: Path, *, is_latest: bool, annotation_path: Path | None) -> None:
             # タスク全件ファイルは、フレーム番号を参照するのに利用する
             if project_id is not None:
                 task_json_path = downloading_obj.download_task_json_to_dir(
@@ -1228,7 +1227,7 @@ def main(args: argparse.Namespace) -> None:
     ListAnnotationCount(service, facade, args).main()
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "list_annotation_count"
     subcommand_help = "ラベルごとまたは属性値ごとにアノテーション数を出力します。"
     epilog = "オーナロールまたはアノテーションユーザロールを持つユーザで実行してください。"