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

{jarvis_ai_assistant-0.1.91/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.91
+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
@@ -53,6 +53,8 @@ Requires-Dist: PyMuPDF>=1.21.0
 Requires-Dist: python-docx>=0.8.11
 Requires-Dist: tiktoken>=0.3.0
 Requires-Dist: tqdm>=4.65.0
+Requires-Dist: docx>=0.2.4
+Requires-Dist: yaspin>=2.5.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

{jarvis_ai_assistant-0.1.91 → 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.91"
+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" }]
@@ -35,6 +35,8 @@ dependencies = [
     "python-docx>=0.8.11",
     "tiktoken>=0.3.0",
     "tqdm>=4.65.0",
+    "docx>=0.2.4",
+    "yaspin>=2.5.0",
 ]
 requires-python = ">=3.8"
 
@@ -46,8 +48,9 @@ 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"
 jss = "jarvis.jarvis_smart_shell.main:main"
-jarvis-platform = "jarvis.jarvis_platform.main:main"
+jarvis-platform = "jarvis.jarvis_platform.main:main"

{jarvis_ai_assistant-0.1.91 → 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.91",
+    version="0.1.93",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -27,10 +27,13 @@ setup(
         "python-docx>=0.8.11",
         "tiktoken>=0.3.0",
         "tqdm>=4.65.0",
+        "docx>=0.2.4",
+        "yaspin>=2.5.0",
     ],
     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",
@@ -50,4 +53,4 @@ setup(
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
     ],
-)
+)

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

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

{jarvis_ai_assistant-0.1.91 → 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. 当前任务目标
@@ -259,6 +259,8 @@ class Agent:
                 analysis_prompt = """本次任务已结束，请分析是否需要生成方法论。
 如果认为需要生成方法论，请先判断是创建新的方法论还是更新已有方法论。如果是更新已有方法论，使用update，否则使用add。
 如果认为不需要生成方法论，请说明原因。
+方法论应该适应普遍场景，不要出现本次任务特定的信息，如代码的commit信息等。
+方法论中应该包含：问题重述、最优解决方案、注意事项（按需），除此外不要出现任何其他的信息。
 仅输出方法论工具的调用指令，或者是不需要生成方法论的说明，除此之外不要输出任何内容。
 """
                 self.prompt = analysis_prompt