MERGE

app/asgi.py

@@ -1,11 +1,12 @@
 """Application implementation - ASGI."""
 
+from os import path
 from fastapi import FastAPI, Request
 from fastapi.exceptions import RequestValidationError
 from fastapi.responses import JSONResponse
 from loguru import logger
 from fastapi.staticfiles import StaticFiles
-
+# from starlette.routing import Router
 from app.config import config
 from app.models.exception import HttpException
 from app.router import root_api_router
@@ -39,16 +40,19 @@ def get_application() -> FastAPI:
         version=config.project_version,
         debug=False,
     )
+
+    # instance.mount("/", StaticFiles(directory=utils.public_dir(), html=True), name="")
+
     instance.include_router(root_api_router)
     instance.add_exception_handler(HttpException, exception_handler)
     instance.add_exception_handler(RequestValidationError, validation_exception_handler)
     return instance
 
-
 app = get_application()
-public_dir = utils.public_dir()
-app.mount("/", StaticFiles(directory=public_dir, html=True), name="")
-
+sub_app = FastAPI()
+video_dir = utils.video_dir()
+sub_app.mount("/videos", StaticFiles(directory=video_dir), name="videos")
+app.mount("/subapp", sub_app)
 
 @app.on_event("shutdown")
 def shutdown_event():

app/controllers/ping.py

@@ -1,9 +1,8 @@
 from fastapi import APIRouter
 from fastapi import Request
-
 router = APIRouter()
 
 
 @router.get("/ping", tags=["Health Check"], description="检查服务可用性", response_description="pong")
 def ping(request: Request) -> str:
-    return "pong"
+    return "pong"

app/utils/utils.py

@@ -102,9 +102,24 @@ def song_dir(sub_dir: str = ""):
         os.makedirs(d)
     return d
 
-
 def public_dir(sub_dir: str = ""):
-    d = resource_dir(f"public")
+    d = os.path.join(root_dir(), "public")
+    if sub_dir:
+        d = os.path.join(d, sub_dir)
+    if not os.path.exists(d):
+        os.makedirs(d)
+    return d
+
+# def public_dir(sub_dir: str = ""):
+#     d = resource_dir(f"public")
+#     if sub_dir:
+#         d = os.path.join(d, sub_dir)
+#     if not os.path.exists(d):
+#         os.makedirs(d)
+#     return d
+
+def video_dir(sub_dir: str = ""):
+    d = os.path.join(root_dir(), "videos")
     if sub_dir:
         d = os.path.join(d, sub_dir)
     if not os.path.exists(d):

webui/Main.py

@@ -1,6 +1,6 @@
 import streamlit as st
 
-st.set_page_config(page_title="MoneyPrinterTurbo", page_icon="🤖", layout="wide",
+st.set_page_config(page_title="Text to Video", page_icon="🤖", layout="wide",
                    initial_sidebar_state="auto")
 import sys
 import os
@@ -16,7 +16,7 @@
 <style>#root > div:nth-child(1) > div > div > div > div > section > div {padding-top: 0rem;}</style>
 """
 st.markdown(hide_streamlit_style, unsafe_allow_html=True)
-st.title("MoneyPrinterTurbo")
+st.title("Text to Video")
 
 root_dir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 font_dir = os.path.join(root_dir, "resource", "fonts")