organization improvements

.gitignore

@@ -390,13 +390,14 @@ downloads/
 eggs#letta/letta-server:0.3.7
 **/**/.eggs/
 MANIFEST
+**/**/*.dmg
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.
 *.manifest
 *.spec
-!installable_apps/letta.spec
+!installable_apps/*.spec
 # Installer logs
 pip-log.txt
 pip-delete-this-directory.txt

installable_apps/installable_image.py → installable_apps/desktop_application/installable_image.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 import darkdetect
 
-from installable_logger import get_logger
+from .installable_logger import get_logger
 
 logger = get_logger(__name__)
 

installable_apps/logserver/main.py → installable_apps/desktop_application/logserver/main.py

@@ -5,8 +5,8 @@
 import asyncio
 
 from letta.settings import settings
-from installable_image import InstallableImage
-from installable_logger import get_logger
+from installable_apps.desktop_application.installable_image import InstallableImage
+from installable_apps.desktop_application.installable_logger import get_logger
 
 logger = get_logger(__name__)
 

installable_apps/startup.py → installable_apps/desktop_application/startup.py

@@ -6,10 +6,10 @@
 from letta.server.rest_api.app import app as letta_app
 from letta.server.constants import REST_DEFAULT_PORT
 
-from server import ThreadedServer
+from .server import ThreadedServer
 from logserver.main import app as log_app
-from tray import Tray
-from installable_logger import get_logger
+from .tray import Tray
+from .installable_logger import get_logger
 
 logger = get_logger(__name__)
 

installable_apps/tray.py → installable_apps/desktop_application/tray.py

@@ -3,7 +3,7 @@
 from pystray import Icon, Menu, MenuItem
 from PIL import Image
 
-from installable_image import InstallableImage
+from .installable_image import InstallableImage
 
 class Tray:
     icon_image: "Path"

installable_apps/dmg_packager.sh

@@ -1,26 +1,25 @@
 #!/bin/bash
 
 # build the app for distribution
-pyinstaller letta.spec
+pyinstaller macos.spec
 
-# fix for known silent exec fail from https://github.com/pyinstaller/pyinstaller/issues/5154#issuecomment-2508011279
-APP_NAME="letta"
 APP_VERSION=$( python -c "from importlib.metadata import version; print(version('letta'))")
 BUILD_ARCH=$(uname -m)
-WORKDIR=dist/$APP_NAME.app/Contents/MacOS
-mv $WORKDIR/$APP_NAME $WORKDIR/${APP_NAME}_cli
+# fix for known silent exec fail from https://github.com/pyinstaller/pyinstaller/issues/5154#issuecomment-2508011279
+WORKDIR=dist/letta.app/Contents/MacOS
+mv $WORKDIR/letta $WORKDIR/letta_cli
 
-cat << EOF > $WORKDIR/$APP_NAME
+cat << EOF > $WORKDIR/letta
 #!/bin/bash
 # This is the launcher for OSX, this way the app will be opened
 # when you double click it from the apps folder
-open -n /Applications/${APP_NAME}.app/Contents/MacOS/${APP_NAME}_cli
+open -n /Applications/letta.app/Contents/MacOS/letta_cli
 EOF
 
-chmod +x $WORKDIR/$APP_NAME
+chmod +x $WORKDIR/letta
 
 mkdir dist/package
-cp -r dist/$APP_NAME.app dist/package
+cp -r dist/letta.app dist/package
 
 # Create the .dmg file
 create-dmg --volname "Letta Installer" --window-size 800 400 --icon-size 100 --background "assets/installer_background.png" --icon letta.app 200 200 --hide-extension letta.app --app-drop-link 600 185 "Letta-Installer-${APP_VERSION}-${BUILD_ARCH}.dmg" dist/package

installable_apps/letta.spec → installable_apps/macos.spec

@@ -2,7 +2,7 @@
 
 
 a = Analysis(
-    ['startup.py'],
+    ['desktop_application/startup.py'],
     pathex=[],
     binaries=[
         ('venv/lib/python3.12/site-packages/pgserver/pginstall', 'pgserver/pginstall')
@@ -14,7 +14,7 @@ a = Analysis(
         ('venv/lib/python3.12/site-packages/letta/prompts/system', 'letta/prompts/system'),
         ('venv/lib/python3.12/site-packages/letta/functions/function_sets', 'letta/functions/function_sets'),
         ('assets','assets'),
-        ('logserver/templates','logserver/templates'),
+        ('desktop_application/logserver/templates','logserver/templates'),
 
     ],
     hiddenimports=[],