jarvis-ai-assistant 0.1.36__tar.gz → 0.1.38__tar.gz

{jarvis_ai_assistant-0.1.36/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.38}/PKG-INFO

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

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

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

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.36" 
+__version__ = "0.1.38" 

{jarvis_ai_assistant-0.1.36 → jarvis_ai_assistant-0.1.38}/src/jarvis/main.py

@@ -98,30 +98,30 @@ def select_task(tasks: dict) -> str:
             continue
 
 def main():
-    """Main entry point for Jarvis."""
-    # Add argument parser
-    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='', help='选择模型')
+    """Jarvis 的主入口点"""
+    # 添加参数解析器
+    parser = argparse.ArgumentParser(description='Jarvis AI 助手')
+    parser.add_argument('-f', '--files', nargs='*', help='要处理的文件列表')
+    parser.add_argument('--keep-history', action='store_true', help='保持聊天历史(不删除会话)')
+    parser.add_argument('-p', '--platform', default='', help='选择AI平台')
     args = parser.parse_args()
 
     load_env_from_file()
 
-    model = args.model if args.model else os.getenv('JARVIS_MODEL')
+    platform = args.platform if args.platform else os.getenv('JARVIS_PLATFORM')
 
-    if not model:
-        PrettyOutput.print("未指定模型，请使用 -m 参数或者设置 JARVIS_MODEL 环境变量", OutputType.ERROR)
+    if not platform:
+        PrettyOutput.print("未指定AI平台，请使用 -p 参数或者设置 JARVIS_PLATFORM 环境变量", OutputType.ERROR)
         return 1
 
-    ModelRegistry.get_model_registry().set_global_model(model)
+    ModelRegistry.get_model_registry().set_global_model(platform)
     
     try:
         # 获取全局模型实例
         agent = Agent()
 
         # 欢迎信息
-        PrettyOutput.print(f"Jarvis 已初始化 - With {model}", OutputType.SYSTEM)
+        PrettyOutput.print(f"Jarvis 已初始化 - With {platform} 平台", OutputType.SYSTEM)
         if args.keep_history:
             PrettyOutput.print("已启用历史保留模式", OutputType.INFO)
         

{jarvis_ai_assistant-0.1.36 → jarvis_ai_assistant-0.1.38}/src/jarvis/models/ai8.py

@@ -68,6 +68,7 @@ class AI8Model(BaseModel):
         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)
             
     def create_conversation(self) -> bool:
         """Create a new conversation"""
@@ -103,6 +104,7 @@ class AI8Model(BaseModel):
             # 2. 更新会话设置
             session_data = {
                 **self.conversation,
+                "model": self.model,
                 "contextCount": 1024,
                 "prompt": self.system_message,
                 "plugins": ["tavily_search"],

{jarvis_ai_assistant-0.1.36 → jarvis_ai_assistant-0.1.38}/src/jarvis/models/openai.py

@@ -31,6 +31,8 @@ class OpenAIModel(BaseModel):
             
         self.base_url = os.getenv("OPENAI_API_BASE", "https://api.deepseek.com")
         self.model_name = os.getenv("OPENAI_MODEL_NAME", "deepseek-chat")
+
+        PrettyOutput.print(f"当前使用模型: {self.model_name}", OutputType.SYSTEM)
             
         self.client = OpenAI(
             api_key=self.api_key,

{jarvis_ai_assistant-0.1.36 → jarvis_ai_assistant-0.1.38}/src/jarvis/models/oyi.py

@@ -51,6 +51,7 @@ class OyiModel(BaseModel):
         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)
 
         
     def create_conversation(self) -> bool:

{jarvis_ai_assistant-0.1.36 → jarvis_ai_assistant-0.1.38/src/jarvis_ai_assistant.egg-info}/PKG-INFO

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