jarvis-ai-assistant 0.1.72__py3-none-any.whl → 0.1.73__py3-none-any.whl

jarvis/__init__.py

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

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/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/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.dist-info → jarvis_ai_assistant-0.1.73.dist-info}/METADATA

@@ -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.dist-info → jarvis_ai_assistant-0.1.73.dist-info}/RECORD

@@ -1,11 +1,11 @@
-jarvis/__init__.py,sha256=MyFCehMdftT6QiIVeyWoT3cnA4reDk6ObCHGRDEr7JY,50
+jarvis/__init__.py,sha256=cOQGkKfetErqIGax4StIXz4nEwj37NA4SG09WyDuwtU,50
 jarvis/agent.py,sha256=kl6pwNrluzb-9eZKgwmsk5Jh4CpWi4F8B3RvEQNvc5U,14921
 jarvis/main.py,sha256=7EcSlxa5JFFXBujzKDWdNtwX6axLhFFdJMc2GxTjfdk,6295
 jarvis/utils.py,sha256=vZV8sHj0ggZy4Rb8RxIujQhRWgeNEomhqVl4WXmpq7c,7498
 jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_codebase/main.py,sha256=A-KY9WzAIsCF0QPndm4b8-rAKEz4nLlm4NkfUMpnQUM,21965
+jarvis/jarvis_codebase/main.py,sha256=X8Z0axQLA0-yC8AthvjthxM_ufr-GFek8rBFGMgkzAU,22420
 jarvis/jarvis_coder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_coder/main.py,sha256=uQ7aQ3hmnxecacjLSBOV0rSLkacExGLgQRc9zD1ar1E,22085
+jarvis/jarvis_coder/main.py,sha256=EuKRCa6wiOj7Rjeyh-ewATZY2aGWzbvaqFQXNy2B8_M,22947
 jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
 jarvis/models/ai8.py,sha256=vgy-r_3HHxGMAalZrA65VWHC1PuwBTYgtprSgHkCbrk,12557
 jarvis/models/base.py,sha256=ShV1H8Unee4RMaiFO4idROQA0Hc6wu4dyeRPX5fcszk,1433
@@ -15,7 +15,7 @@ jarvis/models/oyi.py,sha256=X2c5SWDIuQDCCFBcEKbzIWEz3I34eOAi0d1XAFgxlpw,15001
 jarvis/models/registry.py,sha256=YpooKSpk5pSWfb5cBDz5wRfPK-abb9uuUZr4WBejqwI,7762
 jarvis/tools/__init__.py,sha256=7Rqyj5hBAv5cWDVr5T9ZTZASO7ssBHeQNm2_4ZARdkA,72
 jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
-jarvis/tools/codebase_qa.py,sha256=AEpusYxyWtALVVwPk1DMUH9cVI73mE1e3WFHJXDpXto,2333
+jarvis/tools/codebase_qa.py,sha256=0r3SnLtJXm2NgIPCVkKnyfLKxk0RGvODpv7cBfwerKo,2402
 jarvis/tools/coder.py,sha256=ZJfPInKms4Hj3-eQlBwamVsvZ-2nlZ-4jsqJ-tJc6mg,2040
 jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
 jarvis/tools/generator.py,sha256=vVP3eN5cCDpRXf_fn0skETkPXAW1XZFWx9pt2_ahK48,5999
@@ -25,9 +25,9 @@ jarvis/tools/search.py,sha256=1EqOVvLhg2Csh-i03-XeCrusbyfmH69FZ8khwZt8Tow,6131
 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.72.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.72.dist-info/METADATA,sha256=4YOsbaLCJw40e43wAL34myfveTRLOmC-MIpBrkrt2zs,12399
-jarvis_ai_assistant-0.1.72.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.72.dist-info/entry_points.txt,sha256=QNUeqmUJd7nHufel2FO7cRttS1uKFfnbIyObv8eVyOY,140
-jarvis_ai_assistant-0.1.72.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.72.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.73.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.73.dist-info/METADATA,sha256=u_IoU6F2lDynOwzedwiB52WNnOgSPuUiDa9Ahz5o2jE,12399
+jarvis_ai_assistant-0.1.73.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+jarvis_ai_assistant-0.1.73.dist-info/entry_points.txt,sha256=QNUeqmUJd7nHufel2FO7cRttS1uKFfnbIyObv8eVyOY,140
+jarvis_ai_assistant-0.1.73.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.73.dist-info/RECORD,,