Pārlūkot izejas kodu

remove builtins hack

Falko Schindler 2 gadi atpakaļ
vecāks
revīzija
1c294e6487

+ 4 - 5
examples/custom_fastapi_app/frontend.py

@@ -1,14 +1,11 @@
 from fastapi import FastAPI
+from nicegui import globals, ui
 
 
 def init(app: FastAPI) -> None:
-    import builtins
-    builtins.nicegui_APP = app
-    from nicegui import ui, globals
-
     @ui.page('/show')
     def show():
-        ui.label('Hello World, FastAPI!')
+        ui.label('Hello, FastAPI!')
 
     globals.title = 'FastAPI'
     globals.favicon = None
@@ -17,3 +14,5 @@ def init(app: FastAPI) -> None:
     globals.excludes = []
     globals.host = 'localhost'
     globals.port = 8000
+
+    app.mount('/', globals.app)

+ 2 - 1
examples/custom_fastapi_app/main.py

@@ -4,7 +4,6 @@ import uvicorn
 from fastapi import FastAPI
 
 app = FastAPI()
-frontend.init(app)
 
 
 @app.get('/')
@@ -12,5 +11,7 @@ def read_root():
     return {'Hello': 'World'}
 
 
+frontend.init(app)
+
 if __name__ == '__main__':
     uvicorn.run(app, host="0.0.0.0", port=8000)

+ 1 - 2
nicegui/nicegui.py

@@ -1,5 +1,4 @@
 import asyncio
-import builtins
 import urllib.parse
 from pathlib import Path
 from typing import Dict, Optional
@@ -18,7 +17,7 @@ from .helpers import safe_invoke
 from .page import page
 from .task_logger import create_task
 
-globals.app = app = builtins.nicegui_APP if hasattr(builtins, 'nicegui_APP') else FastAPI()
+globals.app = app = FastAPI()
 globals.sio = sio = SocketManager(app=app)._sio
 
 app.add_middleware(GZipMiddleware)