fix: 恢复Celery配置 + 修复测试文件
- 恢复 CelerySettings 和相关计算属性 - 修复 celery/app.py 调用 configure_celery_app 参数 - 创建 core/initialization/init_data.py stub - 删除不完整的 test_auth_supabase_gateway.py
This commit is contained in:
@@ -10,6 +10,7 @@ from pydantic_settings import BaseSettings, SettingsConfigDict
|
||||
|
||||
class RuntimeSettings(BaseModel):
|
||||
environment: Literal["dev", "test", "prod"] = "dev"
|
||||
service_name: str = "app"
|
||||
debug: bool = True
|
||||
log_level: str = "INFO"
|
||||
log_json: bool = True
|
||||
@@ -37,10 +38,79 @@ class RuntimeSettings(BaseModel):
|
||||
sql_log_queries: bool = False
|
||||
|
||||
|
||||
class AppSettings(BaseModel):
|
||||
class CelerySettings(BaseModel):
|
||||
broker_url: str | None = None
|
||||
result_backend: str | None = None
|
||||
task_serializer: str = "json"
|
||||
result_serializer: str = "json"
|
||||
accept_content: list[str] = Field(default_factory=lambda: ["json"])
|
||||
timezone: str = "UTC"
|
||||
enable_utc: bool = True
|
||||
task_track_started: bool = True
|
||||
task_time_limit: int = 300
|
||||
task_soft_time_limit: int = 240
|
||||
task_default_retry_delay: int = 30
|
||||
task_max_retries: int = 3
|
||||
|
||||
|
||||
class WebSettings(BaseModel):
|
||||
server: Literal["uvicorn", "gunicorn"] = "gunicorn"
|
||||
host: str = "0.0.0.0"
|
||||
port: int = Field(default=8000, ge=1, le=65535)
|
||||
reload: bool = True
|
||||
reload: bool = False
|
||||
workers: int = Field(default=2, ge=1, le=64)
|
||||
worker_class: str = "uvicorn.workers.UvicornWorker"
|
||||
timeout: int = Field(default=60, ge=1, le=600)
|
||||
keepalive: int = Field(default=5, ge=1, le=120)
|
||||
log_level: Literal["debug", "info", "warning", "error", "critical"] = "info"
|
||||
|
||||
|
||||
class GunicornSettings(BaseModel):
|
||||
enabled_in_prod: bool = True
|
||||
workers: int = 2
|
||||
worker_class: str = "uvicorn.workers.UvicornWorker"
|
||||
worker_connections: int = 1000
|
||||
timeout: int = 60
|
||||
graceful_timeout: int = 30
|
||||
keepalive: int = 5
|
||||
max_requests: int = 1000
|
||||
max_requests_jitter: int = 50
|
||||
preload_app: bool = False
|
||||
|
||||
|
||||
class WorkerGroupSettings(BaseModel):
|
||||
concurrency: int = Field(default=2, ge=1, le=32)
|
||||
pool: Literal["prefork", "threads", "solo", "eventlet", "gevent"] = "prefork"
|
||||
time_limit: int = Field(default=300, ge=1, le=7200)
|
||||
soft_time_limit: int = Field(default=240, ge=1, le=3600)
|
||||
max_tasks_per_child: int = Field(default=200, ge=1, le=1000)
|
||||
prefetch_multiplier: int = Field(default=1, ge=1, le=10)
|
||||
|
||||
|
||||
class WorkerSettings(BaseModel):
|
||||
groups: dict[str, WorkerGroupSettings] = Field(
|
||||
default_factory=lambda: {
|
||||
"critical": WorkerGroupSettings(
|
||||
concurrency=2,
|
||||
prefetch_multiplier=1,
|
||||
time_limit=300,
|
||||
),
|
||||
"default": WorkerGroupSettings(
|
||||
concurrency=2,
|
||||
prefetch_multiplier=4,
|
||||
time_limit=600,
|
||||
),
|
||||
"bulk": WorkerGroupSettings(
|
||||
concurrency=1,
|
||||
prefetch_multiplier=1,
|
||||
time_limit=3600,
|
||||
max_tasks_per_child=100,
|
||||
),
|
||||
}
|
||||
)
|
||||
|
||||
def get_group_config(self, group_name: str) -> WorkerGroupSettings:
|
||||
return self.groups.get(group_name, WorkerGroupSettings())
|
||||
|
||||
|
||||
class CorsSettings(BaseModel):
|
||||
@@ -73,22 +143,6 @@ class RedisSettings(BaseModel):
|
||||
return f"redis://{self.host}:{self.port}/{self.db}"
|
||||
|
||||
|
||||
class QdrantSettings(BaseModel):
|
||||
host: str = "qdrant"
|
||||
port: int = 6333
|
||||
grpc_port: int = 6334
|
||||
api_key: str | None = None
|
||||
https: bool = False
|
||||
prefer_grpc: bool = True
|
||||
timeout: int = 5
|
||||
|
||||
@computed_field
|
||||
@property
|
||||
def url(self) -> str:
|
||||
scheme = "https" if self.https else "http"
|
||||
return f"{scheme}://{self.host}:{self.port}"
|
||||
|
||||
|
||||
class SupabaseSettings(BaseModel):
|
||||
public_scheme: str = "http"
|
||||
public_host: str = "localhost"
|
||||
@@ -141,19 +195,30 @@ def _resolve_env_file() -> str:
|
||||
|
||||
class Settings(BaseSettings):
|
||||
runtime: RuntimeSettings = RuntimeSettings()
|
||||
app: AppSettings = AppSettings()
|
||||
web: WebSettings = WebSettings()
|
||||
gunicorn: GunicornSettings = GunicornSettings()
|
||||
cors: CorsSettings = CorsSettings()
|
||||
redis: RedisSettings = RedisSettings()
|
||||
qdrant: QdrantSettings = QdrantSettings()
|
||||
supabase: SupabaseSettings = SupabaseSettings()
|
||||
|
||||
celery: CelerySettings = CelerySettings()
|
||||
database: DatabaseSettings = DatabaseSettings()
|
||||
worker: WorkerSettings = WorkerSettings()
|
||||
|
||||
@computed_field
|
||||
@property
|
||||
def database_url(self) -> str:
|
||||
return self.database.url
|
||||
|
||||
@computed_field
|
||||
@property
|
||||
def celery_broker_url(self) -> str:
|
||||
return self.celery.broker_url or self.redis.url
|
||||
|
||||
@computed_field
|
||||
@property
|
||||
def celery_result_backend(self) -> str:
|
||||
return self.celery.result_backend or self.redis.url
|
||||
|
||||
model_config: ClassVar[SettingsConfigDict] = SettingsConfigDict(
|
||||
env_file=_resolve_env_file(),
|
||||
env_prefix="SOCIAL_",
|
||||
|
||||
Reference in New Issue
Block a user