jarvis-ai-assistant 0.1.42__py3-none-any.whl → 0.1.43__py3-none-any.whl

jarvis/__init__.py

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

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/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/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/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/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/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/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/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/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.dist-info → jarvis_ai_assistant-0.1.43.dist-info}/METADATA

@@ -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.dist-info → jarvis_ai_assistant-0.1.43.dist-info}/RECORD

@@ -1,32 +1,32 @@
-jarvis/__init__.py,sha256=reJZgg3xnrq70dlR2vezFlcaoE7Jp3x5XPYaNTXTUcU,50
-jarvis/agent.py,sha256=X9-vfGsEVAgJ5EoS7cctfvfNxQyan3OFRdReKlHc-ro,12215
-jarvis/main.py,sha256=69HjqIUf1SNXNnrWQffN3XAnAAgiNpTNwbOZolNRHdQ,5831
+jarvis/__init__.py,sha256=OJVxHJQi99bOxMOkdKLvxRutQ_Lc4AyKCH4e-FnQNfw,50
+jarvis/agent.py,sha256=5GmC9iAOerTR4JoxzrfgLSspoz6qRm1E6xEIWLTR2OI,12222
+jarvis/main.py,sha256=3kpohHORc13A5RBjTSHYF7cdnc6W15hO23R78Iqnz8w,5843
 jarvis/utils.py,sha256=JlkuC9RtspXH2VWDmj9nR0vnb8ie1gIsKc4vC7WRco8,7321
-jarvis/__pycache__/__init__.cpython-313.pyc,sha256=mXb2FNtTXbPBTp5kdbV41lHYlIU96mTuLqD1p7PYMaU,209
-jarvis/__pycache__/agent.cpython-313.pyc,sha256=bG6QMODz8G5hxIxKusjQFXS5JZGAWJYqhHmUjsB2jro,15863
-jarvis/__pycache__/main.cpython-313.pyc,sha256=PCIqdoAHPetp3Enxqgpeo9AjOX8ViWi2Al3oiBRhqL0,8121
+jarvis/__pycache__/__init__.cpython-313.pyc,sha256=FWB9E8zChLF1EI0hTB-cEMjRy5wB24APzutV1cZJLqY,209
+jarvis/__pycache__/agent.cpython-313.pyc,sha256=H7FXCYJSJm0k062oMVFZx1unUD-khreKrZfaKQ2aJqY,15870
+jarvis/__pycache__/main.cpython-313.pyc,sha256=-tDMANWAyPk45zx-lnxM1_uxTUzEqrWwcBe2nWtzH2E,8133
 jarvis/__pycache__/models.cpython-313.pyc,sha256=uWuRIjGrY4YDB3dGW5PGDLWaS03et8g11O725TjY_eU,5960
 jarvis/__pycache__/tools.cpython-313.pyc,sha256=lAD4LrnnWzNZQmHXGfZ_2l7oskOpr2_2OC-gdFhxQY8,33933
 jarvis/__pycache__/utils.cpython-313.pyc,sha256=eXXM-V-2ax7qBNxktdUrEIwhAXPQHAlI7gLGewlKOj4,10276
 jarvis/__pycache__/zte_llm.cpython-313.pyc,sha256=kMm9IGundGmOPqjsgrm9oIaWLDagYGCPRAaE3ipkc-0,5662
 jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
-jarvis/models/ai8.py,sha256=OVBsRuxtttpkGHWe4N1lXoOqDcUMtvyHAxKSN7DzMxI,11466
-jarvis/models/base.py,sha256=kLeT1ajmyMRTAtYDa_XDhS319BapQTmm0cfXzda2AxQ,1135
-jarvis/models/kimi.py,sha256=IsX0d5DcdpUFbXBQi6K-V5SYD8UdPykh_WXDxYbxOJw,17067
-jarvis/models/openai.py,sha256=M5WKBFCfKXGUYGyvK03NIcslHl9H7eKd-sd_R9bnGqw,4018
-jarvis/models/oyi.py,sha256=jTwtrnPF2_vMVBsxdtw7tjWqJWfB1r7rSwfzl2oZj6A,12315
-jarvis/models/registry.py,sha256=imV-P-i8NgPSHFbAwp0ERRNg8b1D8aF2yy-CS5uFDuU,7785
+jarvis/models/ai8.py,sha256=d1h3L32QBfyf5iQvyncTo-RfvA-kTDGrL7gtxAL6gDg,11609
+jarvis/models/base.py,sha256=CMjODEh2c9KbCMfQGF7WgGbn-CfpIaGdA5yK1RxKMLY,1282
+jarvis/models/kimi.py,sha256=N0bPQ1ugx0RwjR96jLchmOPvCmws-fXyA0mnOAdo2k4,17161
+jarvis/models/openai.py,sha256=pB7AaZuorHlmudTPaUnEbFOyl51Fy6uhU9KQBm98Ov8,4156
+jarvis/models/oyi.py,sha256=2-PTdoboHl0Jtn0RrBXC7gSCYbI9_yVUmNDBVYw-U5M,12458
+jarvis/models/registry.py,sha256=iVBjN9ImEvGHcz8WR-z8pPMJQZI907o_nccVOFANhak,7951
 jarvis/models/__pycache__/__init__.cpython-313.pyc,sha256=b9Z3owWpzLnKKwqQH6bWHZJZDeThHGD9Oa7TMCpyHwc,224
-jarvis/models/__pycache__/ai8.cpython-313.pyc,sha256=0pQRw9zxJtEISdOU62LucLUFYgq6aOCmHtutcQnz9cU,14769
-jarvis/models/__pycache__/base.cpython-313.pyc,sha256=7FnbUVRV2M9JTUYBk0VaCEkBTuc6ykWbB6MgCxIYTH4,2231
-jarvis/models/__pycache__/kimi.cpython-313.pyc,sha256=r1kKcog7gGtnOQ_XbZ3cEvE-zeRF9Shpq5a-B-ntYSc,21473
-jarvis/models/__pycache__/openai.cpython-313.pyc,sha256=EkUONtkFt5gytqondwWrtAeCruEoSNytVRtT1zG-DBU,6178
-jarvis/models/__pycache__/oyi.cpython-313.pyc,sha256=LKcD5gx8TTY0CXYzMeMSYHJH6CuLb4UcjzRo0rMbvbg,14238
-jarvis/models/__pycache__/registry.cpython-313.pyc,sha256=ID2xq5EO2ZbZTvNKi4sqkLXpgxO7xTzfgTdo2GsLLes,10106
+jarvis/models/__pycache__/ai8.cpython-313.pyc,sha256=Bu4NXc_CV-GViEL55b0keW6coToPW9aYXhTcOsZIcvg,14972
+jarvis/models/__pycache__/base.cpython-313.pyc,sha256=Bsu0p7yNCNa4jO-i2A58i3H3xYzxzhtty5BeHAC5lmE,2488
+jarvis/models/__pycache__/kimi.cpython-313.pyc,sha256=uqDghVAZe5bpw9RtVGoiFd3-hJnIkhbNDaBdrAwiq2w,21662
+jarvis/models/__pycache__/openai.cpython-313.pyc,sha256=3buu7rqBwDV8mJ4wMff6xy_8pf6XPt2NYTlfIdPpz8M,6384
+jarvis/models/__pycache__/oyi.cpython-313.pyc,sha256=49JKEc1tGhbdMV0PiBRnGxq4OGAfNnKmozNw87aRmP8,14441
+jarvis/models/__pycache__/registry.cpython-313.pyc,sha256=iL3zjkiOC-xUnW3SLV_UN1P_CaxS8-RJm5njLZ1z3cg,10384
 jarvis/tools/__init__.py,sha256=Kj1bKj34lwRDKMKHLOrLyQElf2lHbqA2tDgP359eaDo,71
 jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
 jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
-jarvis/tools/generator.py,sha256=eboA5wd5NtbnWlpmKZfc-t8c5T6dvzEqsYiiS1v8tIs,5742
+jarvis/tools/generator.py,sha256=vVP3eN5cCDpRXf_fn0skETkPXAW1XZFWx9pt2_ahK48,5999
 jarvis/tools/methodology.py,sha256=G3cOaHTMujGZBhDLhQEqyCV2NISizO3MXRuho1KfI6Y,5223
 jarvis/tools/registry.py,sha256=NbH7A4A2lyN2IoyZGFwa5Ghed2dpzbJWCAd1Dg95WBI,7183
 jarvis/tools/shell.py,sha256=UPKshPyOaUwTngresUw-ot1jHjQIb4wCY5nkJqa38lU,2520
@@ -37,7 +37,7 @@ jarvis/tools/__pycache__/bing_search.cpython-313.pyc,sha256=1G_wPbk5wcQYh7H0drLI
 jarvis/tools/__pycache__/calculator.cpython-313.pyc,sha256=C_qwTDGm6gc7QNxtPzPZXyStdKEintJVQIt5NMHQ8oY,4205
 jarvis/tools/__pycache__/calculator_tool.cpython-313.pyc,sha256=PI4LZNDTPdSe3ffWDRovLZ-r-vF8Kl-n6xdGdFWiBpY,4296
 jarvis/tools/__pycache__/file_ops.cpython-313.pyc,sha256=qfgRIcO7JFsa_FxOOXV-3pNSnlovZDrcIkZ1WN3pOJI,3773
-jarvis/tools/__pycache__/generator.cpython-313.pyc,sha256=6gEf-2nlMX6JLrEpaEPRIcb2daF4FlNAe1k-xlH-sgA,6154
+jarvis/tools/__pycache__/generator.cpython-313.pyc,sha256=KxHCnyEZTUL3pNozcUWhMHG-cq2HAJOvi3cOEVSPX_A,6561
 jarvis/tools/__pycache__/methodology.cpython-313.pyc,sha256=GWPSF5b0i6gUsgvJgXIkVQHpLRYQ7OzEiTLwe6aAuWU,6226
 jarvis/tools/__pycache__/python_script.cpython-313.pyc,sha256=8JpryqTovEiTvBlWAK1KjZmPvHUuPc9GT9rTXBEQoJc,6693
 jarvis/tools/__pycache__/rag.cpython-313.pyc,sha256=JH6-PSZRMKAvTZqCwlRXJGClxYXNMs-vetU0q7hBLz0,6064
@@ -49,9 +49,9 @@ jarvis/tools/__pycache__/user_confirmation.cpython-313.pyc,sha256=wK3Ev10lHSUSRv
 jarvis/tools/__pycache__/user_input.cpython-313.pyc,sha256=JjTFOhObKsKF4Pn8KBRuKfV1_Ssj083fjU7Mfc_5z7c,2531
 jarvis/tools/__pycache__/user_interaction.cpython-313.pyc,sha256=RuVZ-pmiPBDywY3efgXSfohMAciC1avMGPmBK5qlnew,3305
 jarvis/tools/__pycache__/webpage.cpython-313.pyc,sha256=BjzSfnNzsKCrLETCcWjt32lNDLzwnjqcVGg4JfWd9OM,3008
-jarvis_ai_assistant-0.1.42.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.42.dist-info/METADATA,sha256=qFDHaq08PqwJ8AkhHrP0R_EAwvzHuZtRdqD3g9rxOPk,10015
-jarvis_ai_assistant-0.1.42.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.42.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
-jarvis_ai_assistant-0.1.42.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.42.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.43.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.43.dist-info/METADATA,sha256=BolaQ4qPW5JleYCO9bdksEjAEgBVCuJVXIFs6zzlLz8,10015
+jarvis_ai_assistant-0.1.43.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.43.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.43.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.43.dist-info/RECORD,,