0b74f322e2
--clone carried memory.provider (e.g. hindsight) in config.yaml but not the provider's own config under the profile home (hindsight/config.json, mem0.json, ...), so the clone booted with the provider selected and silently unavailable. Copy the ACTIVE provider's <provider>/ dir and/or <provider>.json by the same convention the dashboard memory-provider routers read, guard the name against path traversal, tighten copies to 0600 (they can hold an API key), and say so in the CLI notice. Convention-based on purpose: hindsight is a catalog plugin now, so a hook the plugin must implement could not fix the reported case, and no provider module is imported during profile create. Supersedes #43107 (credit @bionicbutterfly13 for the direction).
72 lines
3.1 KiB
Python
72 lines
3.1 KiB
Python
"""Carry the ACTIVE memory provider's own config into a ``--clone`` (#120115).
|
|
|
|
``--clone`` copies ``config.yaml`` — and with it ``memory.provider: hindsight`` — but the
|
|
provider keeps its settings outside config.yaml, so the clone booted with the provider
|
|
selected and silently unavailable. Providers store per-home config by convention (the same
|
|
convention ``hermes_cli.web_routers.memory_providers`` reads): a ``<home>/<provider>/``
|
|
directory (hindsight) or a flat ``<home>/<provider>.json`` (mem0, honcho, supermemory). Copying
|
|
by convention keeps this free of plugin imports: the provider may live in the catalog, not in
|
|
tree, so a hook the plugin must implement could not fix the reported case.
|
|
"""
|
|
|
|
import contextlib
|
|
import os
|
|
import re
|
|
import shutil
|
|
from pathlib import Path
|
|
from typing import Optional
|
|
|
|
# A provider name is a bare directory/file stem; anything else (path separators, ``..``, spaces)
|
|
# would let a hand-edited config.yaml aim the copy outside the source profile.
|
|
_PROVIDER_NAME_RE = re.compile(r"^[A-Za-z0-9_.-]+$")
|
|
|
|
|
|
def active_memory_provider(config: Optional[dict]) -> Optional[str]:
|
|
"""The external ``memory.provider`` named in a parsed config.yaml, or None for the built-in
|
|
store or an unsafe name."""
|
|
from agent.memory_provider import is_core_memory_provider
|
|
|
|
memory = (config or {}).get("memory")
|
|
name = memory.get("provider") if isinstance(memory, dict) else None
|
|
if not isinstance(name, str) or is_core_memory_provider(name):
|
|
return None
|
|
name = name.strip()
|
|
if name in {".", ".."} or not _PROVIDER_NAME_RE.match(name):
|
|
return None
|
|
return name
|
|
|
|
|
|
def clone_memory_provider_config(source_dir: Path, profile_dir: Path, provider: Optional[str]) -> bool:
|
|
"""Copy ``<provider>/`` and/or ``<provider>.json`` from *source_dir* into *profile_dir* when
|
|
present. Files land owner-only like ``.env``: they can hold an API key. Returns True when
|
|
anything was copied."""
|
|
if not provider:
|
|
return False
|
|
copied = False
|
|
src_dir = source_dir / provider
|
|
if src_dir.is_dir():
|
|
shutil.copytree(src_dir, profile_dir / provider, dirs_exist_ok=True)
|
|
for root, _dirs, files in os.walk(profile_dir / provider):
|
|
for filename in files:
|
|
with contextlib.suppress(OSError):
|
|
os.chmod(os.path.join(root, filename), 0o600)
|
|
copied = True
|
|
src_file = source_dir / f"{provider}.json"
|
|
if src_file.is_file():
|
|
dst = profile_dir / f"{provider}.json"
|
|
shutil.copy2(src_file, dst)
|
|
with contextlib.suppress(OSError):
|
|
os.chmod(str(dst), 0o600)
|
|
copied = True
|
|
return copied
|
|
|
|
|
|
def cloned_memory_provider(profile_dir: Path) -> Optional[str]:
|
|
"""Name of the external provider whose config *profile_dir* now carries, for the CLI notice."""
|
|
from hermes_cli.profiles import _load_yaml_dict
|
|
|
|
provider = active_memory_provider(_load_yaml_dict(profile_dir / "config.yaml"))
|
|
if provider and ((profile_dir / provider).is_dir() or (profile_dir / f"{provider}.json").is_file()):
|
|
return provider
|
|
return None
|