jarvis-ai-assistant 0.1.32__py3-none-any.whl → 0.1.33__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.32" 
+__version__ = "0.1.33" 

jarvis/main.py

@@ -103,19 +103,25 @@ def main():
     parser = argparse.ArgumentParser(description='Jarvis AI Assistant')
     parser.add_argument('-f', '--files', nargs='*', help='List of files to process')
     parser.add_argument('--keep-history', action='store_true', help='Keep chat history (do not delete chat session)')
-    parser.add_argument('-m', '--model', default='kimi', help='选择模型')
+    parser.add_argument('-m', '--model', default='', help='选择模型')
     args = parser.parse_args()
 
     load_env_from_file()
 
-    ModelRegistry.get_model_registry().set_global_model(args.model)
+    model = args.model if args.model else os.getenv('JARVIS_MODEL')
+
+    if not model:
+        PrettyOutput.print("未指定模型，请使用 -m 参数或者设置 JARVIS_MODEL 环境变量", OutputType.ERROR)
+        return 1
+
+    ModelRegistry.get_model_registry().set_global_model(model)
     
     try:
         # 获取全局模型实例
         agent = Agent()
 
         # 欢迎信息
-        PrettyOutput.print(f"Jarvis 已初始化 - With {args.model}", OutputType.SYSTEM)
+        PrettyOutput.print(f"Jarvis 已初始化 - With {model}", OutputType.SYSTEM)
         if args.keep_history:
             PrettyOutput.print("已启用历史保留模式", OutputType.INFO)
         

jarvis/models/ai8.py

@@ -0,0 +1,277 @@
+import os
+from typing import Dict, List
+from jarvis.models.base import BaseModel
+from jarvis.utils import PrettyOutput, OutputType
+import requests
+import json
+import base64
+
+class AI8Model(BaseModel):
+    """AI8 model implementation"""
+    
+    model_name = "ai8"
+    BASE_URL = "https://ai8.rcouyi.com"
+    
+    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("moonshot-v1-32k", OutputType.INFO)
+        PrettyOutput.print("moonshot-v1-128k", 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.token = os.getenv("AI8_API_KEY")
+        if not all([self.model, self.token]):
+            raise Exception("AI8_MODEL or AI8_API_KEY is not set")
+            
+    def create_conversation(self) -> bool:
+        """Create a new conversation"""
+        try:
+            headers = {
+                'Authorization': self.token,
+                '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'
+            }
+            
+            # 1. 创建会话
+            response = requests.post(
+                f"{self.BASE_URL}/api/chat/session",
+                headers=headers
+            )
+            
+            if response.status_code != 200:
+                PrettyOutput.print(f"创建会话失败: {response.status_code}", OutputType.ERROR)
+                return False
+            
+            data = response.json()
+            if data['code'] != 0:
+                PrettyOutput.print(f"创建会话失败: {data.get('msg', '未知错误')}", OutputType.ERROR)
+                return False
+            
+            self.conversation = data['data']
+            PrettyOutput.print(f"创建会话成功: {data['data']['id']}", OutputType.SUCCESS)
+            
+            # 2. 更新会话设置
+            session_data = {
+                **self.conversation,
+                "contextCount": 1024,
+                "prompt": self.system_message,
+                "plugins": ["tavily_search"],
+                "localPlugins": None,
+                "useAppId": 0
+            }
+            
+            response = requests.put(
+                f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",
+                headers=headers,
+                json=session_data
+            )
+            
+            if response.status_code == 200:
+                data = response.json()
+                if data['code'] == 0:
+                    self.conversation = data['data']
+                    PrettyOutput.print("会话设置更新成功", OutputType.SUCCESS)
+                    return True
+                else:
+                    PrettyOutput.print(f"更新会话设置失败: {data.get('msg', '未知错误')}", OutputType.ERROR)
+                    return False
+            else:
+                PrettyOutput.print(f"更新会话设置失败: {response.status_code}", OutputType.ERROR)
+                return False
+            
+        except Exception as e:
+            PrettyOutput.print(f"创建会话异常: {str(e)}", OutputType.ERROR)
+            return False
+        
+    def upload_files(self, file_list: List[str]) -> List[Dict]:
+        for file_path in file_list:
+            name = os.path.basename(file_path)
+            with open(file_path, 'rb') as f:
+                file_data = f.read()
+            base64_data = base64.b64encode(file_data).decode('utf-8')
+            self.files.append({
+                "name": name,
+                "data": f"data:image/png;base64,{base64_data}"
+            })
+            PrettyOutput.print(f"文件 {name} 已准备好发送", OutputType.SUCCESS)
+    
+    def set_system_message(self, message: str):
+        """Set system message"""
+        self.system_message = message
+        
+    def chat(self, message: str) -> str:
+        """Execute chat with the model
+        
+        Args:
+            message: User input message
+            
+        Returns:
+            str: Model response
+        """
+        try:
+            # 确保有会话ID
+            if not self.conversation:
+                if not self.create_conversation():
+                    raise Exception("Failed to create conversation")
+                
+            headers = {
+                'Authorization': self.token,
+                'Content-Type': 'application/json',
+                'Accept': 'text/event-stream',
+                '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'
+            }
+            
+            payload = {
+                "text": message,
+                "sessionId": self.conversation['id'],
+                "files": []
+            }
+            
+            # 如果有文件需要发送
+            if self.files:
+                for file_data in self.files:
+                    payload["files"].append({
+                        "name": file_data["name"],
+                        "data": file_data["data"]
+                    })
+                self.files = []  # 清空已使用的文件
+            
+            response = requests.post(
+                f"{self.BASE_URL}/api/chat/completions",
+                headers=headers,
+                json=payload,
+                stream=True
+            )
+            
+            if response.status_code != 200:
+                error_msg = f"聊天请求失败: {response.status_code}"
+                PrettyOutput.print(error_msg, OutputType.ERROR)
+                raise Exception(error_msg)
+            
+            # 处理流式响应
+            full_response = ""
+            for line in response.iter_lines():
+                if line:
+                    line = line.decode('utf-8')
+                    if line.startswith('data: '):
+                        try:
+                            data = json.loads(line[6:])
+                            if data.get('type') == 'string':
+                                chunk = data.get('data', '')
+                                if chunk:
+                                    full_response += chunk
+                                    PrettyOutput.print_stream(chunk)
+
+                        except json.JSONDecodeError:
+                            continue
+            
+            PrettyOutput.print_stream_end()
+
+            return full_response
+            
+        except Exception as e:
+            PrettyOutput.print(f"聊天异常: {str(e)}", OutputType.ERROR)
+            raise e
+            
+    def name(self) -> str:
+        """Return model name"""
+        return self.model_name
+        
+    def reset(self):
+        """Reset model state"""
+        self.conversation = None
+        self.files = []  # 清空文件列表
+            
+    def delete_chat(self) -> bool:
+        """Delete current chat session"""
+        try:
+            if not self.conversation:
+                return True
+            
+            headers = {
+                'Authorization': self.token,
+                '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.delete(
+                f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",
+                headers=headers
+            )
+            
+            if response.status_code == 200:
+                data = response.json()
+                if data['code'] == 0:
+                    PrettyOutput.print("会话删除成功", OutputType.SUCCESS)
+                    self.reset()
+                    return True
+                else:
+                    error_msg = f"删除会话失败: {data.get('msg', '未知错误')}"
+                    PrettyOutput.print(error_msg, OutputType.ERROR)
+                    return False
+            else:
+                error_msg = f"删除会话请求失败: {response.status_code}"
+                PrettyOutput.print(error_msg, OutputType.ERROR)
+                return False
+            
+        except Exception as e:
+            PrettyOutput.print(f"删除会话异常: {str(e)}", OutputType.ERROR)
+            return False
+        

jarvis/models/oyi.py

@@ -14,6 +14,34 @@ class OyiModel(BaseModel):
     
     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)
+        PrettyOutput.print("使用OYI_MODEL配置模型", OutputType.SUCCESS)
+        
+                           
         self.messages = []
         self.system_message = ""
         self.conversation = None

{jarvis_ai_assistant-0.1.32.dist-info → jarvis_ai_assistant-0.1.33.dist-info}/METADATA

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

@@ -1,25 +1,27 @@
-jarvis/__init__.py,sha256=WCzps5uo3WencEBknwjSQ5YjmvxkCFmigbNfF_1D6ts,50
+jarvis/__init__.py,sha256=K3XebXHZE6kSmgNBnsXUeI2ljKwqHTsmFycr1tKnbP4,50
 jarvis/agent.py,sha256=QR5nwej7LKYg2s9q7lVG1R7C62t8OcJz0PTuIFncDB8,11805
-jarvis/main.py,sha256=Lh0kMjfa3M692MpSn0T7jiXdR9EZpKDu7GSRPeLv7hk,5553
+jarvis/main.py,sha256=FOfc2v7iX9my5USyf4oxcGzyJe4AH4TwIEQk2WdNWrI,5768
 jarvis/utils.py,sha256=JlkuC9RtspXH2VWDmj9nR0vnb8ie1gIsKc4vC7WRco8,7321
-jarvis/__pycache__/__init__.cpython-313.pyc,sha256=hB9XrD1bAFDQCRPcpo5W6SqRb1VIoPRY4r3V2-hjedo,209
+jarvis/__pycache__/__init__.cpython-313.pyc,sha256=WcNiIdZTVZKVlyxKWve-Trc49FuiqOMMe4g_fMxKlDA,209
 jarvis/__pycache__/agent.cpython-313.pyc,sha256=cgbX5L0T16_ZBYw1K3wHGQ8UT7khEn5V7AlOGFkoN68,15200
-jarvis/__pycache__/main.cpython-313.pyc,sha256=ZZl8WwAJtRj14_v_-mvlvCGUmfd-oJtqAMKv3RiR3lU,7673
+jarvis/__pycache__/main.cpython-313.pyc,sha256=KKVD1bs_4MDOdq2f04rsJpI8Osp959Fo5KOsUUBvrDM,7985
 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=Lqb1NWFIfq7HlZIsJ7eUGyGjdYyaJqOoOf7cG_yo73A,57
+jarvis/models/ai8.py,sha256=mXa_fE_tHztK9SP3gUOFoSl6A-ceUkNsTVC6flEXlow,11457
 jarvis/models/base.py,sha256=dNkYPg9ISrHGEpmQLN9kxCDU-kqJAJlm_owdDC302Dk,1132
 jarvis/models/kimi.py,sha256=iI8mBzUxiyxa_bzDG9uwE3BZtreEUt0EJOIP_l2rSDM,16788
 jarvis/models/openai.py,sha256=aFpRH6K0YG6suCRGlJLw2JzLh2Ftpn6AYhdnKtMQQlY,3940
-jarvis/models/oyi.py,sha256=QCFLtrJN3CkHZ1mAudoFH684cx4tZiFUrerr7jtvEI8,10583
+jarvis/models/oyi.py,sha256=DzRKD0jVYvU_O5dXKlOmy83j8tPIcGGHVJcV90QEmxs,12219
 jarvis/models/registry.py,sha256=ecIo3a0G-pRPw4eg77ozzbGVh6vy93DHF8oAnU2g51w,7511
 jarvis/models/__pycache__/__init__.cpython-313.pyc,sha256=hD4Uui0EPCTfoPOasTYzIi46Kv_q7OI8m-Lck-nX4zM,220
+jarvis/models/__pycache__/ai8.cpython-313.pyc,sha256=xexoy9Qgy0BYAfKY85Yy3oj2B-Sw9q2TXxeTmeK6tvQ,14775
 jarvis/models/__pycache__/base.cpython-313.pyc,sha256=9VvOXFPYOrB-2pO2py7dWOVbimODnXQJFLlFbyF7-LI,2207
 jarvis/models/__pycache__/kimi.cpython-313.pyc,sha256=FGtHoTv747oNY4Lqnwf5BkGYKnevHOlIEDIlbsY7va0,20893
 jarvis/models/__pycache__/openai.cpython-313.pyc,sha256=CU3KaUA0XcOK55sexF7OxfQ6_jdofABsufmFxm0T3mk,6004
-jarvis/models/__pycache__/oyi.cpython-313.pyc,sha256=zpmRUcqDewifdvHel7goKuQiyo_6TYvmECoc_akAEkc,11163
+jarvis/models/__pycache__/oyi.cpython-313.pyc,sha256=AzChNnqApFVNNXVi77uw7GwL7EfWnXp0T8G7_VUPpyY,14037
 jarvis/models/__pycache__/registry.cpython-313.pyc,sha256=jUZUyHyfzeQtjCdk2NCZGTsTUsvKyIlnZVDzZY1gLuU,9985
 jarvis/tools/__init__.py,sha256=Kj1bKj34lwRDKMKHLOrLyQElf2lHbqA2tDgP359eaDo,71
 jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
@@ -47,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.32.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.32.dist-info/METADATA,sha256=hUCVm5P7w8ORbGpX2O3puRO1t8R-V3kOoXIbCLFkOG8,9765
-jarvis_ai_assistant-0.1.32.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.32.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
-jarvis_ai_assistant-0.1.32.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.32.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.33.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.33.dist-info/METADATA,sha256=WLKoychbzXs8Mom2ctlWUnrXnxTMn5BFzKBzf2ME3SE,9765
+jarvis_ai_assistant-0.1.33.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.33.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.33.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.33.dist-info/RECORD,,