jarvis-ai-assistant 0.1.42__tar.gz → 0.1.43__tar.gz

{jarvis_ai_assistant-0.1.42/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.42
+Version: 0.1.43
 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.1.42 → jarvis_ai_assistant-0.1.43}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.42"
+version = "0.1.43"
 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" }]

{jarvis_ai_assistant-0.1.42 → jarvis_ai_assistant-0.1.43}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.42",
+    version="0.1.43",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.1.42 → jarvis_ai_assistant-0.1.43}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.42" 
+__version__ = "0.1.43" 

{jarvis_ai_assistant-0.1.42 → jarvis_ai_assistant-0.1.43}/src/jarvis/agent.py

@@ -20,7 +20,7 @@ class Agent:
             name: Agent名称，默认为"Jarvis"
             is_sub_agent: 是否为子Agent，默认为False
         """
-        self.model = PlatformRegistry.get_platform()
+        self.model = PlatformRegistry.get_global_platform()
         self.tool_registry = ToolRegistry.get_global_tool_registry()
         self.name = name
         self.is_sub_agent = is_sub_agent

{jarvis_ai_assistant-0.1.42 → jarvis_ai_assistant-0.1.43}/src/jarvis/main.py

@@ -114,7 +114,7 @@ def main():
         PrettyOutput.print("未指定AI平台，请使用 -p 参数或者设置 JARVIS_PLATFORM 环境变量", OutputType.ERROR)
         return 1
 
-    PlatformRegistry.get_platform_registry().set_global_platform(platform)
+    PlatformRegistry.get_global_platform_registry().set_global_platform_name(platform)
     
     try:
         # 获取全局模型实例

{jarvis_ai_assistant-0.1.42 → jarvis_ai_assistant-0.1.43}/src/jarvis/models/ai8.py

@@ -62,11 +62,15 @@ class AI8Model(BasePlatform):
         self.system_message = ""
         self.conversation = None
         self.files = []
-        self.model = os.getenv("AI8_MODEL") or "deepseek-chat"
+        self.model_name = os.getenv("AI8_MODEL") or "deepseek-chat"
         self.token = os.getenv("AI8_API_KEY")
-        if not all([self.model, self.token]):
+        if not all([self.model_name, self.token]):
             raise Exception("AI8_MODEL or AI8_API_KEY is not set")
-        PrettyOutput.print(f"当前使用模型: {self.model}", OutputType.SYSTEM)
+        PrettyOutput.print(f"当前使用模型: {self.model_name}", OutputType.SYSTEM)
+
+    def set_model_name(self, model_name: str):
+        """设置模型名称"""
+        self.model_name = model_name
             
     def create_conversation(self) -> bool:
         """Create a new conversation"""
@@ -102,7 +106,7 @@ class AI8Model(BasePlatform):
             # 2. 更新会话设置
             session_data = {
                 **self.conversation,
-                "model": self.model,
+                "model": self.model_name,
                 "contextCount": 1024,
                 "prompt": self.system_message,
                 "plugins": ["tavily_search"],
@@ -228,7 +232,7 @@ class AI8Model(BasePlatform):
             
     def name(self) -> str:
         """Return model name"""
-        return self.model
+        return self.model_name
         
     def reset(self):
         """Reset model state"""

{jarvis_ai_assistant-0.1.42 → jarvis_ai_assistant-0.1.43}/src/jarvis/models/base.py

@@ -9,8 +9,11 @@ class BasePlatform(ABC):
     def __init__(self):
         """初始化模型"""
         pass
+
+    def set_model_name(self, model_name: str):
+        """设置模型名称"""
+        raise NotImplementedError("set_model_name is not implemented")
         
-    
     @abstractmethod
     def chat(self, message: str) -> str:
         """执行对话"""

{jarvis_ai_assistant-0.1.42 → jarvis_ai_assistant-0.1.43}/src/jarvis/models/kimi.py

@@ -45,6 +45,10 @@ class KimiModel(BasePlatform):
         """设置系统消息"""
         self.system_message = message
 
+    def set_model_name(self, model_name: str):
+        """设置模型名称"""
+        pass
+
     def _create_chat(self) -> bool:
         """创建新的对话会话"""
         url = "https://kimi.moonshot.cn/api/chat"

{jarvis_ai_assistant-0.1.42 → jarvis_ai_assistant-0.1.43}/src/jarvis/models/openai.py

@@ -30,9 +30,9 @@ class OpenAIModel(BasePlatform):
             raise Exception("OPENAI_API_KEY is not set")
             
         self.base_url = os.getenv("OPENAI_API_BASE", "https://api.deepseek.com")
-        self.model = os.getenv("OPENAI_MODEL_NAME", "deepseek-chat")
+        self.model_name = os.getenv("OPENAI_MODEL_NAME", "deepseek-chat")
 
-        PrettyOutput.print(f"当前使用模型: {self.model}", OutputType.SYSTEM)
+        PrettyOutput.print(f"当前使用模型: {self.model_name}", OutputType.SYSTEM)
             
         self.client = OpenAI(
             api_key=self.api_key,
@@ -41,6 +41,10 @@ class OpenAIModel(BasePlatform):
         self.messages: List[Dict[str, str]] = []
         self.system_message = ""
 
+    def set_model_name(self, model_name: str):
+        """设置模型名称"""
+        self.model_name = model_name
+
     def set_system_message(self, message: str):
         """设置系统消息"""
         self.system_message = message
@@ -55,7 +59,7 @@ class OpenAIModel(BasePlatform):
             self.messages.append({"role": "user", "content": message})
             
             response = self.client.chat.completions.create(
-                model=self.model,  # 使用配置的模型名称
+                model=self.model_name,  # 使用配置的模型名称
                 messages=self.messages,
                 stream=True
             )
@@ -82,7 +86,7 @@ class OpenAIModel(BasePlatform):
 
     def name(self) -> str:
         """返回模型名称"""
-        return self.model
+        return self.model_name
 
     def reset(self):
         """重置模型状态"""

{jarvis_ai_assistant-0.1.42 → jarvis_ai_assistant-0.1.43}/src/jarvis/models/oyi.py

@@ -47,11 +47,15 @@ class OyiModel(BasePlatform):
         self.conversation = None
         self.upload_files = []
         self.first_chat = True
-        self.model = os.getenv("OYI_MODEL") or "deepseek-chat"
+        self.model_name = os.getenv("OYI_MODEL") or "deepseek-chat"
         self.token = os.getenv("OYI_API_KEY")
-        if not all([self.model, self.token]):
+        if not all([self.model_name, self.token]):
             raise Exception("OYI_MODEL or OYI_API_KEY is not set")
-        PrettyOutput.print(f"当前使用模型: {self.model}", OutputType.SYSTEM)
+        PrettyOutput.print(f"当前使用模型: {self.model_name}", OutputType.SYSTEM)
+
+    def set_model_name(self, model_name: str):
+        """设置模型名称"""
+        self.model_name = model_name
 
         
     def create_conversation(self) -> bool:
@@ -71,7 +75,7 @@ class OyiModel(BasePlatform):
                 "isLock": False,
                 "systemMessage": "",
                 "params": json.dumps({
-                    "model": self.model,
+                    "model": self.model_name,
                     "is_webSearch": True,
                     "message": [],
                     "systemMessage": None,
@@ -202,7 +206,7 @@ class OyiModel(BasePlatform):
             
     def name(self) -> str:
         """Return model name"""
-        return self.model
+        return self.model_name
         
     def reset(self):
         """Reset model state"""

{jarvis_ai_assistant-0.1.42 → jarvis_ai_assistant-0.1.43}/src/jarvis/models/registry.py

@@ -130,7 +130,7 @@ class PlatformRegistry:
 
 
     @staticmethod
-    def get_platform_registry():
+    def get_global_platform_registry():
         """获取全局平台注册器"""
         if PlatformRegistry.global_platform_registry is None:
             PlatformRegistry.global_platform_registry = PlatformRegistry()
@@ -152,9 +152,9 @@ class PlatformRegistry:
         self.platforms: Dict[str, Type[BasePlatform]] = {}
 
     @staticmethod
-    def get_platform() -> BasePlatform:
+    def get_global_platform() -> BasePlatform:
         """获取全局平台实例"""
-        platform = PlatformRegistry.get_platform_registry().create_platform(PlatformRegistry.global_platform_name)
+        platform = PlatformRegistry.get_global_platform_registry().create_platform(PlatformRegistry.global_platform_name)
         if not platform:
             raise Exception(f"Failed to create platform: {PlatformRegistry.global_platform_name}")
         return platform
@@ -194,6 +194,10 @@ class PlatformRegistry:
         """获取可用平台列表"""
         return list(self.platforms.keys()) 
     
-    def set_global_platform(self, platform_name: str):
+    def set_global_platform_name(self, platform_name: str):
         """设置全局平台"""
         PlatformRegistry.global_platform_name = platform_name
+
+    def get_global_platform_name(self) -> str:
+        """获取全局平台名称"""
+        return PlatformRegistry.global_platform_name

{jarvis_ai_assistant-0.1.42 → jarvis_ai_assistant-0.1.43}/src/jarvis/tools/generator.py

@@ -1,3 +1,4 @@
+import os
 from typing import Dict, Any
 from pathlib import Path
 from jarvis.models.registry import PlatformRegistry
@@ -41,7 +42,11 @@ class ToolGeneratorTool:
 
     def _generate_tool_code(self, tool_name: str, class_name: str, description: str, parameters: Dict) -> str:
         """使用大模型生成工具代码"""
-        model = PlatformRegistry.get_platform()
+        platform_name = os.getenv("JARVIS_CODEGEN_PLATFORM") or PlatformRegistry.get_global_platform_name()
+        model = PlatformRegistry.create_platform(platform_name)
+        model_name = os.getenv("JARVIS_CODEGEN_MODEL")
+        if model_name:
+            model.set_model_name(model_name)
 
         prompt = f"""请生成一个Python工具类的代码，要求如下，除了代码，不要输出任何内容：
 

{jarvis_ai_assistant-0.1.42 → jarvis_ai_assistant-0.1.43/src/jarvis_ai_assistant.egg-info}/PKG-INFO

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