auto-coder 0.1.196__py3-none-any.whl → 0.1.198__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.
Potentially problematic release.
This version of auto-coder might be problematic. Click here for more details.
- {auto_coder-0.1.196.dist-info → auto_coder-0.1.198.dist-info}/METADATA +1 -1
- {auto_coder-0.1.196.dist-info → auto_coder-0.1.198.dist-info}/RECORD +29 -28
- autocoder/agent/coder.py +1234 -17
- autocoder/agent/project_reader.py +1 -1
- autocoder/auto_coder.py +13 -11
- autocoder/auto_coder_rag.py +1 -1
- autocoder/chat_auto_coder.py +17 -16
- autocoder/command_args.py +185 -79
- autocoder/common/__init__.py +21 -2
- autocoder/common/code_auto_generate_editblock.py +8 -2
- autocoder/common/code_auto_merge_editblock.py +81 -24
- autocoder/common/sys_prompt.py +163 -0
- autocoder/index/index.py +131 -44
- autocoder/lang.py +12 -2
- autocoder/pyproject/__init__.py +30 -1
- autocoder/rag/cache/byzer_storage_cache.py +1 -1
- autocoder/rag/cache/file_monitor_cache.py +1 -1
- autocoder/rag/cache/simple_cache.py +2 -2
- autocoder/rag/long_context_rag.py +1 -0
- autocoder/regexproject/__init__.py +30 -1
- autocoder/suffixproject/__init__.py +30 -1
- autocoder/tsproject/__init__.py +30 -1
- autocoder/utils/queue_communicate.py +7 -0
- autocoder/utils/rest.py +1 -1
- autocoder/version.py +1 -1
- {auto_coder-0.1.196.dist-info → auto_coder-0.1.198.dist-info}/LICENSE +0 -0
- {auto_coder-0.1.196.dist-info → auto_coder-0.1.198.dist-info}/WHEEL +0 -0
- {auto_coder-0.1.196.dist-info → auto_coder-0.1.198.dist-info}/entry_points.txt +0 -0
- {auto_coder-0.1.196.dist-info → auto_coder-0.1.198.dist-info}/top_level.txt +0 -0
autocoder/command_args.py
CHANGED
|
@@ -14,14 +14,18 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
14
14
|
subparsers = parser.add_subparsers(dest="command")
|
|
15
15
|
|
|
16
16
|
parser.add_argument("--request_id", default="", help=desc["request_id"])
|
|
17
|
-
parser.add_argument("--source_dir", required=False,
|
|
17
|
+
parser.add_argument("--source_dir", required=False,
|
|
18
|
+
help=desc["source_dir"])
|
|
18
19
|
parser.add_argument("--git_url", help=desc["git_url"])
|
|
19
|
-
parser.add_argument("--target_file", required=False,
|
|
20
|
+
parser.add_argument("--target_file", required=False,
|
|
21
|
+
help=desc["target_file"])
|
|
20
22
|
parser.add_argument("--query", help=desc["query"])
|
|
21
23
|
parser.add_argument("--template", default="common", help=desc["template"])
|
|
22
|
-
parser.add_argument("--project_type", default="py",
|
|
24
|
+
parser.add_argument("--project_type", default="py",
|
|
25
|
+
help=desc["project_type"])
|
|
23
26
|
parser.add_argument("--execute", action="store_true", help=desc["execute"])
|
|
24
|
-
parser.add_argument("--package_name", default="",
|
|
27
|
+
parser.add_argument("--package_name", default="",
|
|
28
|
+
help=desc["package_name"])
|
|
25
29
|
parser.add_argument("--script_path", default="", help=desc["script_path"])
|
|
26
30
|
|
|
27
31
|
parser.add_argument("--model", default="", help=desc["model"])
|
|
@@ -39,8 +43,10 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
39
43
|
parser.add_argument("--vl_model", default="", help=desc["vl_model"])
|
|
40
44
|
parser.add_argument("--sd_model", default="", help=desc["sd_model"])
|
|
41
45
|
parser.add_argument("--emb_model", default="", help=desc["emb_model"])
|
|
42
|
-
parser.add_argument("--text2voice_model", default="",
|
|
43
|
-
|
|
46
|
+
parser.add_argument("--text2voice_model", default="",
|
|
47
|
+
help=desc["text2voice_model"])
|
|
48
|
+
parser.add_argument("--voice2text_model", default="",
|
|
49
|
+
help=desc["voice2text_model"])
|
|
44
50
|
|
|
45
51
|
parser.add_argument("--index_model", default="", help=desc["index_model"])
|
|
46
52
|
parser.add_argument(
|
|
@@ -76,10 +82,13 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
76
82
|
parser.add_argument(
|
|
77
83
|
"--index_build_workers", type=int, default=1, help=desc["index_build_workers"]
|
|
78
84
|
)
|
|
79
|
-
parser.add_argument("--rag_doc_filter_relevance",
|
|
85
|
+
parser.add_argument("--rag_doc_filter_relevance",
|
|
86
|
+
type=int, default=5, help="")
|
|
80
87
|
|
|
81
|
-
parser.add_argument("--file", default=None,
|
|
82
|
-
|
|
88
|
+
parser.add_argument("--file", default=None,
|
|
89
|
+
required=False, help=desc["file"])
|
|
90
|
+
parser.add_argument("--ray_address", default="auto",
|
|
91
|
+
help=desc["ray_address"])
|
|
83
92
|
parser.add_argument(
|
|
84
93
|
"--anti_quota_limit", type=int, default=1, help=desc["anti_quota_limit"]
|
|
85
94
|
)
|
|
@@ -93,7 +102,8 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
93
102
|
"--print_request", action="store_true", help=desc["print_request"]
|
|
94
103
|
)
|
|
95
104
|
parser.add_argument("--code_model", default="", help=desc["code_model"])
|
|
96
|
-
parser.add_argument("--planner_model", default="",
|
|
105
|
+
parser.add_argument("--planner_model", default="",
|
|
106
|
+
help=desc["planner_model"])
|
|
97
107
|
parser.add_argument(
|
|
98
108
|
"--py_packages", required=False, default="", help=desc["py_packages"]
|
|
99
109
|
)
|
|
@@ -103,13 +113,17 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
103
113
|
parser.add_argument("--urls", default="", help=desc["urls"])
|
|
104
114
|
parser.add_argument(
|
|
105
115
|
"--urls_use_model", action="store_true", help=desc["urls_use_model"]
|
|
106
|
-
)
|
|
107
|
-
parser.add_argument("--designer_model", default="",
|
|
108
|
-
|
|
109
|
-
parser.add_argument("--
|
|
116
|
+
)
|
|
117
|
+
parser.add_argument("--designer_model", default="",
|
|
118
|
+
help=desc["designer_model"])
|
|
119
|
+
parser.add_argument("--query_prefix", default=None,
|
|
120
|
+
help=desc["query_prefix"])
|
|
121
|
+
parser.add_argument("--query_suffix", default=None,
|
|
122
|
+
help=desc["query_suffix"])
|
|
110
123
|
|
|
111
124
|
parser.add_argument("--search", default="", help="")
|
|
112
|
-
parser.add_argument("--search_engine", default="",
|
|
125
|
+
parser.add_argument("--search_engine", default="",
|
|
126
|
+
help=desc["search_engine"])
|
|
113
127
|
parser.add_argument(
|
|
114
128
|
"--search_engine_token", default="", help=desc["search_engine_token"]
|
|
115
129
|
)
|
|
@@ -123,12 +137,12 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
123
137
|
)
|
|
124
138
|
|
|
125
139
|
parser.add_argument(
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
140
|
+
"--rag_context_window_limit",
|
|
141
|
+
nargs="?",
|
|
142
|
+
const=True,
|
|
143
|
+
default=False,
|
|
144
|
+
help="",
|
|
145
|
+
)
|
|
132
146
|
|
|
133
147
|
parser.add_argument(
|
|
134
148
|
"--enable_rag_context",
|
|
@@ -140,6 +154,7 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
140
154
|
|
|
141
155
|
parser.add_argument("--rag_token", default="", help="")
|
|
142
156
|
parser.add_argument("--rag_url", default="", help="")
|
|
157
|
+
parser.add_argument("--rag_params_max_tokens", default=4096, help="")
|
|
143
158
|
parser.add_argument(
|
|
144
159
|
"--rag_type", default="storage", help="RAG type, default is storage"
|
|
145
160
|
)
|
|
@@ -160,7 +175,8 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
160
175
|
)
|
|
161
176
|
|
|
162
177
|
parser.add_argument("--image_file", default="", help=desc["image_file"])
|
|
163
|
-
parser.add_argument("--image_mode", default="direct",
|
|
178
|
+
parser.add_argument("--image_mode", default="direct",
|
|
179
|
+
help=desc["image_mode"])
|
|
164
180
|
parser.add_argument(
|
|
165
181
|
"--image_max_iter", type=int, default=1, help=desc["image_max_iter"]
|
|
166
182
|
)
|
|
@@ -181,27 +197,39 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
181
197
|
|
|
182
198
|
revert_parser = subparsers.add_parser("revert", help=desc["revert_desc"])
|
|
183
199
|
revert_parser.add_argument("--file", help=desc["revert_desc"])
|
|
184
|
-
revert_parser.add_argument(
|
|
200
|
+
revert_parser.add_argument(
|
|
201
|
+
"--request_id", default="", help=desc["request_id"])
|
|
185
202
|
|
|
186
203
|
store_parser = subparsers.add_parser("store", help=desc["store_desc"])
|
|
187
|
-
store_parser.add_argument(
|
|
188
|
-
|
|
189
|
-
store_parser.add_argument(
|
|
204
|
+
store_parser.add_argument(
|
|
205
|
+
"--source_dir", default=".", help=desc["source_dir"])
|
|
206
|
+
store_parser.add_argument(
|
|
207
|
+
"--ray_address", default="auto", help=desc["ray_address"])
|
|
208
|
+
store_parser.add_argument(
|
|
209
|
+
"--request_id", default="", help=desc["request_id"])
|
|
190
210
|
|
|
191
211
|
index_parser = subparsers.add_parser("index", help=desc["index_desc"])
|
|
192
212
|
index_parser.add_argument("--file", help=desc["file"])
|
|
193
213
|
index_parser.add_argument("--model", default="", help=desc["model"])
|
|
194
|
-
index_parser.add_argument(
|
|
195
|
-
|
|
196
|
-
index_parser.add_argument(
|
|
197
|
-
|
|
198
|
-
index_parser.add_argument(
|
|
214
|
+
index_parser.add_argument(
|
|
215
|
+
"--index_model", default="", help=desc["index_model"])
|
|
216
|
+
index_parser.add_argument(
|
|
217
|
+
"--source_dir", required=False, help=desc["source_dir"])
|
|
218
|
+
index_parser.add_argument(
|
|
219
|
+
"--project_type", default="py", help=desc["project_type"])
|
|
220
|
+
index_parser.add_argument(
|
|
221
|
+
"--ray_address", default="auto", help=desc["ray_address"])
|
|
222
|
+
index_parser.add_argument(
|
|
223
|
+
"--request_id", default="", help=desc["request_id"])
|
|
199
224
|
|
|
200
225
|
index_query_parser = subparsers.add_parser(
|
|
201
226
|
"index-query", help=desc["index_query_desc"]
|
|
202
227
|
) # New subcommand
|
|
203
228
|
index_query_parser.add_argument("--file", help=desc["file"])
|
|
204
|
-
index_query_parser.add_argument(
|
|
229
|
+
index_query_parser.add_argument(
|
|
230
|
+
"--request_id", default="", help=desc["request_id"])
|
|
231
|
+
index_query_parser.add_argument(
|
|
232
|
+
"--skip_events", action="store_true", help=desc["skip_events"])
|
|
205
233
|
index_query_parser.add_argument("--model", default="", help=desc["model"])
|
|
206
234
|
index_query_parser.add_argument(
|
|
207
235
|
"--index_model", default="", help=desc["index_model"]
|
|
@@ -218,26 +246,34 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
218
246
|
)
|
|
219
247
|
|
|
220
248
|
doc_parser = subparsers.add_parser("doc", help=desc["doc_desc"])
|
|
221
|
-
doc_parser.add_argument("--request_id", default="",
|
|
249
|
+
doc_parser.add_argument("--request_id", default="",
|
|
250
|
+
help=desc["request_id"])
|
|
251
|
+
doc_parser.add_argument(
|
|
252
|
+
"--skip_events", action="store_true", help=desc["skip_events"])
|
|
222
253
|
doc_parser.add_argument("--urls", default="", help=desc["urls"])
|
|
223
254
|
doc_parser.add_argument("--model", default="", help=desc["model"])
|
|
224
|
-
doc_parser.add_argument("--target_file", default="",
|
|
255
|
+
doc_parser.add_argument("--target_file", default="",
|
|
256
|
+
help=desc["target_file"])
|
|
225
257
|
doc_parser.add_argument("--file", default="", help=desc["file"])
|
|
226
|
-
doc_parser.add_argument(
|
|
258
|
+
doc_parser.add_argument(
|
|
259
|
+
"--source_dir", required=False, help=desc["source_dir"])
|
|
227
260
|
doc_parser.add_argument(
|
|
228
261
|
"--human_as_model", action="store_true", help=desc["human_as_model"]
|
|
229
262
|
)
|
|
230
263
|
doc_parser.add_argument(
|
|
231
264
|
"--urls_use_model", action="store_true", help=desc["urls_use_model"]
|
|
232
265
|
)
|
|
233
|
-
doc_parser.add_argument(
|
|
266
|
+
doc_parser.add_argument(
|
|
267
|
+
"--ray_address", default="auto", help=desc["ray_address"])
|
|
234
268
|
|
|
235
269
|
doc_subparsers = doc_parser.add_subparsers(dest="doc_command")
|
|
236
270
|
doc_build_parse = doc_subparsers.add_parser("build", help="")
|
|
237
|
-
doc_build_parse.add_argument(
|
|
271
|
+
doc_build_parse.add_argument(
|
|
272
|
+
"--request_id", default="", help=desc["request_id"])
|
|
238
273
|
doc_build_parse.add_argument("--source_dir", default="", help="")
|
|
239
274
|
doc_build_parse.add_argument("--model", default="", help=desc["model"])
|
|
240
|
-
doc_build_parse.add_argument(
|
|
275
|
+
doc_build_parse.add_argument(
|
|
276
|
+
"--emb_model", default="", help=desc["emb_model"])
|
|
241
277
|
doc_build_parse.add_argument("--file", default="", help=desc["file"])
|
|
242
278
|
doc_build_parse.add_argument(
|
|
243
279
|
"--ray_address", default="auto", help=desc["ray_address"]
|
|
@@ -256,16 +292,21 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
256
292
|
)
|
|
257
293
|
|
|
258
294
|
doc_query_parse = doc_subparsers.add_parser("query", help="")
|
|
259
|
-
doc_query_parse.add_argument(
|
|
295
|
+
doc_query_parse.add_argument(
|
|
296
|
+
"--request_id", default="", help=desc["request_id"])
|
|
297
|
+
doc_query_parse.add_argument(
|
|
298
|
+
"--skip_events", action="store_true", help=desc["skip_events"])
|
|
260
299
|
doc_query_parse.add_argument("--query", default="", help="")
|
|
261
300
|
doc_query_parse.add_argument("--source_dir", default=".", help="")
|
|
262
301
|
doc_query_parse.add_argument("--model", default="", help=desc["model"])
|
|
263
|
-
doc_query_parse.add_argument(
|
|
302
|
+
doc_query_parse.add_argument(
|
|
303
|
+
"--emb_model", default="", help=desc["emb_model"])
|
|
264
304
|
doc_query_parse.add_argument("--file", default="", help=desc["file"])
|
|
265
305
|
doc_query_parse.add_argument(
|
|
266
306
|
"--ray_address", default="auto", help=desc["ray_address"]
|
|
267
307
|
)
|
|
268
|
-
doc_query_parse.add_argument(
|
|
308
|
+
doc_query_parse.add_argument(
|
|
309
|
+
"--execute", action="store_true", help=desc["execute"])
|
|
269
310
|
doc_query_parse.add_argument(
|
|
270
311
|
"--collections",
|
|
271
312
|
default="",
|
|
@@ -281,10 +322,14 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
281
322
|
)
|
|
282
323
|
|
|
283
324
|
doc_chat_parse = doc_subparsers.add_parser("chat", help="")
|
|
284
|
-
doc_chat_parse.add_argument(
|
|
325
|
+
doc_chat_parse.add_argument(
|
|
326
|
+
"--request_id", default="", help=desc["request_id"])
|
|
327
|
+
doc_chat_parse.add_argument(
|
|
328
|
+
"--skip_events", action="store_true", help=desc["skip_events"])
|
|
285
329
|
doc_chat_parse.add_argument("--file", default="", help=desc["file"])
|
|
286
330
|
doc_chat_parse.add_argument("--model", default="", help=desc["model"])
|
|
287
|
-
doc_chat_parse.add_argument(
|
|
331
|
+
doc_chat_parse.add_argument(
|
|
332
|
+
"--emb_model", default="", help=desc["emb_model"])
|
|
288
333
|
doc_chat_parse.add_argument(
|
|
289
334
|
"--ray_address", default="auto", help=desc["ray_address"]
|
|
290
335
|
)
|
|
@@ -306,8 +351,10 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
306
351
|
doc_serve_parse = doc_subparsers.add_parser("serve", help="")
|
|
307
352
|
doc_serve_parse.add_argument("--file", default="", help=desc["file"])
|
|
308
353
|
doc_serve_parse.add_argument("--model", default="", help=desc["model"])
|
|
309
|
-
doc_serve_parse.add_argument(
|
|
310
|
-
|
|
354
|
+
doc_serve_parse.add_argument(
|
|
355
|
+
"--index_model", default="", help=desc["index_model"])
|
|
356
|
+
doc_serve_parse.add_argument(
|
|
357
|
+
"--emb_model", default="", help=desc["emb_model"])
|
|
311
358
|
doc_serve_parse.add_argument(
|
|
312
359
|
"--ray_address", default="auto", help=desc["ray_address"]
|
|
313
360
|
)
|
|
@@ -323,7 +370,7 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
323
370
|
default=3,
|
|
324
371
|
help=desc["index_filter_file_num"],
|
|
325
372
|
)
|
|
326
|
-
|
|
373
|
+
|
|
327
374
|
doc_serve_parse.add_argument(
|
|
328
375
|
"--rag_context_window_limit",
|
|
329
376
|
type=int,
|
|
@@ -343,16 +390,24 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
343
390
|
default=5,
|
|
344
391
|
help=desc["filter_batch_size"],
|
|
345
392
|
)
|
|
393
|
+
parser.add_argument(
|
|
394
|
+
"--skip_events",
|
|
395
|
+
action="store_true",
|
|
396
|
+
help=desc["skip_events"],
|
|
397
|
+
)
|
|
346
398
|
|
|
347
399
|
doc_serve_parse.add_argument(
|
|
348
400
|
"--required_exts", default="", help=desc["doc_build_parse_required_exts"]
|
|
349
401
|
)
|
|
350
|
-
doc_serve_parse.add_argument(
|
|
402
|
+
doc_serve_parse.add_argument(
|
|
403
|
+
"--rag_doc_filter_relevance", type=int, default=5, help="")
|
|
351
404
|
doc_serve_parse.add_argument("--source_dir", default=".", help="")
|
|
352
405
|
doc_serve_parse.add_argument("--host", default="", help="")
|
|
353
406
|
doc_serve_parse.add_argument("--port", type=int, default=8000, help="")
|
|
354
|
-
doc_serve_parse.add_argument(
|
|
355
|
-
|
|
407
|
+
doc_serve_parse.add_argument(
|
|
408
|
+
"--uvicorn_log_level", default="info", help="")
|
|
409
|
+
doc_serve_parse.add_argument(
|
|
410
|
+
"--allow_credentials", action="store_true", help="")
|
|
356
411
|
doc_serve_parse.add_argument("--allowed_origins", default=["*"], help="")
|
|
357
412
|
doc_serve_parse.add_argument("--allowed_methods", default=["*"], help="")
|
|
358
413
|
doc_serve_parse.add_argument("--allowed_headers", default=["*"], help="")
|
|
@@ -361,12 +416,18 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
361
416
|
doc_serve_parse.add_argument("--prompt_template", default="", help="")
|
|
362
417
|
doc_serve_parse.add_argument("--ssl_keyfile", default="", help="")
|
|
363
418
|
doc_serve_parse.add_argument("--ssl_certfile", default="", help="")
|
|
364
|
-
doc_serve_parse.add_argument(
|
|
419
|
+
doc_serve_parse.add_argument(
|
|
420
|
+
"--response_role", default="assistant", help="")
|
|
365
421
|
doc_serve_parse.add_argument("--doc_dir", default="", help="")
|
|
366
422
|
doc_serve_parse.add_argument("--tokenizer_path", default="", help="")
|
|
367
423
|
doc_serve_parse.add_argument(
|
|
368
424
|
"--collections", default="", help="Collection name for indexing"
|
|
369
425
|
)
|
|
426
|
+
doc_serve_parse.add_argument(
|
|
427
|
+
"--skip_events",
|
|
428
|
+
action="store_true",
|
|
429
|
+
help=desc["skip_events"],
|
|
430
|
+
)
|
|
370
431
|
doc_serve_parse.add_argument(
|
|
371
432
|
"--base_dir",
|
|
372
433
|
default="",
|
|
@@ -381,16 +442,23 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
381
442
|
agent_parser = subparsers.add_parser("agent", help="Run an agent")
|
|
382
443
|
agent_subparsers = agent_parser.add_subparsers(dest="agent_command")
|
|
383
444
|
|
|
384
|
-
chat_parser = agent_subparsers.add_parser(
|
|
385
|
-
|
|
445
|
+
chat_parser = agent_subparsers.add_parser(
|
|
446
|
+
"chat", help="Run the chat agent")
|
|
447
|
+
chat_parser.add_argument(
|
|
448
|
+
"--request_id", default="", help=desc["request_id"])
|
|
449
|
+
chat_parser.add_argument(
|
|
450
|
+
"--skip_events", action="store_true", help=desc["skip_events"])
|
|
386
451
|
|
|
387
|
-
chat_parser.add_argument(
|
|
452
|
+
chat_parser.add_argument(
|
|
453
|
+
"--source_dir", default=".", help="Source directory")
|
|
388
454
|
chat_parser.add_argument("--query", help="Query for the planner")
|
|
389
455
|
chat_parser.add_argument("--model", default="", help=desc["model"])
|
|
390
456
|
chat_parser.add_argument("--emb_model", default="", help=desc["emb_model"])
|
|
391
457
|
chat_parser.add_argument("--file", default="", help=desc["file"])
|
|
392
|
-
chat_parser.add_argument(
|
|
393
|
-
|
|
458
|
+
chat_parser.add_argument(
|
|
459
|
+
"--ray_address", default="auto", help=desc["ray_address"])
|
|
460
|
+
chat_parser.add_argument(
|
|
461
|
+
"--execute", action="store_true", help=desc["execute"])
|
|
394
462
|
chat_parser.add_argument(
|
|
395
463
|
"--collections",
|
|
396
464
|
default="",
|
|
@@ -416,6 +484,7 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
416
484
|
|
|
417
485
|
chat_parser.add_argument("--rag_token", default="", help="")
|
|
418
486
|
chat_parser.add_argument("--rag_url", default="", help="")
|
|
487
|
+
chat_parser.add_argument("--rag_params_max_tokens", default=4096, help="")
|
|
419
488
|
chat_parser.add_argument(
|
|
420
489
|
"--rag_type",
|
|
421
490
|
default="storage",
|
|
@@ -441,13 +510,16 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
441
510
|
read_project_parser.add_argument(
|
|
442
511
|
"--request_id", default="", help=desc["request_id"]
|
|
443
512
|
)
|
|
513
|
+
read_project_parser.add_argument(
|
|
514
|
+
"--skip_events", action="store_true", help=desc["skip_events"])
|
|
444
515
|
|
|
445
516
|
read_project_parser.add_argument(
|
|
446
517
|
"--source_dir", default=".", help="Source directory"
|
|
447
518
|
)
|
|
448
519
|
read_project_parser.add_argument("--query", help="Query for the planner")
|
|
449
520
|
read_project_parser.add_argument("--model", default="", help=desc["model"])
|
|
450
|
-
read_project_parser.add_argument(
|
|
521
|
+
read_project_parser.add_argument(
|
|
522
|
+
"--emb_model", default="", help=desc["emb_model"])
|
|
451
523
|
read_project_parser.add_argument("--file", default="", help=desc["file"])
|
|
452
524
|
read_project_parser.add_argument(
|
|
453
525
|
"--ray_address", default="auto", help=desc["ray_address"]
|
|
@@ -480,23 +552,30 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
480
552
|
|
|
481
553
|
read_project_parser.add_argument("--rag_token", default="", help="")
|
|
482
554
|
read_project_parser.add_argument("--rag_url", default="", help="")
|
|
555
|
+
read_project_parser.add_argument("--rag_params_max_tokens", default=4096, help="")
|
|
483
556
|
read_project_parser.add_argument(
|
|
484
557
|
"--rag_type", default="storage", help="RAG type, default is storage"
|
|
485
558
|
)
|
|
486
|
-
read_project_parser.add_argument(
|
|
559
|
+
read_project_parser.add_argument(
|
|
560
|
+
"--target_file", default="./output.txt", help="")
|
|
487
561
|
|
|
488
562
|
voice2text_parser = agent_subparsers.add_parser(
|
|
489
563
|
"voice2text", help="Convert voice to text"
|
|
490
564
|
)
|
|
491
|
-
voice2text_parser.add_argument(
|
|
565
|
+
voice2text_parser.add_argument(
|
|
566
|
+
"--request_id", default="", help=desc["request_id"])
|
|
567
|
+
voice2text_parser.add_argument(
|
|
568
|
+
"--skip_events", action="store_true", help=desc["skip_events"])
|
|
492
569
|
voice2text_parser.add_argument("--model", default="", help=desc["model"])
|
|
493
|
-
voice2text_parser.add_argument(
|
|
570
|
+
voice2text_parser.add_argument(
|
|
571
|
+
"--voice2text_model", default="", help=desc["model"])
|
|
494
572
|
voice2text_parser.add_argument(
|
|
495
573
|
"--ray_address", default="auto", help=desc["ray_address"]
|
|
496
574
|
)
|
|
497
575
|
voice2text_parser.add_argument("--source_dir", default=".", help="")
|
|
498
576
|
voice2text_parser.add_argument("--file", default="", help=desc["file"])
|
|
499
|
-
voice2text_parser.add_argument(
|
|
577
|
+
voice2text_parser.add_argument(
|
|
578
|
+
"--target_file", default="./output.txt", help="")
|
|
500
579
|
|
|
501
580
|
generate_shell_parser = agent_subparsers.add_parser(
|
|
502
581
|
"generate_command", help="Convert text to shell command"
|
|
@@ -504,24 +583,33 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
504
583
|
generate_shell_parser.add_argument(
|
|
505
584
|
"--request_id", default="", help=desc["request_id"]
|
|
506
585
|
)
|
|
507
|
-
generate_shell_parser.add_argument(
|
|
508
|
-
|
|
586
|
+
generate_shell_parser.add_argument(
|
|
587
|
+
"--skip_events", action="store_true", help=desc["skip_events"])
|
|
588
|
+
generate_shell_parser.add_argument(
|
|
589
|
+
"--model", default="", help=desc["model"])
|
|
590
|
+
generate_shell_parser.add_argument(
|
|
591
|
+
"--query", default="", help=desc["query"])
|
|
509
592
|
generate_shell_parser.add_argument(
|
|
510
593
|
"--ray_address", default="auto", help=desc["ray_address"]
|
|
511
594
|
)
|
|
512
595
|
generate_shell_parser.add_argument("--source_dir", default=".", help="")
|
|
513
596
|
generate_shell_parser.add_argument("--file", default="", help=desc["file"])
|
|
514
|
-
generate_shell_parser.add_argument(
|
|
597
|
+
generate_shell_parser.add_argument(
|
|
598
|
+
"--target_file", default="./output.txt", help="")
|
|
515
599
|
|
|
516
600
|
auto_tool_parser = agent_subparsers.add_parser(
|
|
517
601
|
"auto_tool", help="Run the chat agent"
|
|
518
602
|
)
|
|
519
|
-
auto_tool_parser.add_argument(
|
|
520
|
-
|
|
521
|
-
auto_tool_parser.add_argument(
|
|
603
|
+
auto_tool_parser.add_argument(
|
|
604
|
+
"--request_id", default="", help=desc["request_id"])
|
|
605
|
+
auto_tool_parser.add_argument(
|
|
606
|
+
"--skip_events", action="store_true", help=desc["skip_events"])
|
|
607
|
+
auto_tool_parser.add_argument(
|
|
608
|
+
"--source_dir", default=".", help="Source directory")
|
|
522
609
|
auto_tool_parser.add_argument("--query", help="Query for the planner")
|
|
523
610
|
auto_tool_parser.add_argument("--model", default="", help=desc["model"])
|
|
524
|
-
auto_tool_parser.add_argument(
|
|
611
|
+
auto_tool_parser.add_argument(
|
|
612
|
+
"--emb_model", default="", help=desc["emb_model"])
|
|
525
613
|
auto_tool_parser.add_argument("--file", default="", help=desc["file"])
|
|
526
614
|
auto_tool_parser.add_argument(
|
|
527
615
|
"--ray_address", default="auto", help=desc["ray_address"]
|
|
@@ -554,34 +642,47 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
554
642
|
|
|
555
643
|
auto_tool_parser.add_argument("--rag_token", default="", help="")
|
|
556
644
|
auto_tool_parser.add_argument("--rag_url", default="", help="")
|
|
645
|
+
auto_tool_parser.add_argument("--rag_params_max_tokens", default=4096, help="")
|
|
557
646
|
auto_tool_parser.add_argument(
|
|
558
647
|
"--rag_type", default="storage", help="RAG type, default is storage"
|
|
559
648
|
)
|
|
560
|
-
auto_tool_parser.add_argument(
|
|
649
|
+
auto_tool_parser.add_argument(
|
|
650
|
+
"--target_file", default="./output.txt", help="")
|
|
561
651
|
|
|
562
652
|
designer_parser = agent_subparsers.add_parser(
|
|
563
653
|
"designer", help="Run the designer agent"
|
|
564
654
|
)
|
|
565
|
-
designer_parser.add_argument(
|
|
566
|
-
|
|
655
|
+
designer_parser.add_argument(
|
|
656
|
+
"--request_id", default="", help=desc["request_id"])
|
|
657
|
+
designer_parser.add_argument(
|
|
658
|
+
"--skip_events", action="store_true", help=desc["skip_events"])
|
|
659
|
+
designer_parser.add_argument(
|
|
660
|
+
"--source_dir", default=".", help="Source directory")
|
|
567
661
|
designer_parser.add_argument("--query", help="Query for the designer")
|
|
568
662
|
designer_parser.add_argument("--model", default="", help=desc["model"])
|
|
569
663
|
designer_parser.add_argument("--file", default="", help=desc["file"])
|
|
570
|
-
designer_parser.add_argument(
|
|
664
|
+
designer_parser.add_argument(
|
|
665
|
+
"--ray_address", default="auto", help=desc["ray_address"])
|
|
571
666
|
|
|
572
667
|
planner_parser = agent_subparsers.add_parser(
|
|
573
668
|
"planner", help="Run the planner agent"
|
|
574
669
|
)
|
|
575
|
-
planner_parser.add_argument(
|
|
576
|
-
|
|
670
|
+
planner_parser.add_argument(
|
|
671
|
+
"--request_id", default="", help=desc["request_id"])
|
|
672
|
+
planner_parser.add_argument(
|
|
673
|
+
"--skip_events", action="store_true", help=desc["skip_events"])
|
|
674
|
+
planner_parser.add_argument(
|
|
675
|
+
"--source_dir", default=".", help="Source directory")
|
|
577
676
|
planner_parser.add_argument("--query", help="Query for the planner")
|
|
578
677
|
planner_parser.add_argument("--model", default="", help=desc["model"])
|
|
579
|
-
planner_parser.add_argument(
|
|
678
|
+
planner_parser.add_argument(
|
|
679
|
+
"--emb_model", default="", help=desc["emb_model"])
|
|
580
680
|
planner_parser.add_argument("--file", default="", help=desc["file"])
|
|
581
681
|
planner_parser.add_argument(
|
|
582
682
|
"--ray_address", default="auto", help=desc["ray_address"]
|
|
583
683
|
)
|
|
584
|
-
planner_parser.add_argument(
|
|
684
|
+
planner_parser.add_argument(
|
|
685
|
+
"--execute", action="store_true", help=desc["execute"])
|
|
585
686
|
planner_parser.add_argument(
|
|
586
687
|
"--collections",
|
|
587
688
|
default="",
|
|
@@ -607,18 +708,22 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
607
708
|
|
|
608
709
|
planner_parser.add_argument("--rag_token", default="", help="")
|
|
609
710
|
planner_parser.add_argument("--rag_url", default="", help="")
|
|
711
|
+
planner_parser.add_argument("--rag_params_max_tokens", default=4096, help="")
|
|
610
712
|
planner_parser.add_argument(
|
|
611
713
|
"--rag_type", default="storage", help="RAG type, default is storage"
|
|
612
714
|
)
|
|
613
|
-
planner_parser.add_argument(
|
|
715
|
+
planner_parser.add_argument(
|
|
716
|
+
"--target_file", default="./output.txt", help="")
|
|
614
717
|
|
|
615
718
|
init_parser = subparsers.add_parser("init", help=desc["init_desc"])
|
|
616
|
-
init_parser.add_argument(
|
|
719
|
+
init_parser.add_argument(
|
|
720
|
+
"--source_dir", required=True, help=desc["init_dir"])
|
|
617
721
|
|
|
618
722
|
screenshot_parser = subparsers.add_parser(
|
|
619
723
|
"screenshot", help=desc["screenshot_desc"]
|
|
620
724
|
)
|
|
621
|
-
screenshot_parser.add_argument(
|
|
725
|
+
screenshot_parser.add_argument(
|
|
726
|
+
"--urls", required=True, help=desc["screenshot_url"])
|
|
622
727
|
screenshot_parser.add_argument(
|
|
623
728
|
"--output", required=True, help=desc["screenshot_output"]
|
|
624
729
|
)
|
|
@@ -636,7 +741,8 @@ def parse_args(input_args: Optional[List[str]] = None) -> AutoCoderArgs:
|
|
|
636
741
|
)
|
|
637
742
|
doc2html_parser.add_argument("--file", default="", help=desc["file"])
|
|
638
743
|
doc2html_parser.add_argument("--model", default="", help=desc["model"])
|
|
639
|
-
doc2html_parser.add_argument(
|
|
744
|
+
doc2html_parser.add_argument(
|
|
745
|
+
"--vl_model", default="", help=desc["vl_model"])
|
|
640
746
|
doc2html_parser.add_argument(
|
|
641
747
|
"--ray_address", default="auto", help=desc["ray_address"]
|
|
642
748
|
)
|
autocoder/common/__init__.py
CHANGED
|
@@ -98,6 +98,9 @@ class EnvInfo(pydantic.BaseModel):
|
|
|
98
98
|
conda_env: Optional[str]
|
|
99
99
|
virtualenv: Optional[str]
|
|
100
100
|
has_bash: bool
|
|
101
|
+
default_shell: Optional[str]
|
|
102
|
+
home_dir: Optional[str]
|
|
103
|
+
cwd: Optional[str]
|
|
101
104
|
|
|
102
105
|
|
|
103
106
|
def has_sufficient_content(file_content, min_line_count=10):
|
|
@@ -155,8 +158,19 @@ def detect_env() -> EnvInfo:
|
|
|
155
158
|
)
|
|
156
159
|
|
|
157
160
|
conda_env = os.environ.get("CONDA_DEFAULT_ENV")
|
|
158
|
-
|
|
159
161
|
virtualenv = os.environ.get("VIRTUAL_ENV")
|
|
162
|
+
|
|
163
|
+
# Get default shell
|
|
164
|
+
if os_name == "win32":
|
|
165
|
+
default_shell = os.environ.get("COMSPEC", "cmd.exe")
|
|
166
|
+
else:
|
|
167
|
+
default_shell = os.environ.get("SHELL", "/bin/sh")
|
|
168
|
+
|
|
169
|
+
# Get home directory
|
|
170
|
+
home_dir = os.path.expanduser("~")
|
|
171
|
+
|
|
172
|
+
# Get current working directory
|
|
173
|
+
cwd = os.getcwd()
|
|
160
174
|
|
|
161
175
|
has_bash = True
|
|
162
176
|
try:
|
|
@@ -171,6 +185,9 @@ def detect_env() -> EnvInfo:
|
|
|
171
185
|
conda_env=conda_env,
|
|
172
186
|
virtualenv=virtualenv,
|
|
173
187
|
has_bash=has_bash,
|
|
188
|
+
default_shell=default_shell,
|
|
189
|
+
home_dir=home_dir,
|
|
190
|
+
cwd=cwd,
|
|
174
191
|
)
|
|
175
192
|
|
|
176
193
|
|
|
@@ -261,7 +278,8 @@ class AutoCoderArgs(pydantic.BaseModel):
|
|
|
261
278
|
|
|
262
279
|
rag_url: Optional[str] = ""
|
|
263
280
|
rag_token: Optional[str] = ""
|
|
264
|
-
rag_type: Optional[str] = "storage"
|
|
281
|
+
rag_type: Optional[str] = "storage"
|
|
282
|
+
rag_params_max_tokens: Optional[int] = 4096
|
|
265
283
|
rag_doc_filter_relevance: Optional[int] = 5
|
|
266
284
|
rag_context_window_limit: Optional[int] = 120000
|
|
267
285
|
verify_file_relevance_score: int = 6
|
|
@@ -321,6 +339,7 @@ class AutoCoderArgs(pydantic.BaseModel):
|
|
|
321
339
|
inference_slow_without_deep_thought: Optional[bool] = False
|
|
322
340
|
inference_compute_precision: int = 64
|
|
323
341
|
without_contexts: Optional[bool] = False
|
|
342
|
+
skip_events: Optional[bool] = False
|
|
324
343
|
|
|
325
344
|
class Config:
|
|
326
345
|
protected_namespaces = ()
|
|
@@ -2,6 +2,7 @@ from typing import List, Dict, Tuple
|
|
|
2
2
|
from autocoder.common.types import Mode
|
|
3
3
|
from autocoder.common import AutoCoderArgs
|
|
4
4
|
import byzerllm
|
|
5
|
+
from autocoder.common import sys_prompt
|
|
5
6
|
|
|
6
7
|
|
|
7
8
|
class CodeAutoGenerateEditBlock:
|
|
@@ -379,8 +380,11 @@ class CodeAutoGenerateEditBlock:
|
|
|
379
380
|
|
|
380
381
|
with open(self.args.target_file, "w") as file:
|
|
381
382
|
file.write(init_prompt)
|
|
383
|
+
|
|
382
384
|
|
|
383
|
-
conversations = [
|
|
385
|
+
conversations = []
|
|
386
|
+
# conversations.append({"role": "system", "content": sys_prompt.prompt()})
|
|
387
|
+
conversations.append({"role": "user", "content": init_prompt})
|
|
384
388
|
|
|
385
389
|
t = self.llm.chat_oai(conversations=conversations, llm_config=llm_config)
|
|
386
390
|
conversations.append({"role": "assistant", "content": t[0].output})
|
|
@@ -401,7 +405,9 @@ class CodeAutoGenerateEditBlock:
|
|
|
401
405
|
instruction=query, content=source_content
|
|
402
406
|
)
|
|
403
407
|
|
|
404
|
-
conversations = [
|
|
408
|
+
conversations = []
|
|
409
|
+
# conversations.append({"role": "system", "content": sys_prompt.prompt()})
|
|
410
|
+
conversations.append({"role": "user", "content": init_prompt})
|
|
405
411
|
|
|
406
412
|
with open(self.args.target_file, "w") as file:
|
|
407
413
|
file.write(init_prompt)
|