jarvis-ai-assistant 0.1.8__tar.gz → 0.1.10__tar.gz

{jarvis_ai_assistant-0.1.8/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.8
+Version: 0.1.10
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -17,12 +17,8 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: requests>=2.25.1
-Requires-Dist: beautifulsoup4>=4.9.3
-Requires-Dist: duckduckgo-search>=3.0.0
 Requires-Dist: pyyaml>=5.1
-Requires-Dist: ollama>=0.1.6
 Requires-Dist: colorama>=0.4.6
-Requires-Dist: openai>=1.2.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

{jarvis_ai_assistant-0.1.8 → jarvis_ai_assistant-0.1.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.8"
+version = "0.1.10"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "Your Name", email = "your.email@example.com" }]
@@ -21,12 +21,8 @@ classifiers = [
 keywords = ["jarvis", "ai", "assistant", "tools", "automation"]
 dependencies = [
     "requests>=2.25.1",
-    "beautifulsoup4>=4.9.3",
-    "duckduckgo-search>=3.0.0",
     "pyyaml>=5.1",
-    "ollama>=0.1.6",
     "colorama>=0.4.6",
-    "openai>=1.2.0",
 ]
 requires-python = ">=3.8"
 

{jarvis_ai_assistant-0.1.8 → jarvis_ai_assistant-0.1.10}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.8",
+    version="0.1.10",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -14,12 +14,8 @@ setup(
     include_package_data=True,
     install_requires=[
         "requests>=2.25.1",
-        "beautifulsoup4>=4.9.3",
-        "duckduckgo-search>=3.0.0",
         "pyyaml>=5.1",
-        "ollama>=0.1.6",
         "colorama>=0.4.6",
-        "openai>=1.2.0",
     ],
     entry_points={
         "console_scripts": [

{jarvis_ai_assistant-0.1.8 → jarvis_ai_assistant-0.1.10}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.8" 
+__version__ = "0.1.10" 

{jarvis_ai_assistant-0.1.8 → jarvis_ai_assistant-0.1.10}/src/jarvis/agent.py

@@ -24,8 +24,69 @@ class Agent:
         self.tool_registry = tool_registry or ToolRegistry(model)
         self.name = name
         self.is_sub_agent = is_sub_agent
+        self.messages = []
+
+
+    @staticmethod
+    def extract_tool_calls(content: str) -> List[Dict]:
+        """从内容中提取工具调用，如果检测到多个工具调用则抛出异常，并返回工具调用之前的内容和工具调用"""
+        # 分割内容为行
+        lines = content.split('\n')
+        tool_call_lines = []
+        in_tool_call = False
+        
+        # 逐行处理
+        for line in lines:
+            if '<START_TOOL_CALL>' in line:
+                in_tool_call = True
+                continue
+            elif '<END_TOOL_CALL>' in line:
+                if in_tool_call and tool_call_lines:
+                    try:
+                        # 直接解析YAML
+                        tool_call_text = '\n'.join(tool_call_lines)
+                        tool_call_data = yaml.safe_load(tool_call_text)
+                        
+                        # 验证必要的字段
+                        if "name" in tool_call_data and "arguments" in tool_call_data:
+                            # 返回工具调用之前的内容和工具调用
+                            return [{
+                                "name": tool_call_data["name"],
+                                "arguments": tool_call_data["arguments"]
+                            }]
+                        else:
+                            PrettyOutput.print("工具调用缺少必要字段", OutputType.ERROR)
+                            raise '工具调用缺少必要字段'
+                    except yaml.YAMLError as e:
+                        PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
+                        raise 'YAML解析错误'
+                    except Exception as e:
+                        PrettyOutput.print(f"处理工具调用时发生错误: {str(e)}", OutputType.ERROR)
+                        raise '处理工具调用时发生错误'
+                in_tool_call = False
+                continue
+            
+            if in_tool_call:
+                tool_call_lines.append(line)
+        
+        return []
+
+    def _call_model(self, messages: List[Dict]) -> Dict:
+        """调用模型获取响应"""
+        try:
+            return self.model.chat(
+                messages=messages,
+            )
+        except Exception as e:
+            raise Exception(f"{self.name}: 模型调用失败: {str(e)}")
+
+    def run(self, user_input: str) -> str:
+        """处理用户输入并返回响应，返回任务总结报告"""
+        self.clear_history()
+        
+        # 显示任务开始
+        PrettyOutput.section(f"开始新任务: {self.name}", OutputType.PLANNING)
 
-        # 构建工具说明
         tools_prompt = "可用工具:\n"
         for tool in self.tool_registry.get_all_tools():
             tools_prompt += f"- 名称: {tool['name']}\n"
@@ -34,8 +95,8 @@ class Agent:
 
         self.messages = [
             {
-                "role": "system",
-                "content": f"""你是 {name}，一个严格遵循 ReAct 框架进行逐步推理和行动的 AI 助手。
+                "role": "user",
+                "content": f"""你是 {self.name}，一个严格遵循 ReAct 框架进行逐步推理和行动的 AI 助手。
 
 {tools_prompt}
 
@@ -125,78 +186,12 @@ arguments:
 - 不要虚构对话
 - 每个动作后停止
 - 只在有实际用户输入时继续
+
+任务:
+{user_input}
 """
             }
         ]
-
-    @staticmethod
-    def extract_tool_calls(content: str) -> Tuple[str, List[Dict]]:
-        """从内容中提取工具调用，如果检测到多个工具调用则抛出异常，并返回工具调用之前的内容和工具调用"""
-        # 分割内容为行
-        lines = content.split('\n')
-        tool_call_lines = []
-        content_lines = []  # 存储工具调用之前的内容
-        in_tool_call = False
-        
-        # 逐行处理
-        for line in lines:
-            content_lines.append(line)  # 所有内容都添加到 content_lines
-            
-            if '<START_TOOL_CALL>' in line:
-                in_tool_call = True
-                continue
-            elif '<END_TOOL_CALL>' in line:
-                if in_tool_call and tool_call_lines:
-                    try:
-                        # 直接解析YAML
-                        tool_call_text = '\n'.join(tool_call_lines)
-                        tool_call_data = yaml.safe_load(tool_call_text)
-                        
-                        # 验证必要的字段
-                        if "name" in tool_call_data and "arguments" in tool_call_data:
-                            # 返回工具调用之前的内容和工具调用
-                            return '\n'.join(content_lines), [{
-                                "name": tool_call_data["name"],
-                                "arguments": tool_call_data["arguments"]
-                            }]
-                        else:
-                            PrettyOutput.print("工具调用缺少必要字段", OutputType.ERROR)
-                            raise '工具调用缺少必要字段'
-                    except yaml.YAMLError as e:
-                        PrettyOutput.print(f"YAML解析错误: {str(e)}", OutputType.ERROR)
-                        raise 'YAML解析错误'
-                    except Exception as e:
-                        PrettyOutput.print(f"处理工具调用时发生错误: {str(e)}", OutputType.ERROR)
-                        raise '处理工具调用时发生错误'
-                in_tool_call = False
-                continue
-            
-            if in_tool_call:
-                tool_call_lines.append(line)
-        
-        # 如果没有找到有效的工具调用，返回原始内容
-        return '\n'.join(content_lines), []
-
-    def _call_model(self, messages: List[Dict]) -> Dict:
-        """调用模型获取响应"""
-        try:
-            return self.model.chat(
-                messages=messages,
-            )
-        except Exception as e:
-            raise Exception(f"{self.name}: 模型调用失败: {str(e)}")
-
-    def run(self, user_input: str) -> str:
-        """处理用户输入并返回响应，返回任务总结报告"""
-        self.clear_history()
-        
-        # 显示任务开始
-        PrettyOutput.section(f"开始新任务: {self.name}", OutputType.PLANNING)
-        
-        self.messages.append({
-            "role": "user",
-            "content": user_input
-        })
         
         while True:
             try:
@@ -218,15 +213,15 @@ arguments:
 
                 self.messages.append({
                     "role": "assistant",
-                    "content": result[0]
+                    "content": current_response
                 })
 
                 
-                if len(result[1]) > 0:
+                if len(result) > 0:
                     try:
                         # 显示工具调用
                         PrettyOutput.print("执行工具调用...", OutputType.PROGRESS)
-                        tool_result = self.tool_registry.handle_tool_calls(result[1])
+                        tool_result = self.tool_registry.handle_tool_calls(result)
                         PrettyOutput.print(tool_result, OutputType.RESULT)
                     except Exception as e:
                         PrettyOutput.print(str(e), OutputType.ERROR)
@@ -295,4 +290,5 @@ arguments:
 
     def clear_history(self):
         """清除对话历史，只保留系统提示"""
-        self.messages = [self.messages[0]] 
+        self.messages = [] 
+        self.model.reset()

{jarvis_ai_assistant-0.1.8 → jarvis_ai_assistant-0.1.10}/src/jarvis/main.py

@@ -12,33 +12,9 @@ sys.path.insert(0, str(Path(__file__).parent.parent))
 
 from jarvis.agent import Agent
 from jarvis.tools import ToolRegistry
-from jarvis.models import DDGSModel, OllamaModel, OpenAIModel
+from jarvis.models import KimiModel
 from jarvis.utils import PrettyOutput, OutputType, get_multiline_input, load_env_from_file
-from jarvis.zte_llm import create_zte_llm
 
-# 定义支持的平台和模型
-SUPPORTED_PLATFORMS = {
-    "ollama": {
-        "models": ["qwen2.5:14b", "qwq"],
-        "default": "qwen2.5:14b",
-        "allow_custom": True
-    },
-    "ddgs": {
-        "models": ["gpt-4o-mini", "claude-3-haiku", "llama-3.1-70b", "mixtral-8x7b"],
-        "default": "gpt-4o-mini",
-        "allow_custom": False
-    },
-    "zte": {
-        "models": ["NebulaBiz", "nebulacoder", "NTele-72B"],
-        "default": "NebulaBiz",
-        "allow_custom": False
-    },
-    "openai": {
-        "models": ["deepseek-chat"],
-        "default": "deepseek-chat",
-        "allow_custom": True
-    }
-}
 
 def load_tasks() -> dict:
     """Load tasks from .jarvis file if it exists."""
@@ -98,75 +74,20 @@ def main():
     """Main entry point for Jarvis."""
 
     load_env_from_file()
-
-    parser = argparse.ArgumentParser(description="Jarvis AI Assistant")
-    
-    # 添加平台选择参数
-    parser.add_argument(
-        "--platform",
-        choices=list(SUPPORTED_PLATFORMS.keys()),
-        default=os.getenv("JARVIS_PLATFORM") or "ddgs",
-        help="选择运行平台 (默认: ollama)"
-    )
-    
-    # 添加模型选择参数
-    parser.add_argument(
-        "--model",
-        help="选择模型 (默认: 根据平台自动选择)"
-    )
-    
-    # 添加API基础URL参数
-    parser.add_argument(
-        "--api-base",
-        default=os.getenv("JARVIS_OLLAMA_API_BASE") or "http://localhost:11434",
-        help="Ollama API基础URL (仅用于Ollama平台, 默认: http://localhost:11434)"
-    )
-    
-    args = parser.parse_args()
-
-    args.model = args.model or os.getenv("JARVIS_MODEL")
     
-    # 修改模型验证逻辑
-    if args.model:
-        if (args.model not in SUPPORTED_PLATFORMS[args.platform]["models"] and 
-            not SUPPORTED_PLATFORMS[args.platform]["allow_custom"]):
-            supported_models = ", ".join(SUPPORTED_PLATFORMS[args.platform]["models"])
-            PrettyOutput.print(
-                f"错误: 平台 {args.platform} 不支持模型 {args.model}\n"
-                f"支持的模型: {supported_models}",
-                OutputType.ERROR
-            )
-            return 1
-    else:
-        args.model = SUPPORTED_PLATFORMS[args.platform]["default"]
-
     try:
-        # 根据平台创建相应的模型实例
-        if args.platform == "ollama":
-            model = OllamaModel(
-                model_name=args.model,
-                api_base=args.api_base
-            )
-            platform_name = f"Ollama ({args.model})"
-        elif args.platform == "ddgs":  # ddgs
-            model = DDGSModel(model_name=args.model)
-            platform_name = f"DuckDuckGo Search ({args.model})"
-        elif args.platform == "zte":  # zte
-            model = create_zte_llm(model_name=args.model)
-            platform_name = f"ZTE ({args.model})"
-        elif args.platform == "openai":
-            model = OpenAIModel(
-                model_name=args.model,
-                api_key=os.getenv("OPENAI_API_KEY"),
-                api_base=os.getenv("OPENAI_API_BASE")
-            )
-            platform_name = f"OpenAI ({args.model})"
+        kimi_api_key = os.getenv("KIMI_API_KEY")
+        if not kimi_api_key:
+            PrettyOutput.print("Kimi API key 未设置", OutputType.ERROR)
+            return 1
+        
+        model = KimiModel(kimi_api_key)
 
         tool_registry = ToolRegistry(model)
         agent = Agent(model, tool_registry)
 
         # 欢迎信息
-        PrettyOutput.print(f"Jarvis 已初始化 - {platform_name}", OutputType.SYSTEM)
+        PrettyOutput.print(f"Jarvis 已初始化 - With Kimi", OutputType.SYSTEM)
         
         # 加载预定义任务
         tasks = load_tasks()

jarvis_ai_assistant-0.1.10/src/jarvis/models/__init__.py

@@ -0,0 +1,11 @@
+from typing import Dict, List, Optional, Tuple
+from duckduckgo_search import DDGS
+import ollama
+import yaml
+import openai
+
+from ..utils import OutputType, PrettyOutput
+from .base import BaseModel
+from .kimi import KimiModel
+
+__all__ = ['BaseModel', 'KimiModel'] 

jarvis_ai_assistant-0.1.10/src/jarvis/models/base.py

@@ -0,0 +1,15 @@
+from abc import ABC, abstractmethod
+from typing import Dict, List
+
+class BaseModel(ABC):
+    """大语言模型基类"""
+    
+    @abstractmethod
+    def chat(self, messages: List[Dict]) -> str:
+        """执行对话"""
+        pass 
+
+    def reset(self):
+        """重置模型"""
+        pass
+        

jarvis_ai_assistant-0.1.10/src/jarvis/models/kimi.py

@@ -0,0 +1,135 @@
+from typing import Dict, List
+import requests
+import json
+import os
+from .base import BaseModel
+from ..utils import PrettyOutput, OutputType
+import time
+
+class KimiModel(BaseModel):
+    """Kimi模型实现"""
+    
+    def __init__(self, api_key: str = None):
+        """
+        初始化Kimi模型
+        Args:
+            api_key: Kimi API密钥，如果不提供则从环境变量获取
+        """
+        self.api_key = api_key or os.getenv("KIMI_API_KEY")
+        if not self.api_key:
+            raise Exception("KIMI_API_KEY is not set")
+        self.auth_header = f"Bearer {self.api_key}"
+        self.chat_id = ""
+
+    def _create_chat(self) -> bool:
+        """创建新的对话会话"""
+        url = "https://kimi.moonshot.cn/api/chat"
+        payload = json.dumps({
+            "name": "未命名会话",
+            "is_example": False,
+            "kimiplus_id": "kimi"
+        })
+        headers = {
+            'Authorization': self.auth_header,
+            'Content-Type': 'application/json'
+        }
+        try:
+            response = requests.request("POST", url, headers=headers, data=payload)
+            self.chat_id = response.json()["id"]
+            return True
+        except Exception as e:
+            PrettyOutput.print(f"Failed to create chat: {e}", OutputType.ERROR)
+            return False
+
+    def chat(self, messages: List[Dict]) -> str:
+        """
+        实现BaseModel的chat方法
+        Args:
+            messages: 对话消息列表
+        Returns:
+            str: 模型的回复内容
+        """
+        if not self.chat_id:
+            if not self._create_chat():
+                raise Exception("Failed to create chat")
+        
+        url = f"https://kimi.moonshot.cn/api/chat/{self.chat_id}/completion/stream"
+        payload = json.dumps({
+            "messages": [messages[-1]],
+            "use_search": True,
+            "extend": {
+                "sidebar": True
+            },
+            "kimiplus_id": "kimi",
+            "use_research": False,
+            "use_math": False,
+            "refs": [],
+            "refs_file": []
+        })
+        headers = {
+            'Authorization': self.auth_header,
+            'Content-Type': 'application/json'
+        }
+
+        try:
+            response = requests.request("POST", url, headers=headers, data=payload, stream=True)
+            full_response = ""
+            references = []
+            
+            for line in response.iter_lines():
+                if not line:
+                    continue
+                
+                line = line.decode('utf-8')
+                if not line.startswith("data: "):
+                    continue
+                
+                try:
+                    data = json.loads(line[6:])  # 去掉 "data: " 前缀
+                    
+                    # 处理不同类型的事件
+                    if data.get("event") == "cmpl":
+                        if "text" in data:
+                            text = data["text"]
+                            PrettyOutput.print_stream(text, OutputType.SYSTEM)  # 使用统一的流式输出
+                            full_response += text
+                    elif data.get("event") == "ref_docs":
+                        if "ref_cards" in data:
+                            for ref in data["ref_cards"]:
+                                reference = {
+                                    "title": ref.get("title", ""),
+                                    "url": ref.get("url", ""),
+                                    "abstract": ref.get("abstract", "")
+                                }
+                                references.append(reference)
+                                PrettyOutput.print(f"\n参考来源: {reference['title']} - {reference['url']}", 
+                                                 OutputType.INFO)
+                    elif data.get("event") == "error":
+                        error_msg = data.get("error", "Unknown error")
+                        raise Exception(f"Chat error: {error_msg}")
+                    elif data.get("event") == "all_done":
+                        break
+                    
+                except json.JSONDecodeError:
+                    continue
+            
+            # 如果有参考文献，在回答后面添加引用信息
+            if references:
+                full_response += "\n\n参考来源:\n"
+                for i, ref in enumerate(references, 1):
+                    full_response += f"{i}. {ref['title']} - {ref['url']}\n"
+            
+            PrettyOutput.print_stream_end()  # 结束流式输出
+            return full_response
+
+        except Exception as e:
+            raise Exception(f"Kimi API调用失败: {str(e)}")
+        
+    def reset(self):
+        """重置模型"""
+        self.chat_id = ""
+
+
+if __name__ == "__main__":
+    kimi = KimiModel()
+    print(kimi.chat([{"role": "user", "content": "ollama如何部署"}]))

{jarvis_ai_assistant-0.1.8 → jarvis_ai_assistant-0.1.10}/src/jarvis/tools/__init__.py

@@ -1,14 +1,10 @@
 from .base import Tool, ToolRegistry
 from .file_ops import FileOperationTool
-from .search import SearchTool
 from .shell import ShellTool
-from .webpage import WebpageTool
 
 __all__ = [
     'Tool',
     'ToolRegistry',
     'FileOperationTool',
-    'SearchTool',
     'ShellTool',
-    'WebpageTool',
 ] 

{jarvis_ai_assistant-0.1.8 → jarvis_ai_assistant-0.1.10}/src/jarvis/tools/base.py

@@ -30,18 +30,12 @@ class ToolRegistry:
 
     def _register_default_tools(self):
         """注册所有默认工具"""
-        from .search import SearchTool
         from .shell import ShellTool
         from .file_ops import FileOperationTool
-        from .webpage import WebpageTool
-        from .sub_agent import SubAgentTool
 
         tools = [
-            SearchTool(self.model),
             ShellTool(),
             FileOperationTool(),
-            WebpageTool(),
-            SubAgentTool(self.model)
         ]
 
         for tool in tools:

{jarvis_ai_assistant-0.1.8 → jarvis_ai_assistant-0.1.10/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.8
+Version: 0.1.10
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -17,12 +17,8 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Requires-Dist: requests>=2.25.1
-Requires-Dist: beautifulsoup4>=4.9.3
-Requires-Dist: duckduckgo-search>=3.0.0
 Requires-Dist: pyyaml>=5.1
-Requires-Dist: ollama>=0.1.6
 Requires-Dist: colorama>=0.4.6
-Requires-Dist: openai>=1.2.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

{jarvis_ai_assistant-0.1.8 → jarvis_ai_assistant-0.1.10}/src/jarvis_ai_assistant.egg-info/SOURCES.txt

@@ -5,9 +5,7 @@ setup.py
 src/jarvis/__init__.py
 src/jarvis/agent.py
 src/jarvis/main.py
-src/jarvis/models.py
 src/jarvis/utils.py
-src/jarvis/zte_llm.py
 src/jarvis/__pycache__/__init__.cpython-313.pyc
 src/jarvis/__pycache__/agent.cpython-313.pyc
 src/jarvis/__pycache__/main.cpython-313.pyc
@@ -15,13 +13,16 @@ src/jarvis/__pycache__/models.cpython-313.pyc
 src/jarvis/__pycache__/tools.cpython-313.pyc
 src/jarvis/__pycache__/utils.cpython-313.pyc
 src/jarvis/__pycache__/zte_llm.cpython-313.pyc
+src/jarvis/models/__init__.py
+src/jarvis/models/base.py
+src/jarvis/models/kimi.py
+src/jarvis/models/__pycache__/__init__.cpython-313.pyc
+src/jarvis/models/__pycache__/base.cpython-313.pyc
+src/jarvis/models/__pycache__/kimi.cpython-313.pyc
 src/jarvis/tools/__init__.py
 src/jarvis/tools/base.py
 src/jarvis/tools/file_ops.py
-src/jarvis/tools/search.py
 src/jarvis/tools/shell.py
-src/jarvis/tools/sub_agent.py
-src/jarvis/tools/webpage.py
 src/jarvis/tools/__pycache__/__init__.cpython-313.pyc
 src/jarvis/tools/__pycache__/base.cpython-313.pyc
 src/jarvis/tools/__pycache__/bing_search.cpython-313.pyc

{jarvis_ai_assistant-0.1.8 → jarvis_ai_assistant-0.1.10}/src/jarvis_ai_assistant.egg-info/requires.txt

@@ -1,10 +1,6 @@
 requests>=2.25.1
-beautifulsoup4>=4.9.3
-duckduckgo-search>=3.0.0
 pyyaml>=5.1
-ollama>=0.1.6
 colorama>=0.4.6
-openai>=1.2.0
 
 [dev]
 pytest