rdetoolkit 1.5.2__cp313-cp313-win_amd64.whl → 1.5.3__cp313-cp313-win_amd64.whl

rdetoolkit/__init__.py

@@ -15,7 +15,7 @@ if sys.version_info < (3, 10):
 from importlib import import_module
 from typing import Any
 
-__version__ = "1.5.2"
+__version__ = "1.5.3"
 
 _LAZY_ATTRS: dict[str, tuple[str, str]] = {
     "DirectoryOps": ("rdetoolkit.core", "DirectoryOps"),

rdetoolkit/invoicefile.py

@@ -160,16 +160,18 @@ def check_exist_rawfiles(dfexcelinvoice: pd.DataFrame, excel_rawfiles: list[Path
         excel_rawfiles (list[Path]): A list of Path objects representing file paths.
 
     Raises:
-        tructuredError: If any file name in dfexcelinvoice is not found in excel_rawfiles.
+        StructuredError: If any file name in dfexcelinvoice is not found in excel_rawfiles.
 
     Returns:
         list[Path]: A list of Path objects corresponding to the file names in dfexcelinvoice, ordered as they appear in the DataFrame.
     """
-    file_set_group = {f.name for f in excel_rawfiles}
-    file_set_invoice = set(dfexcelinvoice["data_file_names/name"])
-    if file_set_invoice - file_set_group:
-        emsg = f"ERROR: raw file not found: {(file_set_invoice-file_set_group).pop()}"
-        raise StructuredError(emsg)
+    file_set_group = {f.name for f in excel_rawfiles}
+    file_set_invoice = set(dfexcelinvoice["data_file_names/name"])
+    if file_set_invoice - file_set_group:
+        missing = sorted(file_set_invoice - file_set_group)
+        missing_display = (str(name) for name in missing)
+        emsg = f"ERROR: raw file not found: {', '.join(missing_display)}"
+        raise StructuredError(emsg)
     # Sort excel_rawfiles in the order they appear in the invoice
     _tmp = {f.name: f for f in excel_rawfiles}
     try:
@@ -1152,7 +1154,8 @@ class RuleBasedReplacer:
         Args:
             replacements (Mapping[str, Any]): The object containing mapping rules (read-only).
             source_json_obj (MutableMapping[str, Any] | None): Objects of key and value to which you want to apply the rule (performs nested assignments).
-            mapping_rules (Mapping[str, str] | None, optional): Rules for mapping key and value (read-only). Defaults to None.
+            mapping_rules (Mapping[str, str] | None, optional): Rules for mapping key and value (read-only).
+                If None, uses self.rules. Defaults to None.
 
         Returns:
             dict[str, Any]: dictionary type data after conversion
@@ -1173,13 +1176,12 @@ class RuleBasedReplacer:
             result = replacer.apply_rules(replacement_rule, save_file_path, mapping_rules = rule)
             print(result)
         """
-        # [TODO] Correction of type definitions in version 0.1.6
         if mapping_rules is None:
             mapping_rules = self.rules
         if source_json_obj is None:
             source_json_obj = {}
 
-        for key, value in self.rules.items():
+        for key, value in mapping_rules.items():
             keys = key.split(".")
             replace_value = replacements.get(value, "")
             current_obj: MutableMapping[str, Any] = source_json_obj

rdetoolkit/processing/processors/invoice.py

@@ -411,6 +411,7 @@ class SmartTableInvoiceInitializer(Processor):
         """Apply SmartTable row data to invoice and collect metadata updates."""
         metadata_updates: dict[str, dict[str, Any]] = {}
         metadata_def: dict[str, Any] | None = None
+        csv_has_sample_owner_id = False
 
         # Handle empty CSV (no data rows)
         if len(csv_data) == 0:
@@ -435,10 +436,50 @@ class SmartTableInvoiceInitializer(Processor):
                 meta_key, meta_entry = self._process_meta_mapping(col, value, metadata_def)
                 metadata_updates[meta_key] = meta_entry
                 continue
+            # Track if sample/ownerId is explicitly specified in CSV
+            if col == "sample/ownerId":
+                csv_has_sample_owner_id = True
             self._process_mapping_key(col, value, invoice_data, invoice_schema_json_data)
 
+        # Set sample.ownerId to basic.dataOwnerId only if not specified in CSV
+        if not csv_has_sample_owner_id:
+            self._set_sample_owner_id(invoice_data)
+
         return metadata_updates
 
+    def _set_sample_owner_id(self, invoice_data: dict[str, Any]) -> None:
+        """Set sample.ownerId to basic.dataOwnerId for SmartTable processing.
+
+        This ensures that newly registered samples have the correct owner ID,
+        which should always be the data owner (registrant) rather than
+        any temporary sample owner selected in the invoice screen.
+
+        Args:
+            invoice_data: Invoice data dictionary to update.
+
+        Note:
+            - For new sample registration: Sets the correct owner ID
+            - For sample linking: The value is set but not used (safe to set)
+            - If basic.dataOwnerId is missing: Logs warning and preserves existing value
+        """
+        basic_section = invoice_data.get("basic", {})
+        data_owner_id = basic_section.get("dataOwnerId")
+
+        if data_owner_id is None or data_owner_id == "":
+            logger.warning(
+                "basic.dataOwnerId is missing or empty; sample.ownerId will not be updated. "
+                "This may cause incorrect sample owner assignment.",
+            )
+            return
+
+        sample_section = invoice_data.setdefault("sample", {})
+        sample_section["ownerId"] = data_owner_id
+
+        logger.debug(
+            "Set sample.ownerId to basic.dataOwnerId: %s",
+            data_owner_id,
+        )
+
     def _load_metadata_definition(self, metadata_def_path: Path) -> dict[str, Any]:
         """Load metadata definitions for SmartTable meta column processing.
 

{rdetoolkit-1.5.2.dist-info → rdetoolkit-1.5.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rdetoolkit
-Version: 1.5.2
+Version: 1.5.3
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{rdetoolkit-1.5.2.dist-info → rdetoolkit-1.5.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-rdetoolkit\__init__.py,sha256=JHyHP569oIiGeWRopO7rd0KelZFxsHzIFri753zqaGo,3306
+rdetoolkit\__init__.py,sha256=uCoUlAi84FYyEF_xSmSjaJmhqalz-B6Rd8fcqq89K-I,3306
 rdetoolkit\__init__.pyi,sha256=2ILXdK0bu7extORHJnwcCw2GHmlSGrN6-hDV0SV7CF8,472
 rdetoolkit\__main__.py,sha256=RpkjdhIR-v6U17ZAnT3DAIcDwADDqQabSkQoNFiCXQk,126
 rdetoolkit\__main__.pyi,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -30,7 +30,7 @@ rdetoolkit\cmd\validate.py,sha256=wFWbOEKvzpq3zur7wYMjvLfwxDg3zxM42PJefG4RgXY,28
 rdetoolkit\cmd\validate.pyi,sha256=75ca4HTq93Z1ZFtlo7hGFiMVUoswvzCOjdWaaHvnBME,2691
 rdetoolkit\config.py,sha256=7sblHYkOzMPg7cdkBNO4ynnxko896fW6AH6QY8GULfs,15301
 rdetoolkit\config.pyi,sha256=MUZCZXOJtcIGWGNNtKToAfWnf7llO9Bdy4HxULNIYXQ,969
-rdetoolkit\core.cp313-win_amd64.pyd,sha256=ZwqEWjfzW0Yt-IUdq3F_eU9P1rQeua8XwUr6EAoK6qo,6771712
+rdetoolkit\core.cp313-win_amd64.pyd,sha256=vYOlqKjtgYUQSW2OF5yMA_B6oOW5g-4JlrjJpPC5ZVA,6623744
 rdetoolkit\core.pyi,sha256=VxUXk6kEkwsA5a8t0FtfTPt5VtfHjMy7yMz9UzG6r4U,3154
 rdetoolkit\errors.py,sha256=j2tHMViF3WsLXcsyTtC2uq0bOMagdB3Dg5J58-jnF5k,13966
 rdetoolkit\errors.pyi,sha256=XRnfjCkS3k6NIncUUnvDEK9_9Yfe5dghnN1jXZr_9mE,1445
@@ -111,7 +111,7 @@ rdetoolkit\interfaces\filechecker.py,sha256=X3Wgkj4x7xC0blSpUhFyG7EgDq5W7zfMSLxS
 rdetoolkit\interfaces\filechecker.pyi,sha256=gbCG0HY_H5kgjqk3kVfSeJt1AJZsLUb7fuIjJoXtFIM,1119
 rdetoolkit\interfaces\report.py,sha256=HhjruApeOU4JEdQOTx-Q47_8_4cJxnH-ROJUrlLy9J4,914
 rdetoolkit\interfaces\report.pyi,sha256=1reAAKS3Vz5aKCYylijF_VX4OwZUdae6ZtfiBgx7KNw,389
-rdetoolkit\invoicefile.py,sha256=t-0fraB70U0wFtFXMMo-2I0AKq1lh-8nZYBdUQj8IT8,73839
+rdetoolkit\invoicefile.py,sha256=Llp289WwhKaWHotV6C8mZOzmTtn_dOLHSuwgOgV94Hs,73920
 rdetoolkit\invoicefile.pyi,sha256=r4DRMiy9aVu6Q-1iE3lWfCWLTwqYjSeXMuy0zat0OQE,5382
 rdetoolkit\models\__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rdetoolkit\models\__init__.pyi,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -147,7 +147,7 @@ rdetoolkit\processing\processors\descriptions.py,sha256=eqySgvsk1JaOuTHi4wkSHmj7
 rdetoolkit\processing\processors\descriptions.pyi,sha256=fpH5AhmLztaKdNrNd3CUKqJD-PluojHP7SYOG6E3XmM,323
 rdetoolkit\processing\processors\files.py,sha256=QJAQl1-mxRgkn-eacpUW_hQhvIKaxAPEAHOQdej2Lys,10209
 rdetoolkit\processing\processors\files.pyi,sha256=yLFx7Vz4HNzlaMSgzNHhHjIfRbEjeuIvglp3IQXGnBI,643
-rdetoolkit\processing\processors\invoice.py,sha256=ecG30kF9lVvCf_ThtFl6TodR_ILhqozgQ6vDbbASHs4,21716
+rdetoolkit\processing\processors\invoice.py,sha256=YjYXQZSKOdlsLJUBGsT4bvSFJ_MdHBmPxK27CWnhW7U,23460
 rdetoolkit\processing\processors\invoice.pyi,sha256=4Guu_l2BHxY7F5kiud7p0yf_fHnlPceSZwRA7liOOQA,856
 rdetoolkit\processing\processors\smarttable_early_exit.py,sha256=YqrTEYrns_4aiYUFd9NQ4OTIFgQzCcLamz4QpFkbON0,7342
 rdetoolkit\processing\processors\smarttable_early_exit.pyi,sha256=h8l8vf-HPbpA15xvHGYyvHGFK5q_QoTiXVi4jqdexNI,474
@@ -184,8 +184,8 @@ rdetoolkit\validation.py,sha256=ZIdULGWAzQHv8VdfbBZuKSD5eZHtjsMsBhPDD3y4uCA,1841
 rdetoolkit\validation.pyi,sha256=916wLyRHzqtr9UNL9p8_vQC9ya-OpLDMOZkKukfKuyw,999
 rdetoolkit\workflows.py,sha256=jVz_CHbNAVc2FLVyfV-Dhan-EWvoZDKWhMqXZVdwI38,22429
 rdetoolkit\workflows.pyi,sha256=i2QN0RP0xQYCjs1Ctp1y6zoRBqeB0cCw7mYlDAS2jiQ,2199
-rdetoolkit-1.5.2.dist-info\METADATA,sha256=LyLSFsBegG4HM6cBzcfqacmfOnkKT30TBcLjiC7sQPU,9120
-rdetoolkit-1.5.2.dist-info\WHEEL,sha256=n_BmF69IyGtioVWE9c3M_zsEfe6-xMZy1v5HCL_6qE0,97
-rdetoolkit-1.5.2.dist-info\entry_points.txt,sha256=WMEB0vLFWxdgPfIxgGPzK2djc-aVoGclcqvZlXxpxu4,52
-rdetoolkit-1.5.2.dist-info\licenses\LICENSE,sha256=Xh2kqHbF9jlxeCxl_60qCRAAuO8DYe2hkv0bBAjxcko,1103
-rdetoolkit-1.5.2.dist-info\RECORD,,
+rdetoolkit-1.5.3.dist-info\METADATA,sha256=OTJK1vh4kfV2QpEIK8pvoIfVOJDhw_p-AUTBt30_olc,9120
+rdetoolkit-1.5.3.dist-info\WHEEL,sha256=n_BmF69IyGtioVWE9c3M_zsEfe6-xMZy1v5HCL_6qE0,97
+rdetoolkit-1.5.3.dist-info\entry_points.txt,sha256=WMEB0vLFWxdgPfIxgGPzK2djc-aVoGclcqvZlXxpxu4,52
+rdetoolkit-1.5.3.dist-info\licenses\LICENSE,sha256=Xh2kqHbF9jlxeCxl_60qCRAAuO8DYe2hkv0bBAjxcko,1103
+rdetoolkit-1.5.3.dist-info\RECORD,,