jarvis-ai-assistant 0.3.31__tar.gz → 0.3.33__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {jarvis_ai_assistant-0.3.31/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.33}/PKG-INFO +1 -1
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/pyproject.toml +1 -1
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/setup.py +1 -1
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/__init__.py +1 -1
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/agent_manager.py +6 -1
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/edit_file_handler.py +30 -12
- jarvis_ai_assistant-0.3.33/src/jarvis/jarvis_agent/file_context_handler.py +69 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/jarvis.py +154 -29
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/run_loop.py +9 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_agent/code_agent.py +6 -1
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_data/config_schema.json +5 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_multi_agent/__init__.py +21 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_platform/base.py +57 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_platform/openai.py +26 -1
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/edit_file.py +7 -7
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/read_webpage.py +4 -2
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/search_web.py +14 -10
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/config.py +10 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/git_utils.py +1 -1
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/input.py +1 -1
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/utils.py +2 -2
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33/src/jarvis_ai_assistant.egg-info}/PKG-INFO +1 -1
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis_ai_assistant.egg-info/SOURCES.txt +1 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/LICENSE +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/MANIFEST.in +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/README.md +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/setup.cfg +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/__init__.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/builtin_input_handler.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/config.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/config_editor.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/event_bus.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/events.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/file_methodology_manager.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/main.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/memory_manager.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/methodology_share_manager.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/output_handler.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/prompt_builder.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/prompt_manager.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/prompts.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/protocols.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/session_manager.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/share_manager.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/shell_input_handler.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/task_analyzer.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/task_manager.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/tool_executor.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/tool_share_manager.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/user_interaction.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/utils.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_agent/__init__.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_agent/lint.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/__init__.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/c_cpp.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/csharp.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/data_format.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/devops.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/docs.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/go.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/infrastructure.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/java.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/javascript.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/kotlin.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/loader.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/php.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/python.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/ruby.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/rust.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/shell.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/sql.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/swift.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/checklists/web.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_analysis/code_review.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_data/tiktoken/9b5ad71b2ce5302211f9c61530b329a4922fc6a4 +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_git_squash/__init__.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_git_squash/main.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_git_utils/git_commiter.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_mcp/__init__.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_mcp/sse_mcp_client.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_mcp/stdio_mcp_client.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_mcp/streamable_mcp_client.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_memory_organizer/__init__.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_memory_organizer/memory_organizer.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_methodology/main.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_multi_agent/main.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_platform/__init__.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_platform/ai8.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_platform/human.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_platform/kimi.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_platform/registry.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_platform/tongyi.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_platform/yuanbao.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_platform_manager/__init__.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_platform_manager/main.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_platform_manager/service.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_rag/__init__.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_rag/cache.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_rag/cli.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_rag/embedding_manager.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_rag/llm_interface.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_rag/query_rewriter.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_rag/rag_pipeline.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_rag/reranker.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_rag/retriever.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_smart_shell/__init__.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_smart_shell/main.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_stats/__init__.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_stats/cli.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_stats/stats.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_stats/storage.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_stats/visualizer.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/__init__.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/ask_user.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/base.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/clear_memory.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/cli/__init__.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/cli/main.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/execute_script.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/file_analyzer.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/generate_new_tool.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/methodology.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/read_code.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/registry.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/retrieve_memory.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/rewrite_file.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/save_memory.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/sub_agent.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/sub_code_agent.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_tools/virtual_tty.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/__init__.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/builtin_replace_map.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/clipboard.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/embedding.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/file_processors.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/fzf.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/globals.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/http.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/methodology.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/output.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_utils/tag.py +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis_ai_assistant.egg-info/dependency_links.txt +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis_ai_assistant.egg-info/entry_points.txt +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis_ai_assistant.egg-info/requires.txt +0 -0
- {jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis_ai_assistant.egg-info/top_level.txt +0 -0
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
|
|
4
4
|
|
5
5
|
[project]
|
6
6
|
name = "jarvis-ai-assistant"
|
7
|
-
version = "0.3.
|
7
|
+
version = "0.3.33"
|
8
8
|
description = "Jarvis: An AI assistant that uses tools to interact with the system"
|
9
9
|
readme = "README.md"
|
10
10
|
authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
|
@@ -3,7 +3,7 @@ from setuptools import setup, find_packages # type: ignore
|
|
3
3
|
|
4
4
|
setup(
|
5
5
|
name="jarvis-ai-assistant",
|
6
|
-
version="0.3.
|
6
|
+
version="0.3.33",
|
7
7
|
author="skyfire",
|
8
8
|
author_email="skyfireitdiy@hotmail.com",
|
9
9
|
description="An AI assistant that uses various tools to interact with the system",
|
{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/agent_manager.py
RENAMED
@@ -12,6 +12,7 @@ from jarvis.jarvis_agent import (
|
|
12
12
|
origin_agent_system_prompt,
|
13
13
|
)
|
14
14
|
from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
|
15
|
+
from jarvis.jarvis_agent.file_context_handler import file_context_handler
|
15
16
|
from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
|
16
17
|
from jarvis.jarvis_agent.task_manager import TaskManager
|
17
18
|
from jarvis.jarvis_tools.registry import ToolRegistry
|
@@ -46,7 +47,11 @@ class AgentManager:
|
|
46
47
|
self.agent = Agent(
|
47
48
|
system_prompt=origin_agent_system_prompt,
|
48
49
|
model_group=self.model_group,
|
49
|
-
input_handler=[
|
50
|
+
input_handler=[
|
51
|
+
shell_input_handler,
|
52
|
+
file_context_handler,
|
53
|
+
builtin_input_handler,
|
54
|
+
],
|
50
55
|
output_handler=[ToolRegistry()], # type: ignore
|
51
56
|
need_summary=False,
|
52
57
|
use_methodology=self.use_methodology,
|
@@ -166,7 +166,7 @@ class EditFileHandler(OutputHandler):
|
|
166
166
|
- {supported_formats}
|
167
167
|
- {ot("RANGE")}start-end{ct("RANGE")} 仅用于区间替换模式(SEARCH_START/SEARCH_END),表示只在指定行号范围内进行匹配与替换(1-based,闭区间);省略则在整个文件范围内处理
|
168
168
|
- 单点替换要求 SEARCH 在有效范围内唯一匹配(仅替换第一个匹配)
|
169
|
-
-
|
169
|
+
- 区间替换会从包含 {ot("SEARCH_START")} 的行首开始,到包含 {ot("SEARCH_END")} 的行尾结束,替换整个区域
|
170
170
|
否则编辑将失败。"""
|
171
171
|
|
172
172
|
def name(self) -> str:
|
@@ -468,24 +468,42 @@ class EditFileHandler(OutputHandler):
|
|
468
468
|
error_msg = "未找到SEARCH_START"
|
469
469
|
failed_patches.append({"patch": patch, "error": error_msg})
|
470
470
|
else:
|
471
|
-
|
471
|
+
# 从 search_start 之后开始查找 search_end
|
472
|
+
end_idx = base_content.find(search_end, start_idx + len(search_start))
|
472
473
|
if end_idx == -1:
|
473
474
|
error_msg = "在SEARCH_START之后未找到SEARCH_END"
|
474
475
|
failed_patches.append({"patch": patch, "error": error_msg})
|
475
476
|
else:
|
476
|
-
#
|
477
|
-
#
|
478
|
-
|
479
|
-
|
477
|
+
# 将替换范围扩展到整行
|
478
|
+
# 找到 start_idx 所在行的行首
|
479
|
+
line_start_idx = base_content.rfind("\n", 0, start_idx) + 1
|
480
|
+
|
481
|
+
# 找到 end_idx 所在行的行尾
|
482
|
+
match_end_pos = end_idx + len(search_end)
|
483
|
+
line_end_idx = base_content.find("\n", match_end_pos)
|
484
|
+
|
485
|
+
if line_end_idx == -1:
|
486
|
+
# 如果没有找到换行符,说明是最后一行
|
487
|
+
end_of_range = len(base_content)
|
488
|
+
else:
|
489
|
+
# 包含换行符
|
490
|
+
end_of_range = line_end_idx + 1
|
491
|
+
|
492
|
+
final_replace_text = replace_text
|
493
|
+
original_slice = base_content[line_start_idx:end_of_range]
|
494
|
+
|
495
|
+
# 如果原始片段以换行符结尾,且替换内容不为空且不以换行符结尾,
|
496
|
+
# 则为替换内容添加换行符以保持格式
|
480
497
|
if (
|
481
|
-
|
482
|
-
and
|
483
|
-
and
|
498
|
+
final_replace_text
|
499
|
+
and original_slice.endswith("\n")
|
500
|
+
and not final_replace_text.endswith("\n")
|
484
501
|
):
|
485
|
-
|
502
|
+
final_replace_text += "\n"
|
503
|
+
|
486
504
|
base_content = (
|
487
|
-
base_content[:
|
488
|
-
+
|
505
|
+
base_content[:line_start_idx]
|
506
|
+
+ final_replace_text
|
489
507
|
+ base_content[end_of_range:]
|
490
508
|
)
|
491
509
|
found = True
|
@@ -0,0 +1,69 @@
|
|
1
|
+
# -*- coding: utf-8 -*-
|
2
|
+
import re
|
3
|
+
import os
|
4
|
+
from typing import Any, Tuple
|
5
|
+
|
6
|
+
from jarvis.jarvis_tools.read_code import ReadCodeTool
|
7
|
+
|
8
|
+
|
9
|
+
def is_text_file(filepath: str) -> bool:
|
10
|
+
"""
|
11
|
+
Check if a file is a text file.
|
12
|
+
"""
|
13
|
+
try:
|
14
|
+
with open(filepath, "r", encoding="utf-8") as f:
|
15
|
+
f.read(1024) # Try to read a small chunk
|
16
|
+
return True
|
17
|
+
except (UnicodeDecodeError, IOError):
|
18
|
+
return False
|
19
|
+
|
20
|
+
|
21
|
+
def count_lines(filepath: str) -> int:
|
22
|
+
"""
|
23
|
+
Count the number of lines in a file.
|
24
|
+
"""
|
25
|
+
try:
|
26
|
+
with open(filepath, "r", encoding="utf-8", errors="ignore") as f:
|
27
|
+
return sum(1 for _ in f)
|
28
|
+
except IOError:
|
29
|
+
return 0
|
30
|
+
|
31
|
+
|
32
|
+
def file_context_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
|
33
|
+
"""
|
34
|
+
Extracts file paths from the input, reads their content if they are valid text files
|
35
|
+
and appends the content to the input.
|
36
|
+
|
37
|
+
Args:
|
38
|
+
user_input: The user's input string.
|
39
|
+
agent_: The agent instance.
|
40
|
+
|
41
|
+
Returns:
|
42
|
+
A tuple containing the modified user input and a boolean indicating if
|
43
|
+
further processing should be skipped.
|
44
|
+
"""
|
45
|
+
# Regex to find paths in single quotes
|
46
|
+
file_paths = re.findall(r"'([^']+)'", user_input)
|
47
|
+
|
48
|
+
if not file_paths:
|
49
|
+
return user_input, False
|
50
|
+
|
51
|
+
added_context = ""
|
52
|
+
read_code_tool = ReadCodeTool()
|
53
|
+
|
54
|
+
for path in file_paths:
|
55
|
+
if os.path.isfile(path) and is_text_file(path):
|
56
|
+
line_count = count_lines(path)
|
57
|
+
if line_count > 0:
|
58
|
+
# Use ReadCodeTool to get formatted content
|
59
|
+
result = read_code_tool._handle_single_file(path)
|
60
|
+
if result["success"]:
|
61
|
+
# Remove the file path from the original input to avoid redundancy
|
62
|
+
user_input = user_input.replace(f"'{path}'", "")
|
63
|
+
# Append the full, formatted output from the tool, which includes headers and line numbers
|
64
|
+
added_context += "\n" + result["stdout"]
|
65
|
+
|
66
|
+
if added_context:
|
67
|
+
user_input = user_input.strip() + added_context
|
68
|
+
|
69
|
+
return user_input, False
|
@@ -1,6 +1,8 @@
|
|
1
1
|
# -*- coding: utf-8 -*-
|
2
2
|
"""Jarvis AI 助手主入口模块"""
|
3
3
|
from typing import Optional, List
|
4
|
+
import shutil
|
5
|
+
from datetime import datetime
|
4
6
|
|
5
7
|
import typer
|
6
8
|
|
@@ -16,6 +18,7 @@ from jarvis.jarvis_utils.config import (
|
|
16
18
|
get_agent_definition_dirs,
|
17
19
|
get_multi_agent_dirs,
|
18
20
|
get_roles_dirs,
|
21
|
+
get_data_dir,
|
19
22
|
)
|
20
23
|
import jarvis.jarvis_utils.utils as jutils
|
21
24
|
from jarvis.jarvis_utils.input import user_confirm, get_single_line_input
|
@@ -184,6 +187,91 @@ def handle_interactive_config_option(
|
|
184
187
|
return True
|
185
188
|
|
186
189
|
|
190
|
+
def handle_backup_option(backup: bool) -> bool:
|
191
|
+
"""处理数据备份选项,返回是否已处理并需提前结束。"""
|
192
|
+
if not backup:
|
193
|
+
return False
|
194
|
+
|
195
|
+
init_env("", config_file=None)
|
196
|
+
data_dir = Path(get_data_dir())
|
197
|
+
if not data_dir.is_dir():
|
198
|
+
PrettyOutput.print(f"数据目录不存在: {data_dir}", OutputType.ERROR)
|
199
|
+
return True
|
200
|
+
|
201
|
+
backup_dir = Path(os.path.expanduser("~/jarvis_backups"))
|
202
|
+
backup_dir.mkdir(exist_ok=True)
|
203
|
+
|
204
|
+
timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
|
205
|
+
backup_file_base = backup_dir / f"jarvis_data_{timestamp}"
|
206
|
+
|
207
|
+
try:
|
208
|
+
archive_path = shutil.make_archive(
|
209
|
+
str(backup_file_base), "zip", root_dir=str(data_dir)
|
210
|
+
)
|
211
|
+
PrettyOutput.print(f"数据已成功备份到: {archive_path}", OutputType.SUCCESS)
|
212
|
+
except Exception as e:
|
213
|
+
PrettyOutput.print(f"数据备份失败: {e}", OutputType.ERROR)
|
214
|
+
|
215
|
+
return True
|
216
|
+
|
217
|
+
|
218
|
+
def handle_restore_option(restore_path: Optional[str], config_file: Optional[str]) -> bool:
|
219
|
+
"""处理数据恢复选项,返回是否已处理并需提前结束。"""
|
220
|
+
if not restore_path:
|
221
|
+
return False
|
222
|
+
|
223
|
+
restore_file = Path(os.path.expanduser(os.path.expandvars(restore_path)))
|
224
|
+
# 兼容 ~ 与环境变量,避免用户输入未展开路径导致找不到文件
|
225
|
+
if not restore_file.is_file():
|
226
|
+
PrettyOutput.print(f"指定的恢复文件不存在: {restore_file}", OutputType.ERROR)
|
227
|
+
return True
|
228
|
+
|
229
|
+
# 在恢复数据时不要触发完整环境初始化,避免引导流程或网络请求
|
230
|
+
# 优先从配置文件解析 JARVIS_DATA_PATH,否则回退到默认数据目录
|
231
|
+
data_dir_str: Optional[str] = None
|
232
|
+
try:
|
233
|
+
if config_file:
|
234
|
+
cfg_path = Path(os.path.expanduser(os.path.expandvars(config_file)))
|
235
|
+
if cfg_path.is_file():
|
236
|
+
with open(cfg_path, "r", encoding="utf-8", errors="ignore") as cf:
|
237
|
+
cfg_data = yaml.safe_load(cf) or {}
|
238
|
+
if isinstance(cfg_data, dict):
|
239
|
+
val = cfg_data.get("JARVIS_DATA_PATH")
|
240
|
+
if isinstance(val, str) and val.strip():
|
241
|
+
data_dir_str = val.strip()
|
242
|
+
except Exception:
|
243
|
+
data_dir_str = None
|
244
|
+
|
245
|
+
if not data_dir_str:
|
246
|
+
data_dir_str = get_data_dir()
|
247
|
+
|
248
|
+
data_dir = Path(os.path.expanduser(os.path.expandvars(str(data_dir_str))))
|
249
|
+
|
250
|
+
if data_dir.exists():
|
251
|
+
if not user_confirm(
|
252
|
+
f"数据目录 '{data_dir}' 已存在,恢复操作将覆盖它。是否继续?", default=False
|
253
|
+
):
|
254
|
+
PrettyOutput.print("恢复操作已取消。", OutputType.INFO)
|
255
|
+
return True
|
256
|
+
try:
|
257
|
+
shutil.rmtree(data_dir)
|
258
|
+
except Exception as e:
|
259
|
+
PrettyOutput.print(f"无法移除现有数据目录: {e}", OutputType.ERROR)
|
260
|
+
return True
|
261
|
+
|
262
|
+
try:
|
263
|
+
data_dir.mkdir(parents=True)
|
264
|
+
shutil.unpack_archive(str(restore_file), str(data_dir), "zip")
|
265
|
+
PrettyOutput.print(
|
266
|
+
f"数据已从 '{restore_path}' 成功恢复到 '{data_dir}'", OutputType.SUCCESS
|
267
|
+
)
|
268
|
+
|
269
|
+
except Exception as e:
|
270
|
+
PrettyOutput.print(f"数据恢复失败: {e}", OutputType.ERROR)
|
271
|
+
|
272
|
+
return True
|
273
|
+
|
274
|
+
|
187
275
|
def preload_config_for_flags(config_file: Optional[str]) -> None:
|
188
276
|
"""预加载配置(仅用于读取功能开关),不会显示欢迎信息或影响后续 init_env。"""
|
189
277
|
try:
|
@@ -374,6 +462,20 @@ def handle_builtin_config_selector(
|
|
374
462
|
)
|
375
463
|
|
376
464
|
if options:
|
465
|
+
# Add a default option to skip selection
|
466
|
+
options.insert(
|
467
|
+
0,
|
468
|
+
{
|
469
|
+
"category": "skip",
|
470
|
+
"cmd": "",
|
471
|
+
"file": "",
|
472
|
+
"name": "跳过选择 (使用默认通用代理)",
|
473
|
+
"desc": "直接按回车或ESC也可跳过",
|
474
|
+
"details": "",
|
475
|
+
"roles_count": 0,
|
476
|
+
},
|
477
|
+
)
|
478
|
+
|
377
479
|
PrettyOutput.section("可用的内置配置", OutputType.SUCCESS)
|
378
480
|
# 使用 rich Table 呈现
|
379
481
|
table = Table(show_header=True, header_style="bold magenta")
|
@@ -442,35 +544,44 @@ def handle_builtin_config_selector(
|
|
442
544
|
if choice_index != -1:
|
443
545
|
try:
|
444
546
|
sel = options[choice_index]
|
445
|
-
|
446
|
-
|
447
|
-
|
448
|
-
|
449
|
-
args
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
-
args
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
458
|
-
|
459
|
-
|
460
|
-
|
461
|
-
|
462
|
-
|
463
|
-
|
464
|
-
|
465
|
-
|
466
|
-
|
467
|
-
|
468
|
-
|
469
|
-
|
470
|
-
|
471
|
-
|
472
|
-
|
473
|
-
|
547
|
+
# If the "skip" option is chosen, do nothing and proceed to default agent
|
548
|
+
if sel["category"] == "skip":
|
549
|
+
pass
|
550
|
+
else:
|
551
|
+
args: List[str] = []
|
552
|
+
|
553
|
+
if sel["category"] == "agent":
|
554
|
+
# jarvis-agent 支持 -f/--config(全局配置)与 -c/--agent-definition
|
555
|
+
args = [str(sel["cmd"]), "-c", str(sel["file"])]
|
556
|
+
if model_group:
|
557
|
+
args += ["-g", str(model_group)]
|
558
|
+
if config_file:
|
559
|
+
args += ["-f", str(config_file)]
|
560
|
+
if task:
|
561
|
+
args += ["--task", str(task)]
|
562
|
+
|
563
|
+
elif sel["category"] == "multi_agent":
|
564
|
+
# jarvis-multi-agent 需要 -c/--config,用户输入通过 -i/--input 传递
|
565
|
+
args = [str(sel["cmd"]), "-c", str(sel["file"])]
|
566
|
+
if task:
|
567
|
+
args += ["-i", str(task)]
|
568
|
+
|
569
|
+
elif sel["category"] == "roles":
|
570
|
+
# jarvis-platform-manager role 子命令,支持 -c/-t/-g
|
571
|
+
args = [
|
572
|
+
str(sel["cmd"]),
|
573
|
+
"role",
|
574
|
+
"-c",
|
575
|
+
str(sel["file"]),
|
576
|
+
]
|
577
|
+
if model_group:
|
578
|
+
args += ["-g", str(model_group)]
|
579
|
+
|
580
|
+
if args:
|
581
|
+
PrettyOutput.print(
|
582
|
+
f"正在启动: {' '.join(args)}", OutputType.INFO
|
583
|
+
)
|
584
|
+
os.execvp(args[0], args)
|
474
585
|
except Exception:
|
475
586
|
# 任何异常都不影响默认流程
|
476
587
|
pass
|
@@ -521,6 +632,12 @@ def run_cli(
|
|
521
632
|
"--disable-methodology-analysis",
|
522
633
|
help="禁用方法论和任务分析(覆盖配置文件设置)",
|
523
634
|
),
|
635
|
+
backup_data: bool = typer.Option(
|
636
|
+
False, "--backup-data", help="备份 Jarvis 数据目录 (~/.jarvis)"
|
637
|
+
),
|
638
|
+
restore_data: Optional[str] = typer.Option(
|
639
|
+
None, "--restore-data", help="从指定的压缩包恢复 Jarvis 数据"
|
640
|
+
),
|
524
641
|
) -> None:
|
525
642
|
"""Jarvis AI assistant command-line interface."""
|
526
643
|
if ctx.invoked_subcommand is not None:
|
@@ -529,6 +646,14 @@ def run_cli(
|
|
529
646
|
# 使用 rich 输出命令与快捷方式总览
|
530
647
|
print_commands_overview()
|
531
648
|
|
649
|
+
# 处理数据备份
|
650
|
+
if handle_backup_option(backup_data):
|
651
|
+
return
|
652
|
+
|
653
|
+
# 处理数据恢复
|
654
|
+
if handle_restore_option(restore_data, config_file):
|
655
|
+
return
|
656
|
+
|
532
657
|
# 处理配置文件编辑
|
533
658
|
if handle_edit_option(edit, config_file):
|
534
659
|
return
|
{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_agent/run_loop.py
RENAMED
@@ -7,6 +7,7 @@ AgentRunLoop: 承载 Agent 的主运行循环逻辑。
|
|
7
7
|
- 暂不变更外部调用入口,后续在 Agent._main_loop 中委派到该类
|
8
8
|
- 保持与现有异常处理、工具调用、用户交互完全一致
|
9
9
|
"""
|
10
|
+
import os
|
10
11
|
from enum import Enum
|
11
12
|
from typing import Any, TYPE_CHECKING
|
12
13
|
|
@@ -22,6 +23,8 @@ if TYPE_CHECKING:
|
|
22
23
|
class AgentRunLoop:
|
23
24
|
def __init__(self, agent: "Agent") -> None:
|
24
25
|
self.agent = agent
|
26
|
+
self.conversation_rounds = 0
|
27
|
+
self.tool_reminder_rounds = int(os.environ.get("JARVIS_TOOL_REMINDER_ROUNDS", 20))
|
25
28
|
|
26
29
|
def run(self) -> Any:
|
27
30
|
"""主运行循环(委派到传入的 agent 实例的方法与属性)"""
|
@@ -29,6 +32,12 @@ class AgentRunLoop:
|
|
29
32
|
|
30
33
|
while True:
|
31
34
|
try:
|
35
|
+
self.conversation_rounds += 1
|
36
|
+
if self.conversation_rounds % self.tool_reminder_rounds == 0:
|
37
|
+
self.agent.session.addon_prompt = join_prompts(
|
38
|
+
[self.agent.session.addon_prompt, self.agent.get_tool_usage_prompt()]
|
39
|
+
)
|
40
|
+
|
32
41
|
ag = self.agent
|
33
42
|
|
34
43
|
# 更新输入处理器标志
|
{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_code_agent/code_agent.py
RENAMED
@@ -14,6 +14,7 @@ import typer
|
|
14
14
|
from jarvis.jarvis_agent import Agent
|
15
15
|
from jarvis.jarvis_agent.events import AFTER_TOOL_CALL
|
16
16
|
from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
|
17
|
+
from jarvis.jarvis_agent.file_context_handler import file_context_handler
|
17
18
|
from jarvis.jarvis_agent.edit_file_handler import EditFileHandler
|
18
19
|
from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
|
19
20
|
from jarvis.jarvis_code_agent.lint import get_lint_tools
|
@@ -89,7 +90,11 @@ class CodeAgent:
|
|
89
90
|
auto_complete=False,
|
90
91
|
output_handler=[tool_registry, EditFileHandler()], # type: ignore
|
91
92
|
model_group=model_group,
|
92
|
-
input_handler=[
|
93
|
+
input_handler=[
|
94
|
+
shell_input_handler,
|
95
|
+
file_context_handler,
|
96
|
+
builtin_input_handler,
|
97
|
+
],
|
93
98
|
need_summary=need_summary,
|
94
99
|
use_methodology=False, # 禁用方法论
|
95
100
|
use_analysis=False, # 禁用分析
|
{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_data/config_schema.json
RENAMED
@@ -312,6 +312,11 @@
|
|
312
312
|
"description": "是否启用立即中断:在对话迭代中检测到中断信号时立即返回",
|
313
313
|
"default": false
|
314
314
|
},
|
315
|
+
"JARVIS_SAVE_SESSION_HISTORY": {
|
316
|
+
"type": "boolean",
|
317
|
+
"description": "是否保存会话记录",
|
318
|
+
"default": false
|
319
|
+
},
|
315
320
|
"JARVIS_GIT_CHECK_MODE": {
|
316
321
|
"type": "string",
|
317
322
|
"enum": ["strict", "warn"],
|
{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_multi_agent/__init__.py
RENAMED
@@ -154,9 +154,30 @@ content: |2
|
|
154
154
|
PrettyOutput.print(f"未知消息类型: {type(msg)}", OutputType.WARNING)
|
155
155
|
break
|
156
156
|
|
157
|
+
# Generate a brief summary via direct model call to avoid run-loop recursion
|
158
|
+
try:
|
159
|
+
# 参照 Agent.generate_summary 的实现思路:基于当前 session.prompt 追加请求提示,直接调用底层模型
|
160
|
+
multi_agent_summary_prompt = """
|
161
|
+
请基于当前会话,为即将发送给其他智能体的协作交接写一段摘要,包含:
|
162
|
+
- 已完成的主要工作与产出
|
163
|
+
- 关键决策及其理由
|
164
|
+
- 已知的约束/风险/边界条件
|
165
|
+
- 未解决的问题与待澄清点
|
166
|
+
- 下一步建议与对目标智能体的具体请求
|
167
|
+
要求:
|
168
|
+
- 仅输出纯文本,不包含任何指令或工具调用
|
169
|
+
- 使用简洁的要点式表述
|
170
|
+
""".strip()
|
171
|
+
summary_any: Any = agent.model.chat_until_success( # type: ignore[attr-defined]
|
172
|
+
f"{agent.session.prompt}\n{multi_agent_summary_prompt}"
|
173
|
+
)
|
174
|
+
summary_text = summary_any.strip() if isinstance(summary_any, str) else ""
|
175
|
+
except Exception:
|
176
|
+
summary_text = ""
|
157
177
|
prompt = f"""
|
158
178
|
Please handle this message:
|
159
179
|
from: {last_agent_name}
|
180
|
+
summary_of_sender_work: {summary_text}
|
160
181
|
content: {msg['content']}
|
161
182
|
"""
|
162
183
|
to_agent_name = msg.get("to")
|
{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.33}/src/jarvis/jarvis_platform/base.py
RENAMED
@@ -1,5 +1,7 @@
|
|
1
1
|
# -*- coding: utf-8 -*-
|
2
2
|
import re
|
3
|
+
import os
|
4
|
+
from datetime import datetime
|
3
5
|
from abc import ABC, abstractmethod
|
4
6
|
from types import TracebackType
|
5
7
|
from typing import Dict, Generator, List, Optional, Tuple, Type
|
@@ -17,6 +19,8 @@ from jarvis.jarvis_utils.config import (
|
|
17
19
|
get_pretty_output,
|
18
20
|
is_print_prompt,
|
19
21
|
is_immediate_abort,
|
22
|
+
is_save_session_history,
|
23
|
+
get_data_dir,
|
20
24
|
)
|
21
25
|
from jarvis.jarvis_utils.embedding import split_text_into_chunks
|
22
26
|
from jarvis.jarvis_utils.globals import set_in_chat, get_interrupt, console
|
@@ -34,6 +38,7 @@ class BasePlatform(ABC):
|
|
34
38
|
self.web = False # 添加web属性,默认false
|
35
39
|
self._saved = False
|
36
40
|
self.model_group: Optional[str] = None
|
41
|
+
self._session_history_file: Optional[str] = None
|
37
42
|
|
38
43
|
def __enter__(self) -> Self:
|
39
44
|
"""Enter context manager"""
|
@@ -57,6 +62,7 @@ class BasePlatform(ABC):
|
|
57
62
|
def reset(self):
|
58
63
|
"""Reset model"""
|
59
64
|
self.delete_chat()
|
65
|
+
self._session_history_file = None
|
60
66
|
|
61
67
|
@abstractmethod
|
62
68
|
def chat(self, message: str) -> Generator[str, None, None]:
|
@@ -135,6 +141,7 @@ class BasePlatform(ABC):
|
|
135
141
|
if first_chunk:
|
136
142
|
break
|
137
143
|
except StopIteration:
|
144
|
+
self._append_session_history(message, "")
|
138
145
|
return ""
|
139
146
|
|
140
147
|
text_content = Text(overflow="fold")
|
@@ -200,6 +207,7 @@ class BasePlatform(ABC):
|
|
200
207
|
live.update(panel)
|
201
208
|
|
202
209
|
if is_immediate_abort() and get_interrupt():
|
210
|
+
self._append_session_history(message, response)
|
203
211
|
return response # Return the partial response immediately
|
204
212
|
|
205
213
|
# Ensure any remaining content in the buffer is displayed
|
@@ -225,6 +233,7 @@ class BasePlatform(ABC):
|
|
225
233
|
console.print(s, end="")
|
226
234
|
response += s
|
227
235
|
if is_immediate_abort() and get_interrupt():
|
236
|
+
self._append_session_history(message, response)
|
228
237
|
return response
|
229
238
|
console.print()
|
230
239
|
end_time = time.time()
|
@@ -234,6 +243,7 @@ class BasePlatform(ABC):
|
|
234
243
|
for s in self.chat(message):
|
235
244
|
response += s
|
236
245
|
if is_immediate_abort() and get_interrupt():
|
246
|
+
self._append_session_history(message, response)
|
237
247
|
return response
|
238
248
|
# Keep original think tag handling
|
239
249
|
response = re.sub(
|
@@ -242,6 +252,8 @@ class BasePlatform(ABC):
|
|
242
252
|
response = re.sub(
|
243
253
|
ot("thinking") + r".*?" + ct("thinking"), "", response, flags=re.DOTALL
|
244
254
|
)
|
255
|
+
# Save session history (input and full response)
|
256
|
+
self._append_session_history(message, response)
|
245
257
|
return response
|
246
258
|
|
247
259
|
def chat_until_success(self, message: str) -> str:
|
@@ -346,6 +358,51 @@ class BasePlatform(ABC):
|
|
346
358
|
"""Set web flag"""
|
347
359
|
self.web = web
|
348
360
|
|
361
|
+
def _append_session_history(self, user_input: str, model_output: str) -> None:
|
362
|
+
"""
|
363
|
+
Append the user input and model output to a session history file if enabled.
|
364
|
+
The file name is generated on first save and reused until reset.
|
365
|
+
"""
|
366
|
+
try:
|
367
|
+
if not is_save_session_history():
|
368
|
+
return
|
369
|
+
|
370
|
+
if self._session_history_file is None:
|
371
|
+
# Ensure data directory exists
|
372
|
+
data_dir = get_data_dir()
|
373
|
+
os.makedirs(data_dir, exist_ok=True)
|
374
|
+
|
375
|
+
# Build a safe filename including platform, model and timestamp
|
376
|
+
try:
|
377
|
+
platform_name = type(self).platform_name()
|
378
|
+
except Exception:
|
379
|
+
platform_name = "unknown_platform"
|
380
|
+
|
381
|
+
try:
|
382
|
+
model_name = self.name()
|
383
|
+
except Exception:
|
384
|
+
model_name = "unknown_model"
|
385
|
+
|
386
|
+
safe_platform = re.sub(r"[^\w\-\.]+", "_", str(platform_name))
|
387
|
+
safe_model = re.sub(r"[^\w\-\.]+", "_", str(model_name))
|
388
|
+
ts = datetime.now().strftime("%Y%m%d_%H%M%S")
|
389
|
+
|
390
|
+
self._session_history_file = os.path.join(
|
391
|
+
data_dir, f"session_history_{safe_platform}_{safe_model}_{ts}.log"
|
392
|
+
)
|
393
|
+
|
394
|
+
# Append record
|
395
|
+
with open(self._session_history_file, "a", encoding="utf-8", errors="ignore") as f:
|
396
|
+
ts_line = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
|
397
|
+
f.write(f"===== {ts_line} =====\n")
|
398
|
+
f.write("USER:\n")
|
399
|
+
f.write(f"{user_input}\n")
|
400
|
+
f.write("\nASSISTANT:\n")
|
401
|
+
f.write(f"{model_output}\n\n")
|
402
|
+
except Exception:
|
403
|
+
# Do not break chat flow if writing history fails
|
404
|
+
pass
|
405
|
+
|
349
406
|
@abstractmethod
|
350
407
|
def support_web(self) -> bool:
|
351
408
|
"""Check if platform supports web functionality"""
|