diff --git a/Makefile b/Makefile index 58b9509..0575d63 100644 --- a/Makefile +++ b/Makefile @@ -11,3 +11,6 @@ build-windows: build-macos: @echo ---- build for macos +dev: + wails dev + diff --git a/backend-golang/file.go b/backend-golang/file.go index 01f996e..68f1f1d 100644 --- a/backend-golang/file.go +++ b/backend-golang/file.go @@ -5,6 +5,7 @@ import ( "fmt" "os" "os/exec" + "path/filepath" "runtime" "time" @@ -97,9 +98,13 @@ func (a *App) DownloadFile(path string, url string) error { } func (a *App) OpenFileFolder(path string) error { + absPath, err := filepath.Abs(path) + if err != nil { + return err + } switch os := runtime.GOOS; os { case "windows": - cmd := exec.Command("explorer", "/select,", path) + cmd := exec.Command("explorer", "/select,", absPath) err := cmd.Run() if err != nil { return err diff --git a/backend-golang/rwkv.go b/backend-golang/rwkv.go index 3ed4b62..5ed0504 100644 --- a/backend-golang/rwkv.go +++ b/backend-golang/rwkv.go @@ -18,3 +18,16 @@ func (a *App) StartServer(port int) (string, error) { } return string(out), nil } + +func (a *App) ConvertModel(modelPath string, strategy string, outPath string) (string, error) { + cmdHelper, err := filepath.Abs("./cmd-helper") + if err != nil { + return "", err + } + cmd := exec.Command(cmdHelper, "python", "./backend-python/convert_model.py", "--in", modelPath, "--out", outPath, "--strategy", strategy) + out, err := cmd.CombinedOutput() + if err != nil { + return "", err + } + return string(out), nil +} diff --git a/backend-python/convert_model.py b/backend-python/convert_model.py new file mode 100644 index 0000000..66661bd --- /dev/null +++ b/backend-python/convert_model.py @@ -0,0 +1,231 @@ +# Apache License +# Version 2.0, January 2004 +# http://www.apache.org/licenses/ + +# TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +# 1. Definitions. + +# "License" shall mean the terms and conditions for use, reproduction, +# and distribution as defined by Sections 1 through 9 of this document. + +# "Licensor" shall mean the copyright owner or entity authorized by +# the copyright owner that is granting the License. + +# "Legal Entity" shall mean the union of the acting entity and all +# other entities that control, are controlled by, or are under common +# control with that entity. For the purposes of this definition, +# "control" means (i) the power, direct or indirect, to cause the +# direction or management of such entity, whether by contract or +# otherwise, or (ii) ownership of fifty percent (50%) or more of the +# outstanding shares, or (iii) beneficial ownership of such entity. + +# "You" (or "Your") shall mean an individual or Legal Entity +# exercising permissions granted by this License. + +# "Source" form shall mean the preferred form for making modifications, +# including but not limited to software source code, documentation +# source, and configuration files. + +# "Object" form shall mean any form resulting from mechanical +# transformation or translation of a Source form, including but +# not limited to compiled object code, generated documentation, +# and conversions to other media types. + +# "Work" shall mean the work of authorship, whether in Source or +# Object form, made available under the License, as indicated by a +# copyright notice that is included in or attached to the work +# (an example is provided in the Appendix below). + +# "Derivative Works" shall mean any work, whether in Source or Object +# form, that is based on (or derived from) the Work and for which the +# editorial revisions, annotations, elaborations, or other modifications +# represent, as a whole, an original work of authorship. For the purposes +# of this License, Derivative Works shall not include works that remain +# separable from, or merely link (or bind by name) to the interfaces of, +# the Work and Derivative Works thereof. + +# "Contribution" shall mean any work of authorship, including +# the original version of the Work and any modifications or additions +# to that Work or Derivative Works thereof, that is intentionally +# submitted to Licensor for inclusion in the Work by the copyright owner +# or by an individual or Legal Entity authorized to submit on behalf of +# the copyright owner. For the purposes of this definition, "submitted" +# means any form of electronic, verbal, or written communication sent +# to the Licensor or its representatives, including but not limited to +# communication on electronic mailing lists, source code control systems, +# and issue tracking systems that are managed by, or on behalf of, the +# Licensor for the purpose of discussing and improving the Work, but +# excluding communication that is conspicuously marked or otherwise +# designated in writing by the copyright owner as "Not a Contribution." + +# "Contributor" shall mean Licensor and any individual or Legal Entity +# on behalf of whom a Contribution has been received by Licensor and +# subsequently incorporated within the Work. + +# 2. Grant of Copyright License. Subject to the terms and conditions of +# this License, each Contributor hereby grants to You a perpetual, +# worldwide, non-exclusive, no-charge, royalty-free, irrevocable +# copyright license to reproduce, prepare Derivative Works of, +# publicly display, publicly perform, sublicense, and distribute the +# Work and such Derivative Works in Source or Object form. + +# 3. Grant of Patent License. Subject to the terms and conditions of +# this License, each Contributor hereby grants to You a perpetual, +# worldwide, non-exclusive, no-charge, royalty-free, irrevocable +# (except as stated in this section) patent license to make, have made, +# use, offer to sell, sell, import, and otherwise transfer the Work, +# where such license applies only to those patent claims licensable +# by such Contributor that are necessarily infringed by their +# Contribution(s) alone or by combination of their Contribution(s) +# with the Work to which such Contribution(s) was submitted. If You +# institute patent litigation against any entity (including a +# cross-claim or counterclaim in a lawsuit) alleging that the Work +# or a Contribution incorporated within the Work constitutes direct +# or contributory patent infringement, then any patent licenses +# granted to You under this License for that Work shall terminate +# as of the date such litigation is filed. + +# 4. Redistribution. You may reproduce and distribute copies of the +# Work or Derivative Works thereof in any medium, with or without +# modifications, and in Source or Object form, provided that You +# meet the following conditions: + +# (a) You must give any other recipients of the Work or +# Derivative Works a copy of this License; and + +# (b) You must cause any modified files to carry prominent notices +# stating that You changed the files; and + +# (c) You must retain, in the Source form of any Derivative Works +# that You distribute, all copyright, patent, trademark, and +# attribution notices from the Source form of the Work, +# excluding those notices that do not pertain to any part of +# the Derivative Works; and + +# (d) If the Work includes a "NOTICE" text file as part of its +# distribution, then any Derivative Works that You distribute must +# include a readable copy of the attribution notices contained +# within such NOTICE file, excluding those notices that do not +# pertain to any part of the Derivative Works, in at least one +# of the following places: within a NOTICE text file distributed +# as part of the Derivative Works; within the Source form or +# documentation, if provided along with the Derivative Works; or, +# within a display generated by the Derivative Works, if and +# wherever such third-party notices normally appear. The contents +# of the NOTICE file are for informational purposes only and +# do not modify the License. You may add Your own attribution +# notices within Derivative Works that You distribute, alongside +# or as an addendum to the NOTICE text from the Work, provided +# that such additional attribution notices cannot be construed +# as modifying the License. + +# You may add Your own copyright statement to Your modifications and +# may provide additional or different license terms and conditions +# for use, reproduction, or distribution of Your modifications, or +# for any such Derivative Works as a whole, provided Your use, +# reproduction, and distribution of the Work otherwise complies with +# the conditions stated in this License. + +# 5. Submission of Contributions. Unless You explicitly state otherwise, +# any Contribution intentionally submitted for inclusion in the Work +# by You to the Licensor shall be under the terms and conditions of +# this License, without any additional terms or conditions. +# Notwithstanding the above, nothing herein shall supersede or modify +# the terms of any separate license agreement you may have executed +# with Licensor regarding such Contributions. + +# 6. Trademarks. This License does not grant permission to use the trade +# names, trademarks, service marks, or product names of the Licensor, +# except as required for reasonable and customary use in describing the +# origin of the Work and reproducing the content of the NOTICE file. + +# 7. Disclaimer of Warranty. Unless required by applicable law or +# agreed to in writing, Licensor provides the Work (and each +# Contributor provides its Contributions) on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied, including, without limitation, any warranties or conditions +# of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A +# PARTICULAR PURPOSE. You are solely responsible for determining the +# appropriateness of using or redistributing the Work and assume any +# risks associated with Your exercise of permissions under this License. + +# 8. Limitation of Liability. In no event and under no legal theory, +# whether in tort (including negligence), contract, or otherwise, +# unless required by applicable law (such as deliberate and grossly +# negligent acts) or agreed to in writing, shall any Contributor be +# liable to You for damages, including any direct, indirect, special, +# incidental, or consequential damages of any character arising as a +# result of this License or out of the use or inability to use the +# Work (including but not limited to damages for loss of goodwill, +# work stoppage, computer failure or malfunction, or any and all +# other commercial damages or losses), even if such Contributor +# has been advised of the possibility of such damages. + +# 9. Accepting Warranty or Additional Liability. While redistributing +# the Work or Derivative Works thereof, You may choose to offer, +# and charge a fee for, acceptance of support, warranty, indemnity, +# or other liability obligations and/or rights consistent with this +# License. However, in accepting such obligations, You may act only +# on Your own behalf and on Your sole responsibility, not on behalf +# of any other Contributor, and only if You agree to indemnify, +# defend, and hold each Contributor harmless for any liability +# incurred by, or claims asserted against, such Contributor by reason +# of your accepting any such warranty or additional liability. + +# END OF TERMS AND CONDITIONS + +# Copyright (c) 2023 PENG Bo + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import argparse +from rwkv.model import RWKV + +# python convert_model.py --in '/fsx/BlinkDL/HF-MODEL/rwkv-4-pile-14b/RWKV-4-Pile-14B-20230313-ctx8192-test1050' --out 'fp16_RWKV-4-Pile-14B-20230313-ctx8192-test1050' --strategy 'cuda fp16' +# python convert_model.py --in '/fsx/BlinkDL/HF-MODEL/rwkv-4-pile-7b/RWKV-4-Pile-7B-20230109-ctx4096' --out 'fp16_RWKV-4-Pile-7B-20230109-ctx4096' --strategy 'cuda fp16' +# python convert_model.py --in '/fsx/BlinkDL/HF-MODEL/rwkv-4-pile-3b/RWKV-4-Pile-3B-20221110-ctx4096' --out 'fp16i8_and_fp16_RWKV-4-Pile-3B-20221110-ctx4096' --strategy 'cuda fp16i8 *10 -> cuda fp16' + + +def get_args(): + p = argparse.ArgumentParser( + prog="convert_model", + description="Convert RWKV model for faster loading and saves cpu RAM.", + ) + p.add_argument( + "--in", metavar="INPUT", help="Filename for input model.", required=True + ) + p.add_argument( + "--out", metavar="OUTPUT", help="Filename for output model.", required=True + ) + p.add_argument( + "--strategy", + help="Please quote the strategy as it contains spaces and special characters. See https://pypi.org/project/rwkv/ for strategy format definition.", + required=True, + ) + p.add_argument( + "--quiet", action="store_true", help="Suppress normal output, only show errors." + ) + return p.parse_args() + + +args = get_args() +if not args.quiet: + print(f"** {args}") + +RWKV( + getattr(args, "in"), + args.strategy, + verbose=not args.quiet, + convert_and_save_and_exit=args.out, +) diff --git a/backend-python/utils/torch.py b/backend-python/utils/torch.py index af2afe6..5b4ee69 100644 --- a/backend-python/utils/torch.py +++ b/backend-python/utils/torch.py @@ -3,7 +3,7 @@ import sysconfig def set_torch(): - torch_path = os.path.join(sysconfig.get_paths()["purelib"], "torch\\lib") + torch_path = os.path.join(sysconfig.get_paths()["purelib"], f"torch{os.sep}lib") paths = os.environ.get("PATH", "") if os.path.exists(torch_path): print(f"torch found: {torch_path}") diff --git a/frontend/src/components/RunButton.tsx b/frontend/src/components/RunButton.tsx index f88b38f..415e7b0 100644 --- a/frontend/src/components/RunButton.tsx +++ b/frontend/src/components/RunButton.tsx @@ -5,6 +5,8 @@ import {Button} from '@fluentui/react-components'; import {observer} from 'mobx-react-lite'; import {exit, readRoot, switchModel, updateConfig} from '../apis'; import {toast} from 'react-toastify'; +import manifest from '../../../manifest.json'; +import {getStrategy} from '../utils'; const mainButtonText = { [ModelStatus.Offline]: 'Run', @@ -39,11 +41,12 @@ const onClickMainButton = async () => { frequency_penalty: modelConfig.apiParameters.frequencyPenalty }); switchModel({ - model: `models\\${modelConfig.modelParameters.modelName}`, - strategy: commonStore.getStrategy(modelConfig) + model: `${manifest.localModelDir}/${modelConfig.modelParameters.modelName}`, + strategy: getStrategy(modelConfig) }).then((r) => { if (r.ok) { commonStore.setModelStatus(ModelStatus.Working); + toast('Startup Completed', {type: 'success'}); } else if (r.status === 304) { toast('Loading Model', {type: 'info'}); } else { diff --git a/frontend/src/pages/Configs.tsx b/frontend/src/pages/Configs.tsx index 000a7a8..b5a6591 100644 --- a/frontend/src/pages/Configs.tsx +++ b/frontend/src/pages/Configs.tsx @@ -13,6 +13,9 @@ import {Page} from '../components/Page'; import {useNavigate} from 'react-router'; import {RunButton} from '../components/RunButton'; import {updateConfig} from '../apis'; +import {ConvertModel} from '../../wailsjs/go/backend_golang/App'; +import manifest from '../../../manifest.json'; +import {getStrategy, refreshLocalModels} from '../utils'; export const Configs: FC = observer(() => { const [selectedIndex, setSelectedIndex] = React.useState(commonStore.currentModelConfigIndex); @@ -173,7 +176,18 @@ export const Configs: FC = observer(() => { }}/> }/> - + { + const modelPath = `${manifest.localModelDir}/${selectedConfig.modelParameters.modelName}`; + const strategy = getStrategy(selectedConfig); + const newModelPath = modelPath + '-' + strategy.replace(/[> *+]/g, '-'); + toast('Start Converting', {autoClose: 1000, type: 'info'}); + ConvertModel(modelPath, strategy, newModelPath).then(() => { + toast(`Convert Success - ${newModelPath}`, {type: 'success'}); + refreshLocalModels({models: commonStore.modelSourceList}); + }).catch(e => { + toast(`Convert Failed - ${e}`, {type: 'error'}); + }); + }}/> [] = [ createTableColumn({ @@ -106,13 +107,13 @@ const columns: TableColumnDefinition[] = [ { item.isLocal && } onClick={() => { - OpenFileFolder(`.\\${manifest.localModelPath}\\${item.name}`); + OpenFileFolder(`./${manifest.localModelDir}/${item.name}`); }}/> } {item.downloadUrl && !item.isLocal && } onClick={() => { toast(`Downloading ${item.name}`); - DownloadFile(`./${manifest.localModelPath}/${item.name}`, item.downloadUrl!); + DownloadFile(`./${manifest.localModelDir}/${item.name}`, item.downloadUrl!); }}/>} {item.url && } onClick={() => { BrowserOpenURL(item.url!); @@ -131,7 +132,9 @@ export const Models: FC = observer(() => {
Model Source Manifest List - }/> + } onClick={() => { + refreshModels(false); + }}/>
Provide JSON file URLs for the models manifest. Separate URLs with semicolons. The "models" @@ -146,6 +149,7 @@ export const Models: FC = observer(() => { items={commonStore.modelSourceList} columns={columns} sortable={true} + defaultSortState={{sortColumn: 'actions', sortDirection: 'ascending'}} style={{display: 'flex'}} className="flex-col w-full" > diff --git a/frontend/src/startup.ts b/frontend/src/startup.ts index 29359ed..171740b 100644 --- a/frontend/src/startup.ts +++ b/frontend/src/startup.ts @@ -1,18 +1,14 @@ -import commonStore, {defaultModelConfigs, ModelSourceItem} from './stores/commonStore'; -import {ListDirFiles, ReadJson, SaveJson} from '../wailsjs/go/backend_golang/App'; -import manifest from '../../manifest.json'; +import commonStore, {defaultModelConfigs} from './stores/commonStore'; +import {ReadJson} from '../wailsjs/go/backend_golang/App'; +import {LocalConfig, refreshModels} from './utils'; export async function startup() { initCache(); await initConfig(); } -type Cache = { - models: ModelSourceItem[] -} - async function initConfig() { - await ReadJson('config.json').then((configData) => { + await ReadJson('config.json').then((configData: LocalConfig) => { if (configData.modelSourceManifestList) commonStore.setModelSourceManifestList(configData.modelSourceManifestList); if (configData.modelConfigs && Array.isArray(configData.modelConfigs)) @@ -27,80 +23,5 @@ async function initConfig() { } async function initCache() { - let cache: Cache = {models: []}; - await ReadJson('cache.json').then((cacheData: Cache) => { - cache = cacheData; - }).catch( - async () => { - cache = {models: manifest.models}; - await SaveJson('cache.json', cache).catch(() => { - }); - } - ); - // built-in - commonStore.setModelSourceList(cache.models); - - await ListDirFiles(manifest.localModelPath).then((data) => { - cache.models.push(...data.flatMap(d => { - if (!d.isDir && d.name.endsWith('.pth')) - return [{ - name: d.name, - size: d.size, - lastUpdated: d.modTime, - isLocal: true - }]; - return []; - })); - }).catch(() => { - }); - - for (let i = 0; i < cache.models.length; i++) { - if (!cache.models[i].lastUpdatedMs) - cache.models[i].lastUpdatedMs = Date.parse(cache.models[i].lastUpdated); - - for (let j = i + 1; j < cache.models.length; j++) { - if (!cache.models[j].lastUpdatedMs) - cache.models[j].lastUpdatedMs = Date.parse(cache.models[j].lastUpdated); - - if (cache.models[i].name === cache.models[j].name) { - if (cache.models[i].size === cache.models[j].size) { - if (cache.models[i].lastUpdatedMs! < cache.models[j].lastUpdatedMs!) { - cache.models[i] = Object.assign({}, cache.models[i], cache.models[j]); - } else { - cache.models[i] = Object.assign({}, cache.models[j], cache.models[i]); - } - } // else is bad local file - cache.models.splice(j, 1); - j--; - } - } - } - // local files - commonStore.setModelSourceList(cache.models); - await SaveJson('cache.json', cache).catch(() => { - }); - - const manifestUrls = commonStore.modelSourceManifestList.split(/[,，;；\n]/); - const requests = manifestUrls.filter(url => url.endsWith('.json')).map( - url => fetch(url, {cache: 'no-cache'}).then(r => r.json())); - - await Promise.allSettled(requests) - .then((data: PromiseSettledResult[]) => { - cache.models.push(...data.flatMap(d => { - if (d.status === 'fulfilled') - return d.value.models; - return []; - })); - }) - .catch(() => { - }); - cache.models = cache.models.filter((model, index, self) => { - return model.name.endsWith('.pth') - && index === self.findIndex( - m => m.name === model.name || (m.SHA256 === model.SHA256 && m.size === model.size)); - }); - // remote files - commonStore.setModelSourceList(cache.models); - await SaveJson('cache.json', cache).catch(() => { - }); + await refreshModels(true); } \ No newline at end of file diff --git a/frontend/src/stores/commonStore.ts b/frontend/src/stores/commonStore.ts index aec52b3..9695744 100644 --- a/frontend/src/stores/commonStore.ts +++ b/frontend/src/stores/commonStore.ts @@ -1,5 +1,5 @@ import {makeAutoObservable} from 'mobx'; -import {SaveJson} from '../../wailsjs/go/backend_golang/App'; +import {saveConfigs} from '../utils'; export enum ModelStatus { Offline, @@ -83,28 +83,6 @@ class CommonStore { modelSourceManifestList: string = 'https://cdn.jsdelivr.net/gh/josstorer/RWKV-Runner/manifest.json;'; modelSourceList: ModelSourceItem[] = []; - async saveConfigs() { - await SaveJson('config.json', { - modelSourceManifestList: this.modelSourceManifestList, - currentModelConfigIndex: this.currentModelConfigIndex, - modelConfigs: this.modelConfigs - }); - } - - getStrategy(modelConfig: ModelConfig | undefined = undefined) { - let params: ModelParameters; - if (modelConfig) params = modelConfig.modelParameters; - else params = this.getCurrentModelConfig().modelParameters; - let strategy = ''; - strategy += (params.device === 'CPU' ? 'cpu' : 'cuda') + ' '; - strategy += (params.precision === 'fp16' ? 'fp16' : params.precision === 'int8' ? 'fp16i8' : 'fp32'); - if (params.storedLayers < params.maxStoredLayers) - strategy += ` *${params.storedLayers}+`; - if (params.enableHighPrecisionForLastLayer) - strategy += ' -> cpu fp32 *1'; - return strategy; - } - getCurrentModelConfig = () => { return this.modelConfigs[this.currentModelConfigIndex]; }; @@ -116,19 +94,19 @@ class CommonStore { setCurrentConfigIndex = (index: number, saveConfig: boolean = true) => { this.currentModelConfigIndex = index; if (saveConfig) - this.saveConfigs(); + saveConfigs(); }; setModelConfig = (index: number, config: ModelConfig, saveConfig: boolean = true) => { this.modelConfigs[index] = config; if (saveConfig) - this.saveConfigs(); + saveConfigs(); }; setModelConfigs = (configs: ModelConfig[], saveConfig: boolean = true) => { this.modelConfigs = configs; if (saveConfig) - this.saveConfigs(); + saveConfigs(); }; createModelConfig = (config: ModelConfig = defaultModelConfigs[0], saveConfig: boolean = true) => { @@ -136,7 +114,7 @@ class CommonStore { config.name = new Date().toLocaleString(); this.modelConfigs.push(config); if (saveConfig) - this.saveConfigs(); + saveConfigs(); }; deleteModelConfig = (index: number, saveConfig: boolean = true) => { @@ -151,7 +129,7 @@ class CommonStore { this.setCurrentConfigIndex(this.modelConfigs.length - 1); } if (saveConfig) - this.saveConfigs(); + saveConfigs(); }; setModelSourceManifestList = (value: string) => { diff --git a/frontend/src/utils/index.ts b/frontend/src/utils/index.ts new file mode 100644 index 0000000..52d5ad3 --- /dev/null +++ b/frontend/src/utils/index.ts @@ -0,0 +1,135 @@ +import {ListDirFiles, ReadJson, SaveJson} from '../../wailsjs/go/backend_golang/App'; +import manifest from '../../../manifest.json'; +import commonStore, {ModelConfig, ModelParameters, ModelSourceItem} from '../stores/commonStore'; + +export type Cache = { + models: ModelSourceItem[] +} + +export type LocalConfig = { + modelSourceManifestList: string + currentModelConfigIndex: number + modelConfigs: ModelConfig[] +} + +export async function refreshBuiltInModels(readCache: boolean = false) { + let cache: Cache = {models: []}; + if (readCache) + await ReadJson('cache.json').then((cacheData: Cache) => { + cache = cacheData; + }).catch( + async () => { + cache = {models: manifest.models}; + } + ); + else cache = {models: manifest.models}; + + commonStore.setModelSourceList(cache.models); + await saveCache().catch(() => { + }); + return cache; +} + +export async function refreshLocalModels(cache: Cache) { + cache.models = cache.models.filter(m => !m.isLocal); + + await ListDirFiles(manifest.localModelDir).then((data) => { + cache.models.push(...data.flatMap(d => { + if (!d.isDir && d.name.endsWith('.pth')) + return [{ + name: d.name, + size: d.size, + lastUpdated: d.modTime, + isLocal: true + }]; + return []; + })); + }).catch(() => { + }); + + for (let i = 0; i < cache.models.length; i++) { + if (!cache.models[i].lastUpdatedMs) + cache.models[i].lastUpdatedMs = Date.parse(cache.models[i].lastUpdated); + + for (let j = i + 1; j < cache.models.length; j++) { + if (!cache.models[j].lastUpdatedMs) + cache.models[j].lastUpdatedMs = Date.parse(cache.models[j].lastUpdated); + + if (cache.models[i].name === cache.models[j].name) { + if (cache.models[i].size === cache.models[j].size) { + if (cache.models[i].lastUpdatedMs! < cache.models[j].lastUpdatedMs!) { + cache.models[i] = Object.assign({}, cache.models[i], cache.models[j]); + } else { + cache.models[i] = Object.assign({}, cache.models[j], cache.models[i]); + } + } // else is bad local file + cache.models.splice(j, 1); + j--; + } + } + } + commonStore.setModelSourceList(cache.models); + await saveCache().catch(() => { + }); +} + +export async function refreshRemoteModels(cache: Cache) { + const manifestUrls = commonStore.modelSourceManifestList.split(/[,，;；\n]/); + const requests = manifestUrls.filter(url => url.endsWith('.json')).map( + url => fetch(url, {cache: 'no-cache'}).then(r => r.json())); + + await Promise.allSettled(requests) + .then((data: PromiseSettledResult[]) => { + cache.models.push(...data.flatMap(d => { + if (d.status === 'fulfilled') + return d.value.models; + return []; + })); + }) + .catch(() => { + }); + cache.models = cache.models.filter((model, index, self) => { + return model.name.endsWith('.pth') + && index === self.findIndex( + m => m.name === model.name || (m.SHA256 === model.SHA256 && m.size === model.size)); + }); + commonStore.setModelSourceList(cache.models); + await saveCache().catch(() => { + }); +} + +export const refreshModels = async (readCache: boolean = false) => { + const cache = await refreshBuiltInModels(readCache); + await refreshLocalModels(cache); + await refreshRemoteModels(cache); +}; + +export const getStrategy = (modelConfig: ModelConfig | undefined = undefined) => { + let params: ModelParameters; + if (modelConfig) params = modelConfig.modelParameters; + else params = commonStore.getCurrentModelConfig().modelParameters; + let strategy = ''; + strategy += (params.device === 'CPU' ? 'cpu' : 'cuda') + ' '; + strategy += (params.precision === 'fp16' ? 'fp16' : params.precision === 'int8' ? 'fp16i8' : 'fp32'); + if (params.storedLayers < params.maxStoredLayers) + strategy += ` *${params.storedLayers}+`; + if (params.enableHighPrecisionForLastLayer) + strategy += ' -> cpu fp32 *1'; + return strategy; +}; + +export const saveConfigs = async () => { + const data: LocalConfig = { + modelSourceManifestList: commonStore.modelSourceManifestList, + currentModelConfigIndex: commonStore.currentModelConfigIndex, + modelConfigs: commonStore.modelConfigs + }; + return SaveJson('config.json', data); +}; + +export const saveCache = async () => { + const data: Cache = { + models: commonStore.modelSourceList + }; + return SaveJson('cache.json', data); +}; \ No newline at end of file diff --git a/frontend/wailsjs/go/backend_golang/App.d.ts b/frontend/wailsjs/go/backend_golang/App.d.ts index ec0f035..3f3c108 100644 --- a/frontend/wailsjs/go/backend_golang/App.d.ts +++ b/frontend/wailsjs/go/backend_golang/App.d.ts @@ -2,6 +2,8 @@ // This file is automatically generated. DO NOT EDIT import {backend_golang} from '../models'; +export function ConvertModel(arg1:string,arg2:string,arg3:string):Promise; + export function DownloadFile(arg1:string,arg2:string):Promise; export function FileExists(arg1:string):Promise; diff --git a/frontend/wailsjs/go/backend_golang/App.js b/frontend/wailsjs/go/backend_golang/App.js index 51eb3ad..cb3b2d4 100644 --- a/frontend/wailsjs/go/backend_golang/App.js +++ b/frontend/wailsjs/go/backend_golang/App.js @@ -2,6 +2,10 @@ // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // This file is automatically generated. DO NOT EDIT +export function ConvertModel(arg1, arg2, arg3) { + return window['go']['backend_golang']['App']['ConvertModel'](arg1, arg2, arg3); +} + export function DownloadFile(arg1, arg2) { return window['go']['backend_golang']['App']['DownloadFile'](arg1, arg2); } diff --git a/manifest.json b/manifest.json index 2d24e73..316ba15 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "version": "1.0.0", - "localModelPath": "models", + "localModelDir": "models", "programFiles": [ { "url": "https://cdn.jsdelivr.net/gh/josstorer/RWKV-Runner/cmd-helper.bat", @@ -18,6 +18,10 @@ "url": "https://cdn.jsdelivr.net/gh/josstorer/RWKV-Runner/backend-python/global_var.py", "path": "backend-python/global_var.py" }, + { + "url": "https://cdn.jsdelivr.net/gh/josstorer/RWKV-Runner/backend-python/convert_model.py", + "path": "backend-python/convert_model.py" + }, { "url": "https://cdn.jsdelivr.net/gh/josstorer/RWKV-Runner/backend-python/routes/completion.py", "path": "backend-python/routes/completion.py"