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

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

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

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

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.42",
+    version="0.1.44",
     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.44}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.42 → jarvis_ai_assistant-0.1.44}/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.44}/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.44}/src/jarvis/models/ai8.py

@@ -14,59 +14,64 @@ class AI8Model(BasePlatform):
     
     def __init__(self):
         """Initialize model"""
-        PrettyOutput.section("支持的模型", OutputType.SUCCESS)
-
-        PrettyOutput.print("gpt-3.5-turbo", OutputType.INFO)
-        PrettyOutput.print("gpt-4-turbo", OutputType.INFO)
-        PrettyOutput.print("gpt-4o", OutputType.INFO)
-        PrettyOutput.print("gpt-4o-mini", OutputType.INFO)
-        PrettyOutput.print("o1-mini", OutputType.INFO)
-        PrettyOutput.print("gpt-4-vision-preview", OutputType.INFO)
-        PrettyOutput.print("gpt-4-turbo-preview", OutputType.INFO)
-        PrettyOutput.print("o1-mini-all", OutputType.INFO)
-        PrettyOutput.print("gpt-4o-all", OutputType.INFO)
-        PrettyOutput.print("o1-preview", OutputType.INFO)
-        PrettyOutput.print("claude-3-5-sonnet-20241022", OutputType.INFO)
-        PrettyOutput.print("claude-3-opus-20240229", OutputType.INFO)
-        PrettyOutput.print("claude-3-haiku-20240307", OutputType.INFO)
-        PrettyOutput.print("claude-3-5-sonnet-20240620", OutputType.INFO)
-        PrettyOutput.print("deepseek-chat", OutputType.INFO)
-        PrettyOutput.print("deepseek-coder", OutputType.INFO)
-        PrettyOutput.print("glm-4-flash", OutputType.INFO)
-        PrettyOutput.print("glm-4-air", OutputType.INFO)
-        PrettyOutput.print("glm-4v-flash", OutputType.INFO)
-        PrettyOutput.print("qwen-plus", OutputType.INFO)
-        PrettyOutput.print("qwen-vl-max", OutputType.INFO)
-        PrettyOutput.print("qwen-turbo", OutputType.INFO)
-        PrettyOutput.print("lite", OutputType.INFO)
-        PrettyOutput.print("generalv3.5", OutputType.INFO)
-        PrettyOutput.print("yi-lightning", OutputType.INFO)
-        PrettyOutput.print("yi-vision", OutputType.INFO)
-        PrettyOutput.print("yi-spark", OutputType.INFO)
-        PrettyOutput.print("yi-medium", OutputType.INFO)
-        PrettyOutput.print("Doubao-lite-4k", OutputType.INFO)
-        PrettyOutput.print("Doubao-lite-32k", OutputType.INFO)
-        PrettyOutput.print("Doubao-pro-4k", OutputType.INFO)
-        PrettyOutput.print("Doubao-pro-32k", OutputType.INFO)
-        PrettyOutput.print("step-1-flash", OutputType.INFO)
-        PrettyOutput.print("step-1v-8k", OutputType.INFO)
-        PrettyOutput.print("Baichuan4-Air", OutputType.INFO)
-        PrettyOutput.print("Baichuan4-Turbo", OutputType.INFO)
-        PrettyOutput.print("moonshot-v1-8k", OutputType.INFO)
-        PrettyOutput.print("ERNIE-Speed-128K", OutputType.INFO)
-        PrettyOutput.print("ERNIE-3.5-128K", OutputType.INFO)
-
-
-        PrettyOutput.print("使用AI8_MODEL环境变量配置模型", OutputType.SUCCESS)
-        
         self.system_message = ""
         self.conversation = None
         self.files = []
-        self.model = os.getenv("AI8_MODEL") or "deepseek-chat"
+        self.models = {}  # 存储模型信息
+
+        # 获取可用模型列表
+        available_models = self.get_available_models()
+        
+        if available_models:
+            PrettyOutput.section("支持的模型", OutputType.SUCCESS)
+            for model in self.models.values():
+                # 格式化显示模型信息
+                model_str = f"{model['value']:<30}"
+                
+                # 添加标签
+                model_str += f"{model['label']}"
+                
+                # 添加标签和积分信息
+                attrs = []
+                if model['attr'].get('tag'):
+                    attrs.append(model['attr']['tag'])
+                if model['attr'].get('integral'):
+                    attrs.append(model['attr']['integral'])
+                    
+                # 添加特性标记
+                features = []
+                if model['attr'].get('multimodal'):
+                    features.append("多模态")
+                if model['attr'].get('plugin'):
+                    features.append("插件支持")
+                if model['attr'].get('onlyImg'):
+                    features.append("图像支持")
+                if features:
+                    model_str += f" [{'|'.join(features)}]"
+                    
+                # 添加备注
+                if model['attr'].get('note'):
+                    model_str += f" - {model['attr']['note']}"
+                    
+                PrettyOutput.print(model_str, OutputType.INFO)
+        else:
+            PrettyOutput.print("获取模型列表失败", OutputType.WARNING)
+
         self.token = os.getenv("AI8_API_KEY")
-        if not all([self.model, self.token]):
-            raise Exception("AI8_MODEL or AI8_API_KEY is not set")
-        PrettyOutput.print(f"当前使用模型: {self.model}", OutputType.SYSTEM)
+        if not self.token:
+            raise Exception("AI8_API_KEY is not set")
+        
+        PrettyOutput.print("使用AI8_MODEL环境变量配置模型", OutputType.SUCCESS)
+        
+        self.model_name = os.getenv("AI8_MODEL") or "deepseek-chat"
+        if self.model_name not in self.models:
+            PrettyOutput.print(f"警告: 当前选择的模型 {self.model_name} 不在可用列表中", OutputType.WARNING)
+        
+        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 +107,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 +233,7 @@ class AI8Model(BasePlatform):
             
     def name(self) -> str:
         """Return model name"""
-        return self.model
+        return self.model_name
         
     def reset(self):
         """Reset model state"""
@@ -275,3 +280,45 @@ class AI8Model(BasePlatform):
             PrettyOutput.print(f"删除会话异常: {str(e)}", OutputType.ERROR)
             return False
         
+    def get_available_models(self) -> List[str]:
+        """获取可用的模型列表
+        
+        Returns:
+            List[str]: 可用模型名称列表
+        """
+        try:
+            headers = {
+                'Content-Type': 'application/json',
+                'Accept': 'application/json, text/plain, */*',
+                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+                'X-APP-VERSION': '2.2.2',
+                'Origin': self.BASE_URL,
+                'Referer': f'{self.BASE_URL}/chat?_userMenuKey=chat'
+            }
+            
+            response = requests.get(
+                f"{self.BASE_URL}/api/chat/template",
+                headers=headers
+            )
+            
+            if response.status_code != 200:
+                PrettyOutput.print(f"获取模型列表失败: {response.status_code}", OutputType.ERROR)
+                return []
+            
+            data = response.json()
+            if data['code'] != 0:
+                PrettyOutput.print(f"获取模型列表失败: {data.get('msg', '未知错误')}", OutputType.ERROR)
+                return []
+            
+            # 保存模型信息
+            self.models = {
+                model['value']: model 
+                for model in data['data']['models']
+            }
+            
+            return list(self.models.keys())
+            
+        except Exception as e:
+            PrettyOutput.print(f"获取模型列表异常: {str(e)}", OutputType.ERROR)
+            return []
+        

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

@@ -1,6 +1,5 @@
 from abc import ABC, abstractmethod
 from typing import Dict, List
-from ..utils import OutputType, PrettyOutput
 
 
 class BasePlatform(ABC):
@@ -9,8 +8,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.44}/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.44}/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.44}/src/jarvis/models/oyi.py

@@ -15,43 +15,36 @@ class OyiModel(BasePlatform):
     def __init__(self):
         """Initialize model"""
         PrettyOutput.section("支持的模型", OutputType.SUCCESS)
-        PrettyOutput.print("gpt-4o-mini", OutputType.INFO)
-        PrettyOutput.print("gpt-3.5-turbo", OutputType.INFO)
-        PrettyOutput.print("gpt-4o", OutputType.INFO)
-        PrettyOutput.print("gpt-4o-2024-11-20", OutputType.INFO)
-        PrettyOutput.print("o1-mini", OutputType.INFO)
-        PrettyOutput.print("o1-mini-2024-09-12", OutputType.INFO)
-        PrettyOutput.print("gpt-4o-all", OutputType.INFO)
-        PrettyOutput.print("claude-3-5-sonnet-20240620", OutputType.INFO)
-        PrettyOutput.print("claude-3-opus-20240229", OutputType.INFO)
-        PrettyOutput.print("deepseek-chat", OutputType.INFO)
-        PrettyOutput.print("deepseek-coder", OutputType.INFO)
-        PrettyOutput.print("glm-4-flash", OutputType.INFO)
-        PrettyOutput.print("glm-4-air", OutputType.INFO)
-        PrettyOutput.print("qwen-plus", OutputType.INFO)
-        PrettyOutput.print("qwen-turbo", OutputType.INFO)
-        PrettyOutput.print("Doubao-lite-4k", OutputType.INFO)
-        PrettyOutput.print("Doubao-pro-4k", OutputType.INFO)
-        PrettyOutput.print("yi-lightning", OutputType.INFO)
-        PrettyOutput.print("step-1-flash", OutputType.INFO)
-        PrettyOutput.print("moonshot-v1-8k", OutputType.INFO)
-        PrettyOutput.print("lite", OutputType.INFO)
-        PrettyOutput.print("generalv3.5", OutputType.INFO)
-        PrettyOutput.print("gemini-pro", OutputType.INFO)
-        PrettyOutput.print("llama3-70b-8192", OutputType.INFO)
+        
+        # 获取可用模型列表
+        available_models = self.get_available_models()
+        if available_models:
+            for model in available_models:
+                PrettyOutput.print(model, OutputType.INFO)
+        else:
+            PrettyOutput.print("获取模型列表失败", OutputType.WARNING)
+        
         PrettyOutput.print("使用OYI_MODEL环境变量配置模型", OutputType.SUCCESS)
         
-                           
         self.messages = []
         self.system_message = ""
         self.conversation = None
         self.upload_files = []
         self.first_chat = True
-        self.model = os.getenv("OYI_MODEL") or "deepseek-chat"
+        
         self.token = os.getenv("OYI_API_KEY")
-        if not all([self.model, self.token]):
-            raise Exception("OYI_MODEL or OYI_API_KEY is not set")
-        PrettyOutput.print(f"当前使用模型: {self.model}", OutputType.SYSTEM)
+        if not self.token:
+            raise Exception("OYI_API_KEY is not set")
+        
+        self.model_name = os.getenv("OYI_MODEL") or "deepseek-chat"
+        if self.model_name not in [m.split()[0] for m in available_models]:
+            PrettyOutput.print(f"警告: 当前选择的模型 {self.model_name} 不在可用列表中", OutputType.WARNING)
+        
+        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 +64,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 +195,7 @@ class OyiModel(BasePlatform):
             
     def name(self) -> str:
         """Return model name"""
-        return self.model
+        return self.model_name
         
     def reset(self):
         """Reset model state"""
@@ -261,6 +254,12 @@ class OyiModel(BasePlatform):
             Dict: Upload response data
         """
         try:
+            # 检查当前模型是否支持文件上传
+            model_info = self.models.get(self.model_name)
+            if not model_info or not model_info.get('uploadFile', False):
+                PrettyOutput.print(f"当前模型 {self.model_name} 不支持文件上传", OutputType.WARNING)
+                return None
+            
             headers = {
                 'Authorization': f'Bearer {self.token}',
                 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
@@ -272,7 +271,7 @@ class OyiModel(BasePlatform):
             
             with open(file_path, 'rb') as f:
                 files = {
-                    'file': (os.path.basename(file_path), f, mimetypes.guess_type(file_path)[0])  # Adjust content-type based on file type
+                    'file': (os.path.basename(file_path), f, mimetypes.guess_type(file_path)[0])
                 }
                 
                 response = requests.post(
@@ -298,3 +297,70 @@ class OyiModel(BasePlatform):
         except Exception as e:
             PrettyOutput.print(f"文件上传异常: {str(e)}", OutputType.ERROR)
             return None
+
+    def get_available_models(self) -> List[str]:
+        """获取可用的模型列表
+        
+        Returns:
+            List[str]: 可用模型名称列表
+        """
+        try:
+            headers = {
+                'Content-Type': 'application/json',
+                'Accept': 'application/json, text/plain, */*',
+                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+                'Origin': 'https://ai.rcouyi.com',
+                'Referer': 'https://ai.rcouyi.com/'
+            }
+            
+            response = requests.get(
+                "https://ai.rcouyi.com/config/system.json",
+                headers=headers
+            )
+            
+            if response.status_code != 200:
+                PrettyOutput.print(f"获取模型列表失败: {response.status_code}", OutputType.ERROR)
+                return []
+            
+            data = response.json()
+            
+            # 保存模型信息
+            self.models = {
+                model['value']: model
+                for model in data.get('model', [])
+                if model.get('enable', False)  # 只保存启用的模型
+            }
+            
+            # 格式化显示
+            models = []
+            for model in self.models.values():
+                # 基本信息
+                model_str = f"{model['value']:<30} {model['label']}"
+                
+                # 添加后缀标签
+                suffix = model.get('suffix', [])
+                if suffix:
+                    # 处理新格式的suffix (字典列表)
+                    if suffix and isinstance(suffix[0], dict):
+                        suffix_str = ', '.join(s.get('tag', '') for s in suffix)
+                    # 处理旧格式的suffix (字符串列表)
+                    else:
+                        suffix_str = ', '.join(str(s) for s in suffix)
+                    model_str += f" ({suffix_str})"
+                    
+                # 添加描述或提示
+                info = model.get('tooltip') or model.get('description', '')
+                if info:
+                    model_str += f" - {info}"
+                    
+                # 添加文件上传支持标记
+                if model.get('uploadFile'):
+                    model_str += " [支持文件上传]"
+                    
+                models.append(model_str)
+                
+            return sorted(models)
+            
+        except Exception as e:
+            PrettyOutput.print(f"获取模型列表异常: {str(e)}", OutputType.ERROR)
+            return []

{jarvis_ai_assistant-0.1.42 → jarvis_ai_assistant-0.1.44}/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.44}/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.44/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.44
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire