auto-coder 0.1.339__tar.gz → 0.1.341__tar.gz

{auto_coder-0.1.339 → auto_coder-0.1.341}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.339
+Version: 0.1.341
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
-Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: contextlib2

{auto_coder-0.1.339 → auto_coder-0.1.341}/setup.py

@@ -44,11 +44,11 @@ setup(
     package_data={
         "autocoder": ["data/**/*"],
     },
-    install_requires=install_requires,
-    classifiers=[        
-        "Topic :: Scientific/Engineering :: Artificial Intelligence",
-        "Programming Language :: Python :: 3.9",
+    install_requires=install_requires,    
+    classifiers=[                
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
     ],
-    requires_python=">=3.9",
+    requires_python=">=3.10, <=3.12"
 )

{auto_coder-0.1.339 → auto_coder-0.1.341}/src/auto_coder.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: auto-coder
-Version: 0.1.339
+Version: 0.1.341
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
-Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: contextlib2

{auto_coder-0.1.339 → auto_coder-0.1.341}/src/autocoder/auto_coder_runner.py

@@ -2821,8 +2821,9 @@ def generate_new_yaml(query: str):
 def auto_command(query: str,extra_args: Dict[str,Any]={}):    
     """处理/auto指令"""        
     args = get_final_config() 
-    memory = get_memory()            
-    if args.enable_agentic_edit:
+    memory = get_memory()         
+    if args.enable_agentic_edit:        
+        from autocoder.run_context import get_run_context,RunMode
         execute_file,args = generate_new_yaml(query)
         args.file = execute_file                      
         current_files = memory.get("current_files",{}).get("files",[])
@@ -2831,16 +2832,20 @@ def auto_command(query: str,extra_args: Dict[str,Any]={}):
             with open(file,"r",encoding="utf-8") as f:
                 sources.append(SourceCode(module_name=file,source_code=f.read()))  
                     
-            llm = get_single_llm(args.code_model or args.model,product_mode=args.product_mode)    
-            agent = AgenticEdit(llm=llm,args=args,files=SourceCodeList(sources=sources), 
-                                conversation_history=[],
-                                memory_config=MemoryConfig(memory=memory, 
-                                save_memory_func=save_memory), command_config=CommandConfig,
-                                conversation_name="current"
-                                )
+        llm = get_single_llm(args.code_model or args.model,product_mode=args.product_mode) 
+        conversation_history = extra_args.get("conversations",[])   
+        agent = AgenticEdit(llm=llm,args=args,files=SourceCodeList(sources=sources), 
+                            conversation_history=conversation_history,
+                            memory_config=MemoryConfig(memory=memory, 
+                            save_memory_func=save_memory), command_config=CommandConfig,
+                            conversation_name="current"
+                            )
+        if get_run_context() == RunMode.TERMINAL:
             agent.run_in_terminal(AgenticEditRequest(user_input=query))
-            return
-    
+        else:
+            agent.run_with_events(AgenticEditRequest(user_input=query))
+        return
+        
     args = get_final_config()  
     # 准备请求参数
     request = AutoCommandRequest(

{auto_coder-0.1.339 → auto_coder-0.1.341}/src/autocoder/common/v2/agent/agentic_edit.py

@@ -11,6 +11,7 @@ from autocoder.common.printer import Printer
 from rich.console import Console
 from rich.panel import Panel
 from pydantic import SkipValidation
+from byzerllm.utils.types import SingleOutputMeta
 
 # Removed ResultManager, stream_out, git_utils, AutoCommandTools, count_tokens, global_cancel, ActionYmlFileManager, get_event_manager, EventContentCreator, get_run_context, AgenticFilterStreamOutType
 from autocoder.common import AutoCoderArgs, git_utils, SourceCodeList, SourceCode
@@ -118,6 +119,8 @@ class AgenticEdit:
 
         self.conversation_manager = AgenticConversation(
             args, self.conversation_history, conversation_name=conversation_name)
+        # 当前不开启历史记录，所以清空
+        self.conversation_manager.clear_history()
 
         self.shadow_manager = ShadowManager(
             args.source_dir, args.event_file, args.ignore_clean_shadows)
@@ -744,12 +747,13 @@ class AgenticEdit:
         self.conversation_manager.add_user_message(request.user_input)
         logger.debug(
             f"Initial conversation history size: {len(conversations)}")
-
+        
+        tool_executed = False
         while True:
             global_cancel.check_and_raise()
             logger.info(
                 f"Starting LLM interaction cycle. History size: {len(conversations)}")
-            tool_executed = False
+            
             assistant_buffer = ""
 
             llm_response_gen = stream_chat_with_continue(
@@ -1142,7 +1146,44 @@ class AgenticEdit:
                         metadata={}
                     )
                     event_manager.write_result(
-                        content=content.to_dict(), metadata=metadata)
+                        content=content.to_dict(), metadata=metadata.to_dict())
+                elif isinstance(agent_event, PlanModeRespondEvent):
+                    metadata.path = "/agent/edit/plan_mode_respond"                    
+                    content = EventContentCreator.create_markdown_result(
+                        content=agent_event.completion.response,
+                        metadata={}
+                    )                    
+                    event_manager.write_result(
+                        content=content.to_dict(), metadata=metadata.to_dict())
+
+                elif isinstance(agent_event, TokenUsageEvent):                    
+                    last_meta: SingleOutputMeta = agent_event.usage                                                                           
+                    # Get model info for pricing
+                    from autocoder.utils import llms as llm_utils
+                    model_name = ",".join(llm_utils.get_llm_names(self.llm))
+                    model_info = llm_utils.get_model_info(
+                        model_name, self.args.product_mode) or {}
+                    input_price = model_info.get(
+                        "input_price", 0.0) if model_info else 0.0
+                    output_price = model_info.get(
+                        "output_price", 0.0) if model_info else 0.0
+
+                    # Calculate costs
+                    input_cost = (last_meta.input_tokens_count *
+                                  input_price) / 1000000  # Convert to millions
+                    # Convert to millions
+                    output_cost = (
+                        last_meta.generated_tokens_count * output_price) / 1000000
+                                      
+                    get_event_manager(self.args.event_file).write_result(
+                        EventContentCreator.create_result(content=EventContentCreator.ResultTokenStatContent(
+                            model_name=model_name,
+                            elapsed_time=0.0,
+                            first_token_time=last_meta.first_token_time,
+                            input_tokens=last_meta.input_tokens_count,
+                            output_tokens=last_meta.generated_tokens_count,
+                        ).to_dict()),metadata=metadata.to_dict())
+
                 elif isinstance(agent_event, CompletionEvent):
                     # 在这里完成实际合并
                     try:
@@ -1156,7 +1197,7 @@ class AgenticEdit:
                         success_code="AGENT_COMPLETE",
                         success_message="Agent attempted task completion.",
                         result={
-                            **agent_event.completion.model_dump()
+                            "response": agent_event.completion.result
                         }
                     )
                     event_manager.write_completion(
@@ -1200,7 +1241,7 @@ class AgenticEdit:
     def apply_changes(self):
         """
         Apply all tracked file changes to the original project directory.
-        """
+        """        
         for (file_path, change) in self.get_all_file_changes().items():
             with open(file_path, 'w', encoding='utf-8') as f:
                 f.write(change.content)

{auto_coder-0.1.339 → auto_coder-0.1.341}/src/autocoder/common/v2/agent/agentic_edit_conversation.py

@@ -144,6 +144,7 @@ class AgenticConversation:
     def clear_history(self):
         """Clears the conversation history."""
         self._history = []
+        self._save_memory()
 
     def __len__(self) -> int:
         """Returns the number of messages in the history."""

{auto_coder-0.1.339 → auto_coder-0.1.341}/src/autocoder/common/v2/agent/agentic_edit_tools/search_files_tool_resolver.py

@@ -54,7 +54,7 @@ class SearchFilesToolResolver(BaseToolResolver):
             compiled_regex = re.compile(regex_pattern)
             search_glob_pattern = os.path.join(search_base_path, "**", file_pattern)
 
-            ignored_dirs = ['.git', 'node_modules', '.mvn', '.idea', '__pycache__', '.venv', 'venv', 'dist', 'build', '.gradle']
+            ignored_dirs = ['.git',".auto-coder", 'node_modules', '.mvn', '.idea', '__pycache__', '.venv', 'venv', 'dist', 'build', '.gradle']
             logger.info(f"Searching for regex '{regex_pattern}' in files matching '{file_pattern}' under '{search_base_path}' (shadow: {shadow_exists}), ignoring directories: {ignored_dirs}")
 
             for filepath in glob.glob(search_glob_pattern, recursive=True):

{auto_coder-0.1.339 → auto_coder-0.1.341}/src/autocoder/suffixproject/__init__.py

@@ -57,6 +57,7 @@ class SuffixProject:
             "actions",
             ".idea",
             "venv",
+            ".next"
         ]
 
     @byzerllm.prompt()

auto_coder-0.1.341/src/autocoder/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.341"

auto_coder-0.1.339/src/autocoder/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.339"