fix: various build runtime errors

core/ai-assistant-core.spec

@@ -32,9 +32,13 @@ a = Analysis(
     ['ai_assistant_core/main.py'],
     pathex=[],
     binaries=[],
-    datas=[],
+    datas=[
+        ('ai_assistant_core/infrastructure/alembic/env.py', 'ai_assistant_core/infrastructure/alembic'),
+        ('ai_assistant_core/infrastructure/alembic/versions/*', 'ai_assistant_core/infrastructure/alembic/versions'),
+        ('ai_assistant_core/infrastructure/alembic.ini', 'ai_assistant_core/infrastructure')
+     ],
     hiddenimports=['tiktoken_ext.openai_public', 'tiktoken_ext'],
-    hookspath=[],
+    hookspath=['./pyinstaller_hooks'],
     hooksconfig={},
     runtime_hooks=[],
     excludes=[],

core/ai_assistant_core/infrastructure/alembic/env.py

@@ -1,30 +1,12 @@
-from logging.config import fileConfig
-
 from sqlalchemy import engine_from_config
 from sqlalchemy import pool
 
 from alembic import context
 
-# this is the Alembic Config object, which provides
-# access to the values within the .ini file in use.
 config = context.config
 
-# Interpret the config file for Python logging.
-# This line sets up loggers basically.
-if config.config_file_name is not None:
-    fileConfig(config.config_file_name)
-
-# add your model's MetaData object here
-# for 'autogenerate' support
-# from myapp import mymodel
-# target_metadata = mymodel.Base.metadata
 target_metadata = None
 
-# other values from the config, defined by the needs of env.py,
-# can be acquired:
-# my_important_option = config.get_main_option("my_important_option")
-# ... etc.
-
 
 def run_migrations_offline() -> None:
     """Run migrations in 'offline' mode.

core/pyinstaller_hooks/hook-llama_cpp.py

@@ -0,0 +1,28 @@
+# How to use this file
+#
+# 1. create a folder called "hooks" in your repo
+# 2. copy this file there
+# 3. add the --additional-hooks-dir flag to your pyinstaller command:
+#    ex: `pyinstaller --name binary-name --additional-hooks-dir=./hooks entry-point.py`
+
+import os
+import sys
+from PyInstaller.utils.hooks import collect_data_files, get_package_paths
+
+
+# Get the package path
+package_path = get_package_paths("llama_cpp")[0]
+
+# Collect data files
+datas = collect_data_files("llama_cpp")
+
+# Append the additional .dll or .so file
+if os.name == "nt":  # Windows
+    dll_path = os.path.join(package_path, "llama_cpp", "lib", "libllama.dll")
+    datas.append((dll_path, "llama_cpp"))
+elif sys.platform == "darwin":  # Mac
+    so_path = os.path.join(package_path, "llama_cpp", "lib", "libllama.dylib")
+    datas.append((so_path, "llama_cpp"))
+elif os.name == "posix":  # Linux
+    so_path = os.path.join(package_path, "llama_cpp", "lib", "libllama.so")
+    datas.append((so_path, "llama_cpp"))

webapp/pages/_app.tsx

@@ -0,0 +1,11 @@
+import { MainLayout } from '@/app/main-layout';
+import { AppProps } from 'next/app';
+
+
+export default function MyApp({ Component, pageProps }: AppProps): JSX.Element {
+  return (
+    <MainLayout>
+      <Component {...pageProps} />
+    </MainLayout>
+  );
+}

webapp/pages/thread/[id].tsx

@@ -1,6 +1,5 @@
 'use client';
 import { useRouter } from 'next/router';
-import { MainLayout } from '@/app/main-layout';
 import AssistantThread from '@/app/_components/assistant-thread';
 import RecentThreads from '@/app/_components/recent-threads';
 
@@ -9,13 +8,10 @@ export default function Page() {
   const router = useRouter();
 
   const id = typeof router.query.id === 'string' ? router.query.id : undefined;
-
   return (
-    <MainLayout>
-      <main className="h-full flex flex-col">
-        <RecentThreads />
-        { id && <AssistantThread threadId={id} /> }
-      </main>
-    </MainLayout>
+    <main className="h-full flex flex-col">
+      <RecentThreads />
+      { id && <AssistantThread threadId={id} /> }
+    </main>
   );
 }

webapp/src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "build": {
-    "beforeBuildCommand": "bash ./copy-assets.sh || pnpm run build:webapp",
+    "beforeBuildCommand": "pnpm build:webapp && bash ./copy-assets.sh",
     "beforeDevCommand": "npm run dev:webapp",
     "devPath": "http://localhost:3000",
     "distDir": "../out"