Merge develop into main (v0.1.105: Worker healthcheck fix) #178

Merged
xiaoxia merged 3 commits from develop into main 2026-07-02 23:36:45 +08:00
9 changed files with 14 additions and 14 deletions
+4 -4
View File
@@ -9,7 +9,7 @@ on:
jobs:
deploy-staging:
name: Deploy Staging
runs-on: ubuntu-22.04
runs-on: saas
if: github.ref_name == 'main' || github.ref_name == 'develop' || startsWith(github.ref_name, 'feature/')
steps:
@@ -140,7 +140,7 @@ jobs:
build-production-runtime-images:
name: Build Production Runtime Images
runs-on: ubuntu-22.04
runs-on: saas
if: startsWith(github.ref, 'refs/tags/v')
steps:
@@ -249,7 +249,7 @@ jobs:
deploy-production:
name: Deploy Production
runs-on: ubuntu-22.04
runs-on: saas
if: startsWith(github.ref, 'refs/tags/v')
needs: build-production-runtime-images
@@ -290,7 +290,7 @@ jobs:
production-e2e:
name: Production Browser E2E
runs-on: ubuntu-22.04
runs-on: saas
if: startsWith(github.ref, 'refs/tags/v')
needs: deploy-production
+1 -1
View File
@@ -239,7 +239,7 @@ def get_duplication_detail(
return _to_detail_response(record)
@router.delete("/records/{record_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response)
@router.delete("/records/{record_id}", status_code=status.HTTP_204_NO_CONTENT)
def delete_duplication_record(
record_id: str,
authenticated_user: AuthenticatedUser = Depends(get_current_user),
+1 -1
View File
@@ -174,7 +174,7 @@ def update_recipe(
return _to_response(recipe)
@router.delete("/{recipe_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response)
@router.delete("/{recipe_id}", status_code=status.HTTP_204_NO_CONTENT)
def delete_recipe(
recipe_id: str,
authenticated_user: AuthenticatedUser = Depends(get_current_user),
+2 -2
View File
@@ -195,7 +195,7 @@ def update_template(
return _to_response(template)
@router.delete("/{template_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response)
@router.delete("/{template_id}", status_code=status.HTTP_204_NO_CONTENT)
def delete_template(
template_id: str,
authenticated_user: AuthenticatedUser = Depends(get_current_user),
@@ -273,7 +273,7 @@ def create_category(
)
@router.delete("/categories/{category_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response)
@router.delete("/categories/{category_id}", status_code=status.HTTP_204_NO_CONTENT)
def delete_category(
category_id: str,
authenticated_user: AuthenticatedUser = Depends(get_current_user),
+1 -1
View File
@@ -143,7 +143,7 @@ def update_title(
return _to_response(item)
@router.delete("/{title_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response)
@router.delete("/{title_id}", status_code=status.HTTP_204_NO_CONTENT)
def delete_title(
title_id: str,
authenticated_user: AuthenticatedUser = Depends(get_current_user),
+1 -1
View File
@@ -176,7 +176,7 @@ def get_tts_job_status(
)
@router.delete("/jobs/{job_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response)
@router.delete("/jobs/{job_id}", status_code=status.HTTP_204_NO_CONTENT)
def delete_tts_job(
job_id: str,
authenticated_user: AuthenticatedUser = Depends(get_current_user),
-1
View File
@@ -191,7 +191,6 @@ def get_voice_clone_status(
@router.delete(
"/{clone_id}",
status_code=status.HTTP_204_NO_CONTENT,
response_class=Response,
)
def delete_voice_clone(
clone_id: str,
+1 -1
View File
@@ -316,7 +316,7 @@ def update_voice(
return _to_response(item)
@router.delete("/{voice_id}", status_code=status.HTTP_204_NO_CONTENT, response_class=Response)
@router.delete("/{voice_id}", status_code=status.HTTP_204_NO_CONTENT)
def delete_voice(
voice_id: str,
authenticated_user: AuthenticatedUser = Depends(get_current_user),
+3 -2
View File
@@ -120,12 +120,13 @@ services:
- xiaoxia-net
# 健康检查配置
# 注:celery inspect ping 依赖 broker 连接,在容器内不可靠,改用进程检查
healthcheck:
test: ["CMD-SHELL", "celery -A app.celery_app inspect ping --timeout 5 || exit 1"]
test: ["CMD-SHELL", "pgrep -f 'celery.*worker' || exit 1"]
interval: 30s
timeout: 10s
retries: 3
start_period: 40s
start_period: 30s
logging: *default-logging