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

jarvis/__init__.py

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

jarvis/models/ai8.py

@@ -14,58 +14,59 @@ 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)
+        self.system_message = ""
+        self.conversation = None
+        self.files = []
+        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 self.token:
+            raise Exception("AI8_API_KEY is not set")
+        
         PrettyOutput.print("使用AI8_MODEL环境变量配置模型", OutputType.SUCCESS)
         
-        self.system_message = ""
-        self.conversation = None
-        self.files = []
         self.model_name = os.getenv("AI8_MODEL") or "deepseek-chat"
-        self.token = os.getenv("AI8_API_KEY")
-        if not all([self.model_name, self.token]):
-            raise Exception("AI8_MODEL or AI8_API_KEY is not set")
+        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):
@@ -279,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/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):

jarvis/models/oyi.py

@@ -15,42 +15,31 @@ 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_name = os.getenv("OYI_MODEL") or "deepseek-chat"
+        
         self.token = os.getenv("OYI_API_KEY")
-        if not all([self.model_name, self.token]):
-            raise Exception("OYI_MODEL or OYI_API_KEY is not set")
+        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):
@@ -265,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',
@@ -276,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(
@@ -302,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.43.dist-info → jarvis_ai_assistant-0.1.44.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.43
+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.43.dist-info → jarvis_ai_assistant-0.1.44.dist-info}/RECORD

@@ -1,8 +1,8 @@
-jarvis/__init__.py,sha256=OJVxHJQi99bOxMOkdKLvxRutQ_Lc4AyKCH4e-FnQNfw,50
+jarvis/__init__.py,sha256=30wDVtD64NoYQ74EdslpVbhr4wp-p_fPgv7AeQ0i-Ug,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=FWB9E8zChLF1EI0hTB-cEMjRy5wB24APzutV1cZJLqY,209
+jarvis/__pycache__/__init__.cpython-313.pyc,sha256=Yc1GRrJWnBTglkYG4V1_bmBz7PIuq1V53ZeSEfcE-wQ,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
@@ -10,18 +10,18 @@ jarvis/__pycache__/tools.cpython-313.pyc,sha256=lAD4LrnnWzNZQmHXGfZ_2l7oskOpr2_2
 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=d1h3L32QBfyf5iQvyncTo-RfvA-kTDGrL7gtxAL6gDg,11609
-jarvis/models/base.py,sha256=CMjODEh2c9KbCMfQGF7WgGbn-CfpIaGdA5yK1RxKMLY,1282
+jarvis/models/ai8.py,sha256=9i7n_-TPbvq0AaRILs9ERQ7Vy5tDyoibXkiPsJvwQio,12520
+jarvis/models/base.py,sha256=eeNJJbv9ikPVTtV_E7mgW8LZzVgjQ-OzxlHF6slYrHw,1237
 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/oyi.py,sha256=12jskOgo77LWtXq4u-LX7s_sYomBJSlry4oONtdmVCU,14443
 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=Bu4NXc_CV-GViEL55b0keW6coToPW9aYXhTcOsZIcvg,14972
-jarvis/models/__pycache__/base.cpython-313.pyc,sha256=Bsu0p7yNCNa4jO-i2A58i3H3xYzxzhtty5BeHAC5lmE,2488
+jarvis/models/__pycache__/ai8.cpython-313.pyc,sha256=r3KAXgiIpNHC9X9Z9vbAEorDNmfeiKQOXlKiKC0A_CA,14176
+jarvis/models/__pycache__/base.cpython-313.pyc,sha256=xltXUMcaO5oVNzSmz0-bhPvsH3oHWU7QEPUTPV48x-g,2419
 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__/oyi.cpython-313.pyc,sha256=142O2W2Qrf2OXppA_ScQVkH9Ix2OotK2tQuFW_z7S8c,15691
 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
@@ -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.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,,
+jarvis_ai_assistant-0.1.44.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.44.dist-info/METADATA,sha256=7GkjCkI2v9zr2UjGXletzOPTq9Hhj0sOPTF1J7aDQjo,10015
+jarvis_ai_assistant-0.1.44.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.44.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.44.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.44.dist-info/RECORD,,