From e6251f21136aa97dcb6d697a7f0a3e55cb0dfae3 Mon Sep 17 00:00:00 2001 From: Teknium <127238744+teknium1@users.noreply.github.com> Date: Thu, 3 Sep 2026 00:03:13 -0700 Subject: [PATCH] refactor(hindsight): retain policy phase helper shared by __init__/initialize, single-regex run collapse --- plugins/memory/hindsight/__init__.py | 27 +++++++++++++-------------- plugins/memory/hindsight/embedded.py | 3 +-- plugins/memory/hindsight/settings.py | 4 +--- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/plugins/memory/hindsight/__init__.py b/plugins/memory/hindsight/__init__.py index bcca91fe9e..b960724dda 100644 --- a/plugins/memory/hindsight/__init__.py +++ b/plugins/memory/hindsight/__init__.py @@ -325,13 +325,10 @@ class HindsightMemoryProvider(MemoryProvider): self._sync_thread = None # legacy alias external callers may join; points at the writer self._shutting_down = threading.Event() self._atexit_registered = False - self._auto_retain = self._retain_async = self._retain_indicator = True - self._retain_every_n_turns = 1 self._retain_tags: List[str] = [] self._tags: list[str] | None = None self._retain_source = _DEFAULT_RETAIN_SOURCE self._retain_user_prefix, self._retain_assistant_prefix = "User", "Assistant" - self._retain_context = _RETAIN_CONTEXT_DEFAULT self._turn_counter = self._turn_index = 0 self._session_turns: list[str] = [] # ALL turns for the session self._last_retained_turn_count = 0 # append-mode delta watermark @@ -341,18 +338,14 @@ class HindsightMemoryProvider(MemoryProvider): self._pending_retain_ops: set[str] = set() self._pending_retain_ops_lock = threading.Lock() self._retain_ops_bank_id = "" - # The next turn's warm prefetch could read BEFORE an async retain is - # recall-visible; when True it first waits (bounded, off the reply path) - # for the queue to drain AND the server-side op(s) to complete. - self._prefetch_waits_for_retain = True - self._prefetch_retain_drain_timeout = 10.0 + self._apply_retain_policy({}) # Recall: pending prefetch block + count, and the indicator state (recall_status()). self._prefetch_result, self._prefetch_count = "", 0 self._prefetch_lock = threading.Lock() self._prefetch_thread = None self._last_recall_returned, self._last_recall_count = False, 0 - self._apply_recall_settings({}) # pure-config defaults (no env/secret reads) + self._apply_recall_settings({}) @property def name(self) -> str: @@ -753,6 +746,10 @@ class HindsightMemoryProvider(MemoryProvider): str(_cfg_or_env("retain_assistant_prefix", "HINDSIGHT_RETAIN_ASSISTANT_PREFIX", "Assistant")).strip() or "Assistant" ) + self._apply_retain_policy(cfg) + + def _apply_retain_policy(self, cfg: dict) -> None: + """Pure-config retain knobs (no env/secret reads; ``{}`` yields the defaults).""" self._auto_retain = cfg.get("auto_retain", True) self._retain_every_n_turns = max(1, int(cfg.get("retain_every_n_turns", 1))) self._retain_context = cfg.get("retain_context", _RETAIN_CONTEXT_DEFAULT) @@ -760,10 +757,14 @@ class HindsightMemoryProvider(MemoryProvider): # On by default so the user SEES memory working whether or not the model # mentions it; off switch for customer-facing agents (recall_indicator too). self._retain_indicator = bool(cfg.get("retain_indicator", True)) + # The next turn's warm prefetch could read BEFORE an async retain is + # recall-visible; when True it first waits (bounded, off the reply path) + # for the queue to drain AND the server-side op(s) to complete. self._prefetch_waits_for_retain = cfg.get("prefetch_waits_for_retain", True) self._prefetch_retain_drain_timeout = float(cfg.get("prefetch_retain_drain_timeout", 10.0)) def _apply_recall_settings(self, cfg: dict) -> None: + """Recall knobs are pure config too (``{}`` yields the defaults).""" self._recall_tags = cfg.get("recall_tags") or None self._recall_tags_match = cfg.get("recall_tags_match", "any") self._auto_recall = cfg.get("auto_recall", True) @@ -775,12 +776,10 @@ class HindsightMemoryProvider(MemoryProvider): # recall_max_tokens budget); a comma-separated string is accepted for parity # with recall_tags; an explicit list broadens or disables the filter. configured_types = cfg.get("recall_types") - if configured_types is None: - self._recall_types = ["observation"] - elif isinstance(configured_types, str): + if isinstance(configured_types, str): self._recall_types = [t.strip() for t in configured_types.split(",") if t.strip()] else: - self._recall_types = list(configured_types) or ["observation"] + self._recall_types = list([] if configured_types is None else configured_types) or ["observation"] self._recall_prompt_preamble = cfg.get("recall_prompt_preamble", "") self._recall_indicator = bool(cfg.get("recall_indicator", True)) @@ -866,7 +865,7 @@ class HindsightMemoryProvider(MemoryProvider): def _do_recall(self, query: str) -> tuple[str, int]: """One recall/reflect for *query* (background prefetch and ``recall_sync`` paths) -> (text, memory count); the count is 0 for reflect (synthesis) and on error.""" - if self._recall_max_input_chars and len(query) > self._recall_max_input_chars: + if self._recall_max_input_chars: query = query[:self._recall_max_input_chars] try: if self._prefetch_method == "reflect": diff --git a/plugins/memory/hindsight/embedded.py b/plugins/memory/hindsight/embedded.py index 40d1ec5cc5..1af6925382 100644 --- a/plugins/memory/hindsight/embedded.py +++ b/plugins/memory/hindsight/embedded.py @@ -107,8 +107,7 @@ def _build_embedded_profile_env(config: dict[str, Any], *, llm_api_key: str | No base_url = config.get("llm_base_url") or os.environ.get("HINDSIGHT_API_LLM_BASE_URL", "") if base_url: env_values["HINDSIGHT_API_LLM_BASE_URL"] = str(base_url) - idle_timeout = config.get("idle_timeout") - if idle_timeout is None: + if (idle_timeout := config.get("idle_timeout")) is None: idle_timeout = os.environ.get("HINDSIGHT_IDLE_TIMEOUT") if idle_timeout is not None and idle_timeout != "": env_values["HINDSIGHT_EMBED_DAEMON_IDLE_TIMEOUT"] = str(_parse_int_setting(idle_timeout, _DEFAULT_IDLE_TIMEOUT)) diff --git a/plugins/memory/hindsight/settings.py b/plugins/memory/hindsight/settings.py index 752d88f8bb..d677d421eb 100644 --- a/plugins/memory/hindsight/settings.py +++ b/plugins/memory/hindsight/settings.py @@ -123,6 +123,4 @@ def _resolve_bank_id_template(template: str, fallback: str, **placeholders: str) logger.warning("Invalid bank_id_template %r: %s — using fallback %r", template, exc, fallback) return fallback - rendered = re.sub(r"-{2,}", "-", rendered) - rendered = re.sub(r"_{2,}", "_", rendered) - return rendered.strip("-_") or fallback + return re.sub(r"([-_])\1+", r"\1", rendered).strip("-_") or fallback