jarvis-ai-assistant 0.1.47__tar.gz → 0.1.48__tar.gz

{jarvis_ai_assistant-0.1.47/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.48}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.47"
+version = "0.1.48"
 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.47 → jarvis_ai_assistant-0.1.48}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.47",
+    version="0.1.48",
     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.47 → jarvis_ai_assistant-0.1.48}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.47" 
+__version__ = "0.1.48" 

{jarvis_ai_assistant-0.1.47 → jarvis_ai_assistant-0.1.48}/src/jarvis/main.py

@@ -104,6 +104,7 @@ def main():
     parser.add_argument('-f', '--files', nargs='*', help='要处理的文件列表')
     parser.add_argument('--keep-history', action='store_true', help='保持聊天历史(不删除会话)')
     parser.add_argument('-p', '--platform', default='', help='选择AI平台')
+    parser.add_argument('-m', '--model', default='', help='模型')  # 用于指定使用的模型名称，默认使用环境变量或平台默认模型
     args = parser.parse_args()
 
     load_env_from_file()
@@ -120,6 +121,11 @@ def main():
         # 获取全局模型实例
         agent = Agent()
 
+        # 如果用户传入了模型参数，则更换当前模型为用户指定的模型
+        if args.model:
+            PrettyOutput.print(f"用户传入了模型参数，更换模型: {args.model}", OutputType.USER)
+            agent.model.set_model_name(args.model)
+
         # 欢迎信息
         PrettyOutput.print(f"Jarvis 已初始化 - With {platform} 平台，模型: {agent.model.name()}", OutputType.SYSTEM)
         if args.keep_history:
@@ -151,4 +157,4 @@ def main():
     return 0
 
 if __name__ == "__main__":
-    exit(main()) 
+    exit(main())

{jarvis_ai_assistant-0.1.47 → jarvis_ai_assistant-0.1.48}/src/jarvis/models/oyi.py

@@ -29,7 +29,7 @@ class OyiModel(BasePlatform):
         self.messages = []
         self.system_message = ""
         self.conversation = None
-        self.upload_files = []
+        self.upload_files = []  # 重命名 files 为 upload_files
         self.first_chat = True
         
         self.token = os.getenv("OYI_API_KEY")
@@ -244,7 +244,7 @@ class OyiModel(BasePlatform):
             PrettyOutput.print(f"删除会话异常: {str(e)}", OutputType.ERROR)
             return False
     
-    def upload_file(self, file_path: str) -> Dict:
+    def upload_files(self, file_list: List[str]) -> List[Dict]:
         """Upload a file to OYI API
         
         Args:
@@ -269,30 +269,36 @@ class OyiModel(BasePlatform):
                 'Referer': 'https://ai.rcouyi.com/'
             }
             
-            with open(file_path, 'rb') as f:
-                files = {
-                    'file': (os.path.basename(file_path), f, mimetypes.guess_type(file_path)[0])
-                }
+            for file_path in file_list:
+                # 检查文件类型
+                file_type = mimetypes.guess_type(file_path)[0]
+                if not file_type or not file_type.startswith(('image/', 'text/', 'application/')):
+                    PrettyOutput.print(f"文件类型不支持: {file_type}", OutputType.ERROR)
+                    continue
                 
-                response = requests.post(
-                    f"{self.BASE_URL}/chatapi/m_file/uploadfile",
-                    headers=headers,
-                    files=files
-                )
+                with open(file_path, 'rb') as f:
+                    files = {
+                        'file': (os.path.basename(file_path), f, file_type)
+                    }
                 
-                if response.status_code == 200:
-                    data = response.json()
-                    if data.get('code') == 200:
-                        PrettyOutput.print("文件上传成功", OutputType.SUCCESS)
-                        print(data)
-                        self.upload_files.append(data)
-                        return data
+                    response = requests.post(
+                        f"{self.BASE_URL}/chatapi/m_file/uploadfile",
+                        headers=headers,
+                        files=files
+                    )
+                    
+                    if response.status_code == 200:
+                        data = response.json()
+                        if data.get('code') == 200:
+                            PrettyOutput.print("文件上传成功", OutputType.SUCCESS)
+                            self.upload_files.append(data)
+                            return data
+                        else:
+                            PrettyOutput.print(f"文件上传失败: {data.get('message')}", OutputType.ERROR)
+                            return None
                     else:
-                        PrettyOutput.print(f"文件上传失败: {data.get('message')}", OutputType.ERROR)
+                        PrettyOutput.print(f"文件上传失败: {response.status_code}", OutputType.ERROR)
                         return None
-                else:
-                    PrettyOutput.print(f"文件上传失败: {response.status_code}", OutputType.ERROR)
-                    return None
                 
         except Exception as e:
             PrettyOutput.print(f"文件上传异常: {str(e)}", OutputType.ERROR)

{jarvis_ai_assistant-0.1.47 → jarvis_ai_assistant-0.1.48/src/jarvis_ai_assistant.egg-info}/PKG-INFO

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