Skip to content

Commit

Permalink
Merge pull request #24 from Zero-True/package-frontend
Browse files Browse the repository at this point in the history
Package with frontend files
  • Loading branch information
Red-Giuliano authored Sep 19, 2023
2 parents a173892 + e5c56f5 commit 2fa634d
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 4 deletions.
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
graft zt_backend/dist_dev
graft zt_backend/dist_app
3 changes: 2 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ name = zero-true
description = A collaborative notebook built for data scientists
long_description = file: README.md
long_description_content_type = text/markdown
version = 0.0.dev0
version = 0.0.dev1

[options]
include_package_data = true
packages = find:
install_requires =
fastapi
Expand Down
4 changes: 4 additions & 0 deletions zt_backend/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import zt_backend.router as router
import toml
import os
import uvicorn
import uuid

app = FastAPI()
Expand Down Expand Up @@ -49,3 +50,6 @@ def open_project():
app.mount(route_prefix, StaticFiles(directory=os.path.join(current_path, "dist_app")), name="assets")
else:
app.mount(route_prefix, StaticFiles(directory=os.path.join(current_path, "dist_dev")), name="assets")

def run_app():
uvicorn.run(app, port=2613)
9 changes: 6 additions & 3 deletions zt_cli/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import argparse
import subprocess
import os
import zt_backend.models as models
import zt_backend
from zt_backend.main import run_app

def start_servers():
parser = argparse.ArgumentParser(description="Start the frontend and backend servers.")
Expand All @@ -15,8 +16,10 @@ def start_servers():
else:
os.environ['RUN_MODE'] = 'dev'

os.chdir("zt_backend")
backend_process = subprocess.Popen(["uvicorn", "main:app"])
#run_app()

os.chdir(os.path.dirname(zt_backend.__file__))
backend_process = subprocess.Popen(["uvicorn", "main:app", "--port=2613"])

backend_process.wait()

Expand Down

0 comments on commit 2fa634d

Please sign in to comment.