refactor(compare): record which rate sides a tariff replaced explicitly (#5163 review)

fetch_rates() decided whether a tariff had installed its own rates by
comparing the rate table against the deepcopy it started from. That held
only because every rate source assigns a fresh dict and nothing copies the
table in between. Each branch that installs a tariff's own rates now sets
import_replaced/export_replaced, and both the #5286 dispatch-marker restore
and the saving-minute clearing read those flags.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

Author: chalfontchubby

apps/predbat/compare.py

@@ -73,9 +73,11 @@ def fetch_rates(self, tariff, rate_import_base, rate_export_base, io_adjusted_ba
         # Reset rates to base
         pb.rate_import = copy.deepcopy(rate_import_base)
         pb.rate_export = copy.deepcopy(rate_export_base)
-        # Both sides start as the live cycle's rates; fetch_rates() below replaces a side only if this tariff supplies it
-        live_import = pb.rate_import
-        live_export = pb.rate_export
+        # Both sides start as the live cycle's rates. Each branch below that installs this tariff's own
+        # rates for a side records it here, so the checks further down don't depend on object identity
+        # (which a copying rate_replicate() or rate source would silently break)
+        import_replaced = False
+        export_replaced = False
 
         # Intelligent Octopus dispatch markers go with the import rates they came from (#5286)
         pb.io_adjusted = {}
@@ -94,18 +96,21 @@ def fetch_rates(self, tariff, rate_import_base, rate_export_base, io_adjusted_ba
             # Fixed URL for rate import
             import_url = pb.resolve_arg("rates_import_octopus_url", tariff["rates_import_octopus_url"], indirect=False)
             pb.rate_import = pb.download_octopus_rates(import_url)
+            import_replaced = True
         elif "metric_octopus_import" in tariff:
             # Octopus import rates
             entity_id = pb.resolve_arg("metric_octopus_import", tariff["metric_octopus_import"], indirect=False)
             if entity_id:
                 pb.rate_import = pb.fetch_octopus_rates(entity_id, adjust_key="is_intelligent_adjusted")
+                import_replaced = True
             else:
                 self.log("Warn: Compare tariff {} bad Octopus entity id {}".format(tariff.get("id", ""), entity_id))
         elif "metric_energidataservice_import" in tariff:
             # Energi Data Service import rates
             entity_id = pb.resolve_arg("metric_energidataservice_import", tariff["metric_energidataservice_import"], indirect=False)
             if entity_id:
                 pb.rate_import = pb.fetch_energidataservice_rates(entity_id, adjust_key="is_intelligent_adjusted")
+                import_replaced = True
             else:
                 self.log("Warn: Compare tariff {} bad Energidata entity id {}".format(tariff.get("id", ""), entity_id))
         elif "metric_stromligning_import_today" in tariff or "metric_stromligning_import_tomorrow" in tariff:
@@ -114,30 +119,35 @@ def fetch_rates(self, tariff, rate_import_base, rate_export_base, io_adjusted_ba
             entity_id_tomorrow = pb.resolve_arg("metric_stromligning_import_tomorrow", tariff.get("metric_stromligning_import_tomorrow"))
             if entity_id_today or entity_id_tomorrow:
                 pb.rate_import = pb.fetch_stromligning_rates(entity_id_today, entity_id_tomorrow, adjust_key="is_intelligent_adjusted")
+                import_replaced = True
             else:
                 self.log("Warn: Compare tariff {} bad Strømligning entity ids".format(tariff.get("id", "")))
         elif "rates_import" in tariff:
             pb.rate_import = pb.basic_rates(tariff["rates_import"], "rates_import", include_manual_api=False)
+            import_replaced = True
         else:
             self.log("Using existing rate import data")
-        if pb.rate_import is live_import:
+        if not import_replaced:
             pb.io_adjusted = copy.deepcopy(io_adjusted_base)
 
         if "rates_export_octopus_url" in tariff:
             # Fixed URL for rate export
             pb.rate_export = pb.download_octopus_rates(pb.resolve_arg("rates_export_octopus_url", tariff["rates_export_octopus_url"], indirect=False))
+            export_replaced = True
         elif "metric_octopus_export" in tariff:
             # Octopus export rates
             entity_id = pb.resolve_arg("metric_octopus_export", tariff["metric_octopus_export"], indirect=False)
             if entity_id:
                 pb.rate_export = pb.fetch_octopus_rates(entity_id)
+                export_replaced = True
             else:
                 self.log("Warn: Compare tariff {} bad Octopus entity id {}".format(tariff.get("id", ""), entity_id))
         elif "metric_energidataservice_export" in tariff:
             # Energi Data Service export rates
             entity_id = pb.resolve_arg("metric_energidataservice_export", tariff["metric_energidataservice_export"], indirect=False)
             if entity_id:
                 pb.rate_export = pb.fetch_energidataservice_rates(entity_id, adjust_key="is_intelligent_adjusted")
+                export_replaced = True
             else:
                 self.log("Warn: Compare tariff {} bad Energidata entity id {}".format(tariff.get("id", ""), entity_id))
         elif "metric_stromligning_export_today" in tariff or "metric_stromligning_export_tomorrow" in tariff:
@@ -146,20 +156,22 @@ def fetch_rates(self, tariff, rate_import_base, rate_export_base, io_adjusted_ba
             entity_id_tomorrow = pb.resolve_arg("metric_stromligning_export_tomorrow", tariff.get("metric_stromligning_export_tomorrow"))
             if entity_id_today or entity_id_tomorrow:
                 pb.rate_export = pb.fetch_stromligning_rates(entity_id_today, entity_id_tomorrow)
+                export_replaced = True
             else:
                 self.log("Warn: Compare tariff {} bad Strømligning entity ids".format(tariff.get("id", "")))
         elif "rates_export" in tariff:
             pb.rate_export = pb.basic_rates(tariff["rates_export"], "rates_export", include_manual_api=False)
+            export_replaced = True
         else:
             self.log("Using existing rate export data")
 
         # A tariff that supplied its own rates for a side makes the live saving minutes for that side
         # stale: they are offsets into the live tables, and would map unrelated minutes of the new tariff
         # back to live "base" rates. A side left on the live rates keeps them.
-        if pb.rate_import is not live_import:
+        if import_replaced:
             pb.rate_import_saving_minutes = set()
             pb.rate_import_pre_saving = {}
-        if pb.rate_export is not live_export:
+        if export_replaced:
             pb.rate_export_saving_minutes = set()
             pb.rate_export_pre_saving = {}