Move studio server into studio.

Can add another server later for serving, but for now this is the studio server
Kiln-AI · Aug 17, 2024 · f5b7736 · f5b7736
1 parent b62266d
commit f5b7736
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/desktop/build_desktop_app.sh b/desktop/build_desktop_app.sh
@@ -39,7 +39,7 @@ fi
 # Builds the desktop app
 # TODO: use a spec instead of long winded command line
 pyinstaller $(printf %s "$PLATFORM_OPTS") --icon="./icon.png" \
-  --add-data "./taskbar.png:." --add-data "../../studio/web_ui/build:./studio/web_ui/build" \
+  --add-data "./taskbar.png:." --add-data "../../studio/web_ui/build:./web_ui/build" \
   --noconfirm --distpath=./desktop/build/dist --workpath=./desktop/build/work \
   -n kiln --specpath=./desktop/build \
   --paths=. ./desktop/desktop.py

diff --git a/desktop/desktop.py b/desktop/desktop.py
@@ -4,7 +4,7 @@
 import tkinter as tk
 import webbrowser
 import uvicorn
-import server.server as server
+import studio.server.server as server
 import sys
 import threading
 import contextlib

diff --git a/server/dev.sh → studio/server/dev.sh b/server/dev.sh → studio/server/dev.sh
diff --git a/server/server.py → studio/server/server.py b/server/server.py → studio/server/server.py
@@ -16,7 +16,7 @@ def studio_path():
     except Exception:
         base_path = os.path.join(os.path.dirname(__file__), "..")
 
-    return os.path.join(base_path, "studio/web_ui/build")
+    return os.path.join(base_path, "web_ui/build")
 
 
 app = FastAPI()