jarvis-ai-assistant 0.1.77__tar.gz → 0.1.78__tar.gz

{jarvis_ai_assistant-0.1.77/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.78}/PKG-INFO

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

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

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

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.77" 
+__version__ = "0.1.78" 

{jarvis_ai_assistant-0.1.77 → jarvis_ai_assistant-0.1.78}/src/jarvis/agent.py

@@ -24,7 +24,7 @@ class Agent:
             name: Agent名称，默认为"Jarvis"
             is_sub_agent: 是否为子Agent，默认为False
         """
-        self.model = PlatformRegistry.get_global_platform()
+        self.model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
         self.tool_registry = ToolRegistry.get_global_tool_registry()
         self.name = name
         self.is_sub_agent = is_sub_agent
@@ -32,12 +32,11 @@ class Agent:
         self.conversation_turns = 0  
         
         # 从环境变量加载嵌入模型配置
-        self.embedding_model_name = os.environ.get("JARVIS_EMBEDDING_MODEL", "BAAI/bge-large-zh-v1.5")
         self.embedding_dimension = 1536  # Default for many embedding models
         
         # 初始化嵌入模型
         try:
-            self.embedding_model = load_embedding_model(self.embedding_model_name)
+            self.embedding_model = load_embedding_model()
             
             # 预热模型并获取正确的维度
             test_text = "这是一段测试文本，用于确保模型完全加载。"

{jarvis_ai_assistant-0.1.77 → jarvis_ai_assistant-0.1.78}/src/jarvis/jarvis_codebase/main.py

@@ -19,22 +19,6 @@ class CodeBase:
         self.root_dir = root_dir
         os.chdir(self.root_dir)
         self.thread_count = int(os.environ.get("JARVIS_THREAD_COUNT") or 10)
-        self.cheap_platform = os.environ.get("JARVIS_CHEAP_PLATFORM") or os.environ.get("JARVIS_PLATFORM") or "kimi"
-        self.cheap_model = os.environ.get("JARVIS_CHEAP_MODEL") or os.environ.get("JARVIS_MODEL") or "kimi"
-        self.normal_platform = os.environ.get("JARVIS_PLATFORM") or "kimi"
-        self.codegen_platform = os.environ.get("JARVIS_CODEGEN_PLATFORM") or os.environ.get("JARVIS_PLATFORM") or "kimi"
-        self.codegen_model = os.environ.get("JARVIS_CODEGEN_MODEL") or os.environ.get("JARVIS_MODEL") or "kimi"
-        self.normal_model = os.environ.get("JARVIS_MODEL") or "kimi"
-        self.embedding_model_name = os.environ.get("JARVIS_EMBEDDING_MODEL") or "BAAI/bge-large-zh-v1.5"
-        if not self.cheap_platform or not self.cheap_model or not self.codegen_platform or not self.codegen_model or not self.embedding_model_name or not self.normal_platform or not self.normal_model:
-            raise ValueError("JARVIS_CHEAP_PLATFORM or JARVIS_CHEAP_MODEL or JARVIS_CODEGEN_PLATFORM or JARVIS_CODEGEN_MODEL or JARVIS_EMBEDDING_MODEL or JARVIS_PLATFORM or JARVIS_MODEL is not set")
-        
-        PrettyOutput.print(f"廉价模型使用平台: {self.cheap_platform} 模型: {self.cheap_model}", output_type=OutputType.INFO)
-        PrettyOutput.print(f"代码生成模型使用平台: {self.codegen_platform} 模型: {self.codegen_model}", output_type=OutputType.INFO)
-        PrettyOutput.print(f"分析模型使用平台: {self.normal_platform} 模型: {self.normal_model}", output_type=OutputType.INFO)
-        PrettyOutput.print(f"嵌入模型: {self.embedding_model_name}", output_type=OutputType.INFO)
-        PrettyOutput.print(f"索引建立线程数: {self.thread_count}", output_type=OutputType.INFO)
-        PrettyOutput.print(f"检索算法：分层导航小世界算法", output_type=OutputType.INFO)
             
         # 初始化数据目录
         self.data_dir = os.path.join(self.root_dir, ".jarvis-codebase")
@@ -43,7 +27,7 @@ class CodeBase:
             
         # 初始化嵌入模型，使用系统默认缓存目录
         try:
-            self.embedding_model = load_embedding_model(self.embedding_model_name)
+            self.embedding_model = load_embedding_model()
             
             # 强制完全加载所有模型组件
             test_text = """
@@ -62,7 +46,7 @@ class CodeBase:
         self.vector_dim = self.embedding_model.get_sentence_embedding_dimension()
 
         self.git_file_list = self.get_git_file_list()
-        self.platform_registry = PlatformRegistry().get_global_platform_registry()
+        self.platform_registry = PlatformRegistry.get_global_platform_registry()
         
         # 初始化缓存和索引
         self.cache_path = os.path.join(self.data_dir, "cache.pkl")
@@ -102,8 +86,7 @@ class CodeBase:
                 return False
 
     def make_description(self, file_path: str) -> str:
-        model = self.platform_registry.create_platform(self.cheap_platform)
-        model.set_model_name(self.cheap_model)
+        model = PlatformRegistry.get_global_platform_registry().get_codegen_platform()
         model.set_suppress_output(True)
         content = open(file_path, "r", encoding="utf-8").read()
         prompt = f"""请分析以下代码文件，并生成一个详细的描述。描述应该包含以下要点：
@@ -411,8 +394,7 @@ class CodeBase:
         if not initial_results:
             return []
 
-        model = self.platform_registry.create_platform(self.normal_platform)
-        model.set_model_name(self.normal_model)
+        model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
         model.set_suppress_output(True)
 
         try:
@@ -470,8 +452,7 @@ class CodeBase:
 
     def search_similar(self, query: str, top_k: int = 20) -> List[Tuple[str, float, str]]:
         """搜索相似文件"""
-        model = self.platform_registry.create_platform(self.normal_platform)
-        model.set_model_name(self.normal_model)
+        model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
         model.set_suppress_output(True)
         
         try:
@@ -554,8 +535,7 @@ class CodeBase:
 
 请用专业的语言回答用户的问题，如果给出的文件内容不足以回答用户的问题，请告诉用户，绝对不要胡编乱造。
 """
-        model = self.platform_registry.create_platform(self.codegen_platform)
-        model.set_model_name(self.codegen_model)
+        model = PlatformRegistry.get_global_platform_registry().get_codegen_platform()
         try:
             response = model.chat(prompt)
             return response

{jarvis_ai_assistant-0.1.77 → jarvis_ai_assistant-0.1.78}/src/jarvis/jarvis_coder/main.py

@@ -21,13 +21,7 @@ index_lock = threading.Lock()
 class JarvisCoder:
     def __init__(self, root_dir: str, language: str):
         """初始化代码修改工具"""
-        
-        self.platform = os.environ.get("JARVIS_CODEGEN_PLATFORM") or os.environ.get("JARVIS_PLATFORM")
-        self.model = os.environ.get("JARVIS_CODEGEN_MODEL") or os.environ.get("JARVIS_MODEL")
-
 
-        if not self.platform or not self.model:
-            raise ValueError("JARVIS_CODEGEN_PLATFORM or JARVIS_CODEGEN_MODEL is not set")
 
         self.root_dir = find_git_root(root_dir)
         if not self.root_dir:
@@ -486,8 +480,6 @@ def main():
     load_env_from_file()
     
     parser = argparse.ArgumentParser(description='代码修改工具')
-    parser.add_argument('-p', '--platform', help='AI平台名称', default=os.environ.get('JARVIS_CODEGEN_PLATFORM'))
-    parser.add_argument('-m', '--model', help='模型名称', default=os.environ.get('JARVIS_CODEGEN_MODEL'))
     parser.add_argument('-d', '--dir', help='项目根目录', default=os.getcwd())
     parser.add_argument('-l', '--language', help='编程语言', default="python")
     args = parser.parse_args()
@@ -495,9 +487,6 @@ def main():
     # 设置平台
     if not args.platform:
         print("错误: 未指定AI平台，请使用 -p 参数")
-    # 设置模型
-    if args.model:
-        os.environ['JARVIS_CODEGEN_MODEL'] = args.model
         
     tool = JarvisCoder(args.dir, args.language)
     

{jarvis_ai_assistant-0.1.77 → jarvis_ai_assistant-0.1.78}/src/jarvis/main.py

@@ -104,31 +104,16 @@ def main():
     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=os.getenv('JARVIS_PLATFORM') or 'kimi', help='选择AI平台')
-    parser.add_argument('-m', '--model', default=os.getenv('JARVIS_MODEL') or '', help='模型')  # 用于指定使用的模型名称，默认使用环境变量或平台默认模型
     args = parser.parse_args()
 
-    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)
-
-    if args.model:
-        os.environ["JARVIS_MODEL"] = args.model
-
     try:
         # 获取全局模型实例
         agent = Agent()
 
         # 如果用户传入了模型参数，则更换当前模型为用户指定的模型
-        if args.model:
-            agent.model.set_model_name(args.model)
 
         # 欢迎信息
-        PrettyOutput.print(f"Jarvis 已初始化 - With {platform} 平台，模型: {agent.model.name()}", OutputType.SYSTEM)
+        PrettyOutput.print(f"Jarvis 已初始化 - With {agent.model.name()}", OutputType.SYSTEM)
         if args.keep_history:
             PrettyOutput.print("已启用历史保留模式", OutputType.INFO)
         

{jarvis_ai_assistant-0.1.77 → jarvis_ai_assistant-0.1.78}/src/jarvis/models/registry.py

@@ -152,14 +152,26 @@ class PlatformRegistry:
         """
         self.platforms: Dict[str, Type[BasePlatform]] = {}
 
-    @staticmethod
-    def get_global_platform() -> BasePlatform:
-        """获取全局平台实例"""
-        platform = PlatformRegistry.get_global_platform_registry().create_platform(PlatformRegistry.global_platform_name)
-        if not platform:
-            raise Exception(f"Failed to create platform: {PlatformRegistry.global_platform_name}")
+    def get_normal_platform(self) -> BasePlatform:
+        platform_name = os.environ.get("JARVIS_PLATFORM", "kimi")
+        model_name = os.environ.get("JARVIS_MODEL", "kimi")
+        platform = self.create_platform(platform_name)
+        platform.set_model_name(model_name)
+        return platform
+    
+    def get_codegen_platform(self) -> BasePlatform:
+        platform_name = os.environ.get("JARVIS_CODEGEN_PLATFORM", os.environ.get("JARVIS_PLATFORM", "kimi"))
+        model_name = os.environ.get("JARVIS_CODEGEN_MODEL", os.environ.get("JARVIS_MODEL", "kimi"))
+        platform = self.create_platform(platform_name)
+        platform.set_model_name(model_name)
+        return platform
+    
+    def get_cheap_platform(self) -> BasePlatform:
+        platform_name = os.environ.get("JARVIS_CHEAP_PLATFORM", os.environ.get("JARVIS_PLATFORM", "kimi"))
+        model_name = os.environ.get("JARVIS_CHEAP_MODEL", os.environ.get("JARVIS_MODEL", "kimi"))
+        platform = self.create_platform(platform_name)
+        platform.set_model_name(model_name)
         return platform
-        
 
     def register_platform(self, name: str, platform_class: Type[BasePlatform]):
         """注册平台类
@@ -195,10 +207,3 @@ class PlatformRegistry:
         """获取可用平台列表"""
         return list(self.platforms.keys()) 
     
-    def set_global_platform_name(self, platform_name: str):
-        """设置全局平台"""
-        PlatformRegistry.global_platform_name = platform_name
-
-    def get_global_platform_name(self) -> str:
-        """获取全局平台名称"""
-        return PlatformRegistry.global_platform_name

{jarvis_ai_assistant-0.1.77 → jarvis_ai_assistant-0.1.78}/src/jarvis/rag/main.py

@@ -13,6 +13,7 @@ from tqdm import tqdm
 import fitz  # PyMuPDF for PDF files
 from docx import Document as DocxDocument  # python-docx for DOCX files
 from pathlib import Path
+from jarvis.models.registry import PlatformRegistry
 
 @dataclass
 class Document:
@@ -140,7 +141,6 @@ class RAGTool:
         # 初始化配置
         self.min_paragraph_length = int(os.environ.get("JARVIS_MIN_PARAGRAPH_LENGTH", "50"))  # 最小段落长度
         self.max_paragraph_length = int(os.environ.get("JARVIS_MAX_PARAGRAPH_LENGTH", "1000"))  # 最大段落长度
-        self.embedding_model_name = os.environ.get("JARVIS_EMBEDDING_MODEL", "BAAI/bge-large-zh-v1.5")
         
         # 初始化数据目录
         self.data_dir = os.path.join(self.root_dir, ".jarvis-rag")
@@ -149,7 +149,7 @@ class RAGTool:
             
         # 初始化嵌入模型
         try:
-            self.embedding_model = load_embedding_model(self.embedding_model_name)
+            self.embedding_model = load_embedding_model()
             self.vector_dim = self.embedding_model.get_sentence_embedding_dimension()
             PrettyOutput.print("模型加载完成", output_type=OutputType.SUCCESS)
         except Exception as e:
@@ -363,11 +363,11 @@ class RAGTool:
                             output_type=OutputType.ERROR)
             return []
 
-    def build_index(self):
+    def build_index(self, dir: str):
         """构建文档索引"""
         # 获取所有文件
         all_files = []
-        for root, _, files in os.walk(self.root_dir):
+        for root, _, files in os.walk(dir):
             if any(ignored in root for ignored in ['.jarvis-rag', '.git', '__pycache__', 'node_modules']):
                 continue
             for file in files:
@@ -431,8 +431,73 @@ class RAGTool:
                 
         return results
 
+    def is_index_built(self):
+        """检查索引是否已构建"""
+        return self.index is not None
+
+    def query(self, query: str) -> List[Document]:
+        """查询相关文档
+        
+        Args:
+            query: 查询文本
+            
+        Returns:
+            相关文档列表
+        """
+        if not self.is_index_built():
+            raise ValueError("索引未构建，请先调用build_index()")
+            
+        results = self.search(query)
+        return [doc for doc, _ in results]
+
+    def ask(self, question: str) -> Optional[str]:
+        """询问关于文档的问题
+        
+        Args:
+            question: 用户问题
+            
+        Returns:
+            模型回答，如果失败则返回 None
+        """
+        try:
+            # 搜索相关文档片段
+            results = self.query(question)
+            if not results:
+                return None
+
+            # 构建上下文
+            context = []
+            for doc in results:
+                context.append(f"""
+来源文件: {doc.metadata['file_path']}
+片段位置: {doc.metadata['chunk_index'] + 1}/{doc.metadata['total_chunks']}
+内容:
+{doc.content}
+---
+""")
+
+            # 构建提示词
+            prompt = f"""请基于以下文档片段回答用户的问题。如果文档片段中的信息不足以完整回答问题，请明确指出。
+            
+用户问题: {question}
+
+相关文档片段:
+{''.join(context)}
+
+请提供准确、简洁的回答，并在适当时引用具体的文档来源。
+"""
+            # 获取模型实例并生成回答
+            model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
+            response = model.chat(prompt)
+            
+            return response
+            
+        except Exception as e:
+            PrettyOutput.print(f"问答失败: {str(e)}", output_type=OutputType.ERROR)
+            return None
+
 def main():
-    """命令行入口"""
+    """主函数"""
     import argparse
     import sys
     
@@ -442,39 +507,57 @@ def main():
         sys.stdout = codecs.getwriter('utf-8')(sys.stdout.buffer, 'strict')
         sys.stderr = codecs.getwriter('utf-8')(sys.stderr.buffer, 'strict')
     
-    parser = argparse.ArgumentParser(description='RAG工具')
-    parser.add_argument('--dir', type=str, default=os.getcwd(), help='项目根目录')
-    parser.add_argument('--build', action='store_true', help='构建索引')
-    parser.add_argument('--query', type=str, help='搜索查询')
-    parser.add_argument('--top-k', type=int, default=5, help='返回结果数量')
-    
+    parser = argparse.ArgumentParser(description='文档检索和分析工具')
+    parser.add_argument('--dir', type=str, help='要处理的文档目录')
+    parser.add_argument('--build', action='store_true', help='构建文档索引')
+    parser.add_argument('--search', type=str, help='搜索文档内容')
+    parser.add_argument('--ask', type=str, help='询问关于文档的问题')
     args = parser.parse_args()
-    
+
     try:
-        rag = RAGTool(args.dir)
-        
-        if args.build:
-            rag.build_index()
-            
-        if args.query:
-            results = rag.search(args.query, args.top_k)
-            
-            if not results:
-                PrettyOutput.print("未找到相关内容", output_type=OutputType.WARNING)
-                return
-                
-            PrettyOutput.print("\n搜索结果:", output_type=OutputType.INFO)
-            for doc, score in results:
-                PrettyOutput.print("\n" + "="*50, output_type=OutputType.INFO)
-                PrettyOutput.print(f"文件: {doc.metadata['file_path']}", output_type=OutputType.INFO)
-                PrettyOutput.print(f"相似度: {score:.3f}", output_type=OutputType.INFO)
-                PrettyOutput.print(f"片段 {doc.metadata['chunk_index'] + 1}/{doc.metadata['total_chunks']}", 
-                                output_type=OutputType.INFO)
-                PrettyOutput.print("\n内容:", output_type=OutputType.INFO)
-                # 确保内容是UTF-8编码
-                content = doc.content.encode('utf-8', errors='replace').decode('utf-8')
-                PrettyOutput.print(content, output_type=OutputType.INFO)
-                
+        current_dir = find_git_root()
+        rag = RAGTool(current_dir)
+
+        if args.dir and args.build:
+            PrettyOutput.print(f"正在处理目录: {args.dir}", output_type=OutputType.INFO)
+            rag.build_index(args.dir)
+            return 0
+
+        if args.search or args.ask:
+            if not rag.is_index_built():
+                PrettyOutput.print("索引尚未构建，请先使用 --dir 和 --build 参数构建索引", output_type=OutputType.WARNING)
+                return 1
+
+            if args.search:
+                results = rag.query(args.search)
+                if not results:
+                    PrettyOutput.print("未找到相关内容", output_type=OutputType.WARNING)
+                    return 1
+                    
+                for doc in results:
+                    PrettyOutput.print(f"\n文件: {doc.metadata['file_path']}", output_type=OutputType.INFO)
+                    PrettyOutput.print(f"片段 {doc.metadata['chunk_index'] + 1}/{doc.metadata['total_chunks']}", 
+                                    output_type=OutputType.INFO)
+                    PrettyOutput.print("\n内容:", output_type=OutputType.INFO)
+                    content = doc.content.encode('utf-8', errors='replace').decode('utf-8')
+                    PrettyOutput.print(content, output_type=OutputType.INFO)
+                return 0
+
+            if args.ask:
+                # 调用 ask 方法
+                response = rag.ask(args.ask)
+                if not response:
+                    PrettyOutput.print("未能获取答案", output_type=OutputType.WARNING)
+                    return 1
+                    
+                # 显示回答
+                PrettyOutput.print("\n回答:", output_type=OutputType.INFO)
+                PrettyOutput.print(response, output_type=OutputType.INFO)
+                return 0
+
+        PrettyOutput.print("请指定操作参数。使用 -h 查看帮助。", output_type=OutputType.WARNING)
+        return 1
+
     except Exception as e:
         PrettyOutput.print(f"执行失败: {str(e)}", output_type=OutputType.ERROR)
         return 1

{jarvis_ai_assistant-0.1.77 → jarvis_ai_assistant-0.1.78}/src/jarvis/tools/generator.py

@@ -42,11 +42,7 @@ class ToolGeneratorTool:
 
     def _generate_tool_code(self, tool_name: str, class_name: str, description: str, parameters: Dict) -> str:
         """使用大模型生成工具代码"""
-        platform_name = os.getenv("JARVIS_CODEGEN_PLATFORM") or PlatformRegistry.get_global_platform_name()
-        model = PlatformRegistry.create_platform(platform_name)
-        model_name = os.getenv("JARVIS_CODEGEN_MODEL")
-        if model_name:
-            model.set_model_name(model_name)
+        model = PlatformRegistry.get_global_platform_registry().get_codegen_platform()
 
         prompt = f"""请生成一个Python工具类的代码，要求如下，除了代码，不要输出任何内容：
 

{jarvis_ai_assistant-0.1.77 → jarvis_ai_assistant-0.1.78}/src/jarvis/tools/search.py

@@ -86,7 +86,7 @@ class SearchTool:
 
     def __init__(self):
         """初始化搜索工具，需要传入语言模型用于信息提取"""
-        self.model = PlatformRegistry.get_global_platform_registry().get_global_platform()
+        self.model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
         self.webpage_tool = WebpageTool()
 
     def _search(self, query: str, max_results: int) -> List[Dict]:

{jarvis_ai_assistant-0.1.77 → jarvis_ai_assistant-0.1.78}/src/jarvis/utils.py

@@ -209,8 +209,9 @@ def find_git_root(dir="."):
     os.chdir(curr_dir)
     return ret
 
-def load_embedding_model(model_name: str):
+def load_embedding_model():
     os.environ["TOKENIZERS_PARALLELISM"] = "false"
+    model_name = os.environ.get("JARVIS_EMBEDDING_MODEL", "BAAI/bge-large-zh-v1.5")
     PrettyOutput.print(f"正在加载嵌入模型: {model_name}...", OutputType.INFO)
     try:
         # 首先尝试离线加载
@@ -230,4 +231,5 @@ def load_embedding_model(model_name: str):
             cache_folder=os.path.expanduser("~/.cache/huggingface/hub")
         )
         PrettyOutput.print("模型下载并加载成功", OutputType.SUCCESS)
+    
     return embedding_model

{jarvis_ai_assistant-0.1.77 → jarvis_ai_assistant-0.1.78/src/jarvis_ai_assistant.egg-info}/PKG-INFO

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