jarvis-ai-assistant 0.3.0__tar.gz → 0.3.1__tar.gz

{jarvis_ai_assistant-0.3.0/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.0
+Version: 0.3.1
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.3.0 → jarvis_ai_assistant-0.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.0"
+version = "0.3.1"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.3.0 → jarvis_ai_assistant-0.3.1}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.0",
+    version="0.3.1",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.3.0 → jarvis_ai_assistant-0.3.1}/src/jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.3.0"
+__version__ = "0.3.1"

{jarvis_ai_assistant-0.3.0 → jarvis_ai_assistant-0.3.1}/src/jarvis/jarvis_agent/__init__.py

@@ -34,6 +34,7 @@ from jarvis.jarvis_utils.config import (
     get_thinking_model_name,
     get_thinking_platform_name,
     is_execute_tool_confirm,
+    is_force_save_memory,
     is_use_analysis,
     is_use_methodology,
 )
@@ -115,6 +116,7 @@ class Agent:
         multiline_inputer: Optional[Callable[[str], str]] = None,
         use_methodology: Optional[bool] = None,
         use_analysis: Optional[bool] = None,
+        force_save_memory: Optional[bool] = None,
         files: List[str] = [],
     ):
         """初始化Jarvis Agent实例
@@ -134,6 +136,7 @@ class Agent:
             multiline_inputer: 多行输入处理器
             use_methodology: 是否使用方法论
             use_analysis: 是否使用任务分析
+            force_save_memory: 是否强制保存记忆
         """
         # 基础属性初始化
         self.files = files
@@ -161,6 +164,7 @@ class Agent:
             execute_tool_confirm,
             summary_prompt,
             model_group,
+            force_save_memory,
         )
 
         # 初始化管理器
@@ -186,9 +190,7 @@ class Agent:
 
         self.model = PlatformRegistry().create_platform(platform_name)
         if self.model is None:
-            PrettyOutput.print(
-                f"平台 {platform_name} 不存在，将使用普通模型", OutputType.WARNING
-            )
+            PrettyOutput.print(f"平台 {platform_name} 不存在，将使用普通模型", OutputType.WARNING)
             self.model = PlatformRegistry().get_normal_platform()
 
         if model_name:
@@ -227,6 +229,7 @@ class Agent:
         execute_tool_confirm: Optional[bool],
         summary_prompt: Optional[str],
         model_group: Optional[str],
+        force_save_memory: Optional[bool],
     ):
         """初始化配置选项"""
         # 如果有上传文件，自动禁用方法论
@@ -254,6 +257,12 @@ class Agent:
 
         self.max_token_count = get_max_token_count(model_group)
 
+        self.force_save_memory = (
+            force_save_memory
+            if force_save_memory is not None
+            else is_force_save_memory()
+        )
+
     def _setup_system_prompt(self):
         """设置系统提示词"""
         action_prompt = self.get_tool_usage_prompt()
@@ -440,9 +449,10 @@ class Agent:
             当上下文长度超过最大值时使用
         """
         # 在清理历史之前，提示用户保存重要记忆
-        print("📌 对话历史即将被总结和清理，请先保存重要信息...")
-        self.memory_manager.prompt_memory_save()
-        
+        if self.force_save_memory:
+            print("📌 对话历史即将被总结和清理，请先保存重要信息...")
+            self.memory_manager.prompt_memory_save()
+
         if self._should_use_file_upload():
             return self._handle_history_with_file_upload()
         else:
@@ -504,10 +514,10 @@ class Agent:
             self.task_analyzer.analysis_task(satisfaction_feedback)
         else:
             # 如果没有开启分析，也提示用户是否有值得记忆的信息
-            self.memory_manager.prompt_memory_save()
+            if self.force_save_memory:
+                self.memory_manager.prompt_memory_save()
 
         if self.need_summary:
-
             print("📄 正在生成总结...")
             self.session.prompt = self.summary_prompt
             if not self.model:
@@ -679,9 +689,7 @@ class Agent:
         返回:
             str: "continue" 或 "complete"
         """
-        user_input = self.multiline_inputer(
-            f"{self.name}: 请输入，或输入空行来结束当前任务："
-        )
+        user_input = self.multiline_inputer(f"{self.name}: 请输入，或输入空行来结束当前任务：")
 
         if user_input:
             self.session.prompt = user_input

{jarvis_ai_assistant-0.3.0 → jarvis_ai_assistant-0.3.1}/src/jarvis/jarvis_agent/memory_manager.py

@@ -116,18 +116,12 @@ class MemoryManager:
                 memory_prompts += (
                     "\n    - 如果有关键信息需要记忆，请调用save_memory工具进行记忆："
                 )
-                memory_prompts += (
-                    "\n      * project_long_term: 保存与当前项目相关的长期信息"
-                )
-                memory_prompts += (
-                    "\n      * global_long_term: 保存通用的信息、用户喜好、知识、方法等"
-                )
-                memory_prompts += "\n      * short_term: 保存当前任务相关的临时信息"
+                memory_prompts += "\n      * project_long_term: 保存与当前项目相关的长期信息（如：架构决策、关键配置、特定实现）"
+                memory_prompts += "\n      * global_long_term: 保存通用的信息、用户喜好、知识、方法等（如：常用命令、个人偏好、解决方案）"
+                memory_prompts += "\n      * short_term: 保存当前任务相关的临时信息（如：当前处理的文件、用户中间需求）"
 
             # 如果有retrieve_memory工具，添加相关提示
             if "retrieve_memory" in tool_names:
-                memory_prompts += (
-                    "\n    - 如果需要检索相关记忆信息，请调用retrieve_memory工具"
-                )
+                memory_prompts += "\n    - 如果需要获取上下文或寻找解决方案，请调用retrieve_memory工具检索相关记忆"
 
         return memory_prompts

{jarvis_ai_assistant-0.3.0 → jarvis_ai_assistant-0.3.1}/src/jarvis/jarvis_data/config_schema.json

@@ -245,6 +245,11 @@
       "description": "是否启用静态代码分析",
       "default": true
     },
+    "JARVIS_FORCE_SAVE_MEMORY": {
+      "type": "boolean",
+      "description": "是否强制保存记忆",
+      "default": true
+    },
     "JARVIS_TOOL_GROUP": {
       "type": "string",
       "description": "选择一个预定义的工具配置组",
@@ -391,10 +396,6 @@
       "type": "string",
       "description": "AI8 API Key"
     },
-    "OYI_API_KEY": {
-      "type": "string",
-      "description": "Oyi API Key"
-    },
     "SHELL": {
       "type": "string",
       "description": "系统Shell路径，用于获取当前使用的shell类型",

{jarvis_ai_assistant-0.3.0 → jarvis_ai_assistant-0.3.1}/src/jarvis/jarvis_platform_manager/service.py

@@ -195,11 +195,16 @@ def start_service(
         if "/" in model:
             platform_name, model_name = model.split("/", 1)
         else:
-            # Use default platform and model if not specified
-            if default_platform and default_model:
-                platform_name, model_name = default_platform, default_model
+            # Use default platform if not specified in the model name
+            if default_platform:
+                platform_name = default_platform
+                model_name = model
             else:
-                platform_name, model_name = "oyi", model  # Default to OYI platform
+                raise HTTPException(
+                    status_code=400,
+                    detail="Model name must be in 'platform/model_name' format "
+                    "or a default platform must be set.",
+                )
 
         # Get platform instance
         platform = get_platform_instance(platform_name, model_name)

{jarvis_ai_assistant-0.3.0 → jarvis_ai_assistant-0.3.1}/src/jarvis/jarvis_tools/search_web.py

@@ -31,7 +31,7 @@ class SearchWebTool:
         """执行网络搜索、抓取内容并总结结果。"""
         try:
             PrettyOutput.print("▶️ 使用 DuckDuckGo 开始网页搜索...", OutputType.INFO)
-            results = list(DDGS().text(query, max_results=50))
+            results = list(DDGS().text(query, max_results=50, page=3))
 
             if not results:
                 return {

{jarvis_ai_assistant-0.3.0 → jarvis_ai_assistant-0.3.1}/src/jarvis/jarvis_utils/config.py

@@ -339,6 +339,16 @@ def is_print_prompt() -> bool:
     return GLOBAL_CONFIG_DATA.get("JARVIS_PRINT_PROMPT", False) == True
 
 
+def is_force_save_memory() -> bool:
+    """
+    获取是否强制保存记忆。
+
+    返回：
+        bool: 如果强制保存记忆则返回True，默认为True
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_FORCE_SAVE_MEMORY", True) is True
+
+
 def is_enable_static_analysis() -> bool:
     """
     获取是否启用静态代码分析。

{jarvis_ai_assistant-0.3.0 → jarvis_ai_assistant-0.3.1/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.0
+Version: 0.3.1
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire