jarvis-ai-assistant 0.1.72__tar.gz → 0.1.73__tar.gz

{jarvis_ai_assistant-0.1.72/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.73}/PKG-INFO

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

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

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

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.72" 
+__version__ = "0.1.73" 

{jarvis_ai_assistant-0.1.72 → jarvis_ai_assistant-0.1.73}/src/jarvis/jarvis_codebase/main.py

@@ -377,10 +377,12 @@ class CodeBase:
                 try:
                     file_path, score_str = line.split(':', 1)
                     file_path = file_path.strip()
-                    score = float(score_str.strip())
-                    # 找到对应的原始描述
-                    desc = next((desc for p, _, desc in initial_results if p == file_path), "")
-                    scored_results.append((file_path, score/100.0, desc))
+                    score = float(score_str.strip()) / 100.0  # 转换为0-1范围
+                    # 只保留相关度大于等于0.7的结果
+                    if score >= 0.7:
+                        # 找到对应的原始描述
+                        desc = next((desc for p, _, desc in initial_results if p == file_path), "")
+                        scored_results.append((file_path, score, desc))
                 except:
                     continue
             
@@ -413,8 +415,6 @@ class CodeBase:
         PrettyOutput.print(f"查询:  {query}", output_type=OutputType.INFO)
         
         # 为每个查询获取相似文件
-        all_results = {}  # 文件路径 -> (总分数, 出现次数, 描述)
-        
         q_vector = self.get_embedding(query)
         q_vector = q_vector.reshape(1, -1)
             
@@ -429,12 +429,18 @@ class CodeBase:
                 continue
                 
             similarity = 1.0 / (1.0 + float(distance))
-            PrettyOutput.print(f"  {self.file_paths[i]} : 距离 {distance:.3f}, 相似度 {similarity:.3f}", 
-                                output_type=OutputType.INFO)
+            # 只保留相似度大于等于0.5的结果
+            if similarity >= 0.5:
+                PrettyOutput.print(f"  {self.file_paths[i]} : 距离 {distance:.3f}, 相似度 {similarity:.3f}", 
+                                 output_type=OutputType.INFO)
                 
-            file_path = self.file_paths[i]
-            data = self.vector_cache[file_path]
-            initial_results.append((file_path, similarity, data["description"]))
+                file_path = self.file_paths[i]
+                data = self.vector_cache[file_path]
+                initial_results.append((file_path, similarity, data["description"]))
+
+        if not initial_results:
+            PrettyOutput.print("没有找到相似度大于0.5的文件", output_type=OutputType.WARNING)
+            return []
 
         # 使用大模型重新排序
         PrettyOutput.print("使用大模型重新排序...", output_type=OutputType.INFO)
@@ -483,21 +489,25 @@ class CodeBase:
             model.delete_chat()
 
 
+
 def main():
     parser = argparse.ArgumentParser(description='Codebase management and search tool')
     parser.add_argument('--search', type=str, help='Search query to find similar code files')
     parser.add_argument('--top-k', type=int, default=20, help='Number of results to return (default: 20)')
     parser.add_argument('--ask', type=str, help='Ask a question about the codebase')
+    parser.add_argument('--generate', action='store_true', help='Generate codebase index')
     args = parser.parse_args()
     
     current_dir = find_git_root()
     codebase = CodeBase(current_dir)
 
-    try:
-        codebase.generate_codebase()
-        PrettyOutput.print("\nCodebase generation completed", output_type=OutputType.SUCCESS)
-    except Exception as e:
-        PrettyOutput.print(f"Error during codebase generation: {str(e)}", output_type=OutputType.ERROR)
+
+    if args.generate:
+        try:
+            codebase.generate_codebase()
+            PrettyOutput.print("\nCodebase generation completed", output_type=OutputType.SUCCESS)
+        except Exception as e:
+            PrettyOutput.print(f"Error during codebase generation: {str(e)}", output_type=OutputType.ERROR)
     
     if args.search:
         results = codebase.search_similar(args.search, args.top_k)

{jarvis_ai_assistant-0.1.72 → jarvis_ai_assistant-0.1.73}/src/jarvis/jarvis_coder/main.py

@@ -308,14 +308,34 @@ class JarvisCoder:
 
 
 
+
     def _prepare_execution(self) -> None:
         """准备执行环境"""
         self.main_model = self._new_model()
-        self._codebase.generate_codebase()
+        
+
+        # 询问用户是否更新索引数据库
+        while True:
+            answer = get_multiline_input("是否要更新代码库索引数据库？(y/n)").strip().lower()
+            if answer == 'y':
+                PrettyOutput.print("正在更新代码库索引数据库...", OutputType.PROGRESS)
+                self._codebase.generate_codebase()
+                break
+            elif answer == 'n' or not answer:
+                PrettyOutput.print("跳过代码库索引数据库更新", OutputType.INFO)
+                break
+            else:
+                PrettyOutput.print("请输入 y 或 n", OutputType.WARNING)
+
 
     def _load_related_files(self, feature: str) -> List[Dict]:
         """加载相关文件内容"""
         ret = []
+        # 确保索引数据库已生成
+        if not self._codebase.is_index_generated():
+            PrettyOutput.print("检测到索引数据库未生成，正在生成...", OutputType.WARNING)
+            self._codebase.generate_codebase()
+            
         related_files = self._codebase.search_similar(feature)
         for file, score, _ in related_files:
             PrettyOutput.print(f"相关文件: {file} 相关度: {score:.3f}", OutputType.SUCCESS)

{jarvis_ai_assistant-0.1.72 → jarvis_ai_assistant-0.1.73}/src/jarvis/tools/codebase_qa.py

@@ -45,8 +45,11 @@ class CodebaseQATool:
                     "stderr": "错误：当前目录不在Git仓库中",
                     "error": "NotInGitRepository"
                 }
+
             os.chdir(root_dir)
             codebase = CodeBase(root_dir)
+            # 生成索引
+            codebase.generate_codebase()
             # 执行问答
             response = codebase.ask_codebase(question, top_k)
             os.chdir(current_dir)

{jarvis_ai_assistant-0.1.72 → jarvis_ai_assistant-0.1.73/src/jarvis_ai_assistant.egg-info}/PKG-INFO

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