mirror of
https://github.com/OpenBMB/ChatDev.git
synced 2026-05-13 20:13:43 +00:00
Review feedback on #611: 1. `Path.match` (used by uvicorn to filter reload candidates) does not expand `**` on Python < 3.13, so the flat `WareHouse/*` default only caught direct children — the agent-generated files that actually triggered #569 live at `WareHouse/<project>/<file>` and deeper. Expand defaults to multi-depth glob patterns (up to 10 levels) for each excluded dir. 2. `--reload-exclude` is only honoured by the watchfiles-backed reloader; without watchfiles uvicorn silently falls back to StatReload and drops every exclude pattern. Add `watchfiles` to requirements.txt so the filter works out of the box, and log a WARNING when --reload runs without watchfiles installed instead of failing silently. Test coverage: - `TestExcludePatternDepth` parametrised over 4 WareHouse depths plus logs/data/node_modules cases; also asserts real source paths like `server/app.py` are NOT matched (no over-exclusion regression). - `TestWatchfilesWarning` covers the new `_watchfiles_available` probe and the WARNING log path. 20/20 tests pass; 8 new.
169 lines
4.9 KiB
Python
Executable File
169 lines
4.9 KiB
Python
Executable File
import argparse
|
|
import logging
|
|
from pathlib import Path
|
|
|
|
from runtime.bootstrap.schema import ensure_schema_registry_populated
|
|
from server.app import app
|
|
|
|
|
|
ensure_schema_registry_populated()
|
|
|
|
|
|
# Directories containing the server's Python sources. When --reload is
|
|
# enabled, only these are watched so that agent-generated files under
|
|
# WareHouse/, logs/, etc. never trigger a StatReload restart mid-workflow
|
|
# (issue #569).
|
|
RELOAD_SOURCE_DIRS = [
|
|
"check",
|
|
"entity",
|
|
"functions",
|
|
"mcp_example",
|
|
"runtime",
|
|
"schema_registry",
|
|
"server",
|
|
"tools",
|
|
"utils",
|
|
"workflow",
|
|
]
|
|
|
|
# Directory names whose contents must never trigger a reload. These are
|
|
# expanded into multi-depth glob patterns below so nested files (e.g.
|
|
# ``WareHouse/demo/foo.py``) are also excluded: uvicorn applies these via
|
|
# ``Path.match``, which on Python < 3.13 does not understand ``**`` and
|
|
# matches a pattern of N components only against the last N path parts.
|
|
_RELOAD_EXCLUDE_DIRS = ("WareHouse", "logs", "data", "temp", "node_modules")
|
|
_RELOAD_EXCLUDE_MAX_DEPTH = 10
|
|
|
|
# Glob patterns excluded from reload watching. Only honoured when
|
|
# ``watchfiles`` is installed; StatReload (the pure-Python fallback that
|
|
# ships with uvicorn core) ignores exclude patterns entirely, so the
|
|
# primary defence is the reload_dirs restriction to RELOAD_SOURCE_DIRS.
|
|
RELOAD_EXCLUDES = [
|
|
f"{d}{'/*' * (depth + 1)}"
|
|
for d in _RELOAD_EXCLUDE_DIRS
|
|
for depth in range(_RELOAD_EXCLUDE_MAX_DEPTH)
|
|
]
|
|
|
|
|
|
def _watchfiles_available() -> bool:
|
|
"""Return ``True`` when the ``watchfiles`` package is importable.
|
|
|
|
Split out so tests can patch it without touching ``sys.modules``.
|
|
"""
|
|
import importlib.util
|
|
|
|
return importlib.util.find_spec("watchfiles") is not None
|
|
|
|
|
|
def build_reload_kwargs(args: argparse.Namespace) -> dict:
|
|
"""Build the reload-related kwargs passed to ``uvicorn.run``.
|
|
|
|
Extracted so the configuration is unit-testable without spinning up
|
|
a real server. When ``--reload`` is off the return value is empty.
|
|
"""
|
|
if not args.reload:
|
|
return {}
|
|
return {
|
|
"reload_dirs": list(args.reload_dir) if args.reload_dir else list(RELOAD_SOURCE_DIRS),
|
|
"reload_excludes": list(args.reload_exclude) if args.reload_exclude else list(RELOAD_EXCLUDES),
|
|
}
|
|
|
|
|
|
def build_parser() -> argparse.ArgumentParser:
|
|
parser = argparse.ArgumentParser(description="DevAll Workflow Server")
|
|
parser.add_argument(
|
|
"--host",
|
|
type=str,
|
|
default="0.0.0.0",
|
|
help="Server host (default: 0.0.0.0)"
|
|
)
|
|
parser.add_argument(
|
|
"--port",
|
|
type=int,
|
|
default=8000,
|
|
help="Server port (default: 8000)"
|
|
)
|
|
parser.add_argument(
|
|
"--log-level",
|
|
choices=["debug", "info", "warning", "error", "critical"],
|
|
default="info",
|
|
help="Log level (default: info)"
|
|
)
|
|
parser.add_argument(
|
|
"--reload",
|
|
action="store_true",
|
|
help="Enable auto-reload for development"
|
|
)
|
|
parser.add_argument(
|
|
"--reload-dir",
|
|
action="append",
|
|
default=None,
|
|
metavar="DIR",
|
|
help=(
|
|
"Directory to watch when --reload is active (repeatable). "
|
|
"Defaults to the server's Python source folders, which excludes "
|
|
"WareHouse/ and other output dirs."
|
|
),
|
|
)
|
|
parser.add_argument(
|
|
"--reload-exclude",
|
|
action="append",
|
|
default=None,
|
|
metavar="GLOB",
|
|
help=(
|
|
"Glob pattern excluded from reload watching (repeatable). "
|
|
"Requires watchfiles to take effect."
|
|
),
|
|
)
|
|
return parser
|
|
|
|
|
|
def main():
|
|
import uvicorn
|
|
|
|
args = build_parser().parse_args()
|
|
|
|
# Configure structured logging
|
|
import os
|
|
os.environ['LOG_LEVEL'] = args.log_level.upper()
|
|
|
|
# Ensure log directory exists
|
|
log_dir = Path("logs")
|
|
log_dir.mkdir(exist_ok=True)
|
|
|
|
# Configure logging
|
|
logging.basicConfig(
|
|
level=getattr(logging, args.log_level.upper()),
|
|
format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
|
|
handlers=[
|
|
logging.FileHandler(log_dir / "server.log"),
|
|
logging.StreamHandler()
|
|
]
|
|
)
|
|
|
|
logger = logging.getLogger(__name__)
|
|
logger.info(f"Starting DevAll Workflow Server on {args.host}:{args.port}")
|
|
|
|
if args.reload and not _watchfiles_available():
|
|
logger.warning(
|
|
"--reload is active but 'watchfiles' is not installed; uvicorn will "
|
|
"fall back to StatReload, which ignores --reload-exclude patterns "
|
|
"(including the WareHouse/ defaults). Install watchfiles (or "
|
|
"`pip install uvicorn[standard]`) to enable exclude filtering."
|
|
)
|
|
|
|
# Launch the server
|
|
uvicorn.run(
|
|
"server.app:app",
|
|
host=args.host,
|
|
port=args.port,
|
|
reload=args.reload,
|
|
log_level=args.log_level,
|
|
ws="wsproto",
|
|
**build_reload_kwargs(args),
|
|
)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|