feat: multi-user/multi-persona support with two-level home directory layout
Restructures persona storage from a flat personas/{name}/ layout to
home/{username}/persona/{name}/, mirroring Linux home directories.
Changes:
- persona.py: two ContextVars (user + persona), Linux-style name validation,
set_context(), get_user(), get_persona(), validate(), list_users(),
list_user_personas(); persona_path() takes (username, name)
- config.py: replaces personas_dir with home_dir + home_root()
- git mv personas/inara → home/scott/persona/inara (history preserved)
- home/holly/persona/tina/: Holly's persona stub added
- cron_runner.py: all storage functions take (username, persona) params
- tools/cron.py: stamps user + persona on jobs; APScheduler IDs are
{user}:{persona}:{job_id} to prevent collisions across users
- memory_distiller.py: distill_short/mid/long take (username, persona);
added missing Path + settings imports
- scheduler.py: _load_user_crons() iterates home/*/persona/* (two-level)
- routers/chat.py, orchestrator.py: user field added; set_context() called
- tests/conftest.py: home_root fixture with two-level structure;
patches home_dir instead of personas_dir
- tests/test_persona.py: fully rewritten for two-level API
- tests/test_api_files.py: updated fixture name and path
- .env.default: documents HOME_DIR setting; scrubs stale API key
- CLAUDE.md, README.md: directory maps updated for new layout
All 80 tests pass.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -84,38 +84,42 @@ def start() -> None:
|
||||
|
||||
|
||||
def _load_user_crons() -> None:
|
||||
"""Register all enabled user-defined cron jobs across all personas."""
|
||||
"""Register all enabled user-defined cron jobs across all users and personas."""
|
||||
import asyncio
|
||||
try:
|
||||
from cron_runner import load_crons, parse_schedule, run_job
|
||||
from persona import list_personas
|
||||
from persona import list_users, list_user_personas
|
||||
except ImportError as e:
|
||||
logger.warning("could not import cron modules: %s", e)
|
||||
return
|
||||
|
||||
total = 0
|
||||
for persona_name in list_personas():
|
||||
for job in load_crons(persona_name):
|
||||
if not job.get("enabled", True):
|
||||
continue
|
||||
# Ensure persona is stamped on the job for run_job() to resolve paths
|
||||
job.setdefault("persona", persona_name)
|
||||
try:
|
||||
kwargs = parse_schedule(job["schedule"])
|
||||
sched_id = f"{persona_name}:{job['id']}"
|
||||
_scheduler.add_job(
|
||||
lambda j=job: asyncio.ensure_future(run_job(j)),
|
||||
"cron",
|
||||
id=sched_id,
|
||||
replace_existing=True,
|
||||
**kwargs,
|
||||
)
|
||||
total += 1
|
||||
except Exception as e:
|
||||
logger.warning("cron %s/%s skipped: %s", persona_name, job.get("id"), e)
|
||||
persona_count = 0
|
||||
for username in list_users():
|
||||
for persona_name in list_user_personas(username):
|
||||
persona_count += 1
|
||||
for job in load_crons(username, persona_name):
|
||||
if not job.get("enabled", True):
|
||||
continue
|
||||
# Ensure user + persona are stamped on the job for run_job() path resolution
|
||||
job.setdefault("user", username)
|
||||
job.setdefault("persona", persona_name)
|
||||
try:
|
||||
kwargs = parse_schedule(job["schedule"])
|
||||
sched_id = f"{username}:{persona_name}:{job['id']}"
|
||||
_scheduler.add_job(
|
||||
lambda j=job: asyncio.ensure_future(run_job(j)),
|
||||
"cron",
|
||||
id=sched_id,
|
||||
replace_existing=True,
|
||||
**kwargs,
|
||||
)
|
||||
total += 1
|
||||
except Exception as e:
|
||||
logger.warning("cron %s/%s/%s skipped: %s", username, persona_name, job.get("id"), e)
|
||||
|
||||
if total:
|
||||
logger.info("loaded %d user cron job(s) across %d persona(s)", total, len(list_personas()))
|
||||
logger.info("loaded %d user cron job(s) across %d persona(s)", total, persona_count)
|
||||
|
||||
|
||||
def stop() -> None:
|
||||
|
||||
Reference in New Issue
Block a user