Updates based on review.

Author: ivs-cetmix

cetmix_tower_yaml/models/cx_tower_scheduled_task_cv.py

@@ -24,7 +24,7 @@ def _post_process_yaml_dict_values(self, values):
             variable_value = self.env["cx.tower.variable.value"].browse(
                 variable_value_id
             )
-            if variable_value:
+            if variable_value.exists():
                 res.update(
                     {
                         "name": variable_value.name,

cetmix_tower_yaml/models/cx_tower_yaml_mixin.py

@@ -78,11 +78,14 @@ class CxTowerYamlMixin(models.AbstractModel):
 
     def _compute_yaml_code(self):
         """Compute YAML code based on model record data"""
-        collector = YamlExportCollector()
-
         # This is used for the file name.
         # Eg cx.tower.command record will have 'command_' prefix.
         for record in self:
+            # Use a shared collector from context when one is provided (e.g. by
+            # the export wizard for cross-record deduplication); otherwise use a
+            # fresh per-record collector so that each record's yaml_code is
+            # deterministic regardless of which sibling records are batched.
+            collector = record._context.get("yaml_collector") or YamlExportCollector()
             # We are reading field list for each record
             # because list of fields can differ from record to record
             record.yaml_code = self._convert_dict_to_yaml(
@@ -227,7 +230,7 @@ def _get_deferred_x2m_import_fields(self):
 
     def _has_meaningful_yaml_value(self, value):
         """Return whether a YAML value contains meaningful payload."""
-        if value in (False, None, ""):
+        if value is False or value is None or value == "":
             return False
         if isinstance(value, dict):
             if set(value.keys()) == {"reference"}:

cetmix_tower_yaml/wizards/cx_tower_yaml_import_wiz.py

@@ -162,9 +162,13 @@ def _apply_deferred_m2o_imports(self, deferred_queue):
         """Resolve queued m2o imports after the main import pass."""
         unresolved = []
         for item in deferred_queue:
-            record = self.env[item["record_model"]].get_by_reference(
-                item["record_reference"]
-            )
+            record_id = item.get("record_id")
+            if record_id:
+                record = self.env[item["record_model"]].browse(record_id).exists()
+            else:
+                record = self.env[item["record_model"]].get_by_reference(
+                    item["record_reference"]
+                )
             target = self.env[item["target_model"]].get_by_reference(
                 item["target_reference"]
             )
@@ -197,7 +201,11 @@ def _apply_deferred_x2m_imports(self, deferred_queue):
         unresolved = []
         for item in deferred_queue:
             owner_model = self.env[item["record_model"]]
-            owner_record = owner_model.get_by_reference(item["record_reference"])
+            record_id = item.get("record_id")
+            if record_id:
+                owner_record = owner_model.browse(record_id).exists()
+            else:
+                owner_record = owner_model.get_by_reference(item["record_reference"])
             target_record = self.env[item["target_model"]].get_by_reference(
                 item["target_reference"]
             )
@@ -228,6 +236,17 @@ def _apply_deferred_x2m_imports(self, deferred_queue):
                 _("Deferred relation resolution failed:\n%(details)s", details=details)
             )
 
+    def _tag_deferred_queue_items(self, queue, start, record_id):
+        """Stamp all queue items added since *start* with the owner record ID.
+
+        Args:
+            queue (list): The deferred import queue (m2o or x2m).
+            start (int): Index of the first item belonging to the current record.
+            record_id (int): Database ID of the newly created/updated owner record.
+        """
+        for item in queue[start:]:
+            item["record_id"] = record_id
+
     def action_import_yaml(self):
         """Process YAML data and create records in Odoo"""
 
@@ -248,6 +267,8 @@ def action_import_yaml(self):
         with self.env.cr.savepoint():
             # Process each record
             for record in records:
+                m2o_start = len(deferred_m2o_queue)
+                x2m_start = len(deferred_x2m_queue)
                 record_reference = record.get("reference")
                 if not record_reference:
                     raise ValidationError(_("Record reference is missing"))
@@ -294,6 +315,12 @@ def action_import_yaml(self):
                                 error=e,
                             )
                         ) from e
+                    self._tag_deferred_queue_items(
+                        deferred_m2o_queue, m2o_start, odoo_record.id
+                    )
+                    self._tag_deferred_queue_items(
+                        deferred_x2m_queue, x2m_start, odoo_record.id
+                    )
                     _logger.info(
                         "Updated record '%s' in model '%s'",
                         record_reference,
@@ -324,6 +351,12 @@ def action_import_yaml(self):
                             error=e,
                         )
                     ) from e
+                self._tag_deferred_queue_items(
+                    deferred_m2o_queue, m2o_start, odoo_record.id
+                )
+                self._tag_deferred_queue_items(
+                    deferred_x2m_queue, x2m_start, odoo_record.id
+                )
                 _logger.info(
                     "Created record '%s' in model '%s'",
                     record_reference,