build(agent): new-agents-3#dd492b iteration

core/bridge.py

@@ -6,13 +6,23 @@ def to_canonical(local_problem: Dict[str, Any]) -> Dict[str, Any]:
     Minimal bridge: map a LocalProblem into a canonical representation.
     In a full MVP this would be a richer translation; here we preserve shape.
     """
-    # Expect input like: {"id": "...", "objective": ..., "variables": {...}, "domain": "..."}
+    # Canonicalize to an object_id form, accommodating both dicts and objects.
+    if isinstance(local_problem, dict):
+        object_id = local_problem.get("object_id") or local_problem.get("id")
+        domain = local_problem.get("domain", "unknown")
+        objective = local_problem.get("objective")
+        variables = local_problem.get("variables", {})
+    else:
+        object_id = getattr(local_problem, "asset_id", None) or getattr(local_problem, "id", None)
+        domain = getattr(local_problem, "domain", "unknown")
+        objective = getattr(local_problem, "objective", None)
+        variables = getattr(local_problem, "variables", {})
     canonical = {
         "LocalProblem": {
-            "id": local_problem.get("id"),
-            "domain": local_problem.get("domain", "unknown"),
-            "objective": local_problem.get("objective"),
-            "variables": local_problem.get("variables", {}),
+            "object_id": object_id,
+            "domain": domain,
+            "objective": objective,
+            "variables": variables,
         }
     }
     return canonical
@@ -23,13 +33,17 @@ def from_canonical(canonical: Dict[str, Any]) -> Dict[str, Any]:
     Inverse mapping from canonical representation back to a LocalProblem-like dict.
     """
     lp = canonical.get("LocalProblem", {})
-    # Flatten for compatibility with simple local problem consumer
-    return {
-        "id": lp.get("id"),
-        "domain": lp.get("domain", "unknown"),
-        "objective": lp.get("objective"),
-        "variables": lp.get("variables", {}),
-    }
+    if isinstance(lp, dict):
+        asset_id = lp.get("object_id") or lp.get("id") or lp.get("asset_id")
+        payload = lp.get("variables") if "variables" in lp else lp.get("payload", {})
+        try:
+            from .contracts import LocalProblem as DomainLocalProblem  # type: ignore
+            return DomainLocalProblem(asset_id=asset_id or "", payload=payload or {})
+        except Exception:
+            # Fallback to a dict-like response if domain class couldn't be imported
+            return {"asset_id": asset_id or "", "payload": payload or {}}
+    # Fallback: return input as-is
+    return canonical
 
 
 class CatOptBridge:
@@ -45,5 +59,5 @@ class CatOptBridge:
         return to_canonical(local_problem)
 
     @staticmethod
-    def from_canonical(canonical: Dict[str, Any]) -> Dict[str, Any]:
+    def from_canonical(canonical: Dict[str, Any]) -> Any:
         return from_canonical(canonical)