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

annofabcli/organization_member/change_organization_member.py

@@ -3,13 +3,12 @@ from __future__ import annotations
 import argparse
 import logging
 from collections.abc import Collection
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import more_itertools
 from annofabapi.models import OrganizationMemberRole
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     CommandLine,
@@ -33,7 +32,7 @@ class ChangeOrganizationMemberMain(CommandLineWithConfirm):
         super().__init__(all_yes)
 
     @staticmethod
-    def get_member(organization_member_list: list[dict[str, Any]], user_id: str) -> Optional[dict[str, Any]]:
+    def get_member(organization_member_list: list[dict[str, Any]], user_id: str) -> dict[str, Any] | None:
         return more_itertools.first_true(organization_member_list, pred=lambda e: e["user_id"] == user_id)
 
     def main(self, organization_name: str, user_ids: Collection[str], role: str) -> None:
@@ -107,7 +106,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:
     # 2022/01時点でロールしか変更できないのに、change_roleという名前でなくchangeという名前にしたのは、将来的にロール以外も変更できるようにするため
     subcommand_name = "change"
     subcommand_help = "組織メンバの情報（ロールなど）を変更します。"

annofabcli/organization_member/delete_organization_member.py

@@ -3,13 +3,12 @@ from __future__ import annotations
 import argparse
 import logging
 from collections.abc import Collection
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import more_itertools
 from annofabapi.models import OrganizationMemberRole
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     CommandLine,
@@ -33,7 +32,7 @@ class DeleteOrganizationMemberMain(CommandLineWithConfirm):
         super().__init__(all_yes)
 
     @staticmethod
-    def get_member(organization_member_list: list[dict[str, Any]], user_id: str) -> Optional[dict[str, Any]]:
+    def get_member(organization_member_list: list[dict[str, Any]], user_id: str) -> dict[str, Any] | None:
         return more_itertools.first_true(organization_member_list, pred=lambda e: e["user_id"] == user_id)
 
     def delete_organization_members_from_organization(self, organization_name: str, user_ids: Collection[str]) -> None:
@@ -113,7 +112,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 = "組織からメンバーを脱退させます。"
     epilog = "組織オーナまたは組織管理者ロールを持つユーザで実行してください。"

annofabcli/organization_member/invite_organization_member.py

@@ -1,12 +1,10 @@
 import argparse
 import logging
 from collections.abc import Collection
-from typing import Optional
 
 import annofabapi
 from annofabapi.models import OrganizationMemberRole
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     CommandLine,
@@ -108,7 +106,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 = "invite"
     subcommand_help = "組織にメンバーを招待します。"
     epilog = "組織オーナまたは組織管理者ロールを持つユーザで実行してください。"

annofabcli/organization_member/list_organization_member.py

@@ -1,11 +1,11 @@
 import argparse
 import logging
-from typing import Any, Optional
+from typing import Any
 
 import pandas
 import requests
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.enums import FormatArgument
 from annofabcli.common.facade import AnnofabApiFacade
@@ -87,7 +87,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"
     subcommand_help = "組織メンバ一覧を出力します。"
     description = "組織メンバ一覧を出力します。"

annofabcli/organization_member/subcommand_organization_member.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
 import annofabcli.organization_member.change_organization_member
 import annofabcli.organization_member.delete_organization_member
@@ -19,7 +17,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.organization_member.list_organization_member.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 = "organization_member"
     subcommand_help = "組織メンバ関係のサブコマンド"
     description = "組織メンバ関係のサブコマンド"

annofabcli/project/change_organization_of_project.py

@@ -10,7 +10,7 @@ import more_itertools
 import requests
 from annofabapi.models import JobStatus, OrganizationMemberRole, ProjectJobType
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     CommandLine,
     CommandLineWithConfirm,
@@ -76,7 +76,7 @@ class ChangeProjectOrganizationMain(CommandLineWithConfirm):
             指定したジョブ（job_idがNoneの場合は現在進行中のジョブ）が存在しない場合は、Noneを返す。
         """
 
-        def get_job_from_job_id(arg_job_id: str) -> Optional[dict[str, Any]]:
+        def get_job_from_job_id(arg_job_id: str) -> dict[str, Any] | None:
             content, _ = self.service.api.get_project_job(project_id, query_params={"type": job_type.value})
             job_list = content["list"]
             return more_itertools.first_true(job_list, pred=lambda e: e["job_id"] == arg_job_id)
@@ -134,7 +134,7 @@ class ChangeProjectOrganizationMain(CommandLineWithConfirm):
                 )
                 return JobStatus.PROGRESS
 
-    def change_organization_for_project(self, project_id: str, organization_name: str) -> Optional[dict[str, Any]]:
+    def change_organization_for_project(self, project_id: str, organization_name: str) -> dict[str, Any] | None:
         project = self.service.wrapper.get_project_or_none(project_id)
         if project is None:
             logger.warning(f"project_id='{project_id}'のプロジェクトは存在しないので、スキップします。")
@@ -247,7 +247,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_organization"
     subcommand_help = "プロジェクトの所属する組織を変更します。"
     epilog = "プロジェクトのオーナロール、変更先の組織の管理者またはオーナーロールを持つユーザで実行してください。"

annofabcli/project/change_project_status.py

@@ -1,6 +1,6 @@
 import argparse
 import logging
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
@@ -8,7 +8,7 @@ import requests
 from annofabapi.models import OrganizationMember, Project, ProjectMemberRole, ProjectStatus
 from more_itertools import first_true
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.facade import AnnofabApiFacade
 
@@ -38,7 +38,7 @@ class ChanegProjectStatusMain:
         self.facade = AnnofabApiFacade(service)
 
     @staticmethod
-    def get_account_id_from_user_id(organization_member_list: list[OrganizationMember], user_id: str) -> Optional[str]:
+    def get_account_id_from_user_id(organization_member_list: list[OrganizationMember], user_id: str) -> str | None:
         member = first_true(organization_member_list, pred=lambda e: e["user_id"] == user_id)
         if member is not None:
             return member["account_id"]
@@ -193,7 +193,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_status"
     subcommand_help = "プロジェクトのステータスを変更します。"
     description = "プロジェクトのステータスを変更します。"

annofabcli/project/copy_project.py

@@ -5,11 +5,11 @@ import logging
 import uuid
 from collections.abc import Collection
 from enum import Enum
-from typing import Any, Optional
+from typing import Any
 
 from annofabapi.models import OrganizationMemberRole, ProjectJobType, ProjectMemberRole
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.dataclasses import WaitOptions
 from annofabcli.common.facade import AnnofabApiFacade
@@ -58,8 +58,8 @@ class CopyProject(CommandLine):
         src_project_id: str,
         dest_project_id: str,
         dest_title: str,
-        dest_overview: Optional[str] = None,
-        copied_targets: Optional[Collection[CopiedTarget]] = None,
+        dest_overview: str | None = None,
+        copied_targets: Collection[CopiedTarget] | None = None,
     ) -> None:
         """
         プロジェクトメンバを、別のプロジェクトにコピーする。
@@ -150,7 +150,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/project/create_project.py

@@ -5,12 +5,12 @@ import logging
 import sys
 import uuid
 from enum import Enum
-from typing import Any, Optional
+from typing import Any
 
 from annofabapi.models import InputDataType
 from annofabapi.plugin import EditorPluginId, ExtendSpecsPluginId
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     CommandLine,
@@ -38,11 +38,11 @@ class CreateProject(CommandLine):
         title: str,
         input_data_type: InputDataType,
         *,
-        project_id: Optional[str],
-        overview: Optional[str],
-        editor_plugin_id: Optional[str],
-        custom_project_type: Optional[CustomProjectType],
-        configuration: Optional[dict[str, Any]],
+        project_id: str | None,
+        overview: str | None,
+        editor_plugin_id: str | None,
+        custom_project_type: CustomProjectType | None,
+        configuration: dict[str, Any] | None,
     ):
         new_project_id = project_id if project_id is not None else str(uuid.uuid4())
         if configuration is None:
@@ -141,7 +141,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"
     subcommand_help = "プロジェクトを作成します。"
     epilog = "組織管理者、組織オーナを持つユーザで実行してください。"

annofabcli/project/diff_projects.py

@@ -8,14 +8,13 @@ import functools
 import logging
 import pprint
 from enum import Enum
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import dictdiffer
 import more_itertools
 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.facade import AnnofabApiFacade, convert_annotation_specs_labels_v2_to_v1
@@ -110,7 +109,7 @@ class DiffProjects(CommandLine):
             return True, diff_message
 
         is_different = False
-        for member1, member2 in zip(sorted_members1, sorted_members2):
+        for member1, member2 in zip(sorted_members1, sorted_members2, strict=False):
             ignored_key = {"updated_datetime", "created_datetime", "project_id"}
             diff_result = list(dictdiffer.diff(member1, member2, ignore=ignored_key))
             if len(diff_result) > 0:
@@ -245,7 +244,7 @@ class DiffProjects(CommandLine):
             return True, diff_message
 
         is_different = False
-        for phrase1, phrase2 in zip(sorted_inspection_phrases1, sorted_inspection_phrases2):
+        for phrase1, phrase2 in zip(sorted_inspection_phrases1, sorted_inspection_phrases2, strict=False):
             diff_result = list(dictdiffer.diff(phrase1, phrase2))
             if len(diff_result) > 0:
                 is_different = True
@@ -397,7 +396,7 @@ def main(args: argparse.Namespace) -> None:
     DiffProjects(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 = "diff"
     subcommand_help = "プロジェクト間の差分を表示する。"
     description = "プロジェクト間の差分を表示する。" + "ただし、Annofabで生成されるIDや、変化する日時などは比較しない。"

annofabcli/project/list_project.py

@@ -1,14 +1,14 @@
 import argparse
 import logging
 import sys
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 import pandas
 from annofabapi.models import OrganizationMember, Project
 from more_itertools import first_true
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     ArgumentParser,
@@ -45,7 +45,7 @@ class ListProjectMain:
         self.facade = AnnofabApiFacade(service)
 
     @staticmethod
-    def get_account_id_from_user_id(organization_member_list: list[OrganizationMember], user_id: str) -> Optional[str]:
+    def get_account_id_from_user_id(organization_member_list: list[OrganizationMember], user_id: str) -> str | None:
         member = first_true(organization_member_list, pred=lambda e: e["user_id"] == user_id)
         if member is not None:
             return member["account_id"]
@@ -116,7 +116,7 @@ class ListProjectMain:
 
         return project_query
 
-    def get_project_list_from_organization(self, organization_name: str, project_query: Optional[dict[str, Any]] = None) -> list[Project]:
+    def get_project_list_from_organization(self, organization_name: str, project_query: dict[str, Any] | None = None) -> list[Project]:
         """
         組織名からプロジェクト一覧を取得する。
         """
@@ -254,7 +254,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"
     subcommand_help = "プロジェクト一覧を出力します。"
     description = "プロジェクト一覧を出力します。"

annofabcli/project/put_project.py

@@ -3,9 +3,8 @@ from __future__ import annotations
 import argparse
 import sys
 from logging import getLogger
-from typing import Optional
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.project import create_project
 
 logger = getLogger(__name__)
@@ -24,7 +23,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 = "put"
     subcommand_help = "[DEPRECATED] プロジェクトを作成します。"
     subcommand_description = subcommand_help + "\n`project put` コマンドは非推奨です。代わりに 'project create'コマンドを使用してください。`project put` コマンドは2026年01月01日以降に廃止予定です。"

annofabcli/project/subcommand_project.py

@@ -1,5 +1,4 @@
 import argparse
-from typing import Optional
 
 import annofabcli.project.change_organization_of_project
 import annofabcli.project.change_project_status
@@ -28,7 +27,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.project.update_project.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 = "project"
     subcommand_help = "プロジェクト関係のサブコマンド"
     description = "プロジェクト関係のサブコマンド"

annofabcli/project/update_configuration.py

@@ -1,11 +1,11 @@
 import argparse
 import copy
 import logging
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import CommandLine, CommandLineWithConfirm, build_annofabapi_resource_and_login, get_json_from_args, get_list_from_args
 from annofabcli.common.facade import AnnofabApiFacade
 
@@ -23,7 +23,7 @@ class UpdateProjectConfigurationMain(CommandLineWithConfirm):
         self.facade = AnnofabApiFacade(service)
         super().__init__(all_yes)
 
-    def update_configuration_for_project(self, project_id: str, configuration: dict[str, Any], *, project_index: Optional[int] = None) -> bool:
+    def update_configuration_for_project(self, project_id: str, configuration: dict[str, Any], *, project_index: int | None = None) -> bool:
         """
         指定されたプロジェクトの設定を更新する。
 
@@ -141,7 +141,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 = "update_configuration"
     subcommand_help = "複数のプロジェクトの設定を一括で更新します。"
     epilog = "プロジェクトのオーナロールを持つユーザで実行してください。"

annofabcli/project/update_project.py

@@ -9,13 +9,11 @@ import sys
 from enum import Enum
 from functools import partial
 from pathlib import Path
-from typing import Optional
 
 import annofabapi
 import pandas
 from pydantic import BaseModel
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -48,9 +46,9 @@ class UpdatedProject(BaseModel):
 
     project_id: str
     """更新対象のプロジェクトを表すID"""
-    title: Optional[str] = None
+    title: str | None = None
     """変更後のプロジェクトタイトル（指定した場合のみ更新）"""
-    overview: Optional[str] = None
+    overview: str | None = None
     """変更後のプロジェクト概要（指定した場合のみ更新）"""
 
 
@@ -63,9 +61,9 @@ class UpdateProjectMain(CommandLineWithConfirm):
         self,
         project_id: str,
         *,
-        new_title: Optional[str] = None,
-        new_overview: Optional[str] = None,
-        project_index: Optional[int] = None,
+        new_title: str | None = None,
+        new_overview: str | None = None,
+        project_index: int | None = None,
     ) -> UpdateResult:
         """
         1個のプロジェクトを更新します。
@@ -289,7 +287,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 = "update"
     subcommand_help = "プロジェクトのタイトルまたは概要を更新します。"
     epilog = "プロジェクトオーナロールを持つユーザで実行してください。"

annofabcli/project_member/change_project_members.py

@@ -2,12 +2,12 @@ import argparse
 import logging
 import sys
 from collections.abc import Collection
-from typing import Any, Optional
+from typing import Any
 
 import requests
 from annofabapi.models import ProjectMember, ProjectMemberRole, ProjectMemberStatus
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
     ArgumentParser,
@@ -30,8 +30,8 @@ class ChangeProjectMembers(CommandLine):
         project_id: str,
         user_id: str,
         old_member: ProjectMember,
-        member_role: Optional[ProjectMemberRole] = None,
-        member_info: Optional[dict[str, Any]] = None,
+        member_role: ProjectMemberRole | None = None,
+        member_info: dict[str, Any] | None = None,
     ) -> ProjectMember:
         """
         1人のプロジェクトメンバを変更する。
@@ -73,8 +73,8 @@ class ChangeProjectMembers(CommandLine):
         self,
         project_id: str,
         user_id_list: Collection[str],
-        member_role: Optional[ProjectMemberRole] = None,
-        member_info: Optional[dict[str, Any]] = None,
+        member_role: ProjectMemberRole | None = None,
+        member_info: dict[str, Any] | None = None,
     ):
         """
         プロジェクトメンバのメンバ情報を更新する。
@@ -126,7 +126,7 @@ class ChangeProjectMembers(CommandLine):
         return [e["user_id"] for e in member_list if e["user_id"] != self.service.api.login_user_id]
 
     @staticmethod
-    def validate(args: argparse.Namespace, member_info: Optional[dict[str, Any]] = None) -> bool:
+    def validate(args: argparse.Namespace, member_info: dict[str, Any] | None = None) -> bool:
         COMMON_MESSAGE = "annofabcli project_member change: error:"  # noqa: N806
         if args.role is None and args.member_info is None:
             print(f"{COMMON_MESSAGE} argument `--role`または`--member_info`のどちらかは、必ず指定してください。", file=sys.stderr)  # noqa: T201
@@ -202,7 +202,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"
     subcommand_help = "プロジェクトメンバを変更します。"
     description = "複数のプロジェクトメンバに対して、メンバ情報を変更します。ただし、自分自身は変更できません。"

annofabcli/project_member/copy_project_members.py

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 import argparse
 import logging
-from typing import Any, Optional
+from typing import Any
 
 import annofabapi
 from annofabapi.models import OrganizationMember, ProjectMember, ProjectMemberRole
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.facade import AnnofabApiFacade
 
@@ -47,7 +47,7 @@ class CopyProjectMembers(CommandLine):
         return self.service.wrapper.get_all_organization_members(organization_name)
 
     @staticmethod
-    def find_member(members: list[dict[str, Any]], account_id: str) -> Optional[dict[str, Any]]:
+    def find_member(members: list[dict[str, Any]], account_id: str) -> dict[str, Any] | None:
         for m in members:
             if m["account_id"] == account_id:
                 return m
@@ -175,7 +175,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/project_member/drop_project_members.py

@@ -1,13 +1,12 @@
 import argparse
 import logging
-from typing import Optional
 
 import annofabapi
 import requests
 from annofabapi.models import ProjectMemberStatus
 from more_itertools import first_true
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.facade import AnnofabApiFacade
 
@@ -125,7 +124,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/project_member/invite_project_members.py

@@ -1,13 +1,11 @@
 import argparse
 import logging
-from typing import Optional
 
 import annofabapi
 import requests
 from annofabapi.models import ProjectMemberRole, ProjectMemberStatus
 from more_itertools import first_true
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.facade import AnnofabApiFacade
@@ -136,7 +134,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 = "invite"
     subcommand_help = "複数のプロジェクトに、ユーザを招待します。"
     description = "複数のプロジェクトに、ユーザを招待します。"

annofabcli/project_member/list_users.py

@@ -1,12 +1,11 @@
 import argparse
 import logging
-from typing import Optional
 
 import pandas
 import requests
 from annofabapi.models import ProjectMember
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.enums import FormatArgument
 from annofabcli.common.facade import AnnofabApiFacade
@@ -113,7 +112,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"
     subcommand_help = "複数のプロジェクトのプロジェクトメンバを出力します。"
     description = "複数のプロジェクトのプロジェクトメンバを出力します。"