jarvis-ai-assistant 0.1.201__py3-none-any.whl → 0.1.202__py3-none-any.whl

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.
Files changed (9) hide show
  1. jarvis/__init__.py +1 -1
  2. jarvis/jarvis_agent/edit_file_handler.py +19 -22
  3. jarvis/jarvis_platform/base.py +1 -1
  4. {jarvis_ai_assistant-0.1.201.dist-info → jarvis_ai_assistant-0.1.202.dist-info}/METADATA +1 -1
  5. {jarvis_ai_assistant-0.1.201.dist-info → jarvis_ai_assistant-0.1.202.dist-info}/RECORD +9 -9
  6. {jarvis_ai_assistant-0.1.201.dist-info → jarvis_ai_assistant-0.1.202.dist-info}/WHEEL +0 -0
  7. {jarvis_ai_assistant-0.1.201.dist-info → jarvis_ai_assistant-0.1.202.dist-info}/entry_points.txt +0 -0
  8. {jarvis_ai_assistant-0.1.201.dist-info → jarvis_ai_assistant-0.1.202.dist-info}/licenses/LICENSE +0 -0
  9. {jarvis_ai_assistant-0.1.201.dist-info → jarvis_ai_assistant-0.1.202.dist-info}/top_level.txt +0 -0
jarvis/__init__.py CHANGED
@@ -1,4 +1,4 @@
1
1
  # -*- coding: utf-8 -*-
2
2
  """Jarvis AI Assistant"""
3
3
 
4
- __version__ = "0.1.201"
4
+ __version__ = "0.1.202"
jarvis/jarvis_agent/edit_file_handler.py CHANGED
@@ -23,11 +23,11 @@ class EditFileHandler(OutputHandler):
23
23
  + ot("DIFF")
24
24
  + r"\s*"
25
25
  + ot("SEARCH")
26
- + r"\s*(.*?)\s*"
26
+ + r"(.*?)"
27
27
  + ct("SEARCH")
28
28
  + r"\s*"
29
29
  + ot("REPLACE")
30
- + r"\s*(.*?)\s*"
30
+ + r"(.*?)"
31
31
  + ct("REPLACE")
32
32
  + r"\s*"
33
33
  + ct("DIFF")
@@ -39,11 +39,11 @@ class EditFileHandler(OutputHandler):
39
39
  ot("DIFF")
40
40
  + r"\s*"
41
41
  + ot("SEARCH")
42
- + r"\s*(.*?)\s*"
42
+ + r"(.*?)"
43
43
  + ct("SEARCH")
44
44
  + r"\s*"
45
45
  + ot("REPLACE")
46
- + r"\s*(.*?)\s*"
46
+ + r"(.*?)"
47
47
  + ct("REPLACE")
48
48
  + r"\s*"
49
49
  + ct("DIFF"),
@@ -65,7 +65,6 @@ class EditFileHandler(OutputHandler):
65
65
  return False, "未找到有效的文件编辑指令"
66
66
 
67
67
  results = []
68
- overall_success = True
69
68
 
70
69
  for file_path, diffs in patches.items():
71
70
  file_path = os.path.abspath(file_path)
@@ -110,15 +109,12 @@ class EditFileHandler(OutputHandler):
110
109
  return f"""文件编辑指令格式：
111
110
  {ot("PATCH file=文件路径")}
112
111
  {ot("DIFF")}
113
- {ot("SEARCH")}
114
- 原始代码
115
- {ct("SEARCH")}
116
- {ot("REPLACE")}
117
- 新代码
118
- {ct("REPLACE")}
112
+ {ot("SEARCH")}原始代码{ct("SEARCH")}
113
+ {ot("REPLACE")}新代码{ct("REPLACE")}
119
114
  {ct("DIFF")}
120
115
  {ct("PATCH")}
121
116
 
117
+ 可以返回多个PATCH块用于同时修改多个文件
122
118
  每个PATCH块可以包含多个DIFF块，每个DIFF块包含一组搜索和替换内容。
123
119
  搜索文本必须能在文件中唯一匹配，否则编辑将失败。"""
124
120
 
@@ -345,19 +341,13 @@ class EditFileHandler(OutputHandler):
345
341
 
346
342
  ## 输出模板
347
343
  {ot("DIFF")}
348
- {">" * 5} SEARCH
349
- [需要查找的原始代码，包含足够上下文，避免出现可匹配多处的情况]
350
- {'='*5}
351
- [替换后的新代码]
352
- {"<" * 5} REPLACE
344
+ {ot("SEARCH")}[需要查找的原始代码，包含足够上下文，避免出现可匹配多处的情况]{ct("SEARCH")}
345
+ {ot("REPLACE")}[替换后的新代码]{ct("REPLACE")}
353
346
  {ct("DIFF")}
354
347
 
355
348
  {ot("DIFF")}
356
- {">" * 5} SEARCH
357
- [另一处需要查找的原始代码，包含足够上下文，避免出现可匹配多处的情况]
358
- {'='*5}
359
- [另一处替换后的新代码]
360
- {"<" * 5} REPLACE
349
+ {ot("SEARCH")}[另一处需要查找的原始代码，包含足够上下文，避免出现可匹配多处的情况]{ct("SEARCH")}
350
+ {ot("REPLACE")}[另一处替换后的新代码]{ct("REPLACE")}
361
351
  {ct("DIFF")}
362
352
  """
363
353
 
@@ -383,7 +373,14 @@ class EditFileHandler(OutputHandler):
383
373
  diff_blocks = re.finditer(
384
374
  ot("DIFF")
385
375
  + r"\s*"
386
- + r">{4,} SEARCH\n?(.*?)\n?={4,}\n?(.*?)\s*<{4,} REPLACE\n?"
376
+ + ot("SEARCH")
377
+ + r"(.*?)"
378
+ + ct("SEARCH")
379
+ + r"\s*"
380
+ + ot("REPLACE")
381
+ + r"(.*?)"
382
+ + ct("REPLACE")
383
+ + r"\s*"
387
384
  + ct("DIFF"),
388
385
  response,
389
386
  re.DOTALL,
jarvis/jarvis_platform/base.py CHANGED
@@ -82,7 +82,7 @@ class BasePlatform(ABC):
82
82
  while_true(
83
83
  lambda: while_success(
84
84
  lambda: self.chat(
85
- f"<part_content>{input}</part_content>请返回已收到"
85
+ f"<part_content>{input}</part_content>\n\n请返回已收到"
86
86
  ),
87
87
  5,
88
88
  ),
{jarvis_ai_assistant-0.1.201.dist-info → jarvis_ai_assistant-0.1.202.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: jarvis-ai-assistant
3
- Version: 0.1.201
3
+ Version: 0.1.202
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
{jarvis_ai_assistant-0.1.201.dist-info → jarvis_ai_assistant-0.1.202.dist-info}/RECORD RENAMED
@@ -1,7 +1,7 @@
1
- jarvis/__init__.py,sha256=XoMsxsLPrhfMd065rmFmYUdR1fphq5QSppiLCyiyHnU,75
1
+ jarvis/__init__.py,sha256=1uYZEHP44b3jLJZ5d-Ydy94aetzbjTE6KoKfy3CdhSc,75
2
2
  jarvis/jarvis_agent/__init__.py,sha256=X5BWIOzxXUWtCbpDkTFfUYskf6sbNzb1qQu8nQ4NN1k,34371
3
3
  jarvis/jarvis_agent/builtin_input_handler.py,sha256=1V7kV5Zhw2HE3Xgjs1R-43RZ2huq3Kg-32NCdNnyZmA,2216
4
- jarvis/jarvis_agent/edit_file_handler.py,sha256=Su25_idE9UCXn3uB2pJV4VisYcUTpeBtmkX9OI3tIIo,15336
4
+ jarvis/jarvis_agent/edit_file_handler.py,sha256=ZDHjtggwFrHAOcfOAScKyPHSw9a3NvbKRqRtHjp2w9Q,15545
5
5
  jarvis/jarvis_agent/jarvis.py,sha256=GH2zi8eXNpW8twiY3LKDEZgGmFC5geB0jlkwFrm7hOQ,6279
6
6
  jarvis/jarvis_agent/main.py,sha256=c6bQe-8LXvW2-NBn9Rn_yPYdrwnkJ8KQaSFY2cPvkxw,2775
7
7
  jarvis/jarvis_agent/output_handler.py,sha256=P7oWpXBGFfOsWq7cIhS_z9crkQ19ES7qU5pM92KKjAs,1172
@@ -46,7 +46,7 @@ jarvis/jarvis_methodology/main.py,sha256=NMtd6DRn-Q8NcYtQ3qgTKUp9RW0cDGJod8ZXebl
46
46
  jarvis/jarvis_multi_agent/__init__.py,sha256=sDd3sK88dS7_qAz2ywIAaEWdQ4iRVCiuBu2rQQmrKbU,4512
47
47
  jarvis/jarvis_multi_agent/main.py,sha256=h7VUSwoPrES0XTK8z5kt3XLX1mmcm8UEuFEHQOUWPH4,1696
48
48
  jarvis/jarvis_platform/__init__.py,sha256=WLQHSiE87PPket2M50_hHzjdMIgPIBx2VF8JfB_NNRk,105
49
- jarvis/jarvis_platform/base.py,sha256=69DFeYZjtyvOF12YReLZHQINcW-w-LseogwAYQRff7k,7880
49
+ jarvis/jarvis_platform/base.py,sha256=dv_O3IcUTRhi_jfoRIG2g_FwnYpFRZo8g8tWIanOgVo,7884
50
50
  jarvis/jarvis_platform/human.py,sha256=r8Vlltp_LirJZeZh1Mmi30iJr9tl1JaNFoqthSRHF6o,2826
51
51
  jarvis/jarvis_platform/kimi.py,sha256=uIpSWQ3MqDBYYMROeXin_YqM2LFrovMICKpwLWO1ODo,12784
52
52
  jarvis/jarvis_platform/openai.py,sha256=uEjBikfFj7kp5wondLvOx4WdkmTX0aqF6kixxAufcHg,4806
@@ -91,9 +91,9 @@ jarvis/jarvis_utils/methodology.py,sha256=MhPrMxMqElyAn54BDfpQdUqrRr7IbSlrLvAI39
91
91
  jarvis/jarvis_utils/output.py,sha256=PRCgudPOB8gMEP3u-g0FGD2c6tBgJhLXUMqNPglfjV8,10813
92
92
  jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
93
93
  jarvis/jarvis_utils/utils.py,sha256=RYFQx7OkOu3fe_QhS-5jx7O06k_58X14S-9PFJgwOa4,12178
94
- jarvis_ai_assistant-0.1.201.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
95
- jarvis_ai_assistant-0.1.201.dist-info/METADATA,sha256=EbsPZQI2mPfbeRv6WsJen2ky8nuzILlVZboR0ZaVWBU,20215
96
- jarvis_ai_assistant-0.1.201.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
97
- jarvis_ai_assistant-0.1.201.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
98
- jarvis_ai_assistant-0.1.201.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
99
- jarvis_ai_assistant-0.1.201.dist-info/RECORD,,
94
+ jarvis_ai_assistant-0.1.202.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
95
+ jarvis_ai_assistant-0.1.202.dist-info/METADATA,sha256=7i5-nQ4XDVbIBrfSebmIaqMOKN6GzZot2a4pJ1OJ_AQ,20215
96
+ jarvis_ai_assistant-0.1.202.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
97
+ jarvis_ai_assistant-0.1.202.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
98
+ jarvis_ai_assistant-0.1.202.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
99
+ jarvis_ai_assistant-0.1.202.dist-info/RECORD,,