auto-coder-web 0.1.26__py3-none-any.whl → 0.1.29__py3-none-any.whl

auto_coder_web/proxy.py

@@ -15,315 +15,39 @@ import os
 import argparse
 import aiofiles
 import pkg_resources
-import asyncio
-import pathlib
-import time
 import sys
-from auto_coder_web.file_group import FileGroupManager
-from auto_coder_web.file_manager import get_directory_tree
 from auto_coder_web.auto_coder_runner import AutoCoderRunner
-from autocoder.agent.auto_filegroup import AutoFileGroup
-from .types import (    
-    ChatList,    
+from .types import (        
     FileContentResponse,    
 )
-
-from rich.console import Console
-from prompt_toolkit.shortcuts import radiolist_dialog
-from prompt_toolkit.formatted_text import HTML
-import subprocess
-from prompt_toolkit import prompt
-from pydantic import BaseModel
-from autocoder.utils.log_capture import LogCapture
 from .terminal import terminal_manager
 from autocoder.common import AutoCoderArgs
-import json
-import re
-import yaml
-import git
-import hashlib
-from datetime import datetime
 from auto_coder_web.auto_coder_runner_wrapper import AutoCoderRunnerWrapper
 from .routers import todo_router, settings_router, auto_router, commit_router, chat_router, coding_router
 from expert_routers import history_router
 from .common_router import completions_router, file_router, auto_coder_conf_router, chat_list_router, file_group_router
-
-
-
-def check_environment():
-    """Check and initialize the required environment"""
-    console = Console()
-    console.print("\n[blue]Initializing the environment...[/blue]")
-
-    def check_project():
-        """Check if the current directory is initialized as an auto-coder project"""
-        def print_status(message, status):
-            if status == "success":
-                console.print(f"✓ {message}", style="green")
-            elif status == "warning":
-                console.print(f"! {message}", style="yellow")
-            elif status == "error":
-                console.print(f"✗ {message}", style="red")
-            else:
-                console.print(f"  {message}")
-        
-        if not os.path.exists("actions") or not os.path.exists(".auto-coder"):            
-            print_status("Project not initialized", "warning")
-            init_choice = input(
-                "  Do you want to initialize the project? (y/n): ").strip().lower()
-            if init_choice == "y":
-                try:
-                    if not os.path.exists("actions"):
-                        os.makedirs("actions", exist_ok=True)
-                        print_status("Created actions directory", "success")
-
-                    if not os.path.exists(".auto-coder"):
-                        os.makedirs(".auto-coder", exist_ok=True)
-                        print_status(
-                            "Created .auto-coder directory", "success")
-
-                    subprocess.run(
-                        ["auto-coder", "init", "--source_dir", "."], check=True)
-                    print_status("Project initialized successfully", "success")
-                except subprocess.CalledProcessError:
-                    print_status("Failed to initialize project", "error")
-                    print_status(
-                        "Please try to initialize manually: auto-coder init --source_dir .", "warning")
-                    return False
-            else:
-                print_status("Exiting due to no initialization", "warning")
-                return False
-
-        print_status("Project initialization check complete", "success")
-        return True
-
-    if not check_project():
-        return False
-
-    def print_status(message, status):
-        if status == "success":
-            console.print(f"✓ {message}", style="green")
-        elif status == "warning":
-            console.print(f"! {message}", style="yellow")
-        elif status == "error":
-            console.print(f"✗ {message}", style="red")
-        else:
-            console.print(f"  {message}")
-
-    # Check if Ray is running
-    print_status("Checking Ray", "")
-    ray_status = subprocess.run(
-        ["ray", "status"], capture_output=True, text=True)
-    if ray_status.returncode != 0:
-        print_status("Ray is not running", "warning")
-        try:
-            subprocess.run(["ray", "start", "--head"], check=True)
-            print_status("Ray started successfully", "success")
-        except subprocess.CalledProcessError:
-            print_status("Failed to start Ray", "error")
-            return False
-
-    # Check if deepseek_chat model is available
-    print_status("Checking deepseek_chat model", "")
-    try:
-        result = subprocess.run(
-            ["easy-byzerllm", "chat", "deepseek_chat", "你好"],
-            capture_output=True,
-            text=True,
-            timeout=30,
-        )
-        if result.returncode == 0:
-            print_status("deepseek_chat model is available", "success")
-            print_status("Environment check complete", "success")
-            return True
-    except subprocess.TimeoutExpired:
-        print_status("Model check timeout", "error")
-    except subprocess.CalledProcessError:
-        print_status("Model check error", "error")
-    except Exception as e:
-        print_status(f"Unexpected error: {str(e)}", "error")
-
-    print_status("deepseek_chat model is not available", "warning")
-
-    # If deepseek_chat is not available, prompt user to choose a provider
-    choice = radiolist_dialog(
-        title="Select Provider",
-        text="Please select a provider for deepseek_chat model:",
-        values=[
-            ("1", "硅基流动(https://siliconflow.cn)"),
-            ("2", "Deepseek官方(https://www.deepseek.com/)"),
-        ],
-    ).run()
-
-    if choice is None:
-        print_status("No provider selected", "error")
-        return False
-
-    api_key = prompt(HTML("<b>Please enter your API key: </b>"))
-
-    if choice == "1":
-        print_status("Deploying model with 硅基流动", "")
-        deploy_cmd = [
-            "easy-byzerllm",
-            "deploy",
-            "deepseek-ai/deepseek-v2-chat",
-            "--token",
-            api_key,
-            "--alias",
-            "deepseek_chat",
-        ]
-    else:
-        print_status("Deploying model with Deepseek官方", "")
-        deploy_cmd = [
-            "byzerllm",
-            "deploy",
-            "--pretrained_model_type",
-            "saas/openai",
-            "--cpus_per_worker",
-            "0.001",
-            "--gpus_per_worker",
-            "0",
-            "--worker_concurrency",
-            "1000",
-            "--num_workers",
-            "1",
-            "--infer_params",
-            f"saas.base_url=https://api.deepseek.com/v1 saas.api_key={api_key} saas.model=deepseek-chat",
-            "--model",
-            "deepseek_chat",
-        ]
-
-    try:
-        subprocess.run(deploy_cmd, check=True)
-        print_status("Model deployed successfully", "success")
-    except subprocess.CalledProcessError:
-        print_status("Failed to deploy model", "error")
-        return False
-
-    # Validate the deployment
-    print_status("Validating model deployment", "")
-    try:
-        validation_result = subprocess.run(
-            ["easy-byzerllm", "chat", "deepseek_chat", "你好"],
-            capture_output=True,
-            text=True,
-            timeout=30,
-            check=True,
-        )
-        print_status("Model validation successful", "success")
-    except (subprocess.TimeoutExpired, subprocess.CalledProcessError):
-        print_status("Model validation failed", "error")
-        print_status(
-            "You may need to try manually: easy-byzerllm chat deepseek_chat 你好", "warning")
-        return False
-
-    print_status("Environment initialization complete", "success")
-    return True
-
-
-def check_environment_lite():
-    """Check and initialize the required environment for lite mode"""
-    console = Console()
-    console.print("\n[blue]Initializing the environment (Lite Mode)...[/blue]")
-
-    def check_project():
-        """Check if the current directory is initialized as an auto-coder project"""
-        def print_status(message, status):
-            if status == "success":
-                console.print(f"✓ {message}", style="green")
-            elif status == "warning":
-                console.print(f"! {message}", style="yellow")
-            elif status == "error":
-                console.print(f"✗ {message}", style="red")
-            else:
-                console.print(f"  {message}")
-
-        first_time = False
-        if not os.path.exists("actions") or not os.path.exists(".auto-coder"):
-            first_time = True
-            print_status("Project not initialized", "warning")
-            init_choice = input(
-                "  Do you want to initialize the project? (y/n): ").strip().lower()
-            if init_choice == "y":
-                try:
-                    if not os.path.exists("actions"):
-                        os.makedirs("actions", exist_ok=True)
-                        print_status("Created actions directory", "success")
-
-                    if not os.path.exists(".auto-coder"):
-                        os.makedirs(".auto-coder", exist_ok=True)
-                        print_status(
-                            "Created .auto-coder directory", "success")
-
-                    subprocess.run(
-                        ["auto-coder", "init", "--source_dir", "."], check=True)
-                    print_status("Project initialized successfully", "success")
-                except subprocess.CalledProcessError:
-                    print_status("Failed to initialize project", "error")
-                    print_status(
-                        "Please try to initialize manually: auto-coder init --source_dir .", "warning")
-                    return False
-            else:
-                print_status("Exiting due to no initialization", "warning")
-                return False
-
-        print_status("Project initialization check complete", "success")
-        return True
-
-    if not check_project():
-        return False
-
-    def print_status(message, status):
-        if status == "success":
-            console.print(f"✓ {message}", style="green")
-        elif status == "warning":
-            console.print(f"! {message}", style="yellow")
-        elif status == "error":
-            console.print(f"✗ {message}", style="red")
-        else:
-            console.print(f"  {message}")
-
-    # Setup deepseek api key
-    api_key_dir = os.path.expanduser("~/.auto-coder/keys")
-    api_key_file = os.path.join(api_key_dir, "api.deepseek.com")
-    
-    if not os.path.exists(api_key_file):
-        print_status("API key not found", "warning")
-        api_key = prompt(HTML("<b>Please enter your API key: </b>"))
-        
-        # Create directory if it doesn't exist
-        os.makedirs(api_key_dir, exist_ok=True)
-        
-        # Save the API key
-        with open(api_key_file, "w") as f:
-            f.write(api_key)
-        
-        print_status(f"API key saved successfully: {api_key_file}", "success")
-
-    print_status("Environment initialization complete", "success")
-    return True
-
+from rich.console import Console
+from loguru import logger
+from auto_coder_web.lang import get_message
 
 class ProxyServer:
     def __init__(self, project_path: str, quick: bool = False, product_mode: str = "pro"):
-        self.app = FastAPI()
-
-        if not quick:
-            # Check the environment based on product mode
-            if product_mode == "lite":
-                if not check_environment_lite():
-                    print(
-                        "\033[31mEnvironment check failed. Some features may not work properly.\033[0m")
-            else:
-                if not check_environment():
-                    print(
-                        "\033[31mEnvironment check failed. Some features may not work properly.\033[0m")
-                        
+        self.app = FastAPI()                        
         self.setup_middleware()
 
         self.setup_static_files()
         self.project_path = project_path
+        
+        # Check if project is initialized
+        self.is_initialized = self.check_project_initialization()
+        if not self.is_initialized:
+            logger.warning(get_message("project_not_initialized"))
+            logger.warning(get_message("run_auto_coder_chat"))
+            sys.exit(1)            
+
         self.auto_coder_runner = AutoCoderRunnerWrapper(project_path, product_mode=product_mode)        
+         
+
         self.setup_routes()        
         self.client = httpx.AsyncClient()
 
@@ -354,6 +78,8 @@ class ProxyServer:
         self.app.state.project_path = self.project_path
         # Store auto_coder_runner in app state for dependency injection
         self.app.state.auto_coder_runner = self.auto_coder_runner
+        # Store initialization status
+        self.app.state.is_initialized = self.is_initialized
 
         self.app.include_router(todo_router.router)
         self.app.include_router(settings_router.router)
@@ -382,8 +108,21 @@ class ProxyServer:
             if os.path.exists(self.index_html_path):
                 async with aiofiles.open(self.index_html_path, "r") as f:
                     content = await f.read()
+                    
+                    # If project is not initialized, inject a warning banner
+                    if not self.is_initialized:
+                        init_warning = f"""
+                        <div style="background-color: #fff3cd; color: #856404; padding: 15px; margin: 15px; border-radius: 5px; text-align: center; font-weight: bold;">
+                            <p>⚠️ {get_message("project_not_initialized")}</p>
+                            <p>{get_message("run_auto_coder_chat")}</p>
+                        </div>
+                        """
+                        # Insert the warning after the body tag
+                        content = content.replace("<body>", "<body>" + init_warning)
+                        
                 return HTMLResponse(content=content)
             return HTMLResponse(content="<h1>Welcome to Proxy Server</h1>")
+        
 
         @self.app.get("/api/project-path")
         async def get_project_path():
@@ -481,7 +220,26 @@ class ProxyServer:
                     success=False, 
                     message=f"读取文件出错: {str(e)}"
                 )
+
+        @self.app.get("/api/initialization-status")
+        async def get_initialization_status():
+            """Get the project initialization status"""
+            return {
+                "initialized": self.is_initialized,
+                "message": None if self.is_initialized else get_message("run_auto_coder_chat")
+            }
+    
+    def check_project_initialization(self) -> bool:
+        """Check if the project has been initialized with auto-coder.chat"""
+        auto_coder_dir = os.path.join(self.project_path, ".auto-coder")
+        actions_dir = os.path.join(self.project_path, "actions")
+        return os.path.exists(auto_coder_dir) and os.path.exists(actions_dir)
     
+    def check_project_conf(self):
+        conf = self.auto_coder_runner.get_conf_wrapper()
+        if conf.get("human_as_model","false") in ["true","True","TRUE"]:
+            logger.warning(get_message("human_as_model_warning"))            
+            self.auto_coder_runner.configure_wrapper("human_as_model=false")            
 
 
 def main():

auto_coder_web/routers/coding_router.py

@@ -15,6 +15,7 @@ from autocoder.events.event_types import EventType
 from byzerllm.utils.langutil import asyncfy_with_semaphore
 from autocoder.common.global_cancel import global_cancel, CancelRequestedException 
 from loguru import logger
+import byzerllm
 
 router = APIRouter()
 
@@ -54,6 +55,25 @@ def ensure_task_dir(project_path: str) -> str:
     os.makedirs(task_dir, exist_ok=True)
     return task_dir
 
+@byzerllm.prompt()
+def coding_prompt(messages: List[Dict[str, Any]], request: CodingCommandRequest):
+    '''
+    下面是我们已经产生的一个消息列表,其中 USER_RESPONSE 表示用户的输入，RESULT 你的输出：
+    <messages>
+    {% for message in messages %}
+    <message>
+    <type>{{ message.type }}</type>
+    <content>{{ message.content }}</content>
+    </message>
+    {% endfor %}
+    </messages>
+    
+    下面是用户的最新需求：
+    <request>
+    {{ request.command }}    
+    </request>
+    '''
+
 @router.post("/api/coding-command")
 async def coding_command(request: CodingCommandRequest, project_path: str = Depends(get_project_path)):
     """
@@ -70,8 +90,54 @@ async def coding_command(request: CodingCommandRequest, project_path: str = Depe
             wrapper = AutoCoderRunnerWrapper(project_path)
             wrapper.configure_wrapper(f"event_file:{event_file}")
 
-            # 调用coding方法
-            result = wrapper.coding_wapper(request.command)            
+            # 获取当前会话名称
+            current_session_file = os.path.join(project_path, ".auto-coder", "auto-coder.web", "current-session.json")
+            current_session_name = ""
+            if os.path.exists(current_session_file):
+                try:
+                    with open(current_session_file, 'r') as f:
+                        session_data = json.load(f)
+                        current_session_name = session_data.get("session_name", "")
+                except Exception as e:
+                    logger.error(f"Error reading current session: {str(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")
+                if os.path.exists(chat_list_file):
+                    try:
+                        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                            
+                                
+                                messages.append(msg)
+                    except Exception as e:
+                        logger.error(f"Error reading chat history: {str(e)}")
+            
+            # 构建提示信息
+            prompt_text = ""
+            if messages:
+                # 调用coding_prompt生成包含历史消息的提示
+                prompt_text = coding_prompt.prompt(messages, request)
+                logger.info(prompt_text)
+            
+            # 调用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(request.command)            
+            
             get_event_manager(event_file).write_completion(
                 EventContentCreator.create_completion(
                     "200", "completed", result).to_dict()

auto_coder_web/version.py

@@ -1 +1 @@
-__version__ = "0.1.26"
+__version__ = "0.1.29"

auto_coder_web/web/asset-manifest.json

@@ -1,15 +1,15 @@
 {
   "files": {
-    "main.css": "/static/css/main.b9764291.css",
-    "main.js": "/static/js/main.a707a18c.js",
+    "main.css": "/static/css/main.8a602674.css",
+    "main.js": "/static/js/main.0ade47f8.js",
     "static/js/453.d855a71b.chunk.js": "/static/js/453.d855a71b.chunk.js",
     "index.html": "/index.html",
-    "main.b9764291.css.map": "/static/css/main.b9764291.css.map",
-    "main.a707a18c.js.map": "/static/js/main.a707a18c.js.map",
+    "main.8a602674.css.map": "/static/css/main.8a602674.css.map",
+    "main.0ade47f8.js.map": "/static/js/main.0ade47f8.js.map",
     "453.d855a71b.chunk.js.map": "/static/js/453.d855a71b.chunk.js.map"
   },
   "entrypoints": [
-    "static/css/main.b9764291.css",
-    "static/js/main.a707a18c.js"
+    "static/css/main.8a602674.css",
+    "static/js/main.0ade47f8.js"
   ]
 }

auto_coder_web/web/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script defer="defer" src="/static/js/main.a707a18c.js"></script><link href="/static/css/main.b9764291.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><title>React App</title><script defer="defer" src="/static/js/main.0ade47f8.js"></script><link href="/static/css/main.8a602674.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>