jarvis-ai-assistant 0.1.88__py3-none-any.whl → 0.1.90__py3-none-any.whl

jarvis/tools/ask_user.py

@@ -3,18 +3,8 @@ from jarvis.tools.base import Tool
 from jarvis.utils import get_multiline_input, PrettyOutput, OutputType
 
 class AskUserTool:
-    name="ask_user",
-    description="""当缺少完成任务的信息或有关键决策信息缺失时，询问用户。
-用户可以输入多行文本，空行结束输入。
-
-使用场景：
-1. 需要用户提供更多信息来完成任务
-2. 需要用户做出关键决策
-3. 需要用户确认某些重要操作
-4. 需要用户提供额外信息
-
-参数说明：
-- question: 要询问用户的问题，应该清晰明确""",
+    name="ask_user"
+    description="""当缺少完成任务的信息或有关键决策信息缺失时，询问用户。用户可以输入多行文本，空行结束输入。使用场景：1. 需要用户提供更多信息来完成任务；2. 需要用户做出关键决策；3. 需要用户确认某些重要操作；4. 需要用户提供额外信息"""
     parameters={
         "type": "object",
         "properties": {
@@ -40,8 +30,8 @@ class AskUserTool:
             question = args["question"]
             
             # 显示问题
-            PrettyOutput.print("\n问题:", OutputType.QUESTION)
-            PrettyOutput.print(question, OutputType.QUESTION)
+            PrettyOutput.print("\n问题:", OutputType.SYSTEM)
+            PrettyOutput.print(question, OutputType.SYSTEM)
             
             # 获取用户输入
             PrettyOutput.print("\n请输入您的回答（输入空行结束）:", OutputType.INPUT)

jarvis/tools/codebase_qa.py

@@ -50,7 +50,7 @@ class CodebaseQATool:
             codebase = CodeBase(root_dir)
             # 生成索引
 
-            codebase.generate_codebase(force=True)
+            codebase.generate_codebase()
             # 执行问答
             response = codebase.ask_codebase(question, top_k)
             os.chdir(current_dir)

jarvis/tools/rag.py

@@ -0,0 +1,134 @@
+from typing import Dict, Any
+import os
+from jarvis.utils import OutputType, PrettyOutput
+from jarvis.jarvis_rag.main import RAGTool as RAGCore
+
+class RAGTool:
+    name = "rag"
+    description = "基于文档目录进行问答，支持多种文档格式（txt、pdf、docx等）"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "dir": {
+                "type": "string",
+                "description": "文档目录路径，支持相对路径和绝对路径"
+            },
+            "question": {
+                "type": "string",
+                "description": "要询问的问题"
+            },
+            "rebuild_index": {
+                "type": "boolean",
+                "description": "是否重建索引",
+                "default": False
+            }
+        },
+        "required": ["dir", "question"]
+    }
+
+    def __init__(self):
+        """初始化 RAG 工具"""
+        self.rag_instances = {}  # 缓存不同目录的 RAG 实例
+
+    def _get_rag_instance(self, dir_path: str) -> RAGCore:
+        """获取或创建 RAG 实例
+        
+        Args:
+            dir_path: 文档目录的绝对路径
+            
+        Returns:
+            RAGCore: RAG 实例
+        """
+        if dir_path not in self.rag_instances:
+            self.rag_instances[dir_path] = RAGCore(dir_path)
+        return self.rag_instances[dir_path]
+
+    def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
+        """执行文档问答
+        
+        Args:
+            args: 包含参数的字典
+                - dir: 文档目录路径
+                - question: 要询问的问题
+                - rebuild_index: 是否重建索引
+                
+        Returns:
+            Dict[str, Any]: 执行结果
+        """
+        try:
+            # 获取参数
+            dir_path = os.path.expanduser(args["dir"])  # 展开 ~ 等路径
+            dir_path = os.path.abspath(dir_path)  # 转换为绝对路径
+            question = args["question"]
+            rebuild_index = args.get("rebuild_index", False)
+            
+            # 检查目录是否存在
+            if not os.path.exists(dir_path):
+                return {
+                    "success": False,
+                    "error": f"目录不存在: {dir_path}"
+                }
+                
+            # 检查是否是目录
+            if not os.path.isdir(dir_path):
+                return {
+                    "success": False,
+                    "error": f"路径不是目录: {dir_path}"
+                }
+                
+            # 获取 RAG 实例
+            rag = self._get_rag_instance(dir_path)
+            
+            # 如果需要重建索引或索引不存在
+            if rebuild_index or not rag.is_index_built():
+                PrettyOutput.print("正在构建文档索引...", OutputType.INFO)
+                rag.build_index(dir_path)
+            
+            # 执行问答
+            PrettyOutput.print(f"问题: {question}", OutputType.INFO)
+            response = rag.ask(question)
+            
+            if response is None:
+                return {
+                    "success": False,
+                    "error": "未能获取答案，可能是没有找到相关文档"
+                }
+                
+            return {
+                "success": True,
+                "stdout": response,
+                "stderr": ""
+            }
+            
+        except Exception as e:
+            PrettyOutput.print(f"文档问答失败: {str(e)}", OutputType.ERROR)
+            return {
+                "success": False,
+                "error": f"执行失败: {str(e)}"
+            }
+
+def main():
+    """命令行直接运行工具"""
+    import argparse
+    
+    parser = argparse.ArgumentParser(description='文档问答工具')
+    parser.add_argument('--dir', required=True, help='文档目录路径')
+    parser.add_argument('--question', required=True, help='要询问的问题')
+    parser.add_argument('--rebuild', action='store_true', help='重建索引')
+    args = parser.parse_args()
+    
+    tool = RAGTool()
+    result = tool.execute({
+        "dir": args.dir,
+        "question": args.question,
+        "rebuild_index": args.rebuild
+    })
+    
+    if result["success"]:
+        PrettyOutput.print("\n回答:", OutputType.INFO)
+        PrettyOutput.print(result["stdout"], OutputType.INFO)
+    else:
+        PrettyOutput.print(result["error"], OutputType.ERROR)
+
+if __name__ == "__main__":
+    main() 

jarvis/utils.py

@@ -97,7 +97,7 @@ class PrettyOutput:
         return formatted_text
 
     @staticmethod
-    def print(text: str, output_type: OutputType, timestamp: bool = False):
+    def print(text: str, output_type: OutputType, timestamp: bool = True):
         """打印格式化的输出"""
         print(PrettyOutput.format(text, output_type, timestamp))
         if output_type == OutputType.ERROR:
@@ -110,7 +110,7 @@ class PrettyOutput:
         width = 60
         color = PrettyOutput.COLORS.get(output_type, "")
         print(f"\n{color}" + "=" * width + f"{ColoramaStyle.RESET_ALL}")
-        PrettyOutput.print(title.center(width - 10), output_type, timestamp=False)
+        PrettyOutput.print(title.center(width - 10), output_type, timestamp=True)
         print(f"{color}" + "=" * width + f"{ColoramaStyle.RESET_ALL}\n")
 
     @staticmethod
@@ -128,7 +128,7 @@ class PrettyOutput:
 
 def get_multiline_input(tip: str) -> str:
     """获取多行输入，支持方向键、历史记录等功能"""
-    PrettyOutput.print(tip + "\n", OutputType.INFO)
+    print(f"{Fore.GREEN}{tip}{ColoramaStyle.RESET_ALL}")
     
     # 创建输入会话，启用历史记录
     session = PromptSession(history=None)  # 使用默认历史记录
@@ -219,7 +219,6 @@ def load_embedding_model():
         # 首先尝试离线加载
         embedding_model = SentenceTransformer(
             model_name,
-            device="cpu",
             cache_folder=os.path.expanduser("~/.cache/huggingface/hub"),
             local_files_only=True
         )
@@ -229,7 +228,6 @@ def load_embedding_model():
         # 如果离线加载失败，尝试在线下载
         embedding_model = SentenceTransformer(
             model_name,
-            device="cpu",
             cache_folder=os.path.expanduser("~/.cache/huggingface/hub")
         )
         PrettyOutput.print("模型下载并加载成功", OutputType.SUCCESS)

{jarvis_ai_assistant-0.1.88.dist-info → jarvis_ai_assistant-0.1.90.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.88
+Version: 0.1.90
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -129,11 +129,13 @@ Jarvis supports configuration through environment variables that can be set in t
 |---------|------|--------|------|
 | JARVIS_PLATFORM | AI platform to use, supports kimi/openai/ai8 etc | kimi | Yes |
 | JARVIS_MODEL | Model name to use | - | No |
-| JARVIS_THREAD_COUNT | Number of threads for parallel processing | 10 | No |
 | JARVIS_CODEGEN_PLATFORM | AI platform for code generation | Same as JARVIS_PLATFORM | No |
 | JARVIS_CODEGEN_MODEL | Model name for code generation | Same as JARVIS_MODEL | No |
 | JARVIS_CHEAP_PLATFORM | AI platform for cheap operations | Same as JARVIS_PLATFORM | No |
 | JARVIS_CHEAP_MODEL | Model name for cheap operations | Same as JARVIS_MODEL | No |
+| JARVIS_THINKING_PLATFORM | AI platform for thinking | Same as JARVIS_PLATFORM | No |
+| JARVIS_THINKING_MODEL | Model name for thinking | Same as JARVIS_MODEL | No |
+| JARVIS_THREAD_COUNT | Number of threads for parallel processing | 10 | No |
 | OPENAI_API_KEY | API key for OpenAI platform | - | Required for OpenAI |
 | OPENAI_API_BASE | Base URL for OpenAI API | https://api.deepseek.com | No |
 | OPENAI_MODEL_NAME | Model name for OpenAI | deepseek-chat | No |
@@ -150,11 +152,6 @@ Jarvis supports configuration through environment variables that can be set in t
 jarvis
 ```
 
-### Code Generation
-```bash
-jarvis-coder
-```
-
 ### Codebase Search
 ```bash
 # Generate codebase index

jarvis_ai_assistant-0.1.90.dist-info/RECORD

@@ -0,0 +1,40 @@
+jarvis/__init__.py,sha256=K4L0GnyRU8RmTnb5h-l25KkfFYKwyj5arPEMRMKY1jo,50
+jarvis/agent.py,sha256=82F6n8YKOaLaHp40eljZLfV-Ad4RktB8s-1c8X8-LGU,19128
+jarvis/main.py,sha256=72od8757A3bhe0ncE38S7u-YZsAh0y50w9ozMhgqIU8,5423
+jarvis/utils.py,sha256=Maqu93-rixR-_rjvoBCocCH6XiB1ol1Xozj1eMjNjE0,10308
+jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_codebase/main.py,sha256=hbFYetHZOKSU0HBbKUU8Vu4o3m25nufvBnHGI8OxT6g,26503
+jarvis/jarvis_platform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_platform/main.py,sha256=V-gJQdfHihtrZD6WIYbVAQSDmtrf0PFVndZ7jPrlGZg,4277
+jarvis/jarvis_rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_rag/main.py,sha256=ZzNnU0KhAiz64kMmHd5BSBhImieXYbcfgRT-s-PiP2Y,26415
+jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+jarvis/jarvis_smart_shell/main.py,sha256=QgR1CZRcTVfC8a5hMso3onH3pFdDoniRjr0YQvY2jXQ,3809
+jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
+jarvis/models/ai8.py,sha256=ejMUAf614wBgmsYPkcWrCzONBcIAP4pUTy4b9hrolJY,11830
+jarvis/models/base.py,sha256=qIpO32lejPhaZk5T3VIua3td4gEguXMaeFER5kXYwLY,1782
+jarvis/models/kimi.py,sha256=cB1tC_ifdTAZUEqndzNTIcgHWi4w4tM8zdzSOcDhOrQ,16348
+jarvis/models/ollama.py,sha256=3Mb9ukwKk_HFfYp5dU0Zao5aa9AH_cTJoYhwHJt3MOo,5626
+jarvis/models/openai.py,sha256=-ZMLUZJATVw_nn5xhOxOrJATcdp1PMH4rd-GJXQB7ow,4207
+jarvis/models/oyi.py,sha256=IWsrReLmphm-UMzxXcbAoiWP6w1fJRP3iQTlyDpSyg8,14491
+jarvis/models/registry.py,sha256=SDnrNzf0wQi8mb7qbu4ZNfYIy5vhz1CxmVL3Ru-VATk,8797
+jarvis/tools/__init__.py,sha256=7Rqyj5hBAv5cWDVr5T9ZTZASO7ssBHeQNm2_4ZARdkA,72
+jarvis/tools/ask_user.py,sha256=KNRaiBlAqqAZ0uUkq_l7AKi-y9ZCLE83uLtTdd-UM0o,1919
+jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
+jarvis/tools/chdir.py,sha256=TjfPbX8yvNKgUNJEMXh3ZlVDEIse_Fo8xMoVsiK7_dA,2688
+jarvis/tools/codebase_qa.py,sha256=Lk8EXkin45RKUsp5C_UHm6jADBhyCT-xsYubwJ1hSiE,2403
+jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
+jarvis/tools/generator.py,sha256=TB1zcw_JmRL2W9w6L4IxtrLF3gjnNw5Jj2Zrowj0eSg,5763
+jarvis/tools/methodology.py,sha256=UG6s5VYRcd9wrKX4cg6f7zJhet5AIcthFGMOAdevBiw,5175
+jarvis/tools/rag.py,sha256=tJzuhHaTrujVXCBgmyMqSynVF0UFsIJeRTG0Y_Tt964,4483
+jarvis/tools/registry.py,sha256=AbADf8pcjHqfNoQNJkWqEuVg6zHRdryhJyDQ5w4O2sc,9177
+jarvis/tools/search.py,sha256=c9dXtyICdl8Lm8shNPNyIx9k67uY0rMF8xnIKu2RsnE,8787
+jarvis/tools/shell.py,sha256=UPKshPyOaUwTngresUw-ot1jHjQIb4wCY5nkJqa38lU,2520
+jarvis/tools/sub_agent.py,sha256=rEtAmSVY2ZjFOZEKr5m5wpACOQIiM9Zr_3dT92FhXYU,2621
+jarvis/tools/webpage.py,sha256=d3w3Jcjcu1ESciezTkz3n3Zf-rp_l91PrVoDEZnckOo,2391
+jarvis_ai_assistant-0.1.90.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.90.dist-info/METADATA,sha256=I_z4xwtzuNPXUqjsM9oxNL8pn5ZBLNuI6r74jrOKzLU,12710
+jarvis_ai_assistant-0.1.90.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.90.dist-info/entry_points.txt,sha256=47WUorU2y8wAKrGEVh5n6o3NaOB7A-4-PfSWp-xuFSg,286
+jarvis_ai_assistant-0.1.90.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.90.dist-info/RECORD,,

{jarvis_ai_assistant-0.1.88.dist-info → jarvis_ai_assistant-0.1.90.dist-info}/entry_points.txt

@@ -1,7 +1,7 @@
 [console_scripts]
 jarvis = jarvis.main:main
 jarvis-codebase = jarvis.jarvis_codebase.main:main
-jarvis-coder = jarvis.jarvis_coder.main:main
+jarvis-platform = jarvis.jarvis_platform.main:main
 jarvis-rag = jarvis.jarvis_rag.main:main
 jarvis-smart-shell = jarvis.jarvis_smart_shell.main:main
 jss = jarvis.jarvis_smart_shell.main:main