7 Commits
Author SHA1 Message Date
Tink 9d69ba9f56 fix: isolate /new consolidation in API mode 2026-03-13 19:26:50 +08:00
TinkandClaude Opus 4.6 f5cf0bfdee Merge origin/main into feat/openai-compatible-session-isolation (resolve conflicts)
Resolved 6 conflicted files:
- loop.py: adopt MemoryConsolidator pattern from main, keep _isolated_memory_store
- web.py, base.py, helpers.py: merge both sides' imports
- pyproject.toml: keep both api and wecom optional deps
- test_consolidate_offset.py: adopt main's _make_loop helper and consolidate_messages signatures
- test_openai_api.py: remove tests for deleted _consolidate_memory method

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-13 17:29:44 +08:00
Tink 37060dea0b Merge origin/main into feat/openai-compatible-session-isolation (resolve conflicts)
# Conflicts:
#	nanobot/agent/context.py
#	nanobot/providers/litellm_provider.py
2026-03-09 10:06:51 +08:00
TinkandClaude Opus 4.6 6b3997c463 fix: add from __future__ import annotations across codebase
Ensure all modules using PEP 604 union syntax (X | Y) include
the future annotations import for Python <3.10 compatibility.
While the project requires >=3.11, this avoids import-time
TypeErrors when running tests on older interpreters.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-06 19:13:56 +08:00
TinkandClaude Opus 4.6 e868fb32d2 fix: add from __future__ import annotations to fix Python <3.11 compat
These two files from upstream use PEP 604 union syntax (str | None)
without the future annotations import. While the project requires
Python >=3.11, this makes local testing possible on 3.9/3.10.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-03-06 19:09:38 +08:00
Tink f958eb4cc9 Merge remote-tracking branch 'origin/main' into feat/openai-compatible-session-isolation
# Conflicts:
#	nanobot/agent/context.py
#	tests/test_consolidate_offset.py
2026-03-06 19:03:41 +08:00
Tink 80219baf25 feat(api): add OpenAI-compatible endpoint with x-session-key isolation 2026-03-01 10:53:45 +08:00