diff --git a/extensions/engine-management-extension/src/index.ts b/extensions/engine-management-extension/src/index.ts index 34195c8cc..331bf6531 100644 --- a/extensions/engine-management-extension/src/index.ts +++ b/extensions/engine-management-extension/src/index.ts @@ -39,8 +39,8 @@ export default class JanEngineManagementExtension extends EngineManagementExtens prefixUrl: API_URL, headers: apiKey ? { - Authorization: `Bearer ${apiKey}`, - } + Authorization: `Bearer ${apiKey}`, + } : {}, retry: 10, }) @@ -51,7 +51,7 @@ export default class JanEngineManagementExtension extends EngineManagementExtens */ async onLoad() { // Update default local engine - this.updateDefaultEngine() + // this.updateDefaultEngine() // Migrate this.migrate() @@ -60,12 +60,13 @@ export default class JanEngineManagementExtension extends EngineManagementExtens /** * Called when the extension is unloaded. */ - onUnload() {} + onUnload() { } /** * @returns A Promise that resolves to an object of list engines. */ async getEngines(): Promise { + return {} return this.apiInstance().then((api) => api .get('v1/engines') @@ -94,6 +95,7 @@ export default class JanEngineManagementExtension extends EngineManagementExtens * @returns A Promise that resolves to an array of installed engine. */ async getInstalledEngines(name: string): Promise { + return [] return this.apiInstance().then((api) => api .get(`v1/engines/${name}`) @@ -223,7 +225,7 @@ export default class JanEngineManagementExtension extends EngineManagementExtens }, }) .then((e) => e) - .then(() => {}) + .then(() => { }) ) } @@ -346,7 +348,7 @@ export default class JanEngineManagementExtension extends EngineManagementExtens events.emit(EngineEvent.OnEngineUpdate, {}) await Promise.all( DEFAULT_REMOTE_MODELS.map((data: Model) => - this.addRemoteModel(data).catch(() => {}) + this.addRemoteModel(data).catch(() => { }) ) ) events.emit(ModelEvent.OnModelsUpdate, { fetch: true }) diff --git a/extensions/llamacpp-extension/src/index.ts b/extensions/llamacpp-extension/src/index.ts index 92ddf6b3b..327e55c0e 100644 --- a/extensions/llamacpp-extension/src/index.ts +++ b/extensions/llamacpp-extension/src/index.ts @@ -23,7 +23,7 @@ import { } from '@janhq/core' import { invoke } from '@tauri-apps/api/core' -import { createHmac } from 'crypto' +// import { createHmac } from 'crypto' type LlamacppConfig = { n_gpu_layers: number; @@ -131,8 +131,9 @@ export default class llamacpp_extension extends AIEngine { } private generateApiKey(modelId: string): string { - const hash = createHmac('sha256', this.apiSecret).update(modelId).digest("base64") - return hash + return '' + // const hash = createHmac('sha256', this.apiSecret).update(modelId).digest("base64") + // return hash } // Implement the required LocalProvider interface methods diff --git a/extensions/model-extension/src/index.ts b/extensions/model-extension/src/index.ts index 669051114..3f2f06ff2 100644 --- a/extensions/model-extension/src/index.ts +++ b/extensions/model-extension/src/index.ts @@ -46,8 +46,8 @@ export default class JanModelExtension extends ModelExtension { prefixUrl: CORTEX_API_URL, headers: apiKey ? { - Authorization: `Bearer ${apiKey}`, - } + Authorization: `Bearer ${apiKey}`, + } : {}, retry: 10, }) @@ -87,7 +87,7 @@ export default class JanModelExtension extends ModelExtension { * Called when the extension is unloaded. * @override */ - async onUnload() {} + async onUnload() { } // BEGIN: - Public API /** @@ -192,12 +192,12 @@ export default class JanModelExtension extends ModelExtension { model.sources?.[0]?.url.startsWith('http') || !(await fs.existsSync(model.sources?.[0]?.url)) ? await joinPath([ - await dirName(model.file_path), - model.sources?.[0]?.filename ?? - model.settings?.llama_model_path ?? - model.sources?.[0]?.url.split('/').pop() ?? - model.id, - ]) // Copied models + await dirName(model.file_path), + model.sources?.[0]?.filename ?? + model.settings?.llama_model_path ?? + model.sources?.[0]?.url.split('/').pop() ?? + model.id, + ]) // Copied models : model.sources?.[0]?.url, // Symlink models, model.name ) @@ -288,6 +288,7 @@ export default class JanModelExtension extends ModelExtension { * @param model */ async getSources(): Promise { + return [] const sources = await this.apiInstance() .then((api) => api.get('v1/models/sources').json>()) .then((e) => (typeof e === 'object' ? (e.data as ModelSource[]) : [])) @@ -304,6 +305,7 @@ export default class JanModelExtension extends ModelExtension { * @param model */ async addSource(source: string): Promise { + return return this.apiInstance().then((api) => api.post('v1/models/sources', { json: { @@ -353,6 +355,7 @@ export default class JanModelExtension extends ModelExtension { * @returns */ async fetchModels(): Promise { + return [] return this.apiInstance() .then((api) => api.get('v1/models?limit=-1').json>()) .then((e) => @@ -393,7 +396,7 @@ export default class JanModelExtension extends ModelExtension { [key: string]: any }): Promise { return this.apiInstance() - .then((api) => api.patch('v1/configs', { json: body }).then(() => {})) + .then((api) => api.patch('v1/configs', { json: body }).then(() => { })) .catch((e) => console.debug(e)) } @@ -401,6 +404,7 @@ export default class JanModelExtension extends ModelExtension { * Fetch models from cortex.so */ fetchModelsHub = async () => { + return const models = await this.fetchModels() defaultModelSources.forEach((model) => { diff --git a/src-tauri/src/core/utils/extensions/inference_llamacpp_extension/server.rs b/src-tauri/src/core/utils/extensions/inference_llamacpp_extension/server.rs index c223670c6..2f520b314 100644 --- a/src-tauri/src/core/utils/extensions/inference_llamacpp_extension/server.rs +++ b/src-tauri/src/core/utils/extensions/inference_llamacpp_extension/server.rs @@ -87,7 +87,7 @@ pub async fn load_llama_model( let mut command = Command::new(server_path); let model_path = args[2].replace("-m", ""); - let api_key = args[1].replace("--api-key", "") + let api_key = args[1].replace("--api-key", ""); command.args(args); // Optional: Redirect stdio if needed (e.g., for logging within Jan)