annofabcli 1.106.2__py3-none-any.whl → 1.106.4__py3-none-any.whl

annofabcli/annotation_specs/attribute_restriction.py

@@ -74,21 +74,26 @@ class AttributeRestrictionMessage:
         属性の種類がドロップダウンかセレクトボックスのときは、選択肢の名前を返す。
 
         Args:
-            value (str): _description_
-            attribute (Optional[dict[str,Any]]): _description_
+            value: 制約条件の値
+            attribute: 属性情報
 
         Returns:
-            str: _description_
+            valueが'foo'の場合：
+            -  属性の種類が排他選択でない場合： `'foo'` （valueを返す）
+            -  属性の種類が排他選択である場合： `'FOO'` （選択肢の名前を返す）
+            -  `OutputFormat.DETAILED_TEXT` AND 属性の種類が排他選択である場合： `'FOO' (id='foo')` （選択肢の名前とIDを返す）
+
         """
         if attribute is not None and attribute["type"] in ["choice", "select"]:
             # ラジオボタンかドロップダウンのとき
             choices = attribute["choices"]
             choice = first_true(choices, pred=lambda e: e["choice_id"] == value)
-            if choice is not None:
-                choice_name = AnnofabApiFacade.get_choice_name_en(choice)
-                tmp = f"'{value}'"
+            if value == "" or choice is not None:
+                # `value == ""`を判定条件に加える理由：「排他選択属性が空である/空でない」という制約の場合、`value`は空文字列になるため。
+                choice_name = AnnofabApiFacade.get_choice_name_en(choice) if choice is not None else ""
+                tmp = f"'{choice_name}'"
                 if self.output_format == OutputFormat.DETAILED_TEXT:
-                    tmp = f"{tmp} (name='{choice_name}')"
+                    tmp = f"{tmp} (id='{value}')"
                 return tmp
 
             else:

annofabcli/input_data/put_input_data.py

@@ -129,7 +129,7 @@ class SubPutInputData:
         self.facade = facade
         self.all_yes = all_yes
 
-    def put_input_data(self, project_id: str, csv_input_data: InputDataForPut, last_updated_datetime: Optional[str] = None):  # noqa: ANN201
+    def put_input_data(self, project_id: str, csv_input_data: InputDataForPut, last_updated_datetime: Optional[str] = None) -> None:
         request_body: dict[str, Any] = {"last_updated_datetime": last_updated_datetime}
 
         file_path = get_file_scheme_path(csv_input_data.input_data_path)
@@ -180,22 +180,26 @@ class SubPutInputData:
 
         return self.confirm_processing(message_for_confirm)
 
-    def put_input_data_main(self, project_id: str, csv_input_data: CsvInputData, *, overwrite: bool = False) -> bool:
+    def put_input_data_main_wrapper(self, tpl: tuple[int, CsvInputData], *, project_id: str, overwrite: bool) -> bool:
+        input_data_index, csv_input_data = tpl
+        return self.put_input_data_main(project_id, csv_input_data, input_data_index=input_data_index, overwrite=overwrite)
+
+    def put_input_data_main(self, project_id: str, csv_input_data: CsvInputData, *, input_data_index: int, overwrite: bool = False) -> bool:
         input_data = InputDataForPut(
             input_data_name=csv_input_data.input_data_name,
             input_data_path=csv_input_data.input_data_path,
             input_data_id=csv_input_data.input_data_id if csv_input_data.input_data_id is not None else convert_input_data_name_to_input_data_id(csv_input_data.input_data_name),
         )
-
+        log_message_prefix = f"{input_data_index + 1}件目 :: "
         last_updated_datetime = None
         dict_input_data = self.service.wrapper.get_input_data_or_none(project_id, input_data.input_data_id)
 
         if dict_input_data is not None:
             if overwrite:
-                logger.debug(f"input_data_id='{input_data.input_data_id}' はすでに存在します。")
+                logger.debug(f"{log_message_prefix}input_data_id='{input_data.input_data_id}' はすでに存在します。")
                 last_updated_datetime = dict_input_data["updated_datetime"]
             else:
-                logger.debug(f"input_data_id='{input_data.input_data_id}' がすでに存在するのでスキップします。")
+                logger.debug(f"{log_message_prefix}input_data_id='{input_data.input_data_id}' がすでに存在するのでスキップします。")
                 return False
 
         file_path = get_file_scheme_path(input_data.input_data_path)
@@ -210,18 +214,18 @@ class SubPutInputData:
         # 入力データを登録
         try:
             self.put_input_data(project_id, input_data, last_updated_datetime=last_updated_datetime)
-            logger.debug(f"入力データを登録しました。 :: input_data_id='{input_data.input_data_id}', input_data_name='{input_data.input_data_name}'")
+            logger.debug(f"{log_message_prefix}入力データを登録しました。 :: input_data_id='{input_data.input_data_id}', input_data_name='{input_data.input_data_name}'")
             return True  # noqa: TRY300
 
         except requests.exceptions.HTTPError:
             logger.warning(
-                f"入力データの登録に失敗しました。input_data_id='{input_data.input_data_id}', input_data_name='{input_data.input_data_name}'",
+                f"{log_message_prefix}入力データの登録に失敗しました。input_data_id='{input_data.input_data_id}', input_data_name='{input_data.input_data_name}'",
                 exc_info=True,
             )
             return False
         except CheckSumError:
             logger.warning(
-                f"入力データを登録しましたが、データが破損している可能性があります。input_data_id='{input_data.input_data_id}', input_data_name='{input_data.input_data_name}',",
+                f"{log_message_prefix}入力データを登録しましたが、データが破損している可能性があります。input_data_id='{input_data.input_data_id}', input_data_name='{input_data.input_data_name}'",
                 exc_info=True,
             )
             return False
@@ -259,14 +263,14 @@ class PutInputData(CommandLine):
 
         obj = SubPutInputData(service=self.service, facade=self.facade, all_yes=self.all_yes)
         if parallelism is not None:
-            partial_func = partial(obj.put_input_data_main, project_id, overwrite=overwrite)
+            partial_func = partial(obj.put_input_data_main_wrapper, project_id=project_id, overwrite=overwrite)
             with Pool(parallelism) as pool:
-                result_bool_list = pool.map(partial_func, input_data_list)
+                result_bool_list = pool.map(partial_func, enumerate(input_data_list))
                 count_put_input_data = len([e for e in result_bool_list if e])
 
         else:
-            for csv_input_data in input_data_list:
-                result = obj.put_input_data_main(project_id, csv_input_data=csv_input_data, overwrite=overwrite)
+            for input_data_index, csv_input_data in enumerate(input_data_list):
+                result = obj.put_input_data_main(project_id, csv_input_data=csv_input_data, input_data_index=input_data_index, overwrite=overwrite)
                 if result:
                     count_put_input_data += 1
 

{annofabcli-1.106.2.dist-info → annofabcli-1.106.4.dist-info}/METADATA

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

{annofabcli-1.106.2.dist-info → annofabcli-1.106.4.dist-info}/RECORD

@@ -19,7 +19,7 @@ annofabcli/annotation/restore_annotation.py,sha256=F0_p1k0Yzx0YVOuLYOS48OWutsN5y
 annofabcli/annotation/subcommand_annotation.py,sha256=PfiU4G_Col3quCXKbZpqWoUXGi5p2uB1XI9BKMwaq1I,2288
 annofabcli/annotation_specs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 annofabcli/annotation_specs/add_attribute_restriction.py,sha256=jVA7ltharabR94bf71QuW0x0yVgu6-A7PHn7Dq3kUfg,6825
-annofabcli/annotation_specs/attribute_restriction.py,sha256=tXcCLWVUdmmLWFHLjtSERcgxwFhqk7_zyKZzps0oyso,10123
+annofabcli/annotation_specs/attribute_restriction.py,sha256=Ximx5BHK28raHC2WRwP2W6FfuPvCmHu3PGife9MoZHQ,10687
 annofabcli/annotation_specs/export_annotation_specs.py,sha256=hPDkkzVl1alhSEmRim6w9Vcz5_30fRY0np8GmCEkpcY,4791
 annofabcli/annotation_specs/get_annotation_specs_with_attribute_id_replaced.py,sha256=pJxr90AvE3bd4vg6A4yhq-wjT86ACBxGZu1Lt-Xw08k,8200
 annofabcli/annotation_specs/get_annotation_specs_with_choice_id_replaced.py,sha256=QrF4k_isyFPN6OKNafl_7rbHhlkQp8ITkfOh39NZizg,6797
@@ -82,7 +82,7 @@ annofabcli/input_data/download_input_data_json.py,sha256=vxGoeM3ZEggQbWiWsrDK0_G
 annofabcli/input_data/list_all_input_data.py,sha256=C0u2ZmB52NIgn8-S-F6GT6GFS39gLsl5cCNa_oiNKtk,9754
 annofabcli/input_data/list_all_input_data_merged_task.py,sha256=xs1uT9_ToQNA2luLxTOuPO_AUi5WRf1uMCdoBFZIMaU,12655
 annofabcli/input_data/list_input_data.py,sha256=Jz5tRDPBLE8CyPV85jmOGd2-aHELyAE4MGi7WVjZaDM,11335
-annofabcli/input_data/put_input_data.py,sha256=VDzU6V8mqa5_-kiwWoircqmDgMZRL6SCiRAN6peDrpc,18037
+annofabcli/input_data/put_input_data.py,sha256=3rr5sWGZvlureGyZ4Fga3cfKQOwirLa_cnE7yhybZk0,18600
 annofabcli/input_data/put_input_data_with_zip.py,sha256=SA4aMAwMBFgc9Lh0zmRCbmkXG4AMrcBqd5zeTSdr8lc,5566
 annofabcli/input_data/subcommand_input_data.py,sha256=X8EoxsF6PMiKrvk_r7PIe2D0WZuaPlgLJRuTiljPIdM,2048
 annofabcli/input_data/update_metadata_of_input_data.py,sha256=E4E-FZaQBmhmhMhddehhtVLxS26TsehZzHRI6Ccr8pc,11460
@@ -209,8 +209,8 @@ annofabcli/task_history_event/download_task_history_event_json.py,sha256=hQLVbQ0
 annofabcli/task_history_event/list_all_task_history_event.py,sha256=EeKMyPUxGwYCFtWQHHW954ZserGm8lUqrwNnV1iX9X4,6830
 annofabcli/task_history_event/list_worktime.py,sha256=Y7Pu5DP7scPf7HPt6CTiTvB1_5_Nfi1bStUIaCpkhII,15507
 annofabcli/task_history_event/subcommand_task_history_event.py,sha256=mJVJoT4RXk4HWnY7-Nrsl4If-gtaIIEXd2z7eFZwM2I,1260
-annofabcli-1.106.2.dist-info/METADATA,sha256=8kDxW3p5iajthMP9TJNcPUUEhZMOK1HCqPC83tRHcqU,5286
-annofabcli-1.106.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-annofabcli-1.106.2.dist-info/entry_points.txt,sha256=C2uSUc-kkLJpoK_mDL5FEMAdorLEMPfwSf8VBMYnIFM,56
-annofabcli-1.106.2.dist-info/licenses/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
-annofabcli-1.106.2.dist-info/RECORD,,
+annofabcli-1.106.4.dist-info/METADATA,sha256=ww3ad21ZDcJuBWjrPIw1gktGa0f8go2pGkSGi6zNYP8,5286
+annofabcli-1.106.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+annofabcli-1.106.4.dist-info/entry_points.txt,sha256=C2uSUc-kkLJpoK_mDL5FEMAdorLEMPfwSf8VBMYnIFM,56
+annofabcli-1.106.4.dist-info/licenses/LICENSE,sha256=pcqWYfxFtxBzhvKp3x9MXNM4xciGb2eFewaRhXUNHlo,1081
+annofabcli-1.106.4.dist-info/RECORD,,