jarvis-ai-assistant 0.1.53__py3-none-any.whl → 0.1.55__py3-none-any.whl

jarvis/main.py

@@ -100,23 +100,26 @@ def select_task(tasks: dict) -> str:
 def main():
     """Jarvis 的主入口点"""
     # 添加参数解析器
+    load_env_from_file()
     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平台')
-    parser.add_argument('-m', '--model', default='', help='模型')  # 用于指定使用的模型名称，默认使用环境变量或平台默认模型
+    parser.add_argument('-p', '--platform', default=os.getenv('JARVIS_PLATFORM') or 'kimi', help='选择AI平台')
+    parser.add_argument('-m', '--model', default=os.getenv('JARVIS_MODEL') or '', help='模型')  # 用于指定使用的模型名称，默认使用环境变量或平台默认模型
     args = parser.parse_args()
 
-    load_env_from_file()
-
     platform = args.platform if args.platform else os.getenv('JARVIS_PLATFORM')
 
     if not platform:
         PrettyOutput.print("未指定AI平台，请使用 -p 参数或者设置 JARVIS_PLATFORM 环境变量", OutputType.ERROR)
         return 1
-
-    PlatformRegistry.get_global_platform_registry().set_global_platform_name(platform)
     
+    PlatformRegistry.get_global_platform_registry().set_global_platform_name(platform)
+
+    if args.model:
+        PrettyOutput.print(f"用户传入了模型参数，更换模型: {args.model}", OutputType.USER)
+        os.environ["JARVIS_MODEL"] = args.model
+
     try:
         # 获取全局模型实例
         agent = Agent()

jarvis/models/ai8.py

@@ -63,7 +63,7 @@ class AI8Model(BasePlatform):
         
         PrettyOutput.print("使用AI8_MODEL环境变量配置模型", OutputType.SUCCESS)
         
-        self.model_name = os.getenv("AI8_MODEL") or "deepseek-chat"
+        self.model_name = os.getenv("AI8_MODEL") or os.getenv("JARVIS_MODEL") or "deepseek-chat"
         if self.model_name not in self.models:
             PrettyOutput.print(f"警告: 当前选择的模型 {self.model_name} 不在可用列表中", OutputType.WARNING)
         

jarvis/models/openai.py

@@ -30,7 +30,7 @@ class OpenAIModel(BasePlatform):
             raise Exception("OPENAI_API_KEY is not set")
             
         self.base_url = os.getenv("OPENAI_API_BASE", "https://api.deepseek.com")
-        self.model_name = os.getenv("OPENAI_MODEL_NAME", "deepseek-chat")
+        self.model_name = os.getenv("OPENAI_MODEL_NAME") or os.getenv("JARVIS_MODEL") or "deepseek-chat"
 
         PrettyOutput.print(f"当前使用模型: {self.model_name}", OutputType.SYSTEM)
             

jarvis/models/oyi.py

@@ -36,7 +36,7 @@ class OyiModel(BasePlatform):
         if not self.token:
             raise Exception("OYI_API_KEY is not set")
         
-        self.model_name = os.getenv("OYI_MODEL") or "deepseek-chat"
+        self.model_name = os.getenv("OYI_MODEL") or os.getenv("JARVIS_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)
         

{jarvis_ai_assistant-0.1.53.dist-info → jarvis_ai_assistant-0.1.55.dist-info}/METADATA

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

@@ -1,26 +1,26 @@
-jarvis/__init__.py,sha256=F8J3ApdoQ_vwNwqBBUnMD8AdpsLq6Q9p0Y7y0KiEtlo,50
+jarvis/__init__.py,sha256=TgQTdVOK-cueqCWiQsECrUAQWOxTSqYI1Iu7YTFBom8,50
 jarvis/agent.py,sha256=s8VebNef8BbKM6D9IDWWN-XenEXEL9KoYnDLGKyZY58,12347
-jarvis/main.py,sha256=VIqMYnqNrmVcnO5YC-Tc-ATVBt8IlqIcXHjZvHmyCFs,6272
+jarvis/main.py,sha256=gXXtnrkkvGwEswJL6qiYjVrg3bpzye-GJeAe0Nf2B9o,6509
 jarvis/utils.py,sha256=JlkuC9RtspXH2VWDmj9nR0vnb8ie1gIsKc4vC7WRco8,7321
+jarvis/jarvis_coder/main.py,sha256=eKo7ipNb3eSRuUMwMZclTozz6LUtU95t2B-w_LGkexs,30155
 jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
-jarvis/models/ai8.py,sha256=cJmOHgScU0tgkkYJQUrHfAFnZmDc7aFc0tS90uPJ_jw,12595
+jarvis/models/ai8.py,sha256=6Nu4AJ_YtzVcVJirOrzbRI1WF0WpGBzWuDvu_C5oP0s,12624
 jarvis/models/base.py,sha256=eeNJJbv9ikPVTtV_E7mgW8LZzVgjQ-OzxlHF6slYrHw,1237
 jarvis/models/kimi.py,sha256=N0bPQ1ugx0RwjR96jLchmOPvCmws-fXyA0mnOAdo2k4,17161
-jarvis/models/openai.py,sha256=pbbZKFV-fEGSVMTomT2WFP0lKQtodNkWZkLwCB7JAeA,4231
-jarvis/models/oyi.py,sha256=fXR92NzrSOf40pagIrtJ1ughPlC9Qz7aelQy_ISzexM,14975
+jarvis/models/openai.py,sha256=yJ8e4js365uh-pdka-q8tD6iUoSdP-n4kdxUfaHIQ28,4262
+jarvis/models/oyi.py,sha256=VwPW4UawGrMrDOCIbSs9ieNlE6N0pBtgiroyg9JCJ48,15004
 jarvis/models/registry.py,sha256=iVBjN9ImEvGHcz8WR-z8pPMJQZI907o_nccVOFANhak,7951
 jarvis/tools/__init__.py,sha256=Kj1bKj34lwRDKMKHLOrLyQElf2lHbqA2tDgP359eaDo,71
 jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
-jarvis/tools/code_edit.py,sha256=oMoggVC66Ve_nsQMJiCP00GdH8QzfiLTQnZF9TKa0Vk,30990
 jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
 jarvis/tools/generator.py,sha256=vVP3eN5cCDpRXf_fn0skETkPXAW1XZFWx9pt2_ahK48,5999
 jarvis/tools/methodology.py,sha256=G3cOaHTMujGZBhDLhQEqyCV2NISizO3MXRuho1KfI6Y,5223
 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.53.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.53.dist-info/METADATA,sha256=B0f_N8wLMD1gT9x6qJkYWn4CgKX1o7NymKAPiMkuzCo,10015
-jarvis_ai_assistant-0.1.53.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.53.dist-info/entry_points.txt,sha256=lXpI7P6S17pGqG8xtl3LRC8xG0PsAM4I92UqD2VIQX8,77
-jarvis_ai_assistant-0.1.53.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.53.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.55.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.55.dist-info/METADATA,sha256=LTOhw_m-9kM2VF5j4rnF3sy1T8rV89BB6eRI9ulKIlY,10015
+jarvis_ai_assistant-0.1.55.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.55.dist-info/entry_points.txt,sha256=xDf1Kjt0cr1GrASlrV1iuiMWMkAV6i-jUbcfKasR0os,89
+jarvis_ai_assistant-0.1.55.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.55.dist-info/RECORD,,

jarvis_ai_assistant-0.1.55.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+jarvis = jarvis.main:main
+jarvis_coder = jarvis.jarvis_coder.main:main