topos-node 1.2.1__tar.gz → 1.2.2__tar.gz

{topos_node-1.2.1/topos_node.egg-info → topos_node-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: topos-node
-Version: 1.2.1
+Version: 1.2.2
 Summary: Topos personal AI engine (FastAPI): local data, sync, control plane WebSocket client
 License-Expression: Apache-2.0
 Project-URL: Homepage, https://topos.dialogues.ai

{topos_node-1.2.1 → topos_node-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "topos-node"
-version = "1.2.1"
+version = "1.2.2"
 description = "Topos personal AI engine (FastAPI): local data, sync, control plane WebSocket client"
 readme = "README.md"
 license = "Apache-2.0"

{topos_node-1.2.1 → topos_node-1.2.2}/topos/__version__.py

@@ -1,6 +1,6 @@
 """Topos Control Plane Version Information."""
 
-__version__ = "1.2.1"
-__version_info__ = (1, 2, 1)
+__version__ = "1.2.2"
+__version_info__ = (1, 2, 2)
 
 __all__ = ["__version__", "__version_info__"]

{topos_node-1.2.1 → topos_node-1.2.2}/topos/api/signal.py

@@ -411,6 +411,28 @@ async def split_entity_surface(
         raise HTTPException(status_code=400, detail=str(exc))
 
 
+class EntityMergeBody(BaseModel):
+    absorb_entity_id: str = Field(..., min_length=1, max_length=80)
+
+
+@router.post("/entities/{entity_id}/merge")
+async def merge_entity_into(
+    entity_id: str,
+    body: EntityMergeBody,
+    _api_key: str = Depends(require_api_key),
+):
+    """Owner link: merge another entity into this one (drawer-driven inverse
+    of split; see consolidation.merge_entity_pair)."""
+    from ..features.entities.consolidation import merge_entity_pair
+
+    try:
+        return merge_entity_pair(_entities_conn(), entity_id, body.absorb_entity_id)
+    except LookupError as exc:
+        raise HTTPException(status_code=404, detail=str(exc))
+    except ValueError as exc:
+        raise HTTPException(status_code=400, detail=str(exc))
+
+
 @router.post("/entities/{entity_id}/exclude")
 async def exclude_entity_from_intelligence(
     entity_id: str,

{topos_node-1.2.1 → topos_node-1.2.2}/topos/api/ui_config.py

@@ -24,8 +24,11 @@ ALLOWED_WIDGETS = {
 MAX_PINNED = 3
 
 
+GRAPH_WINDOW_MAX_DAYS = 3650
+
+
 def _default_ui_config() -> dict[str, Any]:
-    return {"version": 1, "topbar": {"pinnedAnalytics": []}}
+    return {"version": 1, "topbar": {"pinnedAnalytics": []}, "graph": {}}
 
 
 def _normalize_ui_config(value: Any) -> dict[str, Any]:
@@ -35,7 +38,24 @@ def _normalize_ui_config(value: Any) -> dict[str, Any]:
     out = {
         "version": int(value.get("version", 1)) if str(value.get("version", "")).isdigit() else 1,
         "topbar": {"pinnedAnalytics": []},
+        "graph": {},
     }
+    # Graph view prefs: the temporal window is personal (data volume/velocity
+    # dependent — 2 days for some owners, 2 months for others). timeWindowDays
+    # is a whole-day count; explicit null = all time; absent = unset.
+    graph = value.get("graph")
+    if isinstance(graph, dict) and "timeWindowDays" in graph:
+        window = graph.get("timeWindowDays")
+        if window is None:
+            out["graph"]["timeWindowDays"] = None
+        elif isinstance(window, (int, float)) and not isinstance(window, bool):
+            days = int(window)
+            if 1 <= days <= GRAPH_WINDOW_MAX_DAYS:
+                out["graph"]["timeWindowDays"] = days
+    if isinstance(graph, dict):
+        mode = graph.get("nodeColorMode")
+        if mode in ("type", "community"):
+            out["graph"]["nodeColorMode"] = mode
     topbar = value.get("topbar")
     pinned = topbar.get("pinnedAnalytics") if isinstance(topbar, dict) else []
     if not isinstance(pinned, list):

{topos_node-1.2.1 → topos_node-1.2.2}/topos/core/handlers/config.py

@@ -21,45 +21,15 @@ from .registry import handles
 
 UI_CONFIG_KEY = "ui_config"
 
-ALLOWED_PINNED_WIDGETS = {
-    "umaAllTime",
-    "uma24h",
-    "mcpRows",
-    "mcp24h",
-    "topConnector",
-    "umaStatusMix",
-    "topConnectors",
-    "mcpSources",
-}
-
-MAX_PINNED_WIDGETS = 3
-
-def _default_ui_config() -> Dict[str, Any]:
-    return {"version": 1, "topbar": {"pinnedAnalytics": []}}
-
-def _normalize_ui_config(value: Any) -> Dict[str, Any]:
-    if not isinstance(value, dict):
-        return _default_ui_config()
-    out: Dict[str, Any] = {
-        "version": int(value.get("version", 1)) if str(value.get("version", "")).isdigit() else 1,
-        "topbar": {"pinnedAnalytics": []},
-    }
-    topbar = value.get("topbar")
-    pinned = topbar.get("pinnedAnalytics") if isinstance(topbar, dict) else []
-    if not isinstance(pinned, list):
-        return out
-    seen: set[str] = set()
-    final: List[str] = []
-    for item in pinned:
-        wid = str(item or "").strip()
-        if not wid or wid in seen or wid not in ALLOWED_PINNED_WIDGETS:
-            continue
-        seen.add(wid)
-        final.append(wid)
-        if len(final) >= MAX_PINNED_WIDGETS:
-            break
-    out["topbar"]["pinnedAnalytics"] = final
-    return out
+# SINGLE SOURCE: this module used to keep its own copy of the ui-config
+# normalizer, which silently drifted — the HTTP endpoint accepted new fields
+# (graph.timeWindowDays) that this WS path (the CP proxy route) stripped.
+from ...api.ui_config import (  # noqa: E402
+    ALLOWED_WIDGETS as ALLOWED_PINNED_WIDGETS,
+    MAX_PINNED as MAX_PINNED_WIDGETS,
+    _default_ui_config,
+    _normalize_ui_config,
+)
 
 @handles("migrate_browser_plugin_app_id")
 async def handle_migrate_browser_plugin_app_id(message: Dict[str, Any]) -> Optional[Dict[str, Any]]:

{topos_node-1.2.1 → topos_node-1.2.2}/topos/core/handlers/signal_features.py

@@ -674,6 +674,38 @@ async def handle_signal_entity_split(message: Dict[str, Any]) -> Optional[Dict[s
         return {"id": req_id, "status": "error", "error": str(exc)}
 
 
+@handles("signal_entity_merge")
+async def handle_signal_entity_merge(message: Dict[str, Any]) -> Optional[Dict[str, Any]]:
+    req_id = message.get("id")
+    if not req_id:
+        return None
+    payload = message.get("payload") or {}
+    entity_id = str(payload.get("entity_id") or "").strip()
+    absorb_entity_id = str(payload.get("absorb_entity_id") or "").strip()
+    if not entity_id or not absorb_entity_id:
+        return {
+            "id": req_id,
+            "status": "error",
+            "error": "entity_id and absorb_entity_id required",
+            "code": 400,
+        }
+    try:
+        from ...features.entities.consolidation import merge_entity_pair
+
+        conn = hub.get_db_connection()
+        return {
+            "id": req_id,
+            "status": "ok",
+            "payload": merge_entity_pair(conn, entity_id, absorb_entity_id),
+        }
+    except LookupError as exc:
+        return {"id": req_id, "status": "error", "error": str(exc), "code": 404}
+    except ValueError as exc:
+        return {"id": req_id, "status": "error", "error": str(exc), "code": 400}
+    except Exception as exc:  # noqa: BLE001
+        return {"id": req_id, "status": "error", "error": str(exc)}
+
+
 @handles("signal_exclude_entity")
 async def handle_signal_exclude_entity(message: Dict[str, Any]) -> Optional[Dict[str, Any]]:
     req_id = message.get("id")

{topos_node-1.2.1 → topos_node-1.2.2}/topos/features/entities/consolidation.py

@@ -484,3 +484,90 @@ def split_surface(conn: sqlite3.Connection, entity_id: str, surface: str) -> Dic
         "mentions_moved": len(moved_ids),
         "alias_removed": alias_removed,
     }
+
+
+def merge_entity_pair(
+    conn: sqlite3.Connection, keep_id: str, absorb_id: str
+) -> Dict[str, Any]:
+    """Owner link: merge absorb_id into keep_id (drawer-driven inverse of split).
+
+    Reuses EntityResolver.merge_entities for mentions/aliases/edges, then clears
+    any no_bind guards between the pair so an explicit re-link after Unlink
+    works. Pending reviews that touched the absorbed entity are marked stale.
+    """
+    from .dossier import refresh_dossiers
+    from .resolver import EntityResolver
+
+    keep_id = str(keep_id).strip()
+    absorb_id = str(absorb_id).strip()
+    if not keep_id or not absorb_id:
+        raise ValueError("keep_id and absorb_id are required")
+    if keep_id == absorb_id:
+        raise ValueError("cannot merge an entity into itself")
+
+    keep_row = conn.execute(
+        "SELECT entity_type, canonical_name FROM entities WHERE entity_id=?",
+        (keep_id,),
+    ).fetchone()
+    absorb_row = conn.execute(
+        "SELECT entity_type, canonical_name FROM entities WHERE entity_id=?",
+        (absorb_id,),
+    ).fetchone()
+    if keep_row is None:
+        raise LookupError(f"entity not found: {keep_id}")
+    if absorb_row is None:
+        raise LookupError(f"entity not found: {absorb_id}")
+    if str(keep_row[0]) != str(absorb_row[0]):
+        raise ValueError(
+            f"entity types must match (keep={keep_row[0]!r}, absorb={absorb_row[0]!r})"
+        )
+
+    mentions_moved = int(
+        conn.execute(
+            "SELECT COUNT(*) FROM entity_mentions WHERE entity_id=?",
+            (absorb_id,),
+        ).fetchone()[0]
+    )
+    absorb_name = str(absorb_row[1] or "")
+
+    # Clear no_bind guards between this pair (either direction) so the owner
+    # can reverse a prior Unlink by explicitly linking again.
+    conn.execute(
+        """
+        DELETE FROM entity_review
+        WHERE kind='no_bind'
+          AND (
+            (candidate_entity_id=? AND subject_entity_id=?)
+            OR (candidate_entity_id=? AND subject_entity_id=?)
+          )
+        """,
+        (keep_id, absorb_id, absorb_id, keep_id),
+    )
+    # Pending reviews that referenced the absorbed entity are now stale.
+    conn.execute(
+        """
+        UPDATE entity_review SET status='stale'
+        WHERE status='pending'
+          AND (subject_entity_id=? OR candidate_entity_id=?)
+        """,
+        (absorb_id, absorb_id),
+    )
+
+    resolver = EntityResolver(conn)
+    resolver.merge_entities(keep_id, absorb_id)
+
+    # Also drop any leftover no_bind rows that still point at the deleted
+    # absorb id as the blocked candidate (surface → absorb).
+    conn.execute(
+        "DELETE FROM entity_review WHERE kind='no_bind' AND candidate_entity_id=?",
+        (absorb_id,),
+    )
+    conn.commit()
+    refresh_dossiers(conn)
+
+    return {
+        "kept": keep_id,
+        "absorbed": absorb_id,
+        "absorbed_name": absorb_name,
+        "mentions_moved": mentions_moved,
+    }

{topos_node-1.2.1 → topos_node-1.2.2}/topos/protocol/handled_message_types.json

@@ -129,6 +129,7 @@
   "signal_data_health",
   "signal_entity_graph",
   "signal_entity_graph_search",
+  "signal_entity_merge",
   "signal_entity_review_action",
   "signal_entity_review_sweep",
   "signal_entity_split",

{topos_node-1.2.1 → topos_node-1.2.2}/topos/sources/install_service.py

@@ -784,6 +784,10 @@ _PATCHABLE_DEFINITION_KEYS = frozenset(
         "enrichment_trigger",
         "raw_enrichment_jobs",
         "canonical_enrichment_jobs",
+        # Signal-lane jobs (goal_extraction, embeddings, topic_clusters, …)
+        # are user configuration the same as the canonical lane — omitting
+        # them made PATCH silently drop the field (2026-07-10, grow_journal).
+        "signal_derivation_jobs",
     }
 )
 _IMMUTABLE_DEFINITION_KEYS = frozenset(

{topos_node-1.2.1 → topos_node-1.2.2/topos_node.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: topos-node
-Version: 1.2.1
+Version: 1.2.2
 Summary: Topos personal AI engine (FastAPI): local data, sync, control plane WebSocket client
 License-Expression: Apache-2.0
 Project-URL: Homepage, https://topos.dialogues.ai