jarvis-ai-assistant 0.1.97__tar.gz → 0.1.98__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of jarvis-ai-assistant might be problematic. Click here for more details.

Files changed (54) hide show
  1. {jarvis_ai_assistant-0.1.97/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.98}/PKG-INFO +1 -1
  2. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/pyproject.toml +1 -1
  3. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/setup.py +1 -1
  4. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/__init__.py +1 -1
  5. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/jarvis_coder/git_utils.py +18 -18
  6. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/jarvis_coder/main.py +150 -150
  7. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/jarvis_coder/patch_handler.py +38 -38
  8. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/jarvis_coder/plan_generator.py +21 -21
  9. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/jarvis_platform/main.py +38 -38
  10. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/jarvis_rag/main.py +181 -181
  11. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/jarvis_smart_shell/main.py +19 -19
  12. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98/src/jarvis_ai_assistant.egg-info}/PKG-INFO +1 -1
  13. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/LICENSE +0 -0
  14. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/MANIFEST.in +0 -0
  15. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/README.md +0 -0
  16. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/setup.cfg +0 -0
  17. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/agent.py +0 -0
  18. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/jarvis_codebase/__init__.py +0 -0
  19. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/jarvis_codebase/main.py +0 -0
  20. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/jarvis_coder/__init__.py +0 -0
  21. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/jarvis_platform/__init__.py +0 -0
  22. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/jarvis_rag/__init__.py +0 -0
  23. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/jarvis_smart_shell/__init__.py +0 -0
  24. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/main.py +0 -0
  25. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/models/__init__.py +0 -0
  26. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/models/ai8.py +0 -0
  27. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/models/base.py +0 -0
  28. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/models/kimi.py +0 -0
  29. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/models/ollama.py +0 -0
  30. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/models/openai.py +0 -0
  31. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/models/oyi.py +0 -0
  32. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/models/registry.py +0 -0
  33. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/__init__.py +0 -0
  34. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/ask_user.py +0 -0
  35. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/base.py +0 -0
  36. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/chdir.py +0 -0
  37. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/codebase_qa.py +0 -0
  38. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/coder.py +0 -0
  39. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/file_ops.py +0 -0
  40. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/generator.py +0 -0
  41. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/methodology.py +0 -0
  42. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/rag.py +0 -0
  43. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/registry.py +0 -0
  44. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/search.py +0 -0
  45. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/shell.py +0 -0
  46. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/sub_agent.py +0 -0
  47. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/thinker.py +0 -0
  48. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/tools/webpage.py +0 -0
  49. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis/utils.py +0 -0
  50. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis_ai_assistant.egg-info/SOURCES.txt +0 -0
  51. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis_ai_assistant.egg-info/dependency_links.txt +0 -0
  52. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis_ai_assistant.egg-info/entry_points.txt +0 -0
  53. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis_ai_assistant.egg-info/requires.txt +0 -0
  54. {jarvis_ai_assistant-0.1.97 → jarvis_ai_assistant-0.1.98}/src/jarvis_ai_assistant.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: jarvis-ai-assistant
3
- Version: 0.1.97
3
+ Version: 0.1.98
4
4
  Summary: Jarvis: An AI assistant that uses tools to interact with the system
5
5
  Home-page: https://github.com/skyfireitdiy/Jarvis
6
6
  Author: skyfire
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "jarvis-ai-assistant"
7
- version = "0.1.97"
7
+ version = "0.1.98"
8
8
  description = "Jarvis: An AI assistant that uses tools to interact with the system"
9
9
  readme = "README.md"
10
10
  authors = [{ name = "Your Name", email = "your.email@example.com" }]
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
2
2
 
3
3
  setup(
4
4
  name="jarvis-ai-assistant",
5
- version="0.1.97",
5
+ version="0.1.98",
6
6
  author="skyfire",
7
7
  author_email="skyfireitdiy@hotmail.com",
8
8
  description="An AI assistant that uses various tools to interact with the system",
@@ -1,3 +1,3 @@
1
1
  """Jarvis AI Assistant"""
2
2
 
3
- __version__ = "0.1.97"
3
+ __version__ = "0.1.98"
@@ -6,31 +6,31 @@ from jarvis.utils import OutputType, PrettyOutput, while_success
6
6
  from jarvis.models.registry import PlatformRegistry
7
7
 
8
8
  def has_uncommitted_files() -> bool:
9
- """判断代码库是否有未提交的文件"""
10
- # 获取未暂存的修改
9
+ """Check if there are uncommitted files in the repository"""
10
+ # Get unstaged modifications
11
11
  unstaged = os.popen("git diff --name-only").read()
12
- # 获取已暂存但未提交的修改
12
+ # Get staged but uncommitted modifications
13
13
  staged = os.popen("git diff --cached --name-only").read()
14
- # 获取未跟踪的文件
14
+ # Get untracked files
15
15
  untracked = os.popen("git ls-files --others --exclude-standard").read()
16
16
 
17
17
  return bool(unstaged or staged or untracked)
18
18
 
19
19
  def generate_commit_message(git_diff: str) -> str:
20
- """根据git diff和功能描述生成commit信息"""
21
- prompt = f"""你是一个经验丰富的程序员,请根据以下代码变更和功能描述生成简洁明了的commit信息:
20
+ """Generate commit message based on git diff and feature description"""
21
+ prompt = f"""You are an experienced programmer, please generate a concise and clear commit message based on the following code changes and feature description:
22
22
 
23
- 代码变更:
23
+ Code changes:
24
24
  Git Diff:
25
25
  {git_diff}
26
26
 
27
- 请遵循以下规则:
28
- 1. 使用英文编写
29
- 2. 采用常规的commit message格式:<type>(<scope>): <subject>
30
- 3. 保持简洁,不超过50个字符
31
- 4. 准确描述代码变更的主要内容
32
- 5. 优先考虑功能描述和git diff中的变更内容
33
- 6. 仅生成commit信息的文本,不要输出任何其他内容
27
+ Please follow these rules:
28
+ 1. Write in English
29
+ 2. Use conventional commit message format: <type>(<scope>): <subject>
30
+ 3. Keep it concise, no more than 50 characters
31
+ 4. Accurately describe the main content of code changes
32
+ 5. Prioritize feature description and changes in git diff
33
+ 6. Only generate the commit message text, do not output anything else
34
34
  """
35
35
 
36
36
  model = PlatformRegistry().get_global_platform_registry().get_normal_platform()
@@ -39,15 +39,15 @@ Git Diff:
39
39
  return ';'.join(response.strip().split("\n"))
40
40
 
41
41
  def save_edit_record(record_dir: str, commit_message: str, git_diff: str) -> None:
42
- """保存代码修改记录"""
43
- # 获取下一个序号
42
+ """Save code modification record"""
43
+ # Get next sequence number
44
44
  existing_records = [f for f in os.listdir(record_dir) if f.endswith('.yaml')]
45
45
  next_num = 1
46
46
  if existing_records:
47
47
  last_num = max(int(f[:4]) for f in existing_records)
48
48
  next_num = last_num + 1
49
49
 
50
- # 创建记录文件
50
+ # Create record file
51
51
  record = {
52
52
  "timestamp": time.strftime("%Y-%m-%d %H:%M:%S"),
53
53
  "commit_message": commit_message,
@@ -58,4 +58,4 @@ def save_edit_record(record_dir: str, commit_message: str, git_diff: str) -> Non
58
58
  with open(record_path, "w", encoding="utf-8") as f:
59
59
  yaml.safe_dump(record, f, allow_unicode=True)
60
60
 
61
- PrettyOutput.print(f"已保存修改记录: {record_path}", OutputType.SUCCESS)
61
+ PrettyOutput.print(f"Modification record saved: {record_path}", OutputType.SUCCESS)