jarvis-ai-assistant 0.1.47__py3-none-any.whl → 0.1.48__py3-none-any.whl

jarvis/__init__.py

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

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

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

@@ -1,13 +1,13 @@
-jarvis/__init__.py,sha256=XHiEIJDUfPpSw7AOyN6pj5Dpsx3J2G2EdRpRhN9TSvI,50
+jarvis/__init__.py,sha256=5Kd0blvGwS59SYMJr_z-vMkb9qnFktJZho8oQ1uSNOw,50
 jarvis/agent.py,sha256=5GmC9iAOerTR4JoxzrfgLSspoz6qRm1E6xEIWLTR2OI,12222
-jarvis/main.py,sha256=3kpohHORc13A5RBjTSHYF7cdnc6W15hO23R78Iqnz8w,5843
+jarvis/main.py,sha256=VIqMYnqNrmVcnO5YC-Tc-ATVBt8IlqIcXHjZvHmyCFs,6272
 jarvis/utils.py,sha256=JlkuC9RtspXH2VWDmj9nR0vnb8ie1gIsKc4vC7WRco8,7321
 jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
 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=12jskOgo77LWtXq4u-LX7s_sYomBJSlry4oONtdmVCU,14443
+jarvis/models/oyi.py,sha256=4_sppGOLS3rucBHinhzjLhSh_6rJKIgLu9h6trHIOGM,14900
 jarvis/models/registry.py,sha256=iVBjN9ImEvGHcz8WR-z8pPMJQZI907o_nccVOFANhak,7951
 jarvis/tools/__init__.py,sha256=Kj1bKj34lwRDKMKHLOrLyQElf2lHbqA2tDgP359eaDo,71
 jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
@@ -17,9 +17,9 @@ jarvis/tools/methodology.py,sha256=G3cOaHTMujGZBhDLhQEqyCV2NISizO3MXRuho1KfI6Y,5
 jarvis/tools/registry.py,sha256=NbH7A4A2lyN2IoyZGFwa5Ghed2dpzbJWCAd1Dg95WBI,7183
 jarvis/tools/shell.py,sha256=UPKshPyOaUwTngresUw-ot1jHjQIb4wCY5nkJqa38lU,2520
 jarvis/tools/sub_agent.py,sha256=rEtAmSVY2ZjFOZEKr5m5wpACOQIiM9Zr_3dT92FhXYU,2621
-jarvis_ai_assistant-0.1.47.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.47.dist-info/METADATA,sha256=QhhvA014wKgM7HFHGN2AL860qE2OJezog5q229lJjLQ,10015
-jarvis_ai_assistant-0.1.47.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.47.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
-jarvis_ai_assistant-0.1.47.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.47.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.48.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.48.dist-info/METADATA,sha256=aa15iAnYAREOwcLJP3tTpjdC5JAmXzouiqXIwKrO83g,10015
+jarvis_ai_assistant-0.1.48.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.48.dist-info/entry_points.txt,sha256=iKu7OMfew9dtfGhW71gIMTg4wvafuPqKb4wyQOnMAGU,44
+jarvis_ai_assistant-0.1.48.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.48.dist-info/RECORD,,