From 88e88b9ce624c3f7c2925bff0310f0159b089334 Mon Sep 17 00:00:00 2001 From: kwaroran Date: Fri, 12 Jan 2024 12:21:23 +0900 Subject: [PATCH] move Python files and update Tauri configuration --- {src-python => src-tauri/src-python}/llamacpp.py | 0 {src-python => src-tauri/src-python}/main.py | 0 {src-python => src-tauri/src-python}/run.py | 0 src-tauri/tauri.conf.json | 7 +++++-- src/ts/process/models/local.ts | 2 ++ 5 files changed, 7 insertions(+), 2 deletions(-) rename {src-python => src-tauri/src-python}/llamacpp.py (100%) rename {src-python => src-tauri/src-python}/main.py (100%) rename {src-python => src-tauri/src-python}/run.py (100%) diff --git a/src-python/llamacpp.py b/src-tauri/src-python/llamacpp.py similarity index 100% rename from src-python/llamacpp.py rename to src-tauri/src-python/llamacpp.py diff --git a/src-python/main.py b/src-tauri/src-python/main.py similarity index 100% rename from src-python/main.py rename to src-tauri/src-python/main.py diff --git a/src-python/run.py b/src-tauri/src-python/run.py similarity index 100% rename from src-python/run.py rename to src-tauri/src-python/run.py diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 7f3ddf8d..f2cb2e3d 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -29,7 +29,7 @@ }, "fs":{ "all": true, - "scope": ["$APPDATA","$APPDATA/*","$APPDATA/**/*", "$DOWNLOAD/*", "/data/**/*"] + "scope": ["$APPDATA","$APPDATA/*","$APPDATA/**/*", "$DOWNLOAD/*", "/data/**/*", "$RESOURCE/*"] }, "path":{ "all": true @@ -87,7 +87,10 @@ "icons/icon.ico" ], "identifier": "co.aiclient.risu", - "targets": "all" + "targets": "all", + "resources": [ + "src-python/*" + ] }, "security": { "csp": null diff --git a/src/ts/process/models/local.ts b/src/ts/process/models/local.ts index b512e4ab..d59e35ae 100644 --- a/src/ts/process/models/local.ts +++ b/src/ts/process/models/local.ts @@ -6,6 +6,7 @@ import { exists } from "@tauri-apps/api/fs"; import { alertClear, alertError, alertMd, alertWait } from "src/ts/alert"; import { get } from "svelte/store"; import { DataBase } from "src/ts/storage/database"; +import { resolveResource } from '@tauri-apps/api/path' let serverRunning = false; export function checkLocalModel():Promise{ @@ -157,6 +158,7 @@ export async function runLocalModel(prompt:string){ export async function installPython(){ const appDir = await path.appDataDir() const completedPath = await path.join(appDir, 'python', 'completed.txt') + console.log(await resolveResource('/src-python/')) if(await exists(completedPath)){ alertMd("Python is already installed") return