Build and config updates

Author: baebranch

.vscode/launch.json

@@ -8,9 +8,10 @@
       "name": "Subconscious Debugger",
       "type": "debugpy",
       "request": "launch",
-      "module": "examples.subconscious",
+      "module": "main",
       "justMyCode": true,
       "console": "internalConsole",
+      "cwd": "${workspaceFolder}/src"
     },
     {
       "name": "Subconscious Installer Debugger",

.vscode/tasks.json

@@ -6,32 +6,87 @@
     {
       "label": "Build Subconscious",
       "type": "shell",
-      "command": "conda activate langchain && pyinstaller",
+      "command": "echo",
       "args": [
-        "--onefile",
-        "--noconsole",
-        "--icon=src\\assets\\favicon.ico",
-        "subconscious.pyw"
+        "Complete!!!"
       ],
       "problemMatcher": [],
       "dependsOn": [
         "Clean Build Dir",
+        "Build Subconscious UI",
         "Copy Assets",
-        "Build Subconscious Installer"
+        "Build Subconscious Installer",
+        "Copy Installer"
       ],
       "dependsOrder": "sequence"
     },
+    {
+      "label": "Build Subconscious UI",
+      "type": "shell",
+      "command": "conda", 
+      "args": [
+        "activate",
+        "langchain",
+        "&&",
+        "flet",
+        "pack",
+        // "pyinstaller",
+        // "--onefile",
+        // "--windowed",
+        // "--noconsole",
+        "--name",
+        "subconscious",
+        "--icon=assets\\favicon.ico",
+        "--product-name",
+        "Subconscious",
+        "--product-version",
+        "v0.1.0",
+        "--file-version",
+        "0.1.0",
+        "--file-description",
+        "Subconscious UI for LLM use",
+        "--copyright",
+        "Copyright (C) 2024 by Subconscious.chat",
+        "main.py",
+      ],
+      "problemMatcher": [],
+      "options": {
+        "cwd": "${workspaceFolder}/src"
+      }
+    },
     {
       "label": "Build Subconscious Installer",
       "type": "shell",
-      "command": "conda activate langchain && pyinstaller",
+      // "command": "conda activate langchain && pyinstaller",
+      "command": "conda",
       "args": [
-        "--onefile",
-        "--noconsole",
-        "--icon=src\\assets\\favicon.ico",
-        "installer\\installer.pyw"
+        "activate",
+        "langchain",
+        "&&",
+        "flet",
+        "pack",
+        // "--onefile",
+        // "--windowed",
+        // "--noconsole",
+        "--name",
+        "installer",
+        "--icon=assets\\favicon.ico",
+        "--product-name",
+        "Subconscious Installer",
+        "--product-version",
+        "v0.1.0",
+        "--file-version",
+        "0.1.0",
+        "--file-description",
+        "Subconscious UI for LLM use",
+        "--copyright",
+        "Copyright (C) 2024 by Subconscious.chat",
+        "main.py"
       ],
       "problemMatcher": [],
+      "options": {
+        "cwd": "${workspaceFolder}/installer/src"
+      }
     },
     {
       "label": "Clean Build Dir",
@@ -40,40 +95,49 @@
       "args": [
         "/s",
         "/q",
-        "dist",
-        "build",
+        "src\\dist",
+        "src\\build",
         "||",
         "exit",
         "0"
       ],
       "problemMatcher": [],
+      // "options": {
+      //   "cwd": "${workspaceFolder}/src"
+      // }
     },
     {
       "label": "Copy Assets",
       "type": "shell",
       "command": "mkdir",
       "args": [
-        "dist",
-        "&&",
-        "mkdir",
-        "dist\\src",
+        "src\\dist\\data",
         "&&",
         "xcopy",
         "src\\assets",
-        "dist\\src\\assets",
+        "src\\dist\\assets",
         "/q",
         "/e",
         "/i",
         "&&",
         "xcopy",
         "src\\lang",
-        "dist\\src\\lang",
+        "src\\dist\\lang",
         "/q",
         "/e",
         "/i",
-        "&&",
-        "mkdir",
-        "dist\\data",
+      ],
+      "problemMatcher": [],
+    },
+    {
+      "label": "Copy Installer",
+      "type": "shell",
+      "command": "xcopy",
+      "args": [
+        "installer\\src\\dist\\installer.exe",
+        "src\\dist",
+        "/i",
+        "/y",
       ],
       "problemMatcher": [],
     }

installer/src/icon.png

@@ -2,7 +2,7 @@
 
 
 a = Analysis(
-    ['installer\\installer.pyw'],
+    ['main.py'],
     pathex=[],
     binaries=[],
     datas=[],
@@ -35,5 +35,6 @@ exe = EXE(
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
-    icon=['src\\assets\\favicon.ico'],
+    version='C:\\Users\\brian\\AppData\\Local\\Temp\\0d9aa1b6-c06d-4f99-bcd8-c4debd724d19',
+    icon=['assets\\favicon.ico'],
 )

installer.spec renamed to installer/src/installer.spec

@@ -2,7 +2,7 @@
 
 
 a = Analysis(
-    ['subconscious.pyw'],
+    ['main.py'],
     pathex=[],
     binaries=[],
     datas=[],
@@ -35,5 +35,6 @@ exe = EXE(
     target_arch=None,
     codesign_identity=None,
     entitlements_file=None,
-    icon=['src\\assets\\favicon.ico'],
+    version='C:\\Users\\brian\\AppData\\Local\\Temp\\1d84a19d-0a5b-4b9a-ae31-36b8743ac365',
+    icon=['assets\\favicon.ico'],
 )