builder2ibek 2.0.2__tar.gz → 2.0.3__tar.gz

{builder2ibek-2.0.2/src/builder2ibek.egg-info → builder2ibek-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: builder2ibek
-Version: 2.0.2
+Version: 2.0.3
 Summary: Conversion tool for DLS XML builder IOC instances to ibek ioc.yaml
 Author-email: Giles Knap <giles.knap@diamond.ac.uk>
 License:                                  Apache License

{builder2ibek-2.0.2 → builder2ibek-2.0.3}/src/builder2ibek/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.0.2'
-__version_tuple__ = version_tuple = (2, 0, 2)
+__version__ = version = '2.0.3'
+__version_tuple__ = version_tuple = (2, 0, 3)
 
-__commit_id__ = commit_id = 'g73d451bd1'
+__commit_id__ = commit_id = 'gb8f3858c1'

{builder2ibek-2.0.2 → builder2ibek-2.0.3}/src/builder2ibek/dbcompare.py

@@ -46,6 +46,12 @@ class EpicsDb:
     fields: dict[str, set[str]] = field(default_factory=lambda: {})
 
 
+@dataclass
+class EpicsField:
+    field_names: set[str] = field(default_factory=lambda: set())
+    values: dict[str, str] = field(default_factory=lambda: {})
+
+
 def normalize_float_records(s: set[str]) -> set[str]:
     normalised = set()
     for item in s:
@@ -140,8 +146,30 @@ def compare_dbs(
         old_norm = normalize_float_records(old.fields[record_str])
         new_norm = normalize_float_records(new.fields[record_str])
         if old_norm != new_norm:
+            old_ef = EpicsField()
+            new_ef = EpicsField()
+            for ef, norm in [(old_ef, old_norm), (new_ef, new_norm)]:
+                for entry in norm:
+                    name, _, value = entry.partition(" ")
+                    ef.field_names.add(name)
+                    ef.values[name] = value
+
+            field_old_only = sorted(old_ef.field_names - new_ef.field_names)
+            field_new_only = sorted(new_ef.field_names - old_ef.field_names)
+            field_both = sorted(old_ef.field_names & new_ef.field_names)
+            value_diffs = [
+                f"{name} ('{old_ef.values[name]}' -> '{new_ef.values[name]}')"
+                for name in field_both
+                if old_ef.values[name] != new_ef.values[name]
+            ]
+
             result += f"\nfields for '{record_str}' are different between the two DBs"
-            # result += f"\ndiff: {old_norm.difference(new_norm)}"
+            if field_old_only:
+                result += f"\n  only in original: {', '.join(field_old_only)}"
+            if field_new_only:
+                result += f"\n  only in new: {', '.join(field_new_only)}"
+            if value_diffs:
+                result += f"\n  different values: {', '.join(value_diffs)}"
 
     if not output:
         print(result)

{builder2ibek-2.0.2 → builder2ibek-2.0.3/src/builder2ibek.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: builder2ibek
-Version: 2.0.2
+Version: 2.0.3
 Summary: Conversion tool for DLS XML builder IOC instances to ibek ioc.yaml
 Author-email: Giles Knap <giles.knap@diamond.ac.uk>
 License:                                  Apache License

{builder2ibek-2.0.2 → builder2ibek-2.0.3}/tests/samples/compare.diff

@@ -36,11 +36,20 @@ records in original:    8136
 *******************************************************************
 
 fields for 'ai SR03A-VA-GAUGE-01:PLOG' are different between the two DBs
+  different values: INP ('SR03A-VA-GAUGE-01:PLOG_CALC CP' -> 'SR03A-VA-GAUGE-01:RAW:EGU  CP')
 fields for 'ai SR03A-VA-GAUGE-02:PLOG' are different between the two DBs
+  different values: INP ('SR03A-VA-GAUGE-02:PLOG_CALC CP' -> 'SR03A-VA-GAUGE-02:RAW:EGU  CP')
 fields for 'ai SR03A-VA-GAUGE-03:PLOG' are different between the two DBs
+  different values: INP ('SR03A-VA-GAUGE-03:PLOG_CALC CP' -> 'SR03A-VA-GAUGE-03:RAW:EGU  CP')
 fields for 'ai SR03A-VA-GAUGE-04:PLOG' are different between the two DBs
+  different values: INP ('SR03A-VA-GAUGE-04:PLOG_CALC CP' -> 'SR03A-VA-GAUGE-04:RAW:EGU  CP')
 fields for 'ai SR03A-VA-GAUGE-31:PLOG' are different between the two DBs
+  different values: INP ('SR03A-VA-GAUGE-31:PLOG_CALC CP' -> 'SR03A-VA-GAUGE-31:RAW:EGU  CP')
 fields for 'ai SR03S-VA-GAUGE-01:PLOG' are different between the two DBs
+  different values: INP ('SR03S-VA-GAUGE-01:PLOG_CALC CP' -> 'SR03S-VA-GAUGE-01:RAW:EGU  CP')
 fields for 'ai SR03S-VA-GAUGE-02:PLOG' are different between the two DBs
+  different values: INP ('SR03S-VA-GAUGE-02:PLOG_CALC CP' -> 'SR03S-VA-GAUGE-02:RAW:EGU  CP')
 fields for 'fanout SR03C-VA-VFAST-01:FAN_01' are different between the two DBs
+  different values: LNK6 ('SR03C-VA-VFAST-01:GAUGE06_0' -> 'SR03C-VA-VFAST-01:GAUGE:06_0')
 fields for 'fanout SR03C-VA-VFAST-01:FAN_02' are different between the two DBs
+  different values: LNK2 ('SR03C-VA-VFAST-01:GAUGE08_0' -> 'SR03C-VA-VFAST-01:GAUGE:08_0')