Moving things around to get builds to work

Author: baebranch

installer/src/main.py

@@ -6,6 +6,8 @@
 import zipfile
 import requests
 import tempfile
+import win32gui
+import win32con
 import flet as ft
 
 from titlebar import TitleBar
@@ -17,6 +19,30 @@ def is_admin():
   except:
     return False
 
+
+def set_app_icon(hwnd, icon_path):
+  hicon = win32gui.LoadImage(None, icon_path, win32con.IMAGE_ICON, 0, 0, win32con.LR_LOADFROMFILE | win32con.LR_DEFAULTSIZE)
+  win32gui.SendMessage(hwnd, win32con.WM_SETICON, win32con.ICON_SMALL, hicon)
+  win32gui.SendMessage(hwnd, win32con.WM_SETICON, win32con.ICON_BIG, hicon)
+
+
+def create_shortcut(target, shortcut_name):
+  """ Create a startmenu shortcut for the Subconscious app """
+  # Get the startmenu directory
+  startmenu_dir = os.path.join(os.environ['APPDATA'], 'Microsoft', 'Windows', 'Start Menu', 'Programs')
+  
+  # Create a shortcut file
+  shortcut_path = os.path.join(startmenu_dir, f"{shortcut_name}.lnk")
+  shell = ctypes.windll.Dispatch("WScript.Shell")
+  shortcut = shell.CreateShortCut(shortcut_path)
+  shortcut.Targetpath = target
+  shortcut.WorkingDirectory = os.path.dirname(target)
+  shortcut.Description = "Subconscious"
+  shortcut.IconLocation = target
+  shortcut.save()
+  return shortcut_path
+
+
 def download_latest_release(download_dir, pb):
   """ Download the latest release of the Subconscious app """
   # GitHub API URL for the latest release
@@ -56,8 +82,17 @@ def extract_to_program_files(zip_path, program_files_dir):
 
 def main(page: ft.Page):
   """ Main function to initiate the installer UI """
-  # Window size
-  page.visible = False
+  # Configure the app icons
+  myappid = u'chat.subconscious.installer'
+  ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
+
+  # Set custom icon for the window and taskbar
+  icon_path = 'assets\\favicon.ico'  # Replace with the path to your custom icon
+  hwnd = win32gui.GetForegroundWindow()
+  set_app_icon(hwnd, icon_path)
+  
+  # Window Config
+  page.window.center()
   page.window.width = page.window.min_width = page.window.max_width = 450
   page.window.height = page.window.min_height = page.window.max_height = 250
   page.window.center()
@@ -78,7 +113,7 @@ def main(page: ft.Page):
     ft.Column(
     [
       ft.Row([
-        ft.Text("Subconscious", size=25, color=ft.Colors.PRIMARY),
+        ft.Text("Installing Subconscious", size=25, color=ft.Colors.PRIMARY),
       ], alignment="left", spacing=0),
       step,
       pb,
@@ -90,8 +125,8 @@ def main(page: ft.Page):
   ),
   padding=ft.padding.only(20, 20, 20, 20))
   )
-  page.visible = True
   page.update()
+  set_app_icon(hwnd, icon_path)
 
   try:
     # Create a temporary directory
@@ -109,13 +144,14 @@ def main(page: ft.Page):
       page.update()
 
       # Ensure the Program Files directory exists
-      os.makedirs(program_files_dir, exist_ok=True)
-      
       # Extract the downloaded zip file to the Program Files directory
+      os.makedirs(program_files_dir, exist_ok=True)
       step.value = "Extracting files..."
       pb.value = 0.75
       page.update()
+
       extract_to_program_files(zip_path, program_files_dir)
+      create_shortcut(os.path.join(program_files_dir, "subconscious.exe"), "Subconscious")
       done.visible = True
       step.value = "Installation completed successfully!"
       pb.value = 1.0

installer/src/titlebar.py

@@ -59,53 +59,53 @@ def minimize(self, _):
   def theme_changed(self):
     """ Change the theme of the title bar buttons """
     if self.page.theme_mode == ft.ThemeMode.LIGHT:
-      self.close.src = "./src/assets/close_dark.svg"
-      self.mini.src = "./src/assets/minimize_dark.svg"
+      self.close.src = "./assets/close_dark.svg"
+      self.mini.src = "./assets/minimize_dark.svg"
       if self.page.window.maximized:
-        self.res_max.src = "./src/assets/restore_dark.svg"
+        self.res_max.src = "./assets/restore_dark.svg"
       else:
-        self.res_max.src = "./src/assets/maximize_dark.svg"
+        self.res_max.src = "./assets/maximize_dark.svg"
     else:
-      self.close.src = "./src/assets/close_light.svg"
-      self.mini.src = "./src/assets/minimize_light.svg"
+      self.close.src = "./assets/close_light.svg"
+      self.mini.src = "./assets/minimize_light.svg"
       if self.page.window.maximized:
-        self.res_max.src = "./src/assets/restore_light.svg"
+        self.res_max.src = "./assets/restore_light.svg"
       else:
-        self.res_max.src = "./src/assets/maximize_light.svg"
+        self.res_max.src = "./assets/maximize_light.svg"
     self.page.update()
 
   def theme_init(self, page):
     """ Change the theme of the title bar buttons """
     if page.theme_mode == ft.ThemeMode.LIGHT:
-      self.close = ft.Image(src="./src/assets/close_dark.svg", width=12, height=12)
-      self.mini = ft.Image(src="./src/assets/minimize_dark.svg", width=12, height=12)
+      self.close = ft.Image(src="./assets/close_dark.svg", width=12, height=12)
+      self.mini = ft.Image(src="./assets/minimize_dark.svg", width=12, height=12)
       if page.window_maximized:
-        self.res_max = ft.Image(src="./src/assets/restore_dark.svg", width=12, height=12)
+        self.res_max = ft.Image(src="./assets/restore_dark.svg", width=12, height=12)
       else:
-        self.res_max = ft.Image(src="./src/assets/maximize_dark.svg", width=12, height=12)
+        self.res_max = ft.Image(src="./assets/maximize_dark.svg", width=12, height=12)
     else:
-      self.close = ft.Image(src="./src/assets/close_light.svg", width=12, height=12)
-      self.mini = ft.Image(src="./src/assets/minimize_light.svg", width=12, height=12)
+      self.close = ft.Image(src="./assets/close_light.svg", width=12, height=12)
+      self.mini = ft.Image(src="./assets/minimize_light.svg", width=12, height=12)
       if page.window_maximized:
-        self.res_max = ft.Image(src="./src/assets/restore_light.svg", width=12, height=12)
+        self.res_max = ft.Image(src="./assets/restore_light.svg", width=12, height=12)
       else:
-        self.res_max = ft.Image(src="./src/assets/maximize_light.svg", width=12, height=12)
+        self.res_max = ft.Image(src="./assets/maximize_light.svg", width=12, height=12)
 
   def toggle(self, _):
     """ Toggle between maximized and window mode """
     if self.page.window.maximized:
       self.res_max_button.tooltip = "Maximize"
       self.page.window.maximized = False
       if self.page.theme_mode == ft.ThemeMode.LIGHT:
-        self.res_max.src = "./src/assets/maximize_dark.svg"
+        self.res_max.src = "./assets/maximize_dark.svg"
       else:
-        self.res_max.src = "./src/assets/maximize_light.svg"
+        self.res_max.src = "./assets/maximize_light.svg"
     else:
       self.res_max_button.tooltip = "Restore"
       self.page.window.maximized = True
       if self.page.theme_mode == ft.ThemeMode.LIGHT:
-        self.res_max.src = "./src/assets/restore_dark.svg"
+        self.res_max.src = "./assets/restore_dark.svg"
       else:
-        self.res_max.src = "./src/assets/restore_light.svg"
+        self.res_max.src = "./assets/restore_light.svg"
     self.page.update()
 

src/__init__.py

@@ -1,6 +1,6 @@
 import json
 import flet as ft
-from src.utilities.filechange import FileChange
+from utilities.filechange import FileChange
 
 
 class PopupLanguageItem(ft.PopupMenuItem):
@@ -263,10 +263,10 @@ def toggler(self, _):
   def theme_changed(self, _):
     """ Toggle the theme mode between light and dark """
     if self.page.theme_mode == ft.ThemeMode.LIGHT:
-      self.minimize = ft.Image(src="./src/assets/minimize_light.svg", width=12, height=12)
-      self.maximize = ft.Image(src="./src/assets/maximize_light.svg", width=12, height=12)
-      self.restore = ft.Image(src="./src/assets/restore_light.svg", width=12, height=12)
-      self.close = ft.Image(src="./src/assets/close_light.svg", width=12, height=12)
+      self.minimize = ft.Image(src="./assets/minimize_light.svg", width=12, height=12)
+      self.maximize = ft.Image(src="./assets/maximize_light.svg", width=12, height=12)
+      self.restore = ft.Image(src="./assets/restore_light.svg", width=12, height=12)
+      self.close = ft.Image(src="./assets/close_light.svg", width=12, height=12)
       self.dark_light_icon.icon = ft.icons.BRIGHTNESS_HIGH
       self.page.theme_mode = ft.ThemeMode.DARK
       self.colour_theme_menu.items.pop(-1)
@@ -277,10 +277,10 @@ def theme_changed(self, _):
         self.page.theme = ft.Theme(color_scheme=PopupColorItem.white)
 
     elif self.page.theme_mode == ft.ThemeMode.DARK:
-      self.minimize = ft.Image(src="./src/assets/minimize_dark.svg", width=12, height=12)
-      self.maximize = ft.Image(src="./src/assets/maximize_dark.svg", width=12, height=12)
-      self.restore = ft.Image(src="./src/assets/restore_dark.svg", width=12, height=12)
-      self.close = ft.Image(src="./src/assets/close_dark.svg", width=12, height=12)
+      self.minimize = ft.Image(src="./assets/minimize_dark.svg", width=12, height=12)
+      self.maximize = ft.Image(src="./assets/maximize_dark.svg", width=12, height=12)
+      self.restore = ft.Image(src="./assets/restore_dark.svg", width=12, height=12)
+      self.close = ft.Image(src="./assets/close_dark.svg", width=12, height=12)
       self.dark_light_icon.icon = ft.icons.BRIGHTNESS_2
       self.page.theme_mode = ft.ThemeMode.LIGHT
       self.colour_theme_menu.items.pop(-1)

src/assets/favicon.ico

@@ -3,13 +3,13 @@
 from uuid import uuid4
 from threading import Thread
 from time import time, monotonic
-from src.utilities import VERSION
+from utilities import VERSION
 from collections import defaultdict
-from src.components.data_objects import HumanMessage
+from components.data_objects import HumanMessage
 
-from src.utilities.filechange import FileChange
-from src.components.data_objects import Message, ExpansionPanelSlug
-from src.components.message_block import MessageBlock, MessageBubble
+from utilities.filechange import FileChange
+from components.data_objects import Message, ExpansionPanelSlug
+from components.message_block import MessageBlock, MessageBubble
 
 
 class MessageList(ft.ListView):
@@ -238,7 +238,7 @@ def render_settings(title, key, val):
 
     # About content
     self.about = ft.Column([
-      ft.Image(src="./src/assets/logo.png", width=100, height=100),
+      ft.Image(src="./assets/logo.png", width=100, height=100),
       ft.Row([
         ft.Icon(ft.icons.INFO_OUTLINE, size=20, color=ft.colors.GREY),
         ft.Text("About", size=20, color=ft.colors.GREY),
@@ -599,8 +599,9 @@ def render_history(self, messages):
     """
     message_list = MessageList()
     for message in messages:
-      message_list.controls.append(MessageBubble(message))
-      message_list.active = True
+      if message:
+        message_list.controls.append(MessageBubble(message))
+        message_list.active = True
     return message_list
 
   def show_thread(self):

src/components/leftbar.py

@@ -3,7 +3,7 @@
 import flet.canvas as cv
 from datetime import datetime
 
-from src.components.data_objects import HumanMessage
+from components.data_objects import HumanMessage
 
 
 class MessageBubble(ft.Row):

src/components/main_window.py

@@ -4,8 +4,8 @@
 import flet as ft
 from types import SimpleNamespace
 
-from src.utilities import VERSION
-from src.utilities.filechange import FileChange
+from utilities import VERSION
+from utilities.filechange import FileChange
 
 
 class NavIcon(ft.Container):
@@ -77,7 +77,7 @@ def __init__(self, page, show_window, settings, switch_llm, safe_exit, set_curre
         ft.Container(
           content=ft.Stack([
               ft.Image(
-                src="./src/assets/ai_sparkle.svg",
+                src="./assets/ai_sparkle.svg",
                 width=30, height=30,
                 top=5, left=5,
                 color=ft.colors.PRIMARY

src/components/message_block.py

@@ -19,7 +19,7 @@ def __init__(self, page, title=None, buttons=None):
         ft.Container(content=
           ft.Row([
             ft.Image(
-              src="./src/assets/icon.png",
+              src="./assets/icon.png",
               width=20, height=20,
               color=ft.colors.PRIMARY,
             ),
@@ -59,53 +59,53 @@ def minimize(self, _):
   def theme_changed(self):
     """ Change the theme of the title bar buttons """
     if self.page.theme_mode == ft.ThemeMode.LIGHT:
-      self.close.src = "./src/assets/close_dark.svg"
-      self.mini.src = "./src/assets/minimize_dark.svg"
+      self.close.src = "./assets/close_dark.svg"
+      self.mini.src = "./assets/minimize_dark.svg"
       if self.page.window.maximized:
-        self.res_max.src = "./src/assets/restore_dark.svg"
+        self.res_max.src = "./assets/restore_dark.svg"
       else:
-        self.res_max.src = "./src/assets/maximize_dark.svg"
+        self.res_max.src = "./assets/maximize_dark.svg"
     else:
-      self.close.src = "./src/assets/close_light.svg"
-      self.mini.src = "./src/assets/minimize_light.svg"
+      self.close.src = "./assets/close_light.svg"
+      self.mini.src = "./assets/minimize_light.svg"
       if self.page.window.maximized:
-        self.res_max.src = "./src/assets/restore_light.svg"
+        self.res_max.src = "./assets/restore_light.svg"
       else:
-        self.res_max.src = "./src/assets/maximize_light.svg"
+        self.res_max.src = "./assets/maximize_light.svg"
     self.page.update()
 
   def theme_init(self, page):
     """ Change the theme of the title bar buttons """
     if page.theme_mode == ft.ThemeMode.LIGHT:
-      self.close = ft.Image(src="./src/assets/close_dark.svg", width=12, height=12)
-      self.mini = ft.Image(src="./src/assets/minimize_dark.svg", width=12, height=12)
+      self.close = ft.Image(src="./assets/close_dark.svg", width=12, height=12)
+      self.mini = ft.Image(src="./assets/minimize_dark.svg", width=12, height=12)
       if page.window_maximized:
-        self.res_max = ft.Image(src="./src/assets/restore_dark.svg", width=12, height=12)
+        self.res_max = ft.Image(src="./assets/restore_dark.svg", width=12, height=12)
       else:
-        self.res_max = ft.Image(src="./src/assets/maximize_dark.svg", width=12, height=12)
+        self.res_max = ft.Image(src="./assets/maximize_dark.svg", width=12, height=12)
     else:
-      self.close = ft.Image(src="./src/assets/close_light.svg", width=12, height=12)
-      self.mini = ft.Image(src="./src/assets/minimize_light.svg", width=12, height=12)
+      self.close = ft.Image(src="./assets/close_light.svg", width=12, height=12)
+      self.mini = ft.Image(src="./assets/minimize_light.svg", width=12, height=12)
       if page.window_maximized:
-        self.res_max = ft.Image(src="./src/assets/restore_light.svg", width=12, height=12)
+        self.res_max = ft.Image(src="./assets/restore_light.svg", width=12, height=12)
       else:
-        self.res_max = ft.Image(src="./src/assets/maximize_light.svg", width=12, height=12)
+        self.res_max = ft.Image(src="./assets/maximize_light.svg", width=12, height=12)
 
   def toggle(self, _):
     """ Toggle between maximized and window mode """
     if self.page.window.maximized:
       self.res_max_button.tooltip = "Maximize"
       self.page.window.maximized = False
       if self.page.theme_mode == ft.ThemeMode.LIGHT:
-        self.res_max.src = "./src/assets/maximize_dark.svg"
+        self.res_max.src = "./assets/maximize_dark.svg"
       else:
-        self.res_max.src = "./src/assets/maximize_light.svg"
+        self.res_max.src = "./assets/maximize_light.svg"
     else:
       self.res_max_button.tooltip = "Restore"
       self.page.window.maximized = True
       if self.page.theme_mode == ft.ThemeMode.LIGHT:
-        self.res_max.src = "./src/assets/restore_dark.svg"
+        self.res_max.src = "./assets/restore_dark.svg"
       else:
-        self.res_max.src = "./src/assets/restore_light.svg"
+        self.res_max.src = "./assets/restore_light.svg"
     self.page.update()