diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e0e1f69 --- /dev/null +++ b/.gitignore @@ -0,0 +1,160 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +.python-version + +# pipenv +Pipfile.lock + +# poetry +poetry.lock + +# pdm +.pdm.toml + +# PEP 582 +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# IDEs +.vscode/ +.idea/ +*.swp +*.swo +*~ +.DS_Store + +# Project specific +outputs/ +*.jsonl +*.log + +# Node modules (if any frontend dependencies) +node_modules/ +package-lock.json +yarn.lock + +# Temporary files +*.tmp +*.temp +.trae/ + diff --git a/.trae/documents/修复预览访问与静态页面挂载.md b/.trae/documents/修复预览访问与静态页面挂载.md deleted file mode 100644 index 256d598..0000000 --- a/.trae/documents/修复预览访问与静态页面挂载.md +++ /dev/null @@ -1,37 +0,0 @@ -## 问题分析 -- 浏览器报错 `net::ERR_ABORTED http://0.0.0.0:8010/`，常见于预览环境对 `0.0.0.0` 的访问被中止或跳转流程未完成。 -- 现有后端已启动并挂载静态目录到 `/`，但预览器可能对根路径加载敏感，或端口/主机解析不一致。 -- 目前 API 路由与静态挂载并存，使用相对 `fetch('/query')` 正常；问题主要是根页面加载。 - -## 修复方案 -1. 主机与端口访问 -- 推荐使用 `http://127.0.0.1:8010/` 或 `http://localhost:8010/` 访问，而不是 `0.0.0.0`。 -- 新增 `/health` 路由用于快速诊断服务是否运行。 - -2. 静态页面挂载位置 -- 将静态目录从根 `/` 改为 `/ui` 挂载，降低与根路径的潜在冲突。 -- 新增 `GET /` 路由，返回 `frontend/index.html` 或 302 跳转到 `/ui/index.html`。 - -3. 前端请求与错误处理 -- 保持相对路径 `fetch('/query')`、`/select`、`/reject`，保持同源；增强错误提示（显示响应状态与内容）。 -- 若需要跨源（前端单独部署），补充 CORS：允许前端源访问后端 API。 - -4. 诊断与验证 -- 使用 `curl http://127.0.0.1:8010/health` 验证健康。 -- 使用 `curl` 端到端：`/query`（新会话与带 `session_id` 再生）、`/select`（生成答案）。 -- 浏览器打开 `/ui/` 页面，执行完整流程：开始生成 → 拒绝并再生 → 选择并出答案。 - -## 具体改动清单 -- `_qwen_xinference_demo/api.py` - - 添加 `GET /health` 路由返回 `{status:"ok"}`。 - - 将 `StaticFiles(directory="frontend", html=True)` 从 `/` 挂载到 `/ui`。 - - 添加 `GET /` 路由，返回 `index.html` 或重定向到 `/ui/index.html`。 -- `frontend/index.html` - - 增强错误显示：同时显示响应状态码与文本（提升诊断能力）。 - -## 后续增强（可选） -- 为 `/query` 与 `/select` 增加耗时、来源日志，便于问题排查。 -- 在页面上展示历史候选与拒绝原因列表，提升可观测性。 -- 提供配置项切换嵌入优先级（Xinference/Ollama）。 - -请确认是否按以上方案进行修改与验证，我将立即实施并完成端到端测试。 \ No newline at end of file diff --git a/__pycache__/config.cpython-310.pyc b/__pycache__/config.cpython-310.pyc deleted file mode 100644 index 7ed0201..0000000 Binary files a/__pycache__/config.cpython-310.pyc and /dev/null differ diff --git a/__pycache__/config.cpython-313.pyc b/__pycache__/config.cpython-313.pyc deleted file mode 100644 index 82e4658..0000000 Binary files a/__pycache__/config.cpython-313.pyc and /dev/null differ diff --git a/__pycache__/ollama_client.cpython-310.pyc b/__pycache__/ollama_client.cpython-310.pyc deleted file mode 100644 index a78a861..0000000 Binary files a/__pycache__/ollama_client.cpython-310.pyc and /dev/null differ diff --git a/__pycache__/prompt_utils.cpython-310.pyc b/__pycache__/prompt_utils.cpython-310.pyc deleted file mode 100644 index fa55b45..0000000 Binary files a/__pycache__/prompt_utils.cpython-310.pyc and /dev/null differ diff --git a/__pycache__/session_state.cpython-310.pyc b/__pycache__/session_state.cpython-310.pyc deleted file mode 100644 index 5f74013..0000000 Binary files a/__pycache__/session_state.cpython-310.pyc and /dev/null differ diff --git a/__pycache__/user_prompt_optimizer.cpython-310.pyc b/__pycache__/user_prompt_optimizer.cpython-310.pyc deleted file mode 100644 index eac9c0b..0000000 Binary files a/__pycache__/user_prompt_optimizer.cpython-310.pyc and /dev/null differ diff --git a/__pycache__/xinference_client.cpython-310.pyc b/__pycache__/xinference_client.cpython-310.pyc deleted file mode 100644 index 75b9114..0000000 Binary files a/__pycache__/xinference_client.cpython-310.pyc and /dev/null differ diff --git a/_qwen_xinference_demo/__pycache__/api.cpython-310.pyc b/_qwen_xinference_demo/__pycache__/api.cpython-310.pyc deleted file mode 100644 index 93a16cf..0000000 Binary files a/_qwen_xinference_demo/__pycache__/api.cpython-310.pyc and /dev/null differ diff --git a/_qwen_xinference_demo/__pycache__/api.cpython-313.pyc b/_qwen_xinference_demo/__pycache__/api.cpython-313.pyc deleted file mode 100644 index 5e08690..0000000 Binary files a/_qwen_xinference_demo/__pycache__/api.cpython-313.pyc and /dev/null differ diff --git a/_qwen_xinference_demo/opro/__pycache__/ollama_client.cpython-310.pyc b/_qwen_xinference_demo/opro/__pycache__/ollama_client.cpython-310.pyc deleted file mode 100644 index bf092de..0000000 Binary files a/_qwen_xinference_demo/opro/__pycache__/ollama_client.cpython-310.pyc and /dev/null differ diff --git a/_qwen_xinference_demo/opro/__pycache__/ollama_client.cpython-313.pyc b/_qwen_xinference_demo/opro/__pycache__/ollama_client.cpython-313.pyc deleted file mode 100644 index 29fc91b..0000000 Binary files a/_qwen_xinference_demo/opro/__pycache__/ollama_client.cpython-313.pyc and /dev/null differ diff --git a/_qwen_xinference_demo/opro/__pycache__/prompt_utils.cpython-310.pyc b/_qwen_xinference_demo/opro/__pycache__/prompt_utils.cpython-310.pyc deleted file mode 100644 index 5aaa537..0000000 Binary files a/_qwen_xinference_demo/opro/__pycache__/prompt_utils.cpython-310.pyc and /dev/null differ diff --git a/_qwen_xinference_demo/opro/__pycache__/prompt_utils.cpython-313.pyc b/_qwen_xinference_demo/opro/__pycache__/prompt_utils.cpython-313.pyc deleted file mode 100644 index dddc7d6..0000000 Binary files a/_qwen_xinference_demo/opro/__pycache__/prompt_utils.cpython-313.pyc and /dev/null differ diff --git a/_qwen_xinference_demo/opro/__pycache__/session_state.cpython-310.pyc b/_qwen_xinference_demo/opro/__pycache__/session_state.cpython-310.pyc deleted file mode 100644 index fd1643b..0000000 Binary files a/_qwen_xinference_demo/opro/__pycache__/session_state.cpython-310.pyc and /dev/null differ diff --git a/_qwen_xinference_demo/opro/__pycache__/session_state.cpython-313.pyc b/_qwen_xinference_demo/opro/__pycache__/session_state.cpython-313.pyc deleted file mode 100644 index 2c6872b..0000000 Binary files a/_qwen_xinference_demo/opro/__pycache__/session_state.cpython-313.pyc and /dev/null differ diff --git a/_qwen_xinference_demo/opro/__pycache__/user_prompt_optimizer.cpython-310.pyc b/_qwen_xinference_demo/opro/__pycache__/user_prompt_optimizer.cpython-310.pyc deleted file mode 100644 index bee2f1d..0000000 Binary files a/_qwen_xinference_demo/opro/__pycache__/user_prompt_optimizer.cpython-310.pyc and /dev/null differ diff --git a/_qwen_xinference_demo/opro/__pycache__/user_prompt_optimizer.cpython-313.pyc b/_qwen_xinference_demo/opro/__pycache__/user_prompt_optimizer.cpython-313.pyc deleted file mode 100644 index 86a5be2..0000000 Binary files a/_qwen_xinference_demo/opro/__pycache__/user_prompt_optimizer.cpython-313.pyc and /dev/null differ diff --git a/_qwen_xinference_demo/opro/__pycache__/xinference_client.cpython-310.pyc b/_qwen_xinference_demo/opro/__pycache__/xinference_client.cpython-310.pyc deleted file mode 100644 index 468d6c1..0000000 Binary files a/_qwen_xinference_demo/opro/__pycache__/xinference_client.cpython-310.pyc and /dev/null differ diff --git a/_qwen_xinference_demo/opro/__pycache__/xinference_client.cpython-313.pyc b/_qwen_xinference_demo/opro/__pycache__/xinference_client.cpython-313.pyc deleted file mode 100644 index 3b8eb3f..0000000 Binary files a/_qwen_xinference_demo/opro/__pycache__/xinference_client.cpython-313.pyc and /dev/null differ