annofabcli 1.103.0__tar.gz → 1.104.1__tar.gz

{annofabcli-1.103.0 → annofabcli-1.104.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: annofabcli
-Version: 1.103.0
+Version: 1.104.1
 Summary: Utility Command Line Interface for AnnoFab
 Author: Kurusugawa Computer Inc.
 License: MIT

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/__main__.py

@@ -74,7 +74,7 @@ def main(arguments: Optional[list[str]] = None) -> None:
     warn_pandas_copy_on_write()
     parser = create_parser()
 
-    if arguments is None:  # noqa: SIM108
+    if arguments is None:
         args = parser.parse_args()
     else:
         args = parser.parse_args(arguments)

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/annotation/import_annotation.py

@@ -293,7 +293,7 @@ class AnnotationConverter:
             logger.warning(f"アノテーション仕様にラベル名(英語)が'{detail.label}'であるラベル情報が存在しないか、または複数存在します。 :: {log_message_suffix}")
             raise
 
-        if detail.attributes is not None:  # noqa: SIM108
+        if detail.attributes is not None:
             additional_data_list = self.convert_attributes(detail.attributes, label_name=detail.label, log_message_suffix=log_message_suffix)
         else:
             additional_data_list = []

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/comment/list_all_comment.py

@@ -18,6 +18,7 @@ from annofabapi.models import CommentType
 
 import annofabcli
 import annofabcli.common.cli
+from annofabcli.comment.list_comment import create_empty_df_comment, create_reply_counter
 from annofabcli.common.cli import ArgumentParser, CommandLine, build_annofabapi_resource_and_login
 from annofabcli.common.download import DownloadingFile
 from annofabcli.common.enums import FormatArgument
@@ -62,12 +63,19 @@ class ListAllCommentMain:
         if comment_type is not None:
             comment_list = [e for e in comment_list if e["comment_type"] == comment_type.value]
 
+        # 返信回数を算出する
+        reply_counter = create_reply_counter(comment_list)
+        for c in comment_list:
+            key = (c["task_id"], c["input_data_id"], c["comment_id"])
+            c["reply_count"] = reply_counter.get(key, 0)
+
         if exclude_reply:
             # 返信コメントを除外する
             comment_list = [e for e in comment_list if e["comment_node"]["_type"] != "Reply"]
 
         visualize = AddProps(self.service, project_id)
         comment_list = [visualize.add_properties_to_comment(e) for e in comment_list]
+
         return comment_list
 
 
@@ -93,7 +101,11 @@ class ListAllComment(CommandLine):
 
         output_format = FormatArgument(args.format)
         if output_format == FormatArgument.CSV:
-            df = pandas.json_normalize(comment_list)
+            if len(comment_list) > 0:
+                df = pandas.json_normalize(comment_list)
+            else:
+                df = create_empty_df_comment()
+
             print_csv(df, output=args.output)
         else:
             print_according_to_format(comment_list, output_format, output=args.output)

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/comment/list_comment.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import argparse
 import logging
+from collections import Counter
 from typing import Any, Optional
 
 import pandas
@@ -19,9 +20,45 @@ from annofabcli.common.visualize import AddProps
 logger = logging.getLogger(__name__)
 
 
+def create_reply_counter(comments: list[dict[str, Any]]) -> Counter[tuple[str, str, str]]:
+    """
+    返信コメントの回数を取得するcounterを生成します。
+
+    """
+    root_comment_id_counter = Counter((c["task_id"], c["input_data_id"], c["comment_node"]["root_comment_id"]) for c in comments if c["comment_node"]["_type"] == "Reply")
+    return root_comment_id_counter
+
+
+def create_empty_df_comment() -> pandas.DataFrame:
+    return pandas.DataFrame(
+        columns=[
+            "project_id",
+            "task_id",
+            "input_data_id",
+            "comment_id",
+            "phase",
+            "phase_stage",
+            "comment_type",
+            "account_id",
+            "user_id",
+            "username",
+            "phrases",
+            "comment",
+            "created_datetime",
+            "updated_datetime",
+            "reply_count",
+        ]
+    )
+
+
 class ListingComments(CommandLine):
-    def get_comments(self, project_id: str, task_id: str, input_data_id: str):  # noqa: ANN201
+    def get_comments(self, project_id: str, task_id: str, input_data_id: str) -> list[dict[str, Any]]:
         comments, _ = self.service.api.get_comments(project_id, task_id, input_data_id, query_params={"v": "2"})
+        # 返信回数を算出する
+        reply_counter = create_reply_counter(comments)
+        for c in comments:
+            key = (c["task_id"], c["input_data_id"], c["comment_id"])
+            c["reply_count"] = reply_counter.get(key, 0)
         return comments
 
     def get_comment_list(self, project_id: str, task_id_list: list[str], *, comment_type: Optional[CommentType], exclude_reply: bool) -> list[dict[str, Any]]:
@@ -49,10 +86,11 @@ class ListingComments(CommandLine):
                     all_comments.extend(comments)
 
             except requests.HTTPError:
-                logger.warning(f"タスク task_id = {task_id} のコメントを取得できませんでした。", exc_info=True)
+                logger.warning(f"task_id='{task_id}'のタスクのコメントの取得に失敗しました。", exc_info=True)
 
         visualize = AddProps(self.service, project_id)
         all_comments = [visualize.add_properties_to_comment(e) for e in all_comments]
+
         return all_comments
 
     def main(self) -> None:
@@ -66,7 +104,11 @@ class ListingComments(CommandLine):
 
         output_format = FormatArgument(args.format)
         if output_format == FormatArgument.CSV:
-            df = pandas.json_normalize(comment_list)
+            if len(comment_list) > 0:
+                df = pandas.json_normalize(comment_list)
+            else:
+                df = create_empty_df_comment()
+
             print_csv(df, output=args.output)
         else:
             print_according_to_format(comment_list, output_format, output=args.output)

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/common/image.py

@@ -112,7 +112,7 @@ def fill_annotation_list(
 
     # 下層レイヤにあるアノテーションから順に画像化する
     # reversed関数を使う理由：`simple_annotation.details`は上層レイヤのアノテーションから順に格納されているため
-    if label_name_list is not None:  # noqa: SIM108
+    if label_name_list is not None:
         annotation_list = [elm for elm in reversed(simple_annotation.details) if elm.label in label_name_list]
     else:
         annotation_list = list(reversed(simple_annotation.details))
@@ -219,7 +219,7 @@ def write_annotation_grayscale_image(
 
     # 下層レイヤにあるアノテーションから順に画像化する
     # reversed関数を使う理由：`simple_annotation.details`は上層レイヤのアノテーションから順に格納されているため
-    if label_name_list is not None:  # noqa: SIM108
+    if label_name_list is not None:
         annotation_list = [elm for elm in reversed(simple_annotation["details"]) if elm["label"] in set(label_name_list)]
     else:
         annotation_list = list(reversed(simple_annotation["details"]))

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/common/utils.py

@@ -221,7 +221,7 @@ def get_cache_dir() -> Path:
 
     """
     cache_home_dir = os.environ.get("XDG_CACHE_HOME")
-    if cache_home_dir is None:  # noqa: SIM108
+    if cache_home_dir is None:
         cache_home_dir_path = Path.home() / ".cache"
     else:
         cache_home_dir_path = Path(cache_home_dir)

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/filesystem/draw_annotation.py

@@ -259,7 +259,7 @@ def draw_annotation_all(  # noqa: ANN201, PLR0913
                 continue
 
         json_file = Path(parser.json_file_path)
-        if image_file is not None:  # noqa: SIM108
+        if image_file is not None:
             output_file = output_dir / f"{json_file.parent.name}/{json_file.stem}{image_file.suffix}"
         else:
             output_file = output_dir / f"{json_file.parent.name}/{json_file.stem}.png"
@@ -317,7 +317,7 @@ class DrawAnnotation(CommandLineWithoutWebapi):
 
         annotation_path: Path = args.annotation
         # Simpleアノテーションの読み込み
-        if annotation_path.is_file():  # noqa: SIM108
+        if annotation_path.is_file():
             iter_parser = lazy_parse_simple_annotation_zip(annotation_path)
         else:
             iter_parser = lazy_parse_simple_annotation_dir(annotation_path)

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/filesystem/mask_user_info.py

@@ -99,7 +99,7 @@ def create_masked_name(name: str) -> str:
 
 
 def get_replaced_user_id_set_from_biography(df: pandas.DataFrame, not_masked_location_set: Optional[set[str]] = None) -> set[str]:
-    if not_masked_location_set is None:  # noqa: SIM108
+    if not_masked_location_set is None:
         filtered_df = df
     else:
         filtered_df = df[df["biography"].map(lambda e: e not in not_masked_location_set)]
@@ -215,7 +215,7 @@ def create_replacement_dict_by_user_id(
     """
     keyが置換対象のuser_id、valueが置換後のマスクされたuser_idであるdictを作成する。
     """
-    if "biography" in df:  # noqa: SIM108
+    if "biography" in df:
         replaced_user_id_set = get_replaced_user_id_set_from_biography(df, not_masked_location_set=not_masked_biography_set)
     else:
         replaced_user_id_set = set()
@@ -320,7 +320,7 @@ class MaskUserInfo(CommandLineWithoutWebapi):
 
         csv_header_row_count: int = args.csv_header_row_count
         csv_path: Path = args.csv
-        if csv_header_row_count == 1:  # noqa: SIM108
+        if csv_header_row_count == 1:
             original_df = pandas.read_csv(str(csv_path))
         else:
             original_df = read_multiheader_csv(str(csv_path), header_row_count=csv_header_row_count)

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/instruction/upload_instruction.py

@@ -70,7 +70,7 @@ class UploadInstruction(CommandLine):
             if src_value.startswith("data:"):
                 img_path = save_image_from_data_uri_scheme(src_value, temp_dir=temp_dir)
             else:  # noqa: PLR5501
-                if src_value[0] == "/":  # noqa: SIM108
+                if src_value[0] == "/":
                     img_path = Path(src_value)
                 else:
                     img_path = html_path.parent / src_value
@@ -98,7 +98,7 @@ class UploadInstruction(CommandLine):
                 continue
 
         # body要素があればその中身、なければhtmlファイルの中身をアップロードする
-        if len(pq_html("body")) > 0:  # noqa: SIM108
+        if len(pq_html("body")) > 0:
             html_data = pq_html("body").html()
         else:
             html_data = pq_html.html()
@@ -108,7 +108,7 @@ class UploadInstruction(CommandLine):
 
     def update_instruction(self, project_id: str, html_data: str) -> None:
         histories, _ = self.service.api.get_instruction_history(project_id)
-        if len(histories) > 0:  # noqa: SIM108
+        if len(histories) > 0:
             last_updated_datetime = histories[0]["updated_datetime"]
         else:
             last_updated_datetime = None

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/job/list_job.py

@@ -23,7 +23,7 @@ class ListJob(CommandLine):
         ジョブ一覧を取得する。
         """
 
-        if job_query is not None:  # noqa: SIM108
+        if job_query is not None:
             query_params = copy.deepcopy(job_query)
         else:
             query_params = {}

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/project_member/change_project_members.py

@@ -147,7 +147,7 @@ class ChangeProjectMembers(CommandLine):
     def main(self) -> None:
         args = self.args
         project_id = args.project_id
-        if args.all_user:  # noqa: SIM108
+        if args.all_user:
             user_id_list = self.get_all_user_id_list_except_myself(project_id)
         else:
             user_id_list = annofabcli.common.cli.get_list_from_args(args.user_id)

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/project_member/invite_project_members.py

@@ -42,7 +42,7 @@ class InviteProjectMemberMain:
         # プロジェクトメンバを追加/更新する
         for user_id in user_id_list:
             dest_member = get_project_member(user_id)
-            if dest_member is not None:  # noqa: SIM108
+            if dest_member is not None:
                 last_updated_datetime = dest_member["updated_datetime"]
             else:
                 last_updated_datetime = None

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/stat_visualization/merge_visualization_dir.py

@@ -147,7 +147,7 @@ class MergingVisualizationFile:
         for project_dir in self.project_dir_list:
             tmp_obj = project_dir.read_worktime_per_date_user()
 
-            if merged_obj is None:  # noqa: SIM108
+            if merged_obj is None:
                 merged_obj = tmp_obj
             else:
                 merged_obj = WorktimePerDate.merge(merged_obj, tmp_obj)

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/statistics/list_annotation_area.py

@@ -55,6 +55,7 @@ def lazy_parse_simple_annotation_by_input_data(annotation_path: Path) -> Iterato
 
 @dataclass(frozen=True)
 class AnnotationAreaInfo(DataClassJsonMixin):
+    project_id: str
     task_id: str
     task_status: str
     task_phase: str
@@ -92,6 +93,7 @@ def get_annotation_area_info_list(parser: SimpleAnnotationParser, simple_annotat
 
         result.append(
             AnnotationAreaInfo(
+                project_id=simple_annotation["project_id"],
                 task_id=simple_annotation["task_id"],
                 task_phase=simple_annotation["task_phase"],
                 task_phase_stage=simple_annotation["task_phase_stage"],
@@ -135,6 +137,7 @@ def create_df(
     annotation_area_list: list[AnnotationAreaInfo],
 ) -> pandas.DataFrame:
     columns = [
+        "project_id",
         "task_id",
         "task_status",
         "task_phase",

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/statistics/list_annotation_attribute.py

@@ -57,6 +57,7 @@ class AnnotationAttribute(pydantic.BaseModel):
     入力データまたはタスク単位の区間アノテーションの長さ情報。
     """
 
+    project_id: str
     task_id: str
     task_status: str
     task_phase: str
@@ -87,6 +88,7 @@ def get_annotation_attribute_list_from_annotation_json(simple_annotation: dict[s
 
         result.append(
             AnnotationAttribute(
+                project_id=simple_annotation["project_id"],
                 task_id=simple_annotation["task_id"],
                 task_status=simple_annotation["task_status"],
                 task_phase=simple_annotation["task_phase"],
@@ -141,6 +143,7 @@ def print_annotation_attribute_list_as_csv(annotation_attribute_list: list, outp
     df = pandas.json_normalize(annotation_attribute_list)
 
     base_columns = [
+        "project_id",
         "task_id",
         "task_status",
         "task_phase",

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/statistics/list_annotation_attribute_filled_count.py

@@ -100,6 +100,7 @@ class AnnotationCountByInputData(DataClassJsonMixin, HasAnnotationAttributeCount
     入力データ単位のアノテーション数の情報。
     """
 
+    project_id: str
     task_id: str
     task_status: TaskStatus
     task_phase: TaskPhase
@@ -126,6 +127,7 @@ class AnnotationCountByTask(DataClassJsonMixin, HasAnnotationAttributeCounts):
     タスク単位のアノテーション数の情報。
     """
 
+    project_id: str
     task_id: str
     task_status: TaskStatus
     task_phase: TaskPhase
@@ -174,6 +176,7 @@ def convert_annotation_count_list_by_input_data_to_by_task(annotation_count_list
 
         result.append(
             AnnotationCountByTask(
+                project_id=first_elm.project_id,
                 task_id=task_id,
                 task_status=first_elm.task_status,
                 task_phase=first_elm.task_phase,
@@ -263,6 +266,7 @@ class ListAnnotationCounterByInputData:
             frame_no = self.frame_no_map.get((simple_annotation["task_id"], simple_annotation["input_data_id"]))
 
         return AnnotationCountByInputData(
+            project_id=simple_annotation["project_id"],
             task_id=simple_annotation["task_id"],
             task_phase=TaskPhase(simple_annotation["task_phase"]),
             task_phase_stage=simple_annotation["task_phase_stage"],
@@ -343,6 +347,7 @@ class AnnotationCountCsvByAttribute:
         prior_attribute_columns: Optional[list[tuple[str, str, str]]] = None,
     ) -> list[tuple[str, str, str]]:
         basic_columns = [
+            ("project_id", "", ""),
             ("task_id", "", ""),
             ("task_status", "", ""),
             ("task_phase", "", ""),
@@ -360,6 +365,7 @@ class AnnotationCountCsvByAttribute:
         prior_attribute_columns: Optional[list[tuple[str, str, str]]] = None,
     ) -> list[tuple[str, str, str]]:
         basic_columns = [
+            ("project_id", "", ""),
             ("task_id", "", ""),
             ("task_status", "", ""),
             ("task_phase", "", ""),
@@ -377,6 +383,7 @@ class AnnotationCountCsvByAttribute:
     ) -> pandas.DataFrame:
         def to_cell(c: AnnotationCountByInputData) -> dict[tuple[str, str, str], Any]:
             cell: dict[tuple[str, str, str], Any] = {
+                ("project_id", "", ""): c.project_id,
                 ("task_id", "", ""): c.task_id,
                 ("task_status", "", ""): c.task_status.value,
                 ("task_phase", "", ""): c.task_phase.value,
@@ -405,6 +412,7 @@ class AnnotationCountCsvByAttribute:
     ) -> pandas.DataFrame:
         def to_cell(c: AnnotationCountByTask) -> dict[tuple[str, str, str], Any]:
             cell: dict[tuple[str, str, str], Any] = {
+                ("project_id", "", ""): c.project_id,
                 ("task_id", "", ""): c.task_id,
                 ("task_status", "", ""): c.task_status.value,
                 ("task_phase", "", ""): c.task_phase.value,

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/statistics/list_annotation_count.py

@@ -115,6 +115,7 @@ class AnnotationCounter(abc.ABC):
 
 @dataclass(frozen=True)
 class AnnotationCounterByTask(AnnotationCounter, DataClassJsonMixin):
+    project_id: str
     task_id: str
     task_status: TaskStatus
     task_phase: TaskPhase
@@ -124,6 +125,7 @@ class AnnotationCounterByTask(AnnotationCounter, DataClassJsonMixin):
 
 @dataclass(frozen=True)
 class AnnotationCounterByInputData(AnnotationCounter, DataClassJsonMixin):
+    project_id: str
     task_id: str
     task_status: TaskStatus
     task_phase: TaskPhase
@@ -254,6 +256,7 @@ class ListAnnotationCounterByInputData:
             frame_no = self.frame_no_map.get((task_id, input_data_id))
 
         return AnnotationCounterByInputData(
+            project_id=simple_annotation["project_id"],
             task_id=simple_annotation["task_id"],
             task_phase=TaskPhase(simple_annotation["task_phase"]),
             task_phase_stage=simple_annotation["task_phase_stage"],
@@ -351,6 +354,7 @@ class ListAnnotationCounterByTask:
             raise RuntimeError(f"{task_parser.task_id} ディレクトリにはjsonファイルが1つも含まれていません。")
 
         return AnnotationCounterByTask(
+            project_id=last_simple_annotation["project_id"],
             task_id=last_simple_annotation["task_id"],
             task_status=TaskStatus(last_simple_annotation["task_status"]),
             task_phase=TaskPhase(last_simple_annotation["task_phase"]),
@@ -468,6 +472,7 @@ class AttributeCountCsv:
     ) -> None:
         def get_columns() -> list[AttributeValueKey]:
             basic_columns = [
+                ("project_id", "", ""),
                 ("task_id", "", ""),
                 ("task_status", "", ""),
                 ("task_phase", "", ""),
@@ -480,6 +485,7 @@ class AttributeCountCsv:
 
         def to_cell(c: AnnotationCounterByTask) -> dict[AttributeValueKey, Any]:
             cell = {
+                ("project_id", "", ""): c.project_id,
                 ("task_id", "", ""): c.task_id,
                 ("task_status", "", ""): c.task_status.value,
                 ("task_phase", "", ""): c.task_phase.value,
@@ -506,6 +512,7 @@ class AttributeCountCsv:
     ) -> None:
         def get_columns() -> list[AttributeValueKey]:
             basic_columns = [
+                ("project_id", "", ""),
                 ("task_id", "", ""),
                 ("task_status", "", ""),
                 ("task_phase", "", ""),
@@ -520,6 +527,7 @@ class AttributeCountCsv:
 
         def to_cell(c: AnnotationCounterByInputData) -> dict[tuple[str, str, str], Any]:
             cell = {
+                ("project_id", "", ""): c.project_id,
                 ("input_data_id", "", ""): c.input_data_id,
                 ("input_data_name", "", ""): c.input_data_name,
                 ("frame_no", "", ""): c.frame_no,
@@ -569,6 +577,7 @@ class LabelCountCsv:
     ) -> None:
         def get_columns() -> list[str]:
             basic_columns = [
+                "project_id",
                 "task_id",
                 "task_status",
                 "task_phase",
@@ -581,6 +590,7 @@ class LabelCountCsv:
 
         def to_dict(c: AnnotationCounterByTask) -> dict[str, Any]:
             d = {
+                "project_id": c.project_id,
                 "task_id": c.task_id,
                 "task_status": c.task_status.value,
                 "task_phase": c.task_phase.value,
@@ -607,6 +617,7 @@ class LabelCountCsv:
     ) -> None:
         def get_columns() -> list[str]:
             basic_columns = [
+                "project_id",
                 "task_id",
                 "task_status",
                 "task_phase",
@@ -621,6 +632,7 @@ class LabelCountCsv:
 
         def to_dict(c: AnnotationCounterByInputData) -> dict[str, Any]:
             d = {
+                "project_id": c.project_id,
                 "input_data_id": c.input_data_id,
                 "input_data_name": c.input_data_name,
                 "frame_no": c.frame_no,

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/statistics/list_annotation_duration.py

@@ -108,6 +108,7 @@ class AnnotationDuration(DataClassJsonMixin):
     入力データまたはタスク単位の区間アノテーションの長さ情報。
     """
 
+    project_id: str
     task_id: str
     task_status: TaskStatus
     task_phase: TaskPhase
@@ -234,6 +235,7 @@ class ListAnnotationDurationByInputData:
             }
 
         return AnnotationDuration(
+            project_id=simple_annotation["project_id"],
             task_id=simple_annotation["task_id"],
             task_phase=TaskPhase(simple_annotation["task_phase"]),
             task_phase_stage=simple_annotation["task_phase_stage"],
@@ -360,6 +362,7 @@ class AnnotationDurationCsvByAttribute:
         prior_attribute_columns: Optional[list[AttributeValueKey]] = None,
     ) -> list[AttributeValueKey]:
         basic_columns = [
+            ("project_id", "", ""),
             ("task_id", "", ""),
             ("task_status", "", ""),
             ("task_phase", "", ""),
@@ -379,6 +382,7 @@ class AnnotationDurationCsvByAttribute:
     ) -> pandas.DataFrame:
         def to_cell(c: AnnotationDuration) -> dict[tuple[str, str, str], Any]:
             cell: dict[AttributeValueKey, Any] = {
+                ("project_id", "", ""): c.project_id,
                 ("input_data_id", "", ""): c.input_data_id,
                 ("input_data_name", "", ""): c.input_data_name,
                 ("task_id", "", ""): c.task_id,
@@ -423,6 +427,7 @@ class AnnotationDurationCsvByLabel:
         prior_label_columns: Optional[list[str]] = None,
     ) -> list[str]:
         basic_columns = [
+            "project_id",
             "task_id",
             "task_status",
             "task_phase",
@@ -442,6 +447,7 @@ class AnnotationDurationCsvByLabel:
     ) -> pandas.DataFrame:
         def to_dict(c: AnnotationDuration) -> dict[str, Any]:
             d: dict[str, Any] = {
+                "project_id": c.project_id,
                 "input_data_id": c.input_data_id,
                 "input_data_name": c.input_data_name,
                 "task_id": c.task_id,

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/statistics/list_video_duration.py

@@ -38,7 +38,7 @@ def get_video_duration_list(task_list: list[dict[str, Any]], input_data_list: li
     result = []
     for task in task_list:
         task_id = task["task_id"]
-        elm = {"task_id": task_id, "task_status": task["status"], "task_phase": task["phase"], "task_phase_stage": task["phase_stage"]}
+        elm = {"project_id": task["project_id"], "task_id": task_id, "task_status": task["status"], "task_phase": task["phase"], "task_phase_stage": task["phase_stage"]}
         input_data_id_list = task["input_data_id_list"]
         assert len(input_data_id_list) == 1, f"task_id='{task_id}'には複数の入力データが含まれています。"
         input_data_id = input_data_id_list[0]
@@ -94,6 +94,7 @@ class ListVideoDuration(CommandLine):
         logger.info(f"{len(video_duration_list)} 件のタスクの動画長さを出力します。")
         if output_format == FormatArgument.CSV:
             columns = [
+                "project_id",
                 "task_id",
                 "task_status",
                 "task_phase",

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/statistics/summarize_task_count.py

@@ -96,7 +96,7 @@ def create_task_count_summary(task_list: list[Task], number_of_inspections: int)
     """
     for task in task_list:
         status = TaskStatus(task["status"])
-        if status == TaskStatus.COMPLETE:  # noqa: SIM108
+        if status == TaskStatus.COMPLETE:
             step_for_current_phase = sys.maxsize
         else:
             step_for_current_phase = get_step_for_current_phase(task, number_of_inspections)
@@ -142,7 +142,7 @@ class SummarizeTaskCount(CommandLine):
             # タスク全件ファイルをダウンロードするので、オーナロールかアノテーションユーザロールであることを確認する。
             super().validate_project(project_id, project_member_roles=[ProjectMemberRole.OWNER, ProjectMemberRole.TRAINING_DATA_USER])
 
-        if is_execute_get_tasks_api:  # noqa: SIM108
+        if is_execute_get_tasks_api:
             task_list = self.service.wrapper.get_all_tasks(project_id)
         else:
             task_list = self.get_task_list_with_downloading_file(project_id, task_json_path, is_latest=is_latest)

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/statistics/visualization/dataframe/annotation_count.py

@@ -59,7 +59,7 @@ class AnnotationCount:
         def get_annotation_count_default(simple_annotation: dict[str, Any]) -> int:
             return len(simple_annotation["details"])
 
-        if get_annotation_count_func is not None:  # noqa: SIM108
+        if get_annotation_count_func is not None:
             get_annotation_count = get_annotation_count_func
         else:
             get_annotation_count = get_annotation_count_default

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/statistics/visualization/dataframe/cumulative_productivity.py

@@ -222,7 +222,7 @@ class AnnotatorCumulativeProductivity(AbstractPhaseCumulativeProductivity):
 
         logger.debug(f"{output_file} を出力します。")
 
-        if target_user_id_list is not None:  # noqa: SIM108
+        if target_user_id_list is not None:
             user_id_list = target_user_id_list
         else:
             user_id_list = self.default_user_id_list
@@ -298,7 +298,7 @@ class InspectorCumulativeProductivity(AbstractPhaseCumulativeProductivity):
 
         logger.debug(f"{output_file} を出力します。")
 
-        if target_user_id_list is not None:  # noqa: SIM108
+        if target_user_id_list is not None:
             user_id_list = target_user_id_list
         else:
             user_id_list = self.default_user_id_list
@@ -360,7 +360,7 @@ class AcceptorCumulativeProductivity(AbstractPhaseCumulativeProductivity):
 
         logger.debug(f"{output_file} を出力します。")
 
-        if target_user_id_list is not None:  # noqa: SIM108
+        if target_user_id_list is not None:
             user_id_list = target_user_id_list
         else:
             user_id_list = self.default_user_id_list

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/statistics/visualization/dataframe/productivity_per_date.py

@@ -253,7 +253,7 @@ class AnnotatorProductivityPerDate(AbstractPhaseProductivityPerDate):
 
         df = self.df.copy()
 
-        if target_user_id_list is not None:  # noqa: SIM108
+        if target_user_id_list is not None:
             user_id_list = target_user_id_list
         else:
             user_id_list = df.sort_values(by="user_id")["user_id"].dropna().unique().tolist()
@@ -406,7 +406,7 @@ class InspectorProductivityPerDate(AbstractPhaseProductivityPerDate):
 
         df = self.df.copy()
 
-        if target_user_id_list is not None:  # noqa: SIM108
+        if target_user_id_list is not None:
             user_id_list = target_user_id_list
         else:
             user_id_list = df.sort_values(by="user_id", ascending=False)["user_id"].dropna().unique().tolist()
@@ -544,7 +544,7 @@ class AcceptorProductivityPerDate(AbstractPhaseProductivityPerDate):
 
         df = self.df.copy()
 
-        if target_user_id_list is not None:  # noqa: SIM108
+        if target_user_id_list is not None:
             user_id_list = target_user_id_list
         else:
             user_id_list = df.sort_values(by="user_id", ascending=False)["user_id"].dropna().unique().tolist()

{annofabcli-1.103.0 → annofabcli-1.104.1}/annofabcli/statistics/visualization/dataframe/task_history.py

@@ -67,7 +67,7 @@ class TaskHistory:
                 new_task_history["worktime_hour"] = isoduration_to_hour(task_history["accumulated_labor_time_milliseconds"])
                 all_task_history_list.append(new_task_history)
 
-        if len(all_task_history_list) > 0:  # noqa: SIM108
+        if len(all_task_history_list) > 0:
             df = pandas.DataFrame(all_task_history_list)
         else:
             df = cls.empty()