auto-coder-web 0.1.43__py3-none-any.whl → 0.1.45__py3-none-any.whl

auto_coder_web/auto_coder_runner_wrapper.py

@@ -50,7 +50,13 @@ class AutoCoderRunnerWrapper:
         return auto_command(command,params)
     
     def configure_wrapper(self,conf: str, skip_print=False ):
-        return configure(conf, skip_print)    
+        return configure(conf, skip_print)  
+
+    def build_index_wrapper(self):
+        return index_build()  
+    
+    def query_index_wrapper(self,query: str):
+        return index_query(query)
 
     def get_conf_wrapper(self):
         memory = get_memory()

auto_coder_web/common_router/completions_router.py

@@ -35,49 +35,68 @@ async def get_project_path(request: Request):
 
 def find_files_in_project(patterns: List[str], project_path: str) -> List[str]:
     memory = get_memory()
-    default_exclude_dirs = [".git", "node_modules", "dist", "build", "__pycache__",".venv"]
+    default_exclude_dirs = [".git", "node_modules", "dist", "build", "__pycache__", ".venv", ".auto-coder"]
     active_file_list = memory["current_files"]["files"]
-
+    final_exclude_dirs = default_exclude_dirs + memory.get("exclude_dirs", [])
     project_root = project_path
-    matched_files = []
-
-    if len(patterns) == 1 and patterns[0] == "":
-        return active_file_list
+    
+    def should_exclude_path(path: str) -> bool:
+        """检查路径是否应该被排除（路径中包含排除目录或以.开头的目录/文件）"""
+        # 处理相对/绝对路径
+        rel_path = path
+        if os.path.isabs(path):
+            try:
+                rel_path = os.path.relpath(path, project_root)
+            except ValueError:
+                rel_path = path
+                
+        # 检查文件或目录本身是否以.开头
+        if os.path.basename(rel_path).startswith('.'):
+            return True
+            
+        # 检查路径中是否包含排除目录
+        path_parts = rel_path.split(os.sep)
+        return any(part in final_exclude_dirs or part.startswith('.') for part in path_parts)
+
+    # 如果没有提供有效模式，返回过滤后的活动文件列表
+    if not patterns or (len(patterns) == 1 and patterns[0] == ""):
+        return [f for f in active_file_list if not should_exclude_path(f)]
+
+    matched_files = set()  # 使用集合避免重复
 
     for pattern in patterns:
+        # 1. 从活动文件列表中匹配
         for file_path in active_file_list:
-            if pattern in os.path.basename(file_path):
-                matched_files.append(file_path)
-
-    final_exclude_dirs = default_exclude_dirs + \
-        memory.get("exclude_dirs", [])
-
-    for pattern in patterns:
+            if not should_exclude_path(file_path) and pattern in os.path.basename(file_path):
+                matched_files.add(file_path)
+        
+        # 2. 如果是通配符模式，使用glob
         if "*" in pattern or "?" in pattern:
             for file_path in glob.glob(pattern, recursive=True):
-                if os.path.isfile(file_path):
-                    abs_path = os.path.abspath(file_path)
-                    if not any(
-                        exclude_dir in abs_path.split(os.sep)
-                        for exclude_dir in final_exclude_dirs
-                    ):
-                        matched_files.append(abs_path)
-        else:
-            is_added = False
-            for root, dirs, files in os.walk(project_root, followlinks=True):
-                dirs[:] = [d for d in dirs if d not in final_exclude_dirs]
-                if pattern in files:
-                    matched_files.append(os.path.join(root, pattern))
-                    is_added = True
-                else:
-                    for file in files:
-                        if pattern in os.path.join(root, file):
-                            matched_files.append(os.path.join(root, file))
-                            is_added = True
-            if not is_added:
-                matched_files.append(pattern)
-
-    return list(set(matched_files))
+                if os.path.isfile(file_path) and not should_exclude_path(file_path):
+                    matched_files.add(os.path.abspath(file_path))
+            continue
+        
+        # 3. 使用os.walk在文件系统中查找
+        for root, dirs, files in os.walk(project_root, followlinks=True):
+            # 过滤不需要遍历的目录
+            dirs[:] = [d for d in dirs if d not in final_exclude_dirs and not d.startswith('.')]
+            
+            if should_exclude_path(root):
+                continue
+            
+            # 查找匹配文件
+            for file in files:
+                if pattern in file:
+                    file_path = os.path.join(root, file)
+                    if not should_exclude_path(file_path):
+                        matched_files.add(file_path)
+        
+        # 4. 如果pattern本身是文件路径
+        if os.path.exists(pattern) and os.path.isfile(pattern) and not should_exclude_path(pattern):
+            matched_files.add(os.path.abspath(pattern))
+
+    return list(matched_files)
 
 def get_symbol_list(project_path: str) -> List[SymbolItem]:
     list_of_symbols = []
@@ -131,10 +150,9 @@ async def get_file_completions(
     completions = []
     project_root = project_path
     for file_name in matches:
-        path_parts = file_name.split(os.sep)
+        # path_parts = file_name.split(os.sep)
         # 只显示最后三层路径，让显示更简洁
-        display_name = os.sep.join(
-            path_parts[-3:]) if len(path_parts) > 3 else file_name
+        display_name = os.path.basename(file_name)
         relative_path = os.path.relpath(file_name, project_root)
 
         completions.append(CompletionItem(
@@ -163,4 +181,4 @@ async def get_symbol_completions(
                 path=relative_path,
                 display=f"{symbol.symbol_name}(location: {relative_path})"
             ))
-    return CompletionResponse(completions=matches) 
+    return CompletionResponse(completions=matches) 

auto_coder_web/proxy.py

@@ -16,12 +16,12 @@ import argparse
 import aiofiles
 import pkg_resources
 import sys
-from .terminal import terminal_manager
+from auto_coder_web.terminal import terminal_manager
 from autocoder.common import AutoCoderArgs
 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, model_router
+from auto_coder_web.routers import todo_router, settings_router, auto_router, commit_router, chat_router, coding_router,index_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
 from rich.console import Console
 from loguru import logger
 from auto_coder_web.lang import get_message
@@ -94,7 +94,8 @@ class ProxyServer:
         self.app.include_router(auto_coder_conf_router.router)
         self.app.include_router(chat_list_router.router)
         self.app.include_router(file_group_router.router) 
-        self.app.include_router(model_router.router)                       
+        self.app.include_router(model_router.router)       
+        self.app.include_router(index_router.router)
 
         @self.app.on_event("shutdown")
         async def shutdown_event():

auto_coder_web/routers/index_router.py

@@ -0,0 +1,201 @@
+import os
+import json
+from threading import Thread
+import time as import_time
+from fastapi import APIRouter, HTTPException, Request, Depends
+from pydantic import BaseModel
+from typing import Optional, Any, Dict, Union, List
+from auto_coder_web.auto_coder_runner_wrapper import AutoCoderRunnerWrapper
+from loguru import logger
+
+# 定义Pydantic模型
+class IndexBuildResponse(BaseModel):
+    status: str
+    message: Optional[str] = None
+
+class IndexStatusCompleted(BaseModel):
+    status: str = "completed"
+    result: Any
+    timestamp: float
+
+class IndexStatusError(BaseModel):
+    status: str = "error"
+    error: str
+    timestamp: float
+
+class IndexStatusUnknown(BaseModel):
+    status: str = "unknown"
+    message: str = "No index build status available"
+
+class SourceCode(BaseModel):
+    module_name: str
+    source_code: str
+    tag: str = ""
+    tokens: int = -1
+    metadata: Dict[str, Any] = {}
+
+class SourceCodeListResponse(BaseModel):
+    sources: List[SourceCode]
+
+# 组合类型
+IndexStatus = Union[IndexStatusCompleted, IndexStatusError, IndexStatusUnknown]
+
+router = APIRouter()
+
+
+async def get_project_path(request: Request) -> str:
+    """                                                                                                                                                                                                
+    从FastAPI请求上下文中获取项目路径                                                                                                                                                                  
+    """
+    return request.app.state.project_path
+
+
+@router.post("/api/index/build")
+async def build_index(project_path: str = Depends(get_project_path)):
+    """                                                                                                                                                                                                
+    构建索引                                                                                                                                                                                           
+
+    在单独的线程中运行索引构建，避免阻塞主线程                                                                                                                                                         
+
+    Args:                                                                                                                                                                                              
+        project_path: 项目路径                                                                                                                                                                         
+
+    Returns:                                                                                                                                                                                           
+        构建索引的状态信息                                                                                                                                                                             
+    """
+
+    # 定义在线程中运行的函数
+    def run_index_build_in_thread():
+        try:
+            # 创建AutoCoderRunnerWrapper实例
+            wrapper = AutoCoderRunnerWrapper(project_path)
+
+            # 调用build_index_wrapper方法构建索引
+            result = wrapper.build_index_wrapper()
+
+            logger.info(f"Index build completed successfully: {result}")
+
+            # 可以选择将结果保存到文件中，以便前端查询
+            status_file = os.path.join(
+                project_path, ".auto-coder", "auto-coder.web", "index-status.json")
+            os.makedirs(os.path.dirname(status_file), exist_ok=True)
+
+            # 使用Pydantic模型创建状态数据
+            status_data = IndexStatusCompleted(
+                result=result,
+                timestamp=import_time.time()
+            )
+
+            with open(status_file, 'w') as f:
+                f.write(status_data.model_dump_json())
+
+        except Exception as e:
+            logger.error(f"Error building index: {str(e)}")
+
+            # 保存错误信息
+            status_file = os.path.join(
+                project_path, ".auto-coder", "auto-coder.web", "index-status.json")
+            os.makedirs(os.path.dirname(status_file), exist_ok=True)
+
+            # 使用Pydantic模型创建错误状态数据
+            status_data = IndexStatusError(
+                error=str(e),
+                timestamp=import_time.time()
+            )
+
+            with open(status_file, 'w') as f:
+                f.write(status_data.model_dump_json())
+
+    try:
+        # 创建并启动线程
+        thread = Thread(target=run_index_build_in_thread)
+        thread.daemon = True  # 设置为守护线程，这样当主程序退出时，线程也会退出
+        thread.start()
+
+        logger.info("Started index build in background thread")
+        return IndexBuildResponse(
+            status="started", 
+            message="Index build started in background"
+        )
+    except Exception as e:
+        logger.error(f"Error starting index build thread: {str(e)}")
+        raise HTTPException(
+            status_code=500, detail=f"Failed to start index build: {str(e)}")
+
+
+@router.get("/api/index/status")
+async def get_index_status(project_path: str = Depends(get_project_path)):
+    """                                                                                                                                                                                                
+    获取索引构建状态                                                                                                                                                                                   
+
+    从状态文件中读取索引构建的最新状态                                                                                                                                                                 
+
+    Args:                                                                                                                                                                                              
+        project_path: 项目路径                                                                                                                                                                         
+
+    Returns:                                                                                                                                                                                           
+        索引构建的状态信息                                                                                                                                                                             
+    """
+    try:
+        status_file = os.path.join(
+            project_path, ".auto-coder", "auto-coder.web", "index-status.json")
+
+        if not os.path.exists(status_file):
+            return IndexStatusUnknown()
+
+        with open(status_file, 'r') as f:
+            status_data_dict = json.load(f)
+        
+        # 根据状态类型返回相应的Pydantic模型
+        if status_data_dict["status"] == "completed":
+            return IndexStatusCompleted(**status_data_dict)
+        elif status_data_dict["status"] == "error":
+            return IndexStatusError(**status_data_dict)
+        else:
+            return IndexStatusUnknown()
+    except Exception as e:
+        logger.error(f"Error getting index status: {str(e)}")
+        raise HTTPException(
+            status_code=500, detail=f"Failed to get index status: {str(e)}")
+
+
+@router.get("/api/index/query", response_model=SourceCodeListResponse)
+async def query_index(query: str, project_path: str = Depends(get_project_path)):
+    """
+    智能搜索项目文件
+    
+    使用索引查询相关文件
+    
+    Args:
+        query: 搜索查询
+        project_path: 项目路径
+        
+    Returns:
+        匹配的源代码文件列表
+    """
+    try:
+        wrapper = AutoCoderRunnerWrapper(project_path)
+        result = wrapper.query_index_wrapper(query)
+        
+        # 将结果转换为SourceCodeListResponse格式
+        if hasattr(result, 'sources'):
+            sources = [
+                SourceCode(
+                    module_name=os.path.relpath(source.module_name, project_path),
+                    source_code="",
+                    tag=source.tag if hasattr(source, 'tag') else "",
+                    tokens=source.tokens if hasattr(source, 'tokens') else -1,
+                    metadata=source.metadata if hasattr(source, 'metadata') else {}
+                )
+                for source in result.sources
+            ]
+            return SourceCodeListResponse(sources=sources)
+        else:
+            # 如果结果不是预期的格式，返回空列表
+            logger.warning(f"Unexpected result format from query_index_wrapper: {type(result)}")
+            return SourceCodeListResponse(sources=[])
+            
+    except Exception as e:
+        logger.error(f"Error querying index: {str(e)}")
+        raise HTTPException(
+            status_code=500, detail=f"Failed to query index: {str(e)}")

auto_coder_web/version.py

@@ -1 +1 @@
-__version__ = "0.1.43"
+__version__ = "0.1.45"

auto_coder_web/web/asset-manifest.json

@@ -1,15 +1,15 @@
 {
   "files": {
-    "main.css": "/static/css/main.b7ab91d3.css",
-    "main.js": "/static/js/main.4d7281bb.js",
+    "main.css": "/static/css/main.f34d9cfc.css",
+    "main.js": "/static/js/main.bb3658c2.js",
     "static/js/453.d855a71b.chunk.js": "/static/js/453.d855a71b.chunk.js",
     "index.html": "/index.html",
-    "main.b7ab91d3.css.map": "/static/css/main.b7ab91d3.css.map",
-    "main.4d7281bb.js.map": "/static/js/main.4d7281bb.js.map",
+    "main.f34d9cfc.css.map": "/static/css/main.f34d9cfc.css.map",
+    "main.bb3658c2.js.map": "/static/js/main.bb3658c2.js.map",
     "453.d855a71b.chunk.js.map": "/static/js/453.d855a71b.chunk.js.map"
   },
   "entrypoints": [
-    "static/css/main.b7ab91d3.css",
-    "static/js/main.4d7281bb.js"
+    "static/css/main.f34d9cfc.css",
+    "static/js/main.bb3658c2.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.4d7281bb.js"></script><link href="/static/css/main.b7ab91d3.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.bb3658c2.js"></script><link href="/static/css/main.f34d9cfc.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>