auto-coder 0.1.353__py3-none-any.whl → 0.1.355__py3-none-any.whl

autocoder/common/v2/code_agentic_editblock_manager.py

@@ -347,7 +347,7 @@ class CodeEditBlockManager:
 
         # 计算这次修复缺失上下文花费的token情况
         token_cost_calculator.track_token_usage_by_generate(
-            llm=self.llm,
+            llm=self.code_generator.llms[0],
             generate=generation_result,
             operation_name="code_generation_complete",
             start_time=start_time,
@@ -433,7 +433,7 @@ class CodeEditBlockManager:
             return (unmerged_formatted_text, merged_formatted_text)
 
         for attempt in range(self.args.auto_fix_merge_max_attempts):
-            global_cancel.check_and_raise()
+            global_cancel.check_and_raise(token=self.args.event_file)
             unmerged_formatted_text, merged_formatted_text = _format_blocks(
                 merge)
             fix_prompt = self.fix_unmerged_blocks.prompt(
@@ -470,7 +470,7 @@ class CodeEditBlockManager:
 
             # 计算这次修复未合并块花费的token情况
             token_cost_calculator.track_token_usage_by_generate(
-                llm=self.llm,
+                llm=self.code_generator.llms[0],
                 generate=generation_result,
                 operation_name="code_generation_complete",
                 start_time=start_time,
@@ -544,7 +544,7 @@ class CodeEditBlockManager:
         token_cost_calculator = TokenCostCalculator(args=self.args)
 
         for attempt in range(self.auto_fix_lint_max_attempts):
-            global_cancel.check_and_raise()
+            global_cancel.check_and_raise(token=self.args.event_file)
             # 代码生成结果更新到影子文件里去
             self.shadow_manager.clean_shadows()
             shadow_files = self._create_shadow_files_from_edits(
@@ -611,7 +611,7 @@ class CodeEditBlockManager:
 
             # 计算这次修复lint问题花费的token情况
             token_cost_calculator.track_token_usage_by_generate(
-                llm=self.llm,
+                llm=self.code_generator.llms[0],
                 generate=generation_result,
                 operation_name="code_generation_complete",
                 start_time=start_time,
@@ -657,7 +657,7 @@ class CodeEditBlockManager:
         token_cost_calculator = TokenCostCalculator(args=self.args)
 
         for attempt in range(self.auto_fix_compile_max_attempts):
-            global_cancel.check_and_raise()
+            global_cancel.check_and_raise(token=self.args.event_file)
             # 先更新增量影子系统的文件
             self.shadow_manager.clean_shadows()
             shadow_files = self._create_shadow_files_from_edits(
@@ -710,7 +710,7 @@ class CodeEditBlockManager:
 
             # 计算这次修复compile问题花费的token情况
             token_cost_calculator.track_token_usage_by_generate(
-                llm=self.llm,
+                llm=self.code_generator.llms[0],
                 generate=generation_result,
                 operation_name="code_generation_complete",
                 start_time=start_time,
@@ -749,7 +749,7 @@ class CodeEditBlockManager:
 
         token_cost_calculator = TokenCostCalculator(args=self.args)
         token_cost_calculator.track_token_usage_by_generate(
-            llm=self.llm,
+            llm=self.code_generator.llms[0],
             generate=generation_result,
             operation_name="code_generation_complete",
             start_time=start_time,
@@ -804,7 +804,7 @@ class CodeEditBlockManager:
         # 生成代码并自动修复lint错误
 
         generation_result = self.generate_and_fix(query, source_code_list)
-        global_cancel.check_and_raise()
+        global_cancel.check_and_raise(token=self.args.event_file)
 
         # 合并代码
         self.code_merger.merge_code(generation_result)

autocoder/common/v2/code_diff_manager.py

@@ -251,7 +251,7 @@ class CodeDiffManager:
         
         # 最多尝试修复5次
         for attempt in range(self.max_correction_attempts):
-            global_cancel.check_and_raise()
+            global_cancel.check_and_raise(token=self.args.event_file)
             # 代码生成结果更新到影子文件里去
             shadow_files = self._create_shadow_files_from_edits(generation_result)
             
@@ -326,7 +326,7 @@ class CodeDiffManager:
         """
         # 生成代码并自动修复lint错误
         generation_result = self.generate_and_fix(query, source_code_list)
-        global_cancel.check_and_raise()
+        global_cancel.check_and_raise(token=self.args.event_file)
         # 合并代码        
         self.code_merger.merge_code(generation_result)
         

autocoder/common/v2/code_editblock_manager.py

@@ -24,6 +24,7 @@ from autocoder.shadows.shadow_manager import ShadowManager
 from autocoder.linters.shadow_linter import ShadowLinter
 from autocoder.linters.models import IssueSeverity
 from loguru import logger
+from autocoder.utils.llms import get_llm_names
 from autocoder.common.global_cancel import global_cancel
 from autocoder.linters.models import ProjectLintResult
 from autocoder.common.token_cost_caculate import TokenCostCalculator
@@ -347,7 +348,7 @@ class CodeEditBlockManager:
 
         # 计算这次修复缺失上下文花费的token情况
         token_cost_calculator.track_token_usage_by_generate(
-            llm=self.llm,
+            llm=self.code_generator.llms[0],
             generate=generation_result,
             operation_name="code_generation_complete",
             start_time=start_time,
@@ -396,24 +397,36 @@ class CodeEditBlockManager:
         def _format_blocks(merge: MergeCodeWithoutEffect) -> Tuple[str, str]:
             unmerged_formatted_text = ""
             for file_path, head, update in merge.failed_blocks:
-                unmerged_formatted_text += "```lang\n"
-                unmerged_formatted_text += f"##File: {file_path}\n"
-                unmerged_formatted_text += "<<<<<<< SEARCH\n"
+                unmerged_formatted_text += "```lang"
+                unmerged_formatted_text += "\n"
+                unmerged_formatted_text += f"##File: {file_path}"
+                unmerged_formatted_text += "\n"
+                unmerged_formatted_text += "<<<<<<< SEARCH"
+                unmerged_formatted_text += "\n"
                 unmerged_formatted_text += head
-                unmerged_formatted_text += "=======\n"
+                unmerged_formatted_text += "\n"
+                unmerged_formatted_text += "======="
+                unmerged_formatted_text += "\n"
                 unmerged_formatted_text += update
-                unmerged_formatted_text += ">>>>>>> REPLACE\n"
+                unmerged_formatted_text += "\n"
+                unmerged_formatted_text += ">>>>>>> REPLACE"
+                unmerged_formatted_text += "\n"
                 unmerged_formatted_text += "```"
                 unmerged_formatted_text += "\n"
 
             merged_formatted_text = ""
             if merge.merged_blocks:
                 for file_path, head, update in merge.merged_blocks:
-                    merged_formatted_text += "```lang\n"
-                    merged_formatted_text += f"##File: {file_path}\n"
+                    merged_formatted_text += "```lang"
+                    merged_formatted_text += "\n"
+                    merged_formatted_text += f"##File: {file_path}"
+                    merged_formatted_text += "\n"
                     merged_formatted_text += head
-                    merged_formatted_text += "=======\n"
+                    merged_formatted_text += "\n"
+                    merged_formatted_text += "======="
+                    merged_formatted_text += "\n"
                     merged_formatted_text += update
+                    merged_formatted_text += "\n"
                     merged_formatted_text += "```"
                     merged_formatted_text += "\n"
 
@@ -433,7 +446,7 @@ class CodeEditBlockManager:
             return (unmerged_formatted_text, merged_formatted_text)
 
         for attempt in range(self.args.auto_fix_merge_max_attempts):
-            global_cancel.check_and_raise()
+            global_cancel.check_and_raise(token=self.args.event_file)
             unmerged_formatted_text, merged_formatted_text = _format_blocks(
                 merge)
             fix_prompt = self.fix_unmerged_blocks.prompt(
@@ -470,7 +483,7 @@ class CodeEditBlockManager:
 
             # 计算这次修复未合并块花费的token情况
             token_cost_calculator.track_token_usage_by_generate(
-                llm=self.llm,
+                llm=self.code_generator.llms[0],
                 generate=generation_result,
                 operation_name="code_generation_complete",
                 start_time=start_time,
@@ -544,7 +557,7 @@ class CodeEditBlockManager:
         token_cost_calculator = TokenCostCalculator(args=self.args)
 
         for attempt in range(self.auto_fix_lint_max_attempts):
-            global_cancel.check_and_raise()
+            global_cancel.check_and_raise(token=self.args.event_file)
             # 代码生成结果更新到影子文件里去
             self.shadow_manager.clean_shadows()
             shadow_files = self._create_shadow_files_from_edits(
@@ -611,7 +624,7 @@ class CodeEditBlockManager:
 
             # 计算这次修复lint问题花费的token情况
             token_cost_calculator.track_token_usage_by_generate(
-                llm=self.llm,
+                llm=self.code_generator.llms[0],
                 generate=generation_result,
                 operation_name="code_generation_complete",
                 start_time=start_time,
@@ -657,7 +670,7 @@ class CodeEditBlockManager:
         token_cost_calculator = TokenCostCalculator(args=self.args)
 
         for attempt in range(self.auto_fix_compile_max_attempts):
-            global_cancel.check_and_raise()
+            global_cancel.check_and_raise(token=self.args.event_file)
             # 先更新增量影子系统的文件
             self.shadow_manager.clean_shadows()
             shadow_files = self._create_shadow_files_from_edits(
@@ -710,7 +723,7 @@ class CodeEditBlockManager:
 
             # 计算这次修复compile问题花费的token情况
             token_cost_calculator.track_token_usage_by_generate(
-                llm=self.llm,
+                llm=self.code_generator.llms[0],
                 generate=generation_result,
                 operation_name="code_generation_complete",
                 start_time=start_time,
@@ -747,9 +760,9 @@ class CodeEditBlockManager:
         generation_result = self.code_generator.single_round_run(
             query, source_code_list)
 
-        token_cost_calculator = TokenCostCalculator(args=self.args)
+        token_cost_calculator = TokenCostCalculator(args=self.args)        
         token_cost_calculator.track_token_usage_by_generate(
-            llm=self.llm,
+            llm=self.code_generator.llms[0],
             generate=generation_result,
             operation_name="code_generation_complete",
             start_time=start_time,
@@ -804,7 +817,7 @@ class CodeEditBlockManager:
         # 生成代码并自动修复lint错误
 
         generation_result = self.generate_and_fix(query, source_code_list)
-        global_cancel.check_and_raise()
+        global_cancel.check_and_raise(token=self.args.event_file)
 
         # 合并代码
         self.code_merger.merge_code(generation_result)

autocoder/common/v2/code_strict_diff_manager.py

@@ -32,6 +32,7 @@ class CodeStrictDiffManager:
         self.code_merger = CodeAutoMergeStrictDiff(llm, args)
         self.shadow_manager = ShadowManager(args.source_dir, args.event_file)
         self.shadow_linter = ShadowLinter(self.shadow_manager, verbose=False)
+        self.args = args
 
     @byzerllm.prompt()
     def fix_linter_errors(self, query: str, lint_issues: str) -> str:
@@ -159,7 +160,7 @@ class CodeStrictDiffManager:
         
         # 最多尝试修复5次
         for attempt in range(self.max_correction_attempts):
-            global_cancel.check_and_raise()
+            global_cancel.check_and_raise(token=self.args.event_file)
             # 代码生成结果更新到影子文件里去
             shadow_files = self._create_shadow_files_from_edits(generation_result)
             
@@ -234,7 +235,7 @@ class CodeStrictDiffManager:
         """
         # 生成代码并自动修复lint错误
         generation_result = self.generate_and_fix(query, source_code_list)
-        global_cancel.check_and_raise()
+        global_cancel.check_and_raise(token=self.args.event_file)
         # 合并代码        
         self.code_merger.merge_code(generation_result)
         

autocoder/dispacher/actions/action.py

@@ -113,7 +113,7 @@ class ActionTSProject(BaseAction):
                     f"Content(send to model) is {content_length} tokens, which is larger than the maximum input length {self.args.model_max_input_length}"
                 )
 
-        global_cancel.check_and_raise()
+        global_cancel.check_and_raise(token=self.args.event_file)
 
         if (args.enable_auto_fix_merge or args.enable_auto_fix_lint) and args.execute and args.auto_merge=="editblock":
             code_merge_manager = CodeEditBlockManager(llm=self.llm, args=self.args,action=self)
@@ -179,7 +179,7 @@ class ActionTSProject(BaseAction):
                     action_file=self.args.file
                 ).to_dict())
 
-            global_cancel.check_and_raise()
+            global_cancel.check_and_raise(token=self.args.event_file)
 
             merge_result = None
             if args.execute and args.auto_merge:
@@ -267,7 +267,7 @@ class ActionPyProject(BaseAction):
                     max_length=self.args.model_max_input_length
                 )
 
-        global_cancel.check_and_raise()
+        global_cancel.check_and_raise(token=self.args.event_file)
 
         if (args.enable_auto_fix_merge or args.enable_auto_fix_lint) and args.execute and args.auto_merge=="editblock":
             code_merge_manager = CodeEditBlockManager(llm=self.llm, args=self.args,action=self)
@@ -334,7 +334,7 @@ class ActionPyProject(BaseAction):
                     action_file=self.args.file
                 ).to_dict())
 
-            global_cancel.check_and_raise()
+            global_cancel.check_and_raise(token=self.args.event_file)
 
             merge_result = None
             if args.execute and args.auto_merge:
@@ -415,7 +415,7 @@ class ActionSuffixProject(BaseAction):
                     f"Content(send to model) is {content_length} tokens, which is larger than the maximum input length {self.args.model_max_input_length}"
                 )
 
-        global_cancel.check_and_raise()
+        global_cancel.check_and_raise(token=self.args.event_file)
 
         if (args.enable_auto_fix_merge or args.enable_auto_fix_lint) and args.execute and args.auto_merge=="editblock":
             code_merge_manager = CodeEditBlockManager(llm=self.llm, args=self.args,action=self)
@@ -481,7 +481,7 @@ class ActionSuffixProject(BaseAction):
                     action_file=self.args.file
                 ).to_dict())
 
-        global_cancel.check_and_raise()
+        global_cancel.check_and_raise(token=self.args.event_file)
 
         merge_result = None
         if args.execute and args.auto_merge:

autocoder/dispacher/actions/plugins/action_regex_project.py

@@ -67,7 +67,7 @@ class ActionRegexProject:
 
         start_time = time.time()
         
-        global_cancel.check_and_raise()
+        global_cancel.check_and_raise(token=self.args.event_file)
 
         if (args.enable_auto_fix_merge or args.enable_auto_fix_lint) and args.execute and args.auto_merge=="editblock":
             code_merge_manager = CodeEditBlockManager(llm=self.llm, args=self.args,action=self)
@@ -128,7 +128,7 @@ class ActionRegexProject:
                     action_file=self.args.file
                 ).to_dict())
 
-            global_cancel.check_and_raise()
+            global_cancel.check_and_raise(token=self.args.event_file)
             
             merge_result = None
             if args.execute and args.auto_merge:

autocoder/events/event_manager_singleton.py

@@ -71,7 +71,7 @@ class EventManagerSingleton:
 
 def get_event_file_path(file_id:str,project_path: Optional[str] = None) -> str:
     if project_path is None:
-        return os.path.join(".auto-coder", "events", f"{file_id}.jsonl")
+        return os.path.join(os.getcwd(),".auto-coder", "events", f"{file_id}.jsonl")
     else:
         return os.path.join(project_path, ".auto-coder", "events", f"{file_id}.jsonl")
 

autocoder/index/index.py

@@ -298,7 +298,7 @@ class IndexManager:
         return False
 
     def build_index_for_single_source(self, source: SourceCode):
-        global_cancel.check_and_raise()
+        global_cancel.check_and_raise(token=self.args.event_file)
 
         file_path = source.module_name
         if not os.path.exists(file_path):
@@ -462,7 +462,7 @@ class IndexManager:
     def filter_exclude_files(self, file_path, exclude_patterns):
         # 增加 ignore_file_utils 的过滤
         try:
-            from src.autocoder.ignorefiles import ignore_file_utils
+            from autocoder.common.ignorefiles import ignore_file_utils
             if ignore_file_utils.should_ignore(file_path):
                 return True
         except Exception:
@@ -575,7 +575,7 @@ class IndexManager:
                 for source in wait_to_build_files
             ]
             for future in as_completed(futures):
-                global_cancel.check_and_raise()
+                global_cancel.check_and_raise(token=self.args.event_file)
                 result = future.result()
                 if result is not None:
                     counter += 1

autocoder/models.py

@@ -60,22 +60,35 @@ default_models_list = [
         "max_output_tokens": 8096
     },    
     {
-        "name": "openrouter/quasar-alpha",
+        "name": "openai/gpt-4.1-mini",
         "description": "",
-        "model_name": "openrouter/quasar-alpha",
+        "model_name": "openai/gpt-4.1-mini",
         "model_type": "saas/openai",
         "base_url": "https://openrouter.ai/api/v1",
         "api_key_path": "",
         "is_reasoning": False,
-        "input_price": 0.0,
-        "output_price": 0.0,
+        "input_price": 2.8,
+        "output_price": 11.2,
         "average_speed": 0.0,
-        "max_output_tokens": 8096*2
+        "max_output_tokens": 8096*3
     },
     {
-        "name": "openrouter/optimus-alpha",
+        "name": "openai/gpt-4.1",
         "description": "",
-        "model_name": "openrouter/optimus-alpha",
+        "model_name": "openai/gpt-4.1",
+        "model_type": "saas/openai",
+        "base_url": "https://openrouter.ai/api/v1",
+        "api_key_path": "",
+        "is_reasoning": False,
+        "input_price": 14.0,
+        "output_price": 42.0,
+        "average_speed": 0.0,
+        "max_output_tokens": 8096*3
+    },   
+    {
+        "name": "openai/gpt-4.1-nano",
+        "description": "",
+        "model_name": "openai/gpt-4.1-nano",
         "model_type": "saas/openai",
         "base_url": "https://openrouter.ai/api/v1",
         "api_key_path": "",
@@ -83,8 +96,8 @@ default_models_list = [
         "input_price": 0.0,
         "output_price": 0.0,
         "average_speed": 0.0,
-        "max_output_tokens": 8096*2
-    },     
+        "max_output_tokens": 8096*3
+    },  
     {
         "name": "openrouter/google/gemini-2.5-pro-preview-03-25",
         "description": "",

autocoder/rag/api_server.py

@@ -187,9 +187,16 @@ async def serve_static_file(full_path: str, request: Request):
         # 直接使用规范化的路径
         file_path = os.path.join("/", os.path.normpath(unquote(full_path)))
         
+        # 获取允许的静态文件目录
+        allowed_static_abs = request.app.state.allowed_static_abs
+        logger.info(f"==allowed_static_abs==: {allowed_static_abs}")
+        
+        if file_path.startswith(("/_images","_images")):            
+            file_path = os.path.join(allowed_static_abs, file_path)  
+
         # 检查文件是否存在
         if not os.path.exists(file_path):
-            raise FileNotFoundError(f"File not found: {file_path}")
+            raise FileNotFoundError(f"File not found: {file_path}")          
         
         # 如果启用了Nginx X-Accel-Redirect，使用X-Accel特性
         if hasattr(request.app.state, "enable_nginx_x_accel") and request.app.state.enable_nginx_x_accel:
@@ -273,6 +280,9 @@ def serve(llm:ByzerLLM, args: ServerArgs):
     allowed_static_abs = os.path.abspath(allowed_static_dir)
     logger.info(f"Static files root directory: {allowed_static_abs}")
     
+    # 将允许的静态文件目录存储到应用状态中
+    router_app.state.allowed_static_abs = allowed_static_abs
+    
     router_app.add_middleware(
         CORSMiddleware,
         allow_origins=args.allowed_origins,
@@ -309,9 +319,11 @@ def serve(llm:ByzerLLM, args: ServerArgs):
                 
                 # Check if path is in allowed directory
                 abs_path = os.path.abspath(os.path.join("/", normalized_path))
+                if abs_path.startswith("/_images"):
+                    return await call_next(request)
                 
                 # 使用预先计算好的allowed_static_abs
-                is_allowed = abs_path.startswith(allowed_static_abs)
+                is_allowed = abs_path.startswith(request.app.state.allowed_static_abs)
                 
                 if not is_allowed:
                     logger.warning(f"Unauthorized path access: {abs_path}")

autocoder/rag/cache/local_byzer_storage_cache.py

@@ -269,7 +269,7 @@ class LocalByzerStorageCache(BaseCacheManager):
                         "file_path": file_info.file_path,
                         "content": chunk[0:self.chunk_size*2],
                         "raw_content": chunk[0:self.chunk_size*2],
-                        "vector": chunk[0:self.chunk_size*2],
+                        "vector": chunk[0:self.args.rag_emb_text_size],
                         "mtime": file_info.modify_time,
                     }
                     items.append(chunk_item)

autocoder/rag/cache/local_duckdb_storage_cache.py

@@ -88,6 +88,7 @@ class LocalDuckdbStorage:
         table_name: str = "documents",
         embed_dim: Optional[int] = None,
         persist_dir: str = "./storage",
+        args: Optional[AutoCoderArgs] = None,
     ) -> None:
         self.llm = llm
         self.database_name = database_name
@@ -95,6 +96,7 @@ class LocalDuckdbStorage:
         self.embed_dim = embed_dim
         self.persist_dir = persist_dir
         self.cache_dir = os.path.join(self.persist_dir, ".cache")
+        self.args = args
         logger.info(f"正在启动 DuckDBVectorStore.")
 
         if self.database_name != ":memory:":
@@ -239,6 +241,11 @@ class LocalDuckdbStorage:
     def _node_to_table_row(
         self, context_chunk: Dict[str, str | float], dim: int | None = None
     ) -> Any:
+        
+        if not context_chunk["raw_content"]:
+            context_chunk["raw_content"] = "empty"        
+        context_chunk["raw_content"] = context_chunk["raw_content"][: self.args.rag_emb_text_size]
+            
         return (
             context_chunk["_id"],
             context_chunk["file_path"],
@@ -332,6 +339,7 @@ class LocalDuckDBStorageCache(BaseCacheManager):
             database_name="byzerai_store_duckdb.db",
             table_name="rag_duckdb",
             persist_dir=self.path,
+            args=args,
         )
         self.queue = []
         self.chunk_size = 1000