jarvis-ai-assistant 0.1.92__tar.gz → 0.1.93__tar.gz

{jarvis_ai_assistant-0.1.92/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.93}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.92"
+version = "0.1.93"
 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" }]
@@ -48,6 +48,7 @@ Homepage = "https://github.com/skyfireitdiy/Jarvis"
 
 [project.scripts]
 jarvis = "jarvis.main:main"
+jarvis-coder = "jarvis.jarvis_coder.main:main"
 jarvis-codebase = "jarvis.jarvis_codebase.main:main"
 jarvis-rag = "jarvis.jarvis_rag.main:main"
 jarvis-smart-shell = "jarvis.jarvis_smart_shell.main:main"

{jarvis_ai_assistant-0.1.92 → jarvis_ai_assistant-0.1.93}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.92",
+    version="0.1.93",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -33,6 +33,7 @@ setup(
     entry_points={
         "console_scripts": [
             "jarvis=jarvis.main:main",
+            "jarvis-coder=jarvis.jarvis_coder.main:main",
             "jarvis-codebase=jarvis.jarvis_codebase.main:main",
             "jarvis-rag=jarvis.jarvis_rag.main:main",
             "jarvis-smart-shell=jarvis.jarvis_smart_shell.main:main",

{jarvis_ai_assistant-0.1.92 → jarvis_ai_assistant-0.1.93}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.92" 
+__version__ = "0.1.93" 

{jarvis_ai_assistant-0.1.92 → jarvis_ai_assistant-0.1.93}/src/jarvis/agent.py

@@ -140,7 +140,7 @@ class Agent:
 
     def _load_methodology(self, user_input: str) -> Dict[str, str]:
         """加载方法论并构建向量索引"""
-        PrettyOutput.print("加载方法论...", OutputType.PLANNING)
+        PrettyOutput.print("加载方法论...", OutputType.PROGRESS)
         user_jarvis_methodology = os.path.expanduser("~/.jarvis_methodology")
         if not os.path.exists(user_jarvis_methodology):
             return {}
@@ -165,13 +165,13 @@ class Agent:
 
             if vectors:
                 vectors_array = np.vstack(vectors)
-                self.methodology_index.add_with_ids(vectors_array, np.array(ids))
+                self.methodology_index.add_with_ids(vectors_array, np.array(ids)) # type: ignore
                 query_embedding = self._create_methodology_embedding(user_input)
                 k = min(5, len(self.methodology_data))
                 PrettyOutput.print(f"检索方法论...", OutputType.INFO)
                 distances, indices = self.methodology_index.search(
                     query_embedding.reshape(1, -1), k
-                )
+                ) # type: ignore
 
                 relevant_methodologies = {}
                 for dist, idx in zip(distances[0], indices[0]):
@@ -208,7 +208,7 @@ class Agent:
         """
         # 创建一个新的模型实例来做总结，避免影响主对话
 
-        PrettyOutput.print("总结对话历史，准备生成总结，开始新的对话...", OutputType.PLANNING)
+        PrettyOutput.print("总结对话历史，准备生成总结，开始新的对话...", OutputType.PROGRESS)
         
         prompt = """请总结之前对话中的关键信息，包括：
 1. 当前任务目标

{jarvis_ai_assistant-0.1.92 → jarvis_ai_assistant-0.1.93}/src/jarvis/jarvis_codebase/main.py

@@ -93,16 +93,10 @@ class CodeBase:
         model = PlatformRegistry.get_global_platform_registry().get_cheap_platform()
         model.set_suppress_output(True)
         prompt = f"""请分析以下代码文件，并生成一个详细的描述。描述应该包含以下要点：
+1. 整个文件的功能描述，不超过100个字
+2. 每个全局变量的函数、类型定义、类、方法等代码元素的一句话描述，不超过50字
 
-1. 主要功能和用途
-2. 关键类和方法的作用
-3. 重要的依赖和技术特征（如使用了什么框架、算法、设计模式等）
-4. 代码处理的主要数据类型和数据结构
-5. 关键业务逻辑和处理流程
-6. 特殊功能点和亮点特性
-
-请用简洁专业的语言描述，突出代码的技术特征和功能特点，以便后续进行关联代码检索。
-
+请用简洁专业的语言描述，突出代码的技术功能，以便后续进行关联代码检索。
 文件路径：{file_path}
 代码内容：
 {content}
@@ -210,7 +204,7 @@ class CodeBase:
         except Exception as e:
             PrettyOutput.print(f"Error vectorizing file {file_path}: {str(e)}", 
                              output_type=OutputType.ERROR)
-            return np.zeros(self.vector_dim, dtype=np.float32)
+            return np.zeros(self.vector_dim, dtype=np.float32) # type: ignore
 
     def clean_cache(self) -> bool:
         """清理过期的缓存记录，返回是否有文件被删除"""
@@ -296,7 +290,7 @@ class CodeBase:
             
         if vectors:
             vectors = np.vstack(vectors)
-            self.index.add_with_ids(vectors, np.array(ids))
+            self.index.add_with_ids(vectors, np.array(ids)) # type: ignore
         else:
             self.index = None
 
@@ -563,7 +557,7 @@ class CodeBase:
             query_vector = self.get_embedding(query)
             query_vector = query_vector.reshape(1, -1)
             
-            distances, indices = self.index.search(query_vector, top_k)
+            distances, indices = self.index.search(query_vector, top_k) # type: ignore
             
             for i, distance in zip(indices[0], distances[0]):
                 if i == -1:
@@ -717,4 +711,4 @@ def main():
 
 
 if __name__ == "__main__":
-    exit(main())
+    exit(main())

jarvis_ai_assistant-0.1.93/src/jarvis/jarvis_coder/git_utils.py

@@ -0,0 +1,64 @@
+import os
+from typing import List
+import yaml
+import time
+from jarvis.utils import OutputType, PrettyOutput, while_success
+from jarvis.models.registry import PlatformRegistry
+
+def has_uncommitted_files() -> bool:
+    """判断代码库是否有未提交的文件"""
+    # 获取未暂存的修改
+    unstaged = os.popen("git diff --name-only").read()
+    # 获取已暂存但未提交的修改
+    staged = os.popen("git diff --cached --name-only").read()
+    # 获取未跟踪的文件
+    untracked = os.popen("git ls-files --others --exclude-standard").read()
+    
+    return bool(unstaged or staged or untracked)
+
+def generate_commit_message(git_diff: str, feature: str) -> str:
+    """根据git diff和功能描述生成commit信息"""
+    prompt = f"""你是一个经验丰富的程序员，请根据以下代码变更和功能描述生成简洁明了的commit信息：
+
+功能描述：
+{feature}
+
+代码变更：
+Git Diff:
+{git_diff}
+
+请遵循以下规则：
+1. 使用英文编写
+2. 采用常规的commit message格式：<type>(<scope>): <subject>
+3. 保持简洁，不超过50个字符
+4. 准确描述代码变更的主要内容
+5. 优先考虑功能描述和git diff中的变更内容
+6. 仅生成commit信息的文本，不要输出任何其他内容
+"""
+    
+    model = PlatformRegistry().get_global_platform_registry().get_codegen_platform()
+    response = while_success(lambda: model.chat(prompt), 5)
+        
+    return response.strip().split("\n")[0]
+
+def save_edit_record(record_dir: str, commit_message: str, git_diff: str) -> None:
+    """保存代码修改记录"""
+    # 获取下一个序号
+    existing_records = [f for f in os.listdir(record_dir) if f.endswith('.yaml')]
+    next_num = 1
+    if existing_records:
+        last_num = max(int(f[:4]) for f in existing_records)
+        next_num = last_num + 1
+    
+    # 创建记录文件
+    record = {
+        "timestamp": time.strftime("%Y-%m-%d %H:%M:%S"),
+        "commit_message": commit_message,
+        "git_diff": git_diff
+    }
+    
+    record_path = os.path.join(record_dir, f"{next_num:04d}.yaml")
+    with open(record_path, "w", encoding="utf-8") as f:
+        yaml.safe_dump(record, f, allow_unicode=True)
+    
+    PrettyOutput.print(f"已保存修改记录: {record_path}", OutputType.SUCCESS)