PATCH glam_app适配子仓库部署

ADD tikhub_api增加视频下载api

src/Douyin_TikTok_Download_API/app/api/endpoints/download.py

@@ -4,9 +4,10 @@ import zipfile
 import aiofiles
 import httpx
 import yaml
-from fastapi import APIRouter, Request, Query, HTTPException  # 导入FastAPI组件
+from fastapi import APIRouter, Request, Query, HTTPException, Depends  # 导入FastAPI组件
 from starlette.responses import FileResponse
 
+from BowongModalFunctions.middleware.authorization import verify_token
 from Douyin_TikTok_Download_API.app.api.models.APIResponseModel import ErrorResponseModel  # 导入响应模型
 from Douyin_TikTok_Download_API.crawlers.hybrid.hybrid_crawler import HybridCrawler  # 导入混合数据爬虫
 
@@ -48,7 +49,7 @@ async def fetch_data_stream(url: str, request:Request , headers: dict = None, fi
                     await out_file.write(chunk)
             return True
 
-@router.get("/download", summary="在线下载抖音|TikTok视频/图片/Online download Douyin|TikTok video/image")
+@router.get("/download", summary="在线下载抖音|TikTok视频/图片/Online download Douyin|TikTok video/image", dependencies=[Depends(verify_token)])
 async def download_file_hybrid(request: Request,
                                url: str = Query(
                                    example="https://www.douyin.com/video/7372484719365098803",

src/Douyin_TikTok_Download_API/app/api/endpoints/hybrid_parsing.py

@@ -1,7 +1,8 @@
 import asyncio
 
-from fastapi import APIRouter, Body, Query, Request, HTTPException  # 导入FastAPI组件
+from fastapi import APIRouter, Body, Query, Request, HTTPException, Depends  # 导入FastAPI组件
 
+from BowongModalFunctions.middleware.authorization import verify_token
 from Douyin_TikTok_Download_API.app.api.models.APIResponseModel import ResponseModel, ErrorResponseModel  # 导入响应模型
 
 # 爬虫/Crawler
@@ -13,7 +14,7 @@ router = APIRouter()
 
 
 @router.get("/video_data", response_model=ResponseModel, tags=["Hybrid-API"],
-            summary="混合解析单一视频接口/Hybrid parsing single video endpoint")
+            summary="混合解析单一视频接口/Hybrid parsing single video endpoint", dependencies=[Depends(verify_token)])
 async def hybrid_parsing_single_video(request: Request,
                                       url: str = Query(example="https://v.douyin.com/L4FJNR3/"),
                                       minimal: bool = Query(default=False)):

src/Douyin_TikTok_Download_API/app/api/router.py

@@ -4,7 +4,7 @@ from Douyin_TikTok_Download_API.app.api.endpoints import (
     # tiktok_app,
     douyin_web,
     # bilibili_web,
-    # hybrid_parsing, ios_shortcut, download,
+    hybrid_parsing, ios_shortcut, download,
 )
 
 router = APIRouter()
@@ -19,11 +19,11 @@ router.include_router(douyin_web.router, prefix="/douyin/web", tags=["Douyin-Web
 # Bilibili routers
 # router.include_router(bilibili_web.router, prefix="/bilibili/web", tags=["Bilibili-Web-API"])
 #
-# # Hybrid routers
+# Hybrid routers
-# router.include_router(hybrid_parsing.router, prefix="/hybrid", tags=["Hybrid-API"])
+router.include_router(hybrid_parsing.router, prefix="/hybrid", tags=["Hybrid-API"])
 #
 # # iOS_Shortcut routers
 # router.include_router(ios_shortcut.router, prefix="/ios", tags=["iOS-Shortcut"])
 #
-# # Download routers
+# Download routers
-# router.include_router(download.router, tags=["Download"])
+router.include_router(download.router, tags=["Download"])

src/cluster/app.py

@@ -4,6 +4,7 @@ from .video import app as media_app
 from .web import app as web_app
 from .ffmpeg_app import app as ffmpeg_app
 from .comfyui_api import comfyui_app as comfyui_api_app
+from glam.modal_glam_deploy import app as glam_app
 # from .comfyui_v1 import app as comfyui_v1_app
 # from .comfyui_v2 import app as comfyui_v2_app
 
@@ -17,5 +18,6 @@ app.include(media_app)
 app.include(ffmpeg_app)
 app.include(web_app)
 app.include(comfyui_api_app)
+app.include(glam_app)
 # app.include(comfyui_v1_app)
 # app.include(comfyui_v2_app)

src/cluster/comfyui_api.py

@@ -27,5 +27,5 @@ custom_secret = modal.Secret.from_name("comfyui-custom-secret", environment_name
     max_inputs=10
 )  # required for UI startup process which runs several API calls concurrently
 @modal.web_server(8000, startup_timeout=60)
-def ui():
+def comfyui_webui():
     subprocess.Popen("comfy launch -- --cpu --listen 0.0.0.0 --port 8000", shell=True)