auto-coder 0.1.365__py3-none-any.whl → 0.1.367__py3-none-any.whl

{auto_coder-0.1.365.dist-info → auto_coder-0.1.367.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.365
+Version: 0.1.367
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Classifier: Programming Language :: Python :: 3.10

{auto_coder-0.1.365.dist-info → auto_coder-0.1.367.dist-info}/RECORD

@@ -14,7 +14,7 @@ autocoder/command_parser.py,sha256=fx1g9E6GaM273lGTcJqaFQ-hoksS_Ik2glBMnVltPCE,1
 autocoder/lang.py,sha256=PFtATuOhHRnfpqHQkXr6p4C893JvpsgwTMif3l-GEi0,14321
 autocoder/models.py,sha256=Gu50IATQtZtgEir1PpCfwgH6o4ygw6XqqbQRj3lx5dU,13798
 autocoder/run_context.py,sha256=IUfSO6_gp2Wt1blFWAmOpN0b0nDrTTk4LmtCYUBIoro,1643
-autocoder/version.py,sha256=IcO5L1bOdV3qLFshmlEIP9ycK_uaklkhdNmRNqLG91g,23
+autocoder/version.py,sha256=h8-NqRVaMTNeO7d427-He9JWyfNB1qAzKWEkF2GN9dw,25
 autocoder/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/agent/agentic_edit.py,sha256=XsfePZ-t6M-uBSdG1VLZXk1goqXk2HPeJ_A8IYyBuWQ,58896
 autocoder/agent/agentic_edit_types.py,sha256=oFcDd_cxJ2yH9Ed1uTpD3BipudgoIEWDMPb5pAkq4gI,3288
@@ -47,7 +47,7 @@ autocoder/agent/base_agentic/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 autocoder/agent/base_agentic/agent_hub.py,sha256=3Al9rCKu-SRgAs1kvnMe4VIIErTIw85QTkhfFu5omO8,5605
 autocoder/agent/base_agentic/agentic_lang.py,sha256=UCq1NY9USaYJakTWc-3cv_MeHxAb6se1PI4lsSwGrPM,3657
 autocoder/agent/base_agentic/agentic_tool_display.py,sha256=UnAq8ovvpu88KLk19Ff0TW-Dq-k7YiRwZiIJgcYPwiY,6989
-autocoder/agent/base_agentic/base_agent.py,sha256=cirGi77mw7OawO4Q1pGcqkhhNukKDS01-zzhnae_1yU,85580
+autocoder/agent/base_agentic/base_agent.py,sha256=H7dOBSrYbVhMF7VBJV6qtq2kSa1iF5pfNwqtHIEU9uw,86371
 autocoder/agent/base_agentic/default_tools.py,sha256=ggtJjysejfDWD6JoG4vBDFrnXFFPRm7JsVVG6XcKer8,33060
 autocoder/agent/base_agentic/test_base_agent.py,sha256=jok9f-DoEagzZRWjk-Zpy3gKw2ztZrsNzEc0XlvE7HU,2804
 autocoder/agent/base_agentic/tool_registry.py,sha256=YFnUXJ78y7g3pm3yGgrhZ-0mx-C1ctdcA0r_ljGiE6o,14292
@@ -141,7 +141,7 @@ autocoder/common/test_run_cmd.py,sha256=0piPrNnxTPS8vJRnsVH6-lgB5zeLaXSRY5pPH13H
 autocoder/common/text.py,sha256=KGRQq314GHBmY4MWG8ossRoQi1_DTotvhxchpn78c-k,1003
 autocoder/common/token_cost_caculate.py,sha256=MSWJtl7YpQSUt-gFQoqUcJMblyPqHXe2ZioiZOFkV80,10085
 autocoder/common/types.py,sha256=Cw_4RH-rGmAgQE-Ck69maMAMqlPCDA4Yj37QmuUY0mQ,713
-autocoder/common/utils_code_auto_generate.py,sha256=zol3E5VQgriGzpR0p51yYnx8unthyurYM83QIudkxeI,4592
+autocoder/common/utils_code_auto_generate.py,sha256=sqtLmVxRveRwqLwJ8UlDgwngwmh2AAo3vgl-I-ALcDQ,4597
 autocoder/common/conversations/__init__.py,sha256=xGZeOFrDsgg2fkPK1zmvYBDhAyX66FtgOcZaxhYKJXU,1338
 autocoder/common/conversations/compatibility.py,sha256=WuBXB4-dw5X9LUMsB16VWbihvRZQ1tT99m6zuBwDfqE,9606
 autocoder/common/conversations/conversation_manager.py,sha256=ZhuhfSdOTncqgy3nHPoEU7Cg0dCsSl-VPcvLbUlL2Tk,18295
@@ -153,7 +153,7 @@ autocoder/common/file_checkpoint/__init__.py,sha256=qwoM0tIU-IMr-zGVCMN8yZtmz0NW
 autocoder/common/file_checkpoint/backup.py,sha256=JO26vOG9k7d8b5jgT24PdccSrTuPqKghp1nz5cmjSiE,8813
 autocoder/common/file_checkpoint/conversation_checkpoint.py,sha256=SFSTjA0fF5rsHlYdLQ-Dr9dfDl5JihndhjeqhN3OuMY,6322
 autocoder/common/file_checkpoint/examples.py,sha256=HTik8E0ddvKjEPGwzizWJBHIP9URrWRyRUOKSjYRUG8,6272
-autocoder/common/file_checkpoint/manager.py,sha256=mkEPURbF109qnCwXOikNmJI8INhdfCwBW1v6sRB7ubY,23757
+autocoder/common/file_checkpoint/manager.py,sha256=H1s1l8biFGpgrEHZK7Em59DqLSvSgguilSfWRXmRF7c,23769
 autocoder/common/file_checkpoint/models.py,sha256=dcZL2QGnklsa_BV_QY81fH-H5hYfhelXrH6GSrubMZo,4730
 autocoder/common/file_checkpoint/store.py,sha256=dgQe-1O_gPJ3QU6tHihGRp0G2jgD2IDxQ-w9zM6Yq54,12920
 autocoder/common/file_checkpoint/test_backup.py,sha256=Z9Y2RyGqxwKPNc7nW-2jtsMAYzqt0qZGzLoq3pn2zCI,8930
@@ -187,7 +187,7 @@ autocoder/common/v2/code_editblock_manager.py,sha256=DMwJw-FAM6VyaBQV3p4xespHpgZ
 autocoder/common/v2/code_manager.py,sha256=C403bS-f6urixwitlKHcml-J03hci-UyNwHJOqBiY6Q,9182
 autocoder/common/v2/code_strict_diff_manager.py,sha256=Bys7tFAq4G03R1zUZuxrszBTvP4QB96jIw2y5BDLyRM,9424
 autocoder/common/v2/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-autocoder/common/v2/agent/agentic_edit.py,sha256=Fx_T6YBWPa4tlTLY8dbecsd1n5a93dGE7b4gygmK56I,115043
+autocoder/common/v2/agent/agentic_edit.py,sha256=IqOku4jEWnmc_5Tn984t84TMDqIzIFCp6UhOVF3cY8k,116071
 autocoder/common/v2/agent/agentic_edit_conversation.py,sha256=pFgWPWHKhZ4J9EcFmIdiGsrSolTZuYcH1qkgKdD8nwk,7726
 autocoder/common/v2/agent/agentic_edit_types.py,sha256=nEcZc2MOZ_fQLaJX-YDha_x9Iim22ao4tykYM2iIy4k,4908
 autocoder/common/v2/agent/agentic_tool_display.py,sha256=-a-JTQLc4q03E_rdIILKMI0B6DHN-5gcGlrqq-mBYK4,7239
@@ -234,8 +234,8 @@ autocoder/dispacher/actions/plugins/action_regex_project.py,sha256=mziGcOtGafeAB
 autocoder/dispacher/actions/plugins/action_translate.py,sha256=GEn7dZA22jy5WyzINomjmzzB795p2Olg-CJla97lRF8,7744
 autocoder/events/__init__.py,sha256=1x_juwr9Ows2RADDa2LyI4QlmPxOVOXZeLO1cht-slM,1443
 autocoder/events/event_content.py,sha256=eLHf5M1BifSqhzzEBgAWKn3JD5_z_1mWeNdZ53TpMqk,12240
-autocoder/events/event_manager.py,sha256=ObbvPfNrrhC85w5VvsnLS9oy92oHEwqMN08qGPReNNA,11884
-autocoder/events/event_manager_singleton.py,sha256=F2OkC-rSTONZd4KS-ERnBAtBPO74aiEAMwJ9IKYa_b0,14742
+autocoder/events/event_manager.py,sha256=--V3sEdoSmYDCXqJXRMaMa1qWR9umuv9Cjd5Czjpavc,11887
+autocoder/events/event_manager_singleton.py,sha256=HOyDeiJGhLcC1yirHavtg-PG9faWXhQEIFrb0sZBtec,14621
 autocoder/events/event_store.py,sha256=y6tT3P-o3yhDptrKi-UmqI_ZBNg7v21FriI3f7lo_ME,12709
 autocoder/events/event_types.py,sha256=W_S6PTDIBdufcuPosgz64iITzQy79flL8s3hWB-vZ9o,3638
 autocoder/helper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -354,9 +354,9 @@ autocoder/utils/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autocoder/utils/auto_coder_utils/chat_stream_out.py,sha256=t902pKxQ5xM7zgIHiAOsTPLwxhE6VuvXAqPy751S7fg,14096
 autocoder/utils/chat_auto_coder_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-auto_coder-0.1.365.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
-auto_coder-0.1.365.dist-info/METADATA,sha256=vo07pJAu6M2IMTWjRq9caGUXRwr88NMs05TIHDGUJKs,2775
-auto_coder-0.1.365.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-auto_coder-0.1.365.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
-auto_coder-0.1.365.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
-auto_coder-0.1.365.dist-info/RECORD,,
+auto_coder-0.1.367.dist-info/LICENSE,sha256=HrhfyXIkWY2tGFK11kg7vPCqhgh5DcxleloqdhrpyMY,11558
+auto_coder-0.1.367.dist-info/METADATA,sha256=1M8FJDPaqao8EERBqrdN-p7V-VykNvS2imDrncLh63Y,2775
+auto_coder-0.1.367.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+auto_coder-0.1.367.dist-info/entry_points.txt,sha256=0nzHtHH4pNcM7xq4EBA2toS28Qelrvcbrr59GqD_0Ak,350
+auto_coder-0.1.367.dist-info/top_level.txt,sha256=Jqc0_uJSw2GwoFQAa9iJxYns-2mWla-9ok_Y3Gcznjk,10
+auto_coder-0.1.367.dist-info/RECORD,,

autocoder/agent/base_agentic/base_agent.py

@@ -794,10 +794,18 @@ class BaseAgent(ABC):
                 llm_response_gen)
 
             event_count = 0
+            mark_event_should_finish = False
             for event in parsed_events:
                 event_count += 1
                 logger.info(f"Processing event #{event_count}: {type(event).__name__}")
                 global_cancel.check_and_raise(token=self.args.event_file)
+
+                if mark_event_should_finish:
+                    if isinstance(event, TokenUsageEvent):
+                        logger.info("Yielding token usage event")
+                        yield event
+                    continue
+
                 if isinstance(event, (LLMOutputEvent, LLMThinkingEvent)):
                     assistant_buffer += event.text
                     logger.debug(f"Accumulated {len(assistant_buffer)} chars in assistant buffer")
@@ -903,7 +911,11 @@ class BaseAgent(ABC):
                     logger.info(
                         f"Added tool result to conversations for tool {type(tool_obj).__name__}")
                     logger.info(f"Breaking LLM cycle after executing tool: {tool_name}")
-                    break  # After tool execution and result, break to start a new LLM cycle
+                    
+                    # 一次交互只能有一次工具，剩下的其实就没有用了，但是如果不让流式处理完，我们就无法获取服务端
+                    # 返回的token消耗和计费，所以通过此标记来完成进入空转，直到流式走完，获取到最后的token消耗和计费
+                    mark_event_should_finish = True
+                    # break  # After tool execution and result, break to start a new LLM cycle
 
                 elif isinstance(event, ErrorEvent):
                     logger.error(f"Error event occurred: {event.message}")
@@ -1022,13 +1034,15 @@ class BaseAgent(ABC):
                     f"Failed to parse tool XML for <{tool_tag}>: {e}\nXML:\n{tool_xml}")
                 return None
         
-        meta_holder = byzerllm.MetaHolder() 
+        last_metadata = None      
         for content_chunk, metadata in generator:
-            global_cancel.check_and_raise(token=self.args.event_file)                                    
-            meta_holder.meta = metadata            
+            global_cancel.check_and_raise(token=self.args.event_file)                      
             if not content_chunk:
+                last_metadata = metadata                
                 continue
-            buffer += content_chunk
+            
+            last_metadata = metadata
+            buffer += content_chunk  
 
             while True:
                 # Check for transitions: thinking -> text, tool -> text, text -> thinking, text -> tool
@@ -1138,9 +1152,7 @@ class BaseAgent(ABC):
 
                 # If no event was processed in this iteration, break inner loop
                 if not found_event:
-                    break
-        
-        yield TokenUsageEvent(usage=meta_holder.meta)        
+                    break               
 
         # After generator exhausted, yield any remaining content
         if in_thinking_block:
@@ -1157,6 +1169,9 @@ class BaseAgent(ABC):
         elif buffer:
             # Yield remaining plain text
             yield LLMOutputEvent(text=buffer)
+
+        # 这个要放在最后，防止其他关联的多个事件的信息中断
+        yield TokenUsageEvent(usage=last_metadata)     
     
     def run_with_events(self, request: AgentRequest):
         """

autocoder/common/file_checkpoint/manager.py

@@ -8,6 +8,7 @@ import os
 import uuid
 import logging
 import difflib
+import time
 from typing import Dict, List, Optional, Tuple, Any
 from datetime import datetime
 

autocoder/common/utils_code_auto_generate.py

@@ -72,7 +72,7 @@ def stream_chat_with_continue(
     """
     
     count = 0
-    temp_conversations = conversations
+    temp_conversations = [] + conversations
     current_metadata = None
     metadatas = {}
     while True:

autocoder/common/v2/agent/agentic_edit.py

@@ -868,23 +868,35 @@ class AgenticEdit:
             assistant_buffer = ""
             logger.info("Initializing stream chat with LLM")
 
-            ## 实际请求大模型
+            # ## 实际请求大模型
             llm_response_gen = stream_chat_with_continue(
                 llm=self.llm,
                 conversations=conversations,
                 llm_config={},  # Placeholder for future LLM configs
                 args=self.args
             )
+
+            # llm_response_gen = self.llm.stream_chat_oai(
+            #     conversations=conversations,
+            #     delta_mode=True            
+            # )
             
             logger.info("Starting to parse LLM response stream")
             parsed_events = self.stream_and_parse_llm_response(
                 llm_response_gen)
 
             event_count = 0
+            mark_event_should_finish = False
             for event in parsed_events:
-                event_count += 1
-                # logger.info(f"Processing event #{event_count}: {type(event).__name__}")
                 global_cancel.check_and_raise(token=self.args.event_file)
+                event_count += 1
+                
+                if mark_event_should_finish:
+                    if isinstance(event, TokenUsageEvent):
+                        logger.info("Yielding token usage event")
+                        yield event
+                    continue
+                                
                 if isinstance(event, (LLMOutputEvent, LLMThinkingEvent)):
                     assistant_buffer += event.text
                     logger.debug(f"Accumulated {len(assistant_buffer)} chars in assistant buffer")
@@ -924,7 +936,8 @@ class AgenticEdit:
                         logger.info(
                             "AgenticEdit analyze loop finished due to AttemptCompletion.")
                         save_formatted_log(self.args.source_dir, json.dumps(conversations, ensure_ascii=False), "agentic_conversation")        
-                        return
+                        mark_event_should_finish = True
+                        continue
 
                     if isinstance(tool_obj, PlanModeRespondTool):
                         logger.info(
@@ -934,7 +947,8 @@ class AgenticEdit:
                         logger.info(
                             "AgenticEdit analyze loop finished due to PlanModeRespond.")
                         save_formatted_log(self.args.source_dir, json.dumps(conversations, ensure_ascii=False), "agentic_conversation")        
-                        return
+                        mark_event_should_finish = True
+                        continue
 
                     # Resolve the tool
                     resolver_cls = TOOL_RESOLVER_MAP.get(type(tool_obj))
@@ -1005,7 +1019,11 @@ class AgenticEdit:
                     logger.info(
                         f"Added tool result to conversations for tool {type(tool_obj).__name__}")
                     logger.info(f"Breaking LLM cycle after executing tool: {tool_name}")
-                    break  # After tool execution and result, break to start a new LLM cycle
+                    
+                    # 一次交互只能有一次工具，剩下的其实就没有用了，但是如果不让流式处理完，我们就无法获取服务端
+                    # 返回的token消耗和计费，所以通过此标记来完成进入空转，直到流式走完，获取到最后的token消耗和计费
+                    mark_event_should_finish=True
+                    # break  # After tool execution and result, break to start a new LLM cycle
 
                 elif isinstance(event, ErrorEvent):
                     logger.error(f"Error event occurred: {event.message}")
@@ -1013,10 +1031,10 @@ class AgenticEdit:
                     # Optionally stop the process on parsing errors
                     # logger.error("Stopping analyze loop due to parsing error.")
                     # return
-
                 elif isinstance(event, TokenUsageEvent):
                     logger.info("Yielding token usage event")
-                    yield event
+                    yield event    
+                
             
             if not tool_executed:
                 # No tool executed in this LLM response cycle
@@ -1136,14 +1154,16 @@ class AgenticEdit:
                 logger.exception(
                     f"Failed to parse tool XML for <{tool_tag}>: {e}\nXML:\n{tool_xml}")
                 return None
-        
-        meta_holder = byzerllm.MetaHolder()
-        for content_chunk, metadata in generator:
-            global_cancel.check_and_raise(token=self.args.event_file)
-            meta_holder.meta = metadata            
+
+        last_metadata = None        
+        for content_chunk, metadata in generator:            
+            global_cancel.check_and_raise(token=self.args.event_file)                      
             if not content_chunk:
+                last_metadata = metadata                
                 continue
-            buffer += content_chunk
+            
+            last_metadata = metadata
+            buffer += content_chunk            
 
             while True:
                 # Check for transitions: thinking -> text, tool -> text, text -> thinking, text -> tool
@@ -1271,8 +1291,8 @@ class AgenticEdit:
             # Yield remaining plain text
             yield LLMOutputEvent(text=buffer)
 
-        # 这个要放在最后，防止其他关联的多个事件的信息中断
-        yield TokenUsageEvent(usage=meta_holder.meta)            
+        # 这个要放在最后，防止其他关联的多个事件的信息中断        
+        yield TokenUsageEvent(usage=last_metadata)            
     
 
     def apply_pre_changes(self):

autocoder/events/event_manager.py

@@ -147,7 +147,7 @@ class EventManager:
         logger.debug(f"Waiting for response to event: {event.event_id}")
         
         # 无限等待响应，不设超时
-        wait_result = blocker.wait(timeout=60.0)  # 设置一个较长的超时时间（60秒）
+        wait_result = blocker.wait(timeout=60.0*60)  # 设置一个较长的超时时间（60秒）
         
         if not wait_result:
             logger.warning(f"Timeout waiting for response to event: {event.event_id}")

autocoder/events/event_manager_singleton.py

@@ -147,8 +147,7 @@ class EventManagerSingleton:
         # 排除默认的events.jsonl文件
         event_files = [f for f in event_files if os.path.basename(f) != "events.jsonl"]
         
-        if len(event_files) <= cls._max_event_files:
-            logger.info(f"事件文件数量({len(event_files)})未超过最大保留数量({cls._max_event_files})，无需清理")
+        if len(event_files) <= cls._max_event_files:            
             return
         
         # 解析文件名中的时间戳，格式为 uuid_YYYYMMDD-HHMMSS.jsonl

autocoder/version.py

@@ -1 +1,2 @@
-__version__ = "0.1.365"
+
+__version__ = "0.1.367"