mirror of
https://github.com/OpenBMB/ChatDev.git
synced 2026-04-25 11:18:06 +00:00
fix: removed duplicate CORS middleware
This commit is contained in:
parent
4ee154dee3
commit
06a601359c
@ -1,7 +1,6 @@
|
|||||||
"""Application bootstrap helpers for the FastAPI server."""
|
"""Application bootstrap helpers for the FastAPI server."""
|
||||||
|
|
||||||
from fastapi import FastAPI
|
from fastapi import FastAPI
|
||||||
from fastapi.middleware.cors import CORSMiddleware
|
|
||||||
|
|
||||||
from server import state
|
from server import state
|
||||||
from server.config_schema_router import router as config_schema_router
|
from server.config_schema_router import router as config_schema_router
|
||||||
@ -13,14 +12,6 @@ from utils.middleware import add_middleware
|
|||||||
def init_app(app: FastAPI) -> None:
|
def init_app(app: FastAPI) -> None:
|
||||||
"""Apply shared middleware, routers, and global state to ``app``."""
|
"""Apply shared middleware, routers, and global state to ``app``."""
|
||||||
|
|
||||||
app.add_middleware(
|
|
||||||
CORSMiddleware,
|
|
||||||
allow_origins=["*"],
|
|
||||||
allow_credentials=True,
|
|
||||||
allow_methods=["*"],
|
|
||||||
allow_headers=["*"],
|
|
||||||
)
|
|
||||||
|
|
||||||
add_exception_handlers(app)
|
add_exception_handlers(app)
|
||||||
add_middleware(app)
|
add_middleware(app)
|
||||||
|
|
||||||
|
|||||||
@ -87,9 +87,9 @@ async def rate_limit_middleware(request: Request, call_next: Callable):
|
|||||||
return response
|
return response
|
||||||
|
|
||||||
|
|
||||||
def add_middleware(app: FastAPI):
|
def add_cors_middleware(app: FastAPI) -> None:
|
||||||
"""Add all middleware to the FastAPI application."""
|
"""Configure and attach CORS middleware."""
|
||||||
# CORS (dev defaults; override via CORS_ALLOW_ORIGINS comma-separated list)
|
# Dev defaults; override via CORS_ALLOW_ORIGINS (comma-separated)
|
||||||
default_origins = [
|
default_origins = [
|
||||||
"http://localhost:5173",
|
"http://localhost:5173",
|
||||||
"http://127.0.0.1:5173",
|
"http://127.0.0.1:5173",
|
||||||
@ -103,7 +103,6 @@ def add_middleware(app: FastAPI):
|
|||||||
# Helpful in dev: allow localhost/127.0.0.1 on any port
|
# Helpful in dev: allow localhost/127.0.0.1 on any port
|
||||||
origin_regex = r"^https?://(localhost|127\.0\.0\.1)(:\d+)?$"
|
origin_regex = r"^https?://(localhost|127\.0\.0\.1)(:\d+)?$"
|
||||||
|
|
||||||
# Add CORS middleware first to handle preflight requests and allow origins.
|
|
||||||
app.add_middleware(
|
app.add_middleware(
|
||||||
CORSMiddleware,
|
CORSMiddleware,
|
||||||
allow_origins=origins,
|
allow_origins=origins,
|
||||||
@ -115,9 +114,15 @@ def add_middleware(app: FastAPI):
|
|||||||
max_age=600,
|
max_age=600,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def add_middleware(app: FastAPI):
|
||||||
|
"""Add all middleware to the FastAPI application."""
|
||||||
|
# Attach CORS first to handle preflight requests and allow origins.
|
||||||
|
add_cors_middleware(app)
|
||||||
|
|
||||||
# Add other middleware
|
# Add other middleware
|
||||||
app.middleware("http")(correlation_id_middleware)
|
app.middleware("http")(correlation_id_middleware)
|
||||||
app.middleware("http")(security_middleware)
|
app.middleware("http")(security_middleware)
|
||||||
# app.middleware("http")(rate_limit_middleware) # Enable if needed
|
# app.middleware("http")(rate_limit_middleware) # Enable if needed
|
||||||
|
|
||||||
return app
|
return app
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user