🎨 added frontend api and runs

backend/beastiary/api/__init__.py

@@ -1 +1 @@
-from .main import app
+from .main import api

backend/beastiary/api/endpoints/runs.py

@@ -12,7 +12,6 @@
 
 @router.get("/", response_model=List[schemas.Run])
 def get_runs(
-    token: str = None,
     db: Session = Depends(deps.get_db),
     skip: int = 0,
     limit: int = 100,
@@ -37,7 +36,6 @@ def get_headers(path):
 @router.post("/", response_model=schemas.Run)
 def create_run(
     *,
-    token: str = None,
     db: Session = Depends(deps.get_db),
     run_in: schemas.RunCreate,
 ) -> Any:

backend/beastiary/api/endpoints/samples.py

@@ -49,7 +49,6 @@ def get_samples(
     run_id: int,
     limit: int = 100,
     get_all: bool = False,
-    token: str = None,
     db: Session = Depends(deps.get_db),
 ) -> Any:
     """

backend/beastiary/api/main.py

@@ -8,48 +8,54 @@
 
 from beastiary.api.endpoints import runs, samples
 
-app = FastAPI()
+api = FastAPI()
 
 
-@app.get("/")
+@api.get("/")
 async def index():
     return FileResponse("beastiary/webapp-dist/index.html")
 
 
-@app.get("/api/security/token", tags=["security"])
+@api.get("/api/security/token", tags=["security"])
 async def test_token() -> Any:
-    return {"data": app.token}
+    return {"data": api.token}
 
 
 api_router = APIRouter(prefix="/api")
 api_router.include_router(samples.router, prefix="/samples", tags=["samples"])
 api_router.include_router(runs.router, prefix="/runs", tags=["runs"])
-app.include_router(api_router)
+api.include_router(api_router)
 
+api.mount("/", StaticFiles(directory="beastiary/webapp-dist"))
 
-app.mount("/", StaticFiles(directory="beastiary/webapp-dist"))
 
-
-@app.middleware("http")
+@api.middleware("http")
 async def auth_check(request: Request, call_next):
     if "/api/" in request.url.path and request.app.security == True:
         token = request.headers.get("Authorization").split()[1]
+        if not token:
+            return JSONResponse(
+                content={"detail": "Authorization header not provided!"},
+                status_code=401,
+            )
+        else:
+            token = token.split()[1]
         print(token)
         if token != request.app.token:
             return JSONResponse(content={"detail": "Invalid token!"}, status_code=401)
     response = await call_next(request)
     return response
 
 
-@app.middleware("http")
+@api.middleware("http")
 async def add_custom_header(request: Request, call_next):
     response = await call_next(request)
     if response.status_code == 404:
         return FileResponse("beastiary/webapp-dist/index.html")
     return response
 
 
-app.add_middleware(
+api.add_middleware(
     CORSMiddleware,
     allow_origins=["*"],
     allow_credentials=True,

backend/beastiary/main.py → backend/beastiary/cli.py

@@ -2,7 +2,7 @@
 import typer
 import uvicorn
 
-from .api import app as api
+from .api import api
 from beastiary.db.init_db import init_db
 from beastiary.db.session import SessionLocal
 import uuid
@@ -17,14 +17,14 @@
 def main(
     debug: bool = typer.Option(False, help="Set debug mode."),
     security: bool = typer.Option(True, help="Turn off token requirement."),
-    host: str = typer.Argument("127.0.0.1"),
-    port: str = typer.Argument(5000),
+    token: str = typer.Option(str(uuid.uuid4())),
+    host: str = typer.Option("127.0.0.1"),
+    port: str = typer.Option(5000),
 ):
     """
     Realtime and remote trace inspection with BEASTIARY.
     """
     typer.echo("🐁 STARTING BEASTIARY 🐁")
-    token = str(uuid.uuid4())
     typer.echo(f"Go to http://{host}:{port}/login?token={token}")
     typer.echo(f"If prompted enter token: {token}")
     api.token = token