auto-coder-web 0.1.80__py3-none-any.whl → 0.1.82__py3-none-any.whl

auto_coder_web/auto_coder_runner_wrapper.py

@@ -4,8 +4,7 @@ from autocoder.auto_coder_runner import (
     load_memory,
     save_memory,
     configure,
-    manage_models,
-    print_conf,
+    manage_models,    
     exclude_dirs,
     exclude_files,
     ask,

auto_coder_web/common_router/model_router.py

@@ -175,7 +175,7 @@ class ModelInfo(BaseModel):
     input_price: float
     output_price: float
     is_reasoning: bool
-
+    max_output_tokens: int = 8096
 class ProviderConfig(BaseModel):
     name: str
     base_url: str
@@ -234,25 +234,36 @@ def load_providers() -> List[Dict]:
                     "is_reasoning": False
                 },
                 {
-                    "id": "openrouter/quasar-alpha",
-                    "name": "quasar-alpha",
-                    "input_price": 0.0,
-                    "output_price": 0.0,
-                    "is_reasoning": False
+                    "id": "openai/gpt-4.1",
+                    "name": "gpt-4.1",
+                    "input_price": 14,
+                    "output_price": 42,
+                    "is_reasoning": False,
+                    "max_output_tokens": 8096*3
                 },
                 {
-                    "id": "openrouter/optimus-alpha",
-                    "name": "optimus-alpha",
-                    "input_price": 0.0,
-                    "output_price": 0.0,
-                    "is_reasoning": False
+                    "id": "openai/gpt-4.1-mini",
+                    "name": "gpt-4.1-mini",
+                    "input_price": 2.8,
+                    "output_price": 11.2,
+                    "is_reasoning": False,
+                    "max_output_tokens": 8096*3
+                },
+                {
+                    "id": "openai/gpt-4.1-nano",
+                    "name": "gpt-4.1-nano",
+                    "input_price": 0.7,
+                    "output_price": 2.8,
+                    "is_reasoning": False,
+                    "max_output_tokens": 8096*3
                 },
                 {
                     "id": "google/gemini-2.5-pro-preview-03-25",
                     "name": "gemini-2.5-pro-preview-03-25",
                     "input_price": 0.0,
                     "output_price": 0.0,
-                    "is_reasoning": False
+                    "is_reasoning": False,
+                    "max_output_tokens": 8096*2
                 }
             ]
         },        

auto_coder_web/init_project.py

@@ -20,6 +20,15 @@ def init_project(project_path: str):
         f.write("\n/actions/")
         f.write("\n/output.txt")
 
+
+    # 生成 .autocoderignore 文件，采用 .gitignore 格式
+    autocoderignore_path = os.path.join(source_dir, ".autocoderignore")
+    autocoderignore_content = (
+        "target\n"        
+    )
+    with open(autocoderignore_path, "w", encoding="utf-8") as f:
+        f.write(autocoderignore_content)    
+
     print(
         f"""Successfully initialized auto-coder project in {os.path.abspath(project_path)}."""
     )

auto_coder_web/proxy.py

@@ -19,7 +19,7 @@ import sys
 from auto_coder_web.terminal import terminal_manager
 from autocoder.common import AutoCoderArgs
 from auto_coder_web.auto_coder_runner_wrapper import AutoCoderRunnerWrapper
-from auto_coder_web.routers import todo_router, settings_router, auto_router, commit_router, chat_router, coding_router, index_router, config_router, upload_router, rag_router, editable_preview_router,mcp_router
+from auto_coder_web.routers import todo_router, settings_router, auto_router, commit_router, chat_router, coding_router, index_router, config_router, upload_router, rag_router, editable_preview_router, mcp_router, direct_chat_router
 from auto_coder_web.expert_routers import history_router
 from auto_coder_web.common_router import completions_router, file_router, auto_coder_conf_router, chat_list_router, file_group_router, model_router, compiler_router
 from auto_coder_web.common_router import active_context_router
@@ -106,7 +106,7 @@ class ProxyServer:
         self.app.include_router(editable_preview_router.router)
         self.app.include_router(mcp_router.router)
         self.app.include_router(active_context_router.router)
-        # self.app.include_router(rag_router.router)
+        self.app.include_router(direct_chat_router.router)
 
         @self.app.on_event("shutdown")
         async def shutdown_event():

auto_coder_web/routers/auto_router.py

@@ -23,7 +23,7 @@ cancel_thread_pool = ThreadPoolExecutor(max_workers=5)
 
 class AutoCommandRequest(BaseModel):
     command: str
-    include_conversation_history: bool = False
+    include_conversation_history: bool = True
     buildin_conversation_history: bool = False
 
 class EventPollRequest(BaseModel):
@@ -64,7 +64,7 @@ def ensure_task_dir(project_path: str) -> str:
 @byzerllm.prompt()
 def coding_prompt(messages: List[Dict[str, Any]], query: str):
     '''
-    下面是我们已经产生的一个消息列表,其中 USER_RESPONSE 表示用户的输入，RESULT 你的输出：
+    下面是我们已经产生的一个消息列表,其中 USER_RESPONSE 表示用户的输入，其他都是你的输出：
     <messages>
     {% for message in messages %}
     <message>
@@ -96,7 +96,8 @@ async def auto_command(request: AutoCommandRequest, project_path: str = Depends(
         try:
             # 创建AutoCoderRunnerWrapper实例，使用从应用上下文获取的项目路径
             wrapper = AutoCoderRunnerWrapper(project_path)
-            wrapper.configure_wrapper(f"event_file:{event_file}")
+            wrapper.configure_wrapper(f"event_file:{event_file}")   
+            global_cancel.register_token(event_file)         
             prompt_text = request.command
 
             if request.include_conversation_history:
@@ -110,33 +111,38 @@ async def auto_command(request: AutoCommandRequest, project_path: str = Depends(
                             current_session_name = session_data.get("session_name", "")
                     except Exception as e:                        
                         logger.error(f"Error reading current session: {str(e)}")
+                        logger.exception(e)
                 
                 # 获取历史消息
                 messages = []
                 if current_session_name:
                     chat_list_file = os.path.join(project_path, ".auto-coder", "auto-coder.web", "chat-lists", f"{current_session_name}.json")
+                    logger.info(f"loading chat history from {chat_list_file}")
                     if os.path.exists(chat_list_file):
                         try:
-                            with open(chat_list_file, 'r', encoding="utf-8") as f:
+                            with open(chat_list_file, 'r', encoding="utf-8") as f:                                
                                 chat_data = json.load(f)
                                 # 从聊天历史中提取消息
-                                for msg in chat_data.get("messages", []):
-                                    # 只保留用户和中间结果信息
-                                    if msg.get("type","") not in ["USER_RESPONSE","RESULT"]:
-                                        continue     
-
-                                    if msg.get("contentType","") in ["token_stat"]:
-                                        continue                            
+                                for msg in chat_data.get("messages", []):                                    
+                                    # if msg.get("metadata",{}).get("stream_out_type","") == "/agent/edit":
+                                    #     messages.append(msg)
+                                    #     continue
                                     
+                                    # if msg.get("type","") not in ["USER_RESPONSE","RESULT","COMPLETION"]:
+                                    #     continue     
+                                    if msg.get("contentType","") in ["token_stat"]:
+                                        continue                                                                
                                     messages.append(msg)
-                        except Exception as e:                            
+                        except Exception as e:                                                       
                             logger.error(f"Error reading chat history: {str(e)}")
+                            logger.exception(e) 
                                                 
                 if messages:
                     # 调用coding_prompt生成包含历史消息的提示
                     prompt_text = coding_prompt.prompt(messages, request.command)                                    
 
-            # 调用auto_command_wrapper方法            
+            # 调用auto_command_wrapper方法  
+            logger.info(f"Executing auto command {file_id} with prompt: {prompt_text}")          
             result = wrapper.auto_command_wrapper(prompt_text, {
                 "event_file_id": file_id
             })            
@@ -369,12 +375,10 @@ async def cancel_task(request: CancelTaskRequest, project_path: str = Depends(ge
     """
     # 定义在线程中执行的取消任务函数
     def cancel_task_thread(event_file_id: str, project_path: str):
-        try:
-            # 设置全局取消标志
-            global_cancel.set()
-            
+        try:                        
             # 获取事件文件路径和事件管理器
             event_file = get_event_file_path(file_id=event_file_id, project_path=project_path)
+            global_cancel.set(token=event_file)
             event_manager = get_event_manager(event_file)
             
             # 向事件流写入取消事件

auto_coder_web/routers/chat_router.py

@@ -68,7 +68,8 @@ async def chat_command(request: ChatCommandRequest, project_path: str = Depends(
         try:
             # 创建AutoCoderRunnerWrapper实例，使用从应用上下文获取的项目路径
             wrapper = AutoCoderRunnerWrapper(project_path)
-            wrapper.configure_wrapper(f"event_file:{event_file}")
+            wrapper.configure_wrapper(f"event_file:{event_file}")    
+            global_cancel.register_token(event_file)
 
             # 调用chat方法
             result = wrapper.chat_wrapper(request.command)            
@@ -304,9 +305,8 @@ async def cancel_task(request: CancelTaskRequest, project_path: str = Depends(ge
         event_file = get_event_file_path(file_id=request.event_file_id, project_path=project_path)
         
         def cancel_in_thread():
-            try:
-                # 设置全局取消标志
-                global_cancel.set_cancel(request.event_file_id)
+            try:                                
+                global_cancel.set(token=event_file)
                 
                 # 获取事件管理器
                 event_manager = get_event_manager(event_file)

auto_coder_web/routers/coding_router.py

@@ -58,7 +58,7 @@ def ensure_task_dir(project_path: str) -> str:
 @byzerllm.prompt()
 def coding_prompt(messages: List[Dict[str, Any]], request: CodingCommandRequest):
     '''
-    下面是我们已经产生的一个消息列表,其中 USER_RESPONSE 表示用户的输入，RESULT 你的输出：
+    下面是我们已经产生的一个消息列表,其中 USER_RESPONSE 表示用户的输入，其他都是你的输出：
     <messages>
     {% for message in messages %}
     <message>
@@ -89,6 +89,7 @@ async def coding_command(request: CodingCommandRequest, project_path: str = Depe
             # 创建AutoCoderRunnerWrapper实例，使用从应用上下文获取的项目路径
             wrapper = AutoCoderRunnerWrapper(project_path)
             wrapper.configure_wrapper(f"event_file:{event_file}")
+            global_cancel.register_token(event_file)
 
             # 获取当前会话名称
             current_session_file = os.path.join(project_path, ".auto-coder", "auto-coder.web", "current-session.json")
@@ -123,20 +124,12 @@ async def coding_command(request: CodingCommandRequest, project_path: str = Depe
                         logger.error(f"Error reading chat history: {str(e)}")
             
             # 构建提示信息
-            prompt_text = ""
+            prompt_text = request.command
             if messages:
                 # 调用coding_prompt生成包含历史消息的提示
-                prompt_text = prompt_text + coding_prompt.prompt(messages, request)
-                logger.info(prompt_text)
+                prompt_text = coding_prompt.prompt(messages, request.command)                                    
             
-            # 调用coding方法，如果有历史消息，传递包含历史的提示
-            if prompt_text:
-                logger.info(f"Using conversation history with {len(messages)} messages for coding command")
-                result = wrapper.coding_wapper(prompt_text)
-            else:
-                # 如果没有历史消息或获取失败，直接传递原始命令
-                logger.info("Using original command without conversation history")
-                result = wrapper.coding_wapper(prompt_text + request.command)            
+            result = wrapper.coding_wapper(prompt_text)            
             
             get_event_manager(event_file).write_completion(
                 EventContentCreator.create_completion(
@@ -370,9 +363,8 @@ async def cancel_task(request: CancelTaskRequest, project_path: str = Depends(ge
         event_file = get_event_file_path(file_id=request.event_file_id, project_path=project_path)
         
         def cancel_in_thread():
-            try:
-                # 设置全局取消标志
-                global_cancel.set()
+            try:                                
+                global_cancel.set(token=event_file)
                 
                 # 获取事件管理器
                 event_manager = get_event_manager(event_file)

auto_coder_web/routers/direct_chat_router.py

@@ -0,0 +1,42 @@
+import traceback
+from fastapi import APIRouter, Request
+from pydantic import BaseModel
+from typing import Any, Dict
+from loguru import logger
+import byzerllm
+
+from autocoder.utils.llms import get_single_llm
+
+router = APIRouter()
+
+class DirectChatRequest(BaseModel):
+    model: str
+    content: str
+    product_mode: str = "lite"
+    options: Dict[str, Any] = {}
+
+class DirectChatResponse(BaseModel):
+    success: bool
+    result: Any = None
+    error: str = None
+
+@router.post("/api/direct_chat", response_model=DirectChatResponse)
+async def direct_chat(req: DirectChatRequest, request: Request):
+    """
+    简单直聊API，指定模型和内容，返回模型回复。
+    """
+    try:
+        # 获取模型
+        llm = get_single_llm(req.model, product_mode=req.product_mode)
+        
+        @byzerllm.prompt()
+        def chat_func(content: str) -> str:
+            """
+            {{ content }}
+            """
+        # 支持自定义llm_config等参数
+        result = chat_func.with_llm(llm).run(req.content)        
+        return DirectChatResponse(success=True, result=result)
+    except Exception as e:
+        logger.error(f"direct_chat error: {e}\n{traceback.format_exc()}")
+        return DirectChatResponse(success=False, error=f"{str(e)}")

auto_coder_web/version.py

@@ -1 +1 @@
-__version__ = "0.1.80"
+__version__ = "0.1.82"