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

annofabcli/project_member/put_project_members.py

@@ -2,7 +2,7 @@ import argparse
 import logging
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import more_itertools
 import pandas
@@ -10,7 +10,7 @@ import requests
 from annofabapi.models import ProjectMemberRole, ProjectMemberStatus
 from dataclasses_json import DataClassJsonMixin
 
-import annofabcli
+import annofabcli.common.cli
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.facade import AnnofabApiFacade
 
@@ -25,8 +25,8 @@ class Member(DataClassJsonMixin):
 
     user_id: str
     member_role: ProjectMemberRole
-    sampling_inspection_rate: Optional[int] = None
-    sampling_acceptance_rate: Optional[int] = None
+    sampling_inspection_rate: int | None = None
+    sampling_acceptance_rate: int | None = None
 
 
 class PutProjectMembers(CommandLine):
@@ -35,7 +35,7 @@ class PutProjectMembers(CommandLine):
     """
 
     @staticmethod
-    def find_member(members: list[dict[str, Any]], user_id: str) -> Optional[dict[str, Any]]:
+    def find_member(members: list[dict[str, Any]], user_id: str) -> dict[str, Any] | None:
         member = more_itertools.first_true(members, default=None, pred=lambda e: e["user_id"] == user_id)
         return member
 
@@ -181,7 +181,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 = "プロジェクトメンバを登録します。"
     epilog = "オーナーロールを持つユーザで実行してください。"

annofabcli/project_member/subcommand_project_member.py

@@ -1,7 +1,5 @@
 import argparse
-from typing import Optional
 
-import annofabcli
 import annofabcli.common.cli
 import annofabcli.project_member.change_project_members
 import annofabcli.project_member.copy_project_members
@@ -23,7 +21,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.project_member.put_project_members.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_member"
     subcommand_help = "プロジェクトメンバ関係のサブコマンド"
     description = "プロジェクトメンバ関係のサブコマンド"

annofabcli/stat_visualization/mask_visualization_dir.py

@@ -5,7 +5,6 @@ import json
 import logging
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Optional
 
 import pandas
 from annofabapi.models import TaskPhase
@@ -54,8 +53,8 @@ class ReplacementDict:
 def create_replacement_dict(
     df_user: pandas.DataFrame,
     *,
-    not_masked_biography_set: Optional[set[str]],
-    not_masked_user_id_set: Optional[set[str]],
+    not_masked_biography_set: set[str] | None,
+    not_masked_user_id_set: set[str] | None,
 ) -> ReplacementDict:
     """
     ユーザー情報を置換するためのインスタンスを生成します。
@@ -76,8 +75,8 @@ def create_replacement_dict(
 
     df2 = df_user.set_index("user_id")
     df3 = df2.loc[replacement_dict_for_user_id.keys()]
-    replacement_dict_for_username = dict(zip(df3["username"], replacement_dict_for_user_id.values()))
-    replacement_dict_for_account_id = dict(zip(df3["account_id"], replacement_dict_for_user_id.values()))
+    replacement_dict_for_username = dict(zip(df3["username"], replacement_dict_for_user_id.values(), strict=False))
+    replacement_dict_for_account_id = dict(zip(df3["account_id"], replacement_dict_for_user_id.values(), strict=False))
 
     replacement_dict_by_biography = create_replacement_dict_by_biography(df_user, not_masked_biography_set=not_masked_biography_set)
 
@@ -93,7 +92,7 @@ def write_line_graph(
     task_worktime_by_phase_user: TaskWorktimeByPhaseUser,
     output_project_dir: ProjectDir,
     *,
-    user_id_list: Optional[list[str]] = None,
+    user_id_list: list[str] | None = None,
     minimal_output: bool = False,
 ) -> None:
     output_project_dir.write_cumulative_line_graph(
@@ -150,8 +149,8 @@ def mask_visualization_dir(
     project_dir: ProjectDir,
     output_project_dir: ProjectDir,
     *,
-    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,
     minimal_output: bool = False,
 ) -> None:
     worktime_per_date = project_dir.read_worktime_per_date_user()
@@ -292,7 +291,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 = "`annofabcli statistics visualize` コマンドの出力結果のユーザ情報をマスクします。"
     description = "`annofabcli statistics visualize` コマンドの出力結果のユーザ情報をマスクします。マスク対象のファイルのみ出力します。"

annofabcli/stat_visualization/merge_visualization_dir.py

@@ -5,7 +5,6 @@ import json
 import logging
 import sys
 from pathlib import Path
-from typing import Optional
 
 from annofabapi.models import TaskPhase
 
@@ -47,7 +46,7 @@ class WritingVisualizationFile:
         output_project_dir: ProjectDir,
         task_completion_criteria: TaskCompletionCriteria,
         *,
-        user_id_list: Optional[list[str]] = None,
+        user_id_list: list[str] | None = None,
         minimal_output: bool = False,
     ) -> None:
         self.output_project_dir = output_project_dir
@@ -138,12 +137,12 @@ class WritingVisualizationFile:
 
 
 class MergingVisualizationFile:
-    def __init__(self, project_dir_list: list[ProjectDir], *, custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None) -> None:
+    def __init__(self, project_dir_list: list[ProjectDir], *, custom_production_volume_list: list[ProductionVolumeColumn] | None = None) -> None:
         self.project_dir_list = project_dir_list
         self.custom_production_volume_list = custom_production_volume_list
 
     def merge_worktime_per_date(self) -> WorktimePerDate:
-        merged_obj: Optional[WorktimePerDate] = None
+        merged_obj: WorktimePerDate | None = None
         for project_dir in self.project_dir_list:
             tmp_obj = project_dir.read_worktime_per_date_user()
 
@@ -191,8 +190,8 @@ def merge_visualization_dir(  # pylint: disable=too-many-statements
     task_completion_criteria: TaskCompletionCriteria,
     output_project_dir: ProjectDir,
     *,
-    custom_production_volume_list: Optional[list[ProductionVolumeColumn]] = None,
-    user_id_list: Optional[list[str]] = None,
+    custom_production_volume_list: list[ProductionVolumeColumn] | None = None,
+    user_id_list: list[str] | None = None,
     minimal_output: bool = False,
 ) -> None:
     merging_obj = MergingVisualizationFile(project_dir_list, custom_production_volume_list=custom_production_volume_list)
@@ -316,7 +315,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"
     subcommand_help = "``annofabcli statistics visualize`` コマンドの出力結果をマージします。"
     description = "``annofabcli statistics visualize`` コマンドの出力結果をマージします。"

annofabcli/stat_visualization/subcommand_stat_visualization.py

@@ -1,5 +1,4 @@
 import argparse
-from typing import Optional
 
 import annofabcli.stat_visualization.mask_visualization_dir
 import annofabcli.stat_visualization.merge_visualization_dir
@@ -19,7 +18,7 @@ def parse_args(parser: argparse.ArgumentParser) -> None:
     annofabcli.stat_visualization.write_performance_rating_csv.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 = "stat_visualization"
     subcommand_help = "`annofabcli statistics visualization` コマンドの出力結果を加工するサブコマンド（アルファ版）"
     description = "`annofabcli statistics visualization` コマンドの出力結果を加工するサブコマンド（アルファ版）"

annofabcli/stat_visualization/summarize_whole_performance_csv.py

@@ -4,7 +4,6 @@ import argparse
 import json
 import logging
 from pathlib import Path
-from typing import Optional
 
 import annofabcli
 from annofabcli.common.cli import (
@@ -64,7 +63,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 = "summarize_whole_performance_csv"
     subcommand_help = "``annofabcli statistics visualize`` コマンドの出力結果であるプロジェクトディレクトリから、プロジェクトごとの生産性や品質の一覧を出力します。。"
     parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help, description=subcommand_help)

annofabcli/stat_visualization/write_graph.py

@@ -4,7 +4,6 @@ import argparse
 import json
 import logging
 from pathlib import Path
-from typing import Optional
 
 from annofabapi.models import TaskPhase
 
@@ -33,7 +32,7 @@ class WritingGraph:
         project_dir: ProjectDir,
         output_project_dir: ProjectDir,
         *,
-        user_id_list: Optional[list[str]] = None,
+        user_id_list: list[str] | None = None,
         minimal_output: bool = False,
     ) -> None:
         self.project_dir = project_dir
@@ -185,7 +184,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 = "write_graph"
     subcommand_help = "`annofabcli statistics visualize` コマンドの出力結果であるプロジェクトのディレクトリから、グラフを出力します。"
     parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help, description=subcommand_help)

annofabcli/stat_visualization/write_performance_rating_csv.py

@@ -7,14 +7,13 @@ from collections.abc import Collection
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any, TypeAlias
 
 import numpy
 import pandas
 from annofabapi.models import TaskPhase
 from dataclasses_json import DataClassJsonMixin
 from pandas.api.typing import NAType
-from typing_extensions import TypeAlias
 
 import annofabcli
 from annofabcli.common.cli import CommandLineWithoutWebapi, get_json_from_args, get_list_from_args
@@ -54,9 +53,9 @@ class ResultDataframe:
 class ThresholdInfo(DataClassJsonMixin):
     """閾値の情報"""
 
-    threshold_worktime: Optional[float] = None
+    threshold_worktime: float | None = None
     """作業時間の閾値。指定した時間以下の作業者は除外する。"""
-    threshold_task_count: Optional[int] = None
+    threshold_task_count: int | None = None
     """作業したタスク数の閾値。作業したタスク数が指定した数以下作業者は除外する。"""
 
 
@@ -164,12 +163,12 @@ class CollectingPerformanceInfo:
     def __init__(
         self,
         *,
-        productivity_indicator: Optional[ProductivityIndicator] = None,
-        quality_indicator: Optional[QualityIndicator] = None,
-        threshold_info: Optional[ThresholdInfo] = None,
-        productivity_indicator_by_directory: Optional[ProductivityIndicatorByDirectory] = None,
-        quality_indicator_by_directory: Optional[QualityIndicatorByDirectory] = None,
-        threshold_infos_by_directory: Optional[ThresholdInfoSettings] = None,
+        productivity_indicator: ProductivityIndicator | None = None,
+        quality_indicator: QualityIndicator | None = None,
+        threshold_info: ThresholdInfo | None = None,
+        productivity_indicator_by_directory: ProductivityIndicatorByDirectory | None = None,
+        quality_indicator_by_directory: QualityIndicatorByDirectory | None = None,
+        threshold_infos_by_directory: ThresholdInfoSettings | None = None,
     ) -> None:
         self.quality_indicator = quality_indicator if quality_indicator is not None else QualityIndicator("pointed_out_inspection_comment_count/annotation_count")
         self.productivity_indicator = productivity_indicator if productivity_indicator is not None else ProductivityIndicator("actual_worktime_hour/annotation_count")
@@ -311,7 +310,7 @@ class CollectingPerformanceInfo:
         self,
         df_user: pandas.DataFrame,
         target_dir: Path,
-        custom_production_volume_list_by_directory: Optional[dict[str, list[ProductionVolumeColumn]]],
+        custom_production_volume_list_by_directory: dict[str, list[ProductionVolumeColumn]] | None,
     ) -> ResultDataframe:
         """対象ディレクトリから、評価対象の指標になる情報を取得します。"""
         df_annotation_productivity = df_user
@@ -332,13 +331,7 @@ class CollectingPerformanceInfo:
             )
             project_dir_list.append(project_dir)
 
-            try:
-                project_info = project_dir.read_project_info()
-                project_title = project_info.project_title
-            except Exception:
-                # 複数のプロジェクトをマージして生産性情報を出力した場合は、`project_info.json`は存在しないので、このブロックに入る
-                logger.info(f"'{project_dir}'からプロジェクト情報を読み込むのに失敗しました。project_titleは空文字にします。", exc_info=True)
-                project_title = ""
+            project_title = project_dir.get_project_title()
 
             try:
                 user_performance = project_dir.read_user_performance()
@@ -395,7 +388,7 @@ def to_rank(series: pandas.Series) -> pandas.Series:
         return pandas.Series([numpy.nan] * len(series))
 
 
-def to_deviation(series: pandas.Series, threshold_deviation_user_count: Optional[int] = None) -> pandas.Series:
+def to_deviation(series: pandas.Series, threshold_deviation_user_count: int | None = None) -> pandas.Series:
     if series.count() == 0 or (threshold_deviation_user_count is not None and series.count() <= threshold_deviation_user_count):
         return pandas.Series([numpy.nan] * len(series))
     else:
@@ -407,7 +400,7 @@ def to_deviation(series: pandas.Series, threshold_deviation_user_count: Optional
             return series.map(lambda x: 50 if not numpy.isnan(x) else numpy.nan)
 
 
-def create_rank_df(df: pandas.DataFrame, *, user_ids: Optional[Collection[str]] = None) -> pandas.DataFrame:
+def create_rank_df(df: pandas.DataFrame, *, user_ids: Collection[str] | None = None) -> pandas.DataFrame:
     df_rank = df.copy()
     for col in df.columns[3:]:
         df_rank[col] = to_rank(df[col])
@@ -421,8 +414,8 @@ def create_rank_df(df: pandas.DataFrame, *, user_ids: Optional[Collection[str]]
 def create_deviation_df(
     df: pandas.DataFrame,
     *,
-    threshold_deviation_user_count: Optional[int] = None,
-    user_ids: Optional[Collection[str]] = None,
+    threshold_deviation_user_count: int | None = None,
+    user_ids: Collection[str] | None = None,
 ) -> pandas.DataFrame:
     """偏差値が格納されたDataFrameを返す。
 
@@ -505,7 +498,7 @@ def create_custom_production_volume_by_directory(cli_value: str) -> dict[str, li
 
 
 class WritingCsv:
-    def __init__(self, threshold_deviation_user_count: Optional[int] = None, user_ids: Optional[Collection[str]] = None) -> None:
+    def __init__(self, threshold_deviation_user_count: int | None = None, user_ids: Collection[str] | None = None) -> None:
         self.threshold_deviation_user_count = threshold_deviation_user_count
         self.user_ids = user_ids
 
@@ -535,7 +528,7 @@ class WritingCsv:
 
 
 def create_productivity_indicator_by_directory(
-    value: Optional[str],
+    value: str | None,
 ) -> ProductivityIndicatorByDirectory:
     """
     コマンドライン引数`--productivity_indicator_by_directory`から渡された文字列を、ProductivityIndicatorByDirectoryに変換する。
@@ -551,7 +544,7 @@ def create_productivity_indicator_by_directory(
 
 
 def create_quality_indicator_by_directory(
-    value: Optional[str],
+    value: str | None,
 ) -> QualityIndicatorByDirectory:
     """
     コマンドライン引数`--quality_indicator_by_directory`から渡された文字列を、ProductivityIndicatorByDirectoryに変換する。
@@ -566,7 +559,7 @@ def create_quality_indicator_by_directory(
     return result
 
 
-def create_threshold_infos_per_project(value: Optional[str]) -> ThresholdInfoSettings:
+def create_threshold_infos_per_project(value: str | None) -> ThresholdInfoSettings:
     if value is None:
         return {}
 
@@ -729,7 +722,7 @@ def main(args: argparse.Namespace) -> None:
     WritePerformanceRatingCsv(args).main()
 
 
-def add_parser(subparsers: Optional[argparse._SubParsersAction] = None) -> argparse.ArgumentParser:
+def add_parser(subparsers: argparse._SubParsersAction | None = None) -> argparse.ArgumentParser:
     subcommand_name = "write_performance_rating_csv"
     subcommand_help = "プロジェクトごとユーザごとにパフォーマンスを評価できる複数のCSVを出力します。"
     description = "プロジェクトごとユーザごとにパフォーマンスを評価できる複数のCSVを出力します。"

annofabcli/statistics/histogram.py

@@ -1,5 +1,4 @@
 import logging
-from typing import Optional
 
 import numpy
 import pandas
@@ -45,8 +44,8 @@ def create_histogram_figure(
     *,
     x_axis_label: str,
     y_axis_label: str,
-    title: Optional[str] = None,
-    sub_title: Optional[str] = None,
+    title: str | None = None,
+    sub_title: str | None = None,
     width: int = 400,
     height: int = 300,
 ) -> figure:
@@ -64,11 +63,11 @@ def create_histogram_figure(
         height: グラフの高さ
     """
     df_histogram = pandas.DataFrame({"frequency": hist, "left": bin_edges[:-1], "right": bin_edges[1:]})
-    df_histogram["interval"] = [f"{left:.1f} to {right:.1f}" for left, right in zip(df_histogram["left"], df_histogram["right"])]
-    df_histogram["width"] = [f"{(right - left):.1f}" for left, right in zip(df_histogram["left"], df_histogram["right"])]
+    df_histogram["interval"] = [f"{left:.1f} to {right:.1f}" for left, right in zip(df_histogram["left"], df_histogram["right"], strict=False)]
+    df_histogram["width"] = [f"{(right - left):.1f}" for left, right in zip(df_histogram["left"], df_histogram["right"], strict=False)]
 
     source = ColumnDataSource(df_histogram)
-    fig = figure(
+    fig = figure(  # type: ignore[call-arg]
         width=width,
         height=height,
         x_axis_label=x_axis_label,

annofabcli/statistics/linegraph.py

@@ -7,10 +7,9 @@ from __future__ import annotations
 import copy
 import logging
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import bokeh
-import bokeh.layouts
 import bokeh.palettes
 import pandas
 from bokeh.models import CrosshairTool, CustomJS, DataRange1d, HoverTool, LinearAxis
@@ -50,7 +49,7 @@ class LineGraph:
     """マーカーのサイズ"""
 
     @staticmethod
-    def _create_hover_tool(tool_tip_items: Optional[list[str]] = None) -> HoverTool:
+    def _create_hover_tool(tool_tip_items: list[str] | None = None) -> HoverTool:
         """
         HoverTool用のオブジェクトを生成する。
         """
@@ -69,10 +68,10 @@ class LineGraph:
         y_axis_label: str,
         width: int = 1200,
         height: int = 1000,
-        tooltip_columns: Optional[list[str]] = None,
+        tooltip_columns: list[str] | None = None,
         **figure_kwargs,  # noqa: ANN003
     ) -> None:
-        fig = figure(
+        fig = figure(  # type: ignore[call-arg]
             title=title,
             x_axis_label=x_axis_label,
             y_axis_label=y_axis_label,
@@ -101,8 +100,8 @@ class LineGraph:
         self,
         axis_label: str,
         *,
-        secondary_y_axis_range: Optional[DataRange1d] = None,
-        primary_y_axis_range: Optional[DataRange1d] = None,
+        secondary_y_axis_range: DataRange1d | None = None,
+        primary_y_axis_range: DataRange1d | None = None,
     ):
         """
         第2のY軸を追加する。
@@ -124,12 +123,12 @@ class LineGraph:
             "right",
         )
         if secondary_y_axis_range is not None:
-            self.figure.extra_y_ranges = {self._SECONDARY_Y_RANGE_NAME: secondary_y_axis_range}  # type: ignore[assignment]
+            self.figure.extra_y_ranges = {self._SECONDARY_Y_RANGE_NAME: secondary_y_axis_range}
         else:
-            self.figure.extra_y_ranges = {self._SECONDARY_Y_RANGE_NAME: DataRange1d()}  # type: ignore[assignment]
+            self.figure.extra_y_ranges = {self._SECONDARY_Y_RANGE_NAME: DataRange1d()}
 
         if primary_y_axis_range is not None:
-            self.figure.y_range = primary_y_axis_range  # type: ignore[assignment]
+            self.figure.y_range = primary_y_axis_range
 
         self.exists_secondary_y_axis = True
 
@@ -140,7 +139,7 @@ class LineGraph:
         y_column: str,
         *,
         legend_label: str,
-        color: Optional[Any] = None,  # noqa: ANN401
+        color: Any | None = None,  # noqa: ANN401
         is_secondary_y_axis: bool = False,
         **kwargs,  # noqa: ANN003
     ) -> tuple[GlyphRenderer, GlyphRenderer]:
@@ -189,10 +188,10 @@ class LineGraph:
         y_column: str,
         *,
         legend_label: str,
-        color: Optional[Any] = None,  # noqa: ANN401
+        color: Any | None = None,  # noqa: ANN401
         is_secondary_y_axis: bool = False,
         **kwargs,  # noqa: ANN003
-    ) -> tuple[GlyphRenderer, GlyphRenderer]:
+    ) -> GlyphRenderer:
         """
         移動平均用の折れ線を追加する
         """
@@ -317,7 +316,7 @@ class LineGraph:
         """
         code = code % (self.DEFAULT_LINE_WIDTH)
         options = [(username, f"{user_id}:{username}") for user_id, username in users]
-        multi_choice = MultiChoice(options=options, title="Find User:", width=300)
+        multi_choice = MultiChoice(options=options, title="Find User:", width=300)  # type: ignore[arg-type]
         multi_choice.js_on_change(
             "value",
             CustomJS(code=code, args=args),

annofabcli/statistics/list_annotation_area.py

@@ -8,7 +8,7 @@ import zipfile
 from collections.abc import Collection, Iterator
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import numpy
 import pandas
@@ -20,8 +20,8 @@ from annofabapi.parser import (
 )
 from annofabapi.segmentation import read_binary_image
 from dataclasses_json import DataClassJsonMixin
+from shapely.geometry import Polygon
 
-import annofabcli
 import annofabcli.common.cli
 from annofabcli.common.cli import (
     COMMAND_LINE_ERROR_STATUS_CODE,
@@ -64,7 +64,7 @@ class AnnotationAreaInfo(DataClassJsonMixin):
     input_data_id: str
     input_data_name: str
 
-    updated_datetime: Optional[str]
+    updated_datetime: str | None
     """アノテーションJSONに格納されているアノテーションの更新日時"""
 
     label: str
@@ -83,6 +83,30 @@ def calculate_segmentation_area(outer_file: Path) -> int:
     return int(numpy.count_nonzero(nd_array))
 
 
+def calculate_polygon_area(points: list[dict[str, int]]) -> int:
+    """
+    Shapelyを使ってポリゴンの面積を計算する
+
+    Args:
+        points: ポリゴンの頂点座標のリスト [{"x": int, "y": int}, ...]
+
+    Returns:
+        int: ポリゴンの面積（ピクセル単位）
+    """
+    if len(points) < 3:
+        # Annofabはポリゴンとポリラインの区別がないため、点が3個未満の場合はあり得る
+        # したがって、assertなどではなく、面積0を返す
+        return 0
+
+    # Shapelyのポリゴンオブジェクトを作成
+    coords = [(point["x"], point["y"]) for point in points]
+    polygon = Polygon(coords)
+
+    # 面積を計算（自己交差がある場合も適切に処理される）
+    area = polygon.area
+    return round(area)
+
+
 def get_annotation_area_info_list(parser: SimpleAnnotationParser, simple_annotation: dict[str, Any]) -> list[AnnotationAreaInfo]:
     result = []
     for detail in simple_annotation["details"]:
@@ -90,7 +114,8 @@ def get_annotation_area_info_list(parser: SimpleAnnotationParser, simple_annotat
             annotation_area = calculate_segmentation_area(parser.open_outer_file(detail["data"]["data_uri"]))
         elif detail["data"]["_type"] == "BoundingBox":
             annotation_area = calculate_bounding_box_area(detail["data"])
-
+        elif detail["data"]["_type"] == "Points":
+            annotation_area = calculate_polygon_area(detail["data"]["points"])
         else:
             continue
 
@@ -116,8 +141,8 @@ def get_annotation_area_info_list(parser: SimpleAnnotationParser, simple_annotat
 def get_annotation_area_info_list_from_annotation_path(
     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[AnnotationAreaInfo]:
     annotation_area_list = []
     target_task_ids = set(target_task_ids) if target_task_ids is not None else None
@@ -166,8 +191,8 @@ def print_annotation_area(
     output_file: Path,
     output_format: FormatArgument,
     *,
-    target_task_ids: Optional[Collection[str]] = None,
-    task_query: Optional[TaskQuery] = None,
+    target_task_ids: Collection[str] | None = None,
+    task_query: TaskQuery | None = None,
 ) -> None:
     annotation_area_list = get_annotation_area_info_list_from_annotation_path(
         annotation_path,
@@ -175,7 +200,7 @@ def print_annotation_area(
         task_query=task_query,
     )
 
-    logger.info(f"{len(annotation_area_list)} 件のタスクに含まれる塗りつぶしアノテーションのピクセル数情報を出力します。")
+    logger.info(f"{len(annotation_area_list)} 件のタスクに含まれる塗りつぶし、矩形、ポリゴンアノテーションの面積情報を出力します。")
 
     if output_format == FormatArgument.CSV:
         df = create_df(annotation_area_list)
@@ -211,7 +236,7 @@ class ListAnnotationArea(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])
             project, _ = self.service.api.get_project(project_id)
@@ -228,7 +253,7 @@ class ListAnnotationArea(CommandLine):
 
         downloading_obj = DownloadingFile(self.service)
 
-        def download_and_print_annotation_area(project_id: str, temp_dir: Path, *, is_latest: bool, annotation_path: Optional[Path]) -> None:
+        def download_and_print_annotation_area(project_id: str, temp_dir: Path, *, is_latest: bool, annotation_path: Path | None) -> None:
             if annotation_path is None:
                 annotation_path = downloading_obj.download_annotation_zip_to_dir(
                     project_id,
@@ -309,9 +334,9 @@ def main(args: argparse.Namespace) -> None:
     ListAnnotationArea(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_area"
-    subcommand_help = "塗りつぶしアノテーションまたは矩形アノテーションの面積を出力します。"
+    subcommand_help = "塗りつぶし、矩形、ポリゴンアノテーションの面積を出力します。"
     epilog = "オーナロールまたはアノテーションユーザロールを持つユーザで実行してください。"
     parser = annofabcli.common.cli.add_parser(subparsers, subcommand_name, subcommand_help, description=subcommand_help, epilog=epilog)
     parse_args(parser)