+ topos.dmg app

.gitignore

@@ -108,3 +108,5 @@ topos/credentials.json
 topos/justfile
 topos/cloudbuild.yaml
 dockerfile
+
+topos.app

README.md

@@ -6,12 +6,17 @@ Game options are:
 
 
 ## Install with nix (Recommended)
-1. Install nix  
+1. Install nix:   
     macos/linux: `sh <(curl -L https://nixos.org/nix/install)`  
-    windows: `sh <(curl -L https://nixos.org/nix/install) --daemon`
+    windows: `sh <(curl -L https://nixos.org/nix/install) --daemon`  
 2. Download this repo `git clone https://github.com/jonnyjohnson1/topos-cli`
 3. `cd topos-cli`
-4. `nix-shell`
+4. build the backend service: `nix-shell`
+5. 
+```
+topos set --spacy trf // set this value. It only needs to be set once.
+topos run // start topos
+```
 
 ## Install Instructions
 requires `brew install just`

default.nix

@@ -3,7 +3,6 @@
 let
   python = pkgs.python3;
 
-
 in pkgs.mkShell {
   buildInputs = [
     pkgs.just
@@ -12,7 +11,6 @@ in pkgs.mkShell {
 
   shellHook = ''
     just build
-    topos set --spacy trf
     topos run
   '';
 }

justfile

@@ -18,4 +18,7 @@ python:
 	pyi-makespec --onefile main.py
 	# add ('topos/config.yaml', 'topos/')
 	pyinstaller main.spec
-	create-dmg 'dist/main' --overwrite
+	create-dmg 'dist/main' --overwrite
+
+dmg:
+    create-dmg topos.app --volicon "topos/assets/topos_blk_rounded.png" --icon "topos/assets/topos_blk_rounded.png"

topos/app/menu_bar_app.py

@@ -1,6 +1,7 @@
 from ..api import api
 from ..downloaders.spacy_loader import download_spacy_model
 from topos.utilities.utils import get_root_directory
+from ..config import get_ssl_certificates
 
 import requests
 import threading
@@ -10,18 +11,37 @@
 import time
 import os
 
+import warnings
+
+ASSETS_PATH = os.path.join(get_root_directory(), "assets/topos_white.png")
 API_URL = "http://0.0.0.0:13341/health"
 DOCS_URL = "http://0.0.0.0:13341/docs"
-ASSETS_PATH = os.path.join(get_root_directory(), "assets/topos_white.png")
-
 
 def start_api():
     api.start_local_api()
 
+def start_web_app():
+    global API_URL, DOCS_URL
+    API_URL = "https://0.0.0.0:13341/health"
+    DOCS_URL = "https://0.0.0.0:13341/docs"
+    api_thread = threading.Thread(target=api.start_web_api)
+    api_thread.daemon = True
+    api_thread.start()
+    # Create and start the tray icon on the main thread
+    create_tray_icon()
+
 def check_health(icon):
+    certs = get_ssl_certificates()
+    if not os.path.exists(certs['cert_path']):
+        print(f"Certificate file not found: {certs['cert_path']}")
+    if not os.path.exists(certs['key_path']):
+        print(f"Key file not found: {certs['key_path']}")
+
     while icon.visible:
         try:
-            response = requests.get(API_URL)
+            with warnings.catch_warnings(): # cert=(certs['cert_path'], certs['key_path']) #for verification, but wasn't working
+                warnings.filterwarnings('ignore', message='Unverified HTTPS request')
+                response = requests.get(API_URL, verify=False)
             if response.status_code == 200:
                 update_status(icon, "Service is running", (170, 255, 0, 255))
             else:
@@ -76,12 +96,19 @@ def on_exit(icon, item):
     icon.visible = False
     icon.stop()
 
-def start_app():
-# if __name__ == "__main__":
-    # Start the API in a separate thread
-    api_thread = threading.Thread(target=start_api)
+def start_local_app():
+    api_thread = threading.Thread(target=api.start_local_api)
     api_thread.daemon = True
     api_thread.start()
+    # Create and start the tray icon on the main thread
+    create_tray_icon()
 
+def start_web_app():
+    global API_URL, DOCS_URL
+    API_URL = "https://0.0.0.0:13341/health"
+    DOCS_URL = "https://0.0.0.0:13341/docs"
+    api_thread = threading.Thread(target=api.start_web_api)
+    api_thread.daemon = True
+    api_thread.start()
     # Create and start the tray icon on the main thread
     create_tray_icon()

topos/cli.py

@@ -21,9 +21,10 @@ def main():
             api.start_hosted_service()
         elif args.web:
             from .app import menu_bar_app
-            api.start_web_api()
+            menu_bar_app.start_web_app()
         else:
-            menu_bar_app.start_app()
+            from .app import menu_bar_app
+            menu_bar_app.start_local_app()
 
     if args.command == 'chat':
         """

topos/config.py

@@ -12,10 +12,13 @@ def get_openai_api_key():
 
 
 def get_ssl_certificates():
-    project_dir = get_root_directory()
+    # project_dir = get_root_directory()
+    # print(project_dir)
+    # "key_path": project_dir + "/key.pem",
+    # "cert_path": project_dir + "/cert.pem"
     return {
-        "key_path": project_dir + "/key.pem",
-        "cert_path": project_dir + "/cert.pem"
+        "key_path": "key.pem",
+        "cert_path": "cert.pem"
     }