theluyuan/RWKV-Runner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore

Browse Source
This commit is contained in:
josc146 2023-06-02 22:20:57 +08:00
parent b41a2e7039
commit e1df1bfc3f
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend-golang/app.go
View File

@ -28,12 +28,12 @@ func NewApp() *App {
// so we can call the runtime methods // so we can call the runtime methods
func (a *App) OnStartup(ctx context.Context) { func (a *App) OnStartup(ctx context.Context) {
a.ctx = ctx a.ctx = ctx
ex, _ := os.Executable() a.exDir = ""
a.exDir = filepath.Dir(ex)
a.cmdPrefix = "" a.cmdPrefix = ""
if runtime.GOOS == "darwin" { if runtime.GOOS == "darwin" {
a.exDir += "/../../../" ex, _ := os.Executable()
a.exDir = filepath.Dir(ex) + "/../../../"
a.cmdPrefix = "cd " + a.exDir + " && " a.cmdPrefix = "cd " + a.exDir + " && "
} }

2
backend-golang/rwkv.go
View File

@ -26,7 +26,7 @@ func (a *App) ConvertModel(python string, modelPath string, strategy string, out
if err != nil { if err != nil {
return "", err return "", err
} }
return Cmd(python, "./backend-python/convert_model.py", "--in", modelPath, "--out", outPath, "--strategy", `"`+strategy+`"`) return Cmd(python, "./backend-python/convert_model.py", "--in", modelPath, "--out", outPath, "--strategy", strategy)
} }
func (a *App) DepCheck(python string) error { func (a *App) DepCheck(python string) error {

2
backend-golang/utils.go
View File

@ -46,7 +46,7 @@ func Cmd(args ...string) (string, error) {
return "", err return "", err
} }
exDir := filepath.Dir(ex) + "/../../../" exDir := filepath.Dir(ex) + "/../../../"
cmd := exec.Command("osascript", "-e", `tell application "Terminal" to do script "`+"cd "+exDir+" && "+strings.Join(args, " ")+`"`) cmd := exec.Command("osascript", "-e", `tell application 'Terminal' to do script '`+"cd "+exDir+" && "+strings.Join(args, " ")+`'`)
err = cmd.Start() err = cmd.Start()
if err != nil { if err != nil {
return "", err return "", err

20
frontend/src/pages/Settings.tsx
View File

@ -118,15 +118,17 @@ export const Settings: FC = observer(() => {
<AccordionHeader ref={advancedHeaderRef} size="large">{t('Advanced')}</AccordionHeader> <AccordionHeader ref={advancedHeaderRef} size="large">{t('Advanced')}</AccordionHeader>
<AccordionPanel> <AccordionPanel>
<div className="flex flex-col gap-2 overflow-hidden"> <div className="flex flex-col gap-2 overflow-hidden">
<Labeled label={t('Custom Models Path')} {commonStore.platform !== 'darwin' &&
content={ <Labeled label={t('Custom Models Path')}
<Input className="grow" placeholder="./models" value={commonStore.settings.customModelsPath} content={
onChange={(e, data) => { <Input className="grow" placeholder="./models" value={commonStore.settings.customModelsPath}
commonStore.setSettings({ onChange={(e, data) => {
customModelsPath: data.value commonStore.setSettings({
}); customModelsPath: data.value
}} /> });
} /> }} />
} />
}
<Labeled label={t('Custom Python Path')} <Labeled label={t('Custom Python Path')}
content={ content={
<Input className="grow" placeholder="./py310/python" value={commonStore.settings.customPythonPath} <Input className="grow" placeholder="./py310/python" value={commonStore.settings.customPythonPath}