[refactor] porting changes from https://huggingface.co/spaces/aletrn/music-separation

README.md

@@ -4,8 +4,8 @@ emoji: 🌖
 colorFrom: yellow
 colorTo: purple
 sdk: gradio
-sdk_version: 4.28.3
-app_file: app_gradio_fastapi/main.py
+sdk_version: 4.32.2
+app_file: app.py
 pinned: false
 license: mit
 ---

app_gradio_fastapi/main.py → app.py

@@ -1,28 +1,35 @@
 import logging
+
 import gradio as gr
+import uvicorn
 from fastapi import FastAPI
 
-from app_gradio_fastapi import routes
-from app_gradio_fastapi.helpers.formatters import request_formatter
-from app_gradio_fastapi.helpers.session_logger import change_logging
+import routes
+from helpers import formatters, session_logger
 
 
-change_logging()
+session_logger.change_logging()
+app = FastAPI(title="gradio-with-fastapi", version="1.0")
+logging.info("FastAPI app created, including routes...")
+app.include_router(routes.router)
+logging.info("routes included, creating gradio app")
 
 
-logging.info("creating FastAPI app...")
 CUSTOM_GRADIO_PATH = "/"
-app = FastAPI(title="logging_app", version="1.0")
-app.include_router(routes.router)
-logging.info("FastAPI app created, creating gradio app...")
 io = gr.Interface(
-    request_formatter,
+    formatters.request_formatter,
     inputs=[
-        gr.Textbox(lines=1, placeholder=10, label="write a number to divide 100 (0 will raise division by zero error)"),
+        gr.Textbox(lines=1, placeholder="10", label="write a number to divide 100; 0 will raise ZeroDivisionError"),
     ],
     outputs=[
         gr.Textbox(lines=1, placeholder=None, label="Text Output"),
     ],
+    title="gradio with fastapi...",
 )
+logging.info("mounting gradio app within FastAPI...")
 app = gr.mount_gradio_app(app, io, path=CUSTOM_GRADIO_PATH)
 logging.info("gradio app mounted")
+
+
+if __name__ == '__main__':
+    uvicorn.run(app, host="0.0.0.0", port=7860)

{app_gradio_fastapi/helpers → helpers}/formatters.py

@@ -1,7 +1,7 @@
 import logging
 from fastapi import HTTPException
 
-from app_gradio_fastapi.helpers import session_logger
+from helpers import session_logger
 
 
 def divide(a: int, b: int) -> float:

{app_gradio_fastapi/helpers → helpers}/session_logger.py

@@ -5,23 +5,28 @@ from typing import Callable
 
 logging_uuid = contextvars.ContextVar("uuid")
 formatter = '%(asctime)s | %(uuid)s [%(pathname)s:%(module)s %(lineno)d] %(levelname)s | %(message)s'
+formatter_without_uuid = '%(asctime)s | [%(pathname)s:%(module)s %(lineno)d] %(levelname)s | %(message)s'
 
 
 loggingType = logging.CRITICAL | logging.ERROR | logging.WARNING | logging.INFO | logging.DEBUG
 
 
-def change_logging(level_log: loggingType = logging.INFO) -> None:
-    old_factory = logging.getLogRecordFactory()
+def change_logging(level_log: loggingType = logging.INFO, formatter_log: str = formatter) -> None:
+    try:
+        old_factory = logging.getLogRecordFactory()
 
-    def record_factory(*args, **kwargs):
-        record = old_factory(*args, **kwargs)
-        record.uuid = logging_uuid.get("uuid")
-        if isinstance(record.msg, str):
-            record.msg = record.msg.replace("\\", "\\\\").replace("\n", "\\n")
-        return record
+        def record_factory(*args, **kwargs):
+            record = old_factory(*args, **kwargs)
+            record.uuid = logging_uuid.get("uuid")
+            if isinstance(record.msg, str):
+                record.msg = record.msg.replace("\\", "\\\\").replace("\n", "\\n")
+            return record
 
-    logging.setLogRecordFactory(record_factory)
-    logging.basicConfig(level=level_log, format=formatter, force=True)
+        logging.setLogRecordFactory(record_factory)
+    except Exception as e:
+        print(f"change_logging exception:{e}, reset logging...")
+        formatter_log = formatter_without_uuid
+    logging.basicConfig(level=level_log, format=formatter_log, force=True)
 
 
 def set_uuid_logging(func: Callable) -> Callable:

requirements.txt

@@ -1,2 +1,2 @@
 fastapi==0.110.2
-gradio==4.28.3
+gradio==4.32.2

app_gradio_fastapi/routes.py → routes.py

@@ -3,7 +3,7 @@ import logging
 
 from fastapi import APIRouter
 
-from app_gradio_fastapi.helpers import session_logger
+from helpers import session_logger
 
 
 router = APIRouter()
@@ -14,7 +14,7 @@ router = APIRouter()
 def health() -> str:
     try:
         logging.info("health check")
-        return json.dumps({"msg": "ok"})
+        return json.dumps({"msg": "still alive..."})
     except Exception as e:
         logging.error(f"exception:{e}.")
         return json.dumps({"msg": "request failed"})