updatePlatform(set ? "OpenAI" : null)}
/>
{ saveSettingTrigger ? "Settings Saved!" : "Save Settings" }
diff --git a/src/utils/general_settings.js b/src/utils/general_settings.js
index 4910a62..b8fc1c5 100644
--- a/src/utils/general_settings.js
+++ b/src/utils/general_settings.js
@@ -2,7 +2,9 @@ const PLATFORM_SETTINGS_KEY = 'platform-settings'
const DEFAULT_PLATFORM_SETTINGS = {
enabled_platform: null,
// aws
- aws_model_id: '', aws_region: ''
+ aws_model_id: '', aws_region: '',
+ // openai
+ openai_model: ''
}
const MODEL_SETTINGS_KEY = 'general-model-settings'
@@ -12,7 +14,7 @@ const DEFAULT_MODEL_SETTINGS = {
temperature: 0.7
}
-function getSettings(key, default_settings) {
+function loadSettings(key, default_settings) {
const setting = localStorage.getItem(key);
if(!setting) {
localStorage.setItem(key, JSON.stringify(default_settings))
@@ -20,22 +22,33 @@ function getSettings(key, default_settings) {
return setting ? JSON.parse(setting) : default_settings;
}
-function updateSettings(key, settings, default_settings) {
- localStorage.setItem(key, JSON.stringify({...default_settings, ...settings}));
-}
+// =============================================================
+// MODEL
+// =============================================================
-export function getPlatformSettings() {
- return getSettings(PLATFORM_SETTINGS_KEY, DEFAULT_PLATFORM_SETTINGS);
+let model_settings = loadSettings(MODEL_SETTINGS_KEY, DEFAULT_MODEL_SETTINGS);
+
+export function getModelSettings() {
+ return model_settings;
}
-export function updatePlatformSettings(settings) {
- updateSettings(PLATFORM_SETTINGS_KEY, settings, DEFAULT_PLATFORM_SETTINGS);
+export function updateModelSettings(settings) {
+ model_settings = { ...model_settings, ...settings };
+ localStorage.setItem(MODEL_SETTINGS_KEY, JSON.stringify(model_settings));
}
-export function getModelSettings() {
- return getSettings(MODEL_SETTINGS_KEY, DEFAULT_MODEL_SETTINGS);
+
+// =============================================================
+// PLATFORM
+// =============================================================
+
+let platform_settings = loadSettings(PLATFORM_SETTINGS_KEY, DEFAULT_PLATFORM_SETTINGS);
+
+export function getPlatformSettings() {
+ return platform_settings;
}
-export function updateModelSettings(settings) {
- updateSettings(MODEL_SETTINGS_KEY, settings, DEFAULT_MODEL_SETTINGS);
+export function updatePlatformSettings(settings) {
+ platform_settings = { ...platform_settings, ...settings }
+ localStorage.setItem(PLATFORM_SETTINGS_KEY, JSON.stringify(platform_settings));
}
\ No newline at end of file
diff --git a/src/utils/workers/aws-worker.js b/src/utils/workers/aws-worker.js
index 1e9c148..1248e43 100644
--- a/src/utils/workers/aws-worker.js
+++ b/src/utils/workers/aws-worker.js
@@ -16,10 +16,8 @@ export async function getCredentials(json_credentials = null) {
return obj
}
-export async function storeCredentials(credentials, all_filled, enabled = false) {
- const update_result = await instance.updateByID('credentials', 'AWS', {json: credentials})
- if(all_filled && enabled) await initBedrockClient();
- return !!update_result
+export async function storeCredentials(credentials) {
+ return !!(await instance.updateByID('credentials', 'AWS', {json: credentials}))
}
export async function getJSONCredentials() {
@@ -34,7 +32,7 @@ export async function getJSONCredentials() {
let bedrock_client = null;
export async function setClient(client) {
- if(!client) {
+ if(!client || !(client instanceof BedrockRuntimeClient)) {
await initBedrockClient();
return bedrock_client;
} else {
@@ -153,7 +151,12 @@ export async function chatCompletions(messages, cb = null) {
if(system.length) input.system = system;
let response_text = '', usage = {}
- abort_signal = false;
+ if(abort_signal) {
+ abort_signal = false;
+ cb && cb('', true);
+ return null;
+ }
+
try {
const command = new ConverseStreamCommand(input);
const response = await bedrock_client.send(command);
@@ -168,11 +171,12 @@ export async function chatCompletions(messages, cb = null) {
if(abort_signal) break;
}
cb && cb(response_text, true);
- abort_signal = false;
} catch(error) {
console.error(error);
cb && cb(`**${error.name}**:\n\`\`\`\n${error.message}\n\`\`\``, true);
return null;
+ } finally {
+ abort_signal = false;
}
return { content: response_text, usage };
diff --git a/src/utils/workers/index.js b/src/utils/workers/index.js
index cb32bcb..df30481 100644
--- a/src/utils/workers/index.js
+++ b/src/utils/workers/index.js
@@ -1,12 +1,13 @@
import { getPlatformSettings } from "../general_settings";
import { chatCompletions as WllamaCompletions, abortCompletion as WllamaAbort } from "./worker";
import { chatCompletions as AwsCompletions, abortCompletion as AwsAbort } from "./aws-worker"
+import { chatCompletions as OpenaiCompletions, abortCompletion as OpenaiAbort } from "./openai-worker";
/**
* @typedef CompletionFunctions
* @property {Function} completions
* @property {Function} abort
- * @property {"Wllama" | "AWS"} platform
+ * @property {"Wllama" | "AWS" | "OpenAI"} platform
*/
/**
@@ -19,6 +20,8 @@ export function getCompletionFunctions() {
switch(platform_settings.enabled_platform ) {
case 'AWS':
return { completions: AwsCompletions, abort: AwsAbort, platform: "AWS" }
+ case 'OpenAI':
+ return { completions: OpenaiCompletions, abort: OpenaiAbort, platform: "OpenAI"}
default:
return { completions: WllamaCompletions, abort: WllamaAbort, platform: "Wllama" }
}
diff --git a/src/utils/workers/openai-worker.js b/src/utils/workers/openai-worker.js
new file mode 100644
index 0000000..0eb0c26
--- /dev/null
+++ b/src/utils/workers/openai-worker.js
@@ -0,0 +1,112 @@
+import OpenAI from 'openai';
+import {instance} from '../idb'
+import { getPlatformSettings } from '../general_settings';
+
+/**
+ * @type {OpenAI?}
+ */
+let openai_client = null;
+
+let abort_signal = false;
+
+export async function getCredentials() {
+ const record = await instance.getByID('credentials', 'OpenAI', ['json']);
+ if(!record) return null;
+ return record.json;
+}
+
+export async function storeCredentials(credentials) {
+ return !!(await instance.updateByID('credentials', 'OpenAI', {json: credentials}))
+}
+
+async function initOpenAIClient() {
+ const credentials = await getCredentials();
+ if(!credentials) return false;
+ openai_client = new OpenAI({
+ apiKey: credentials.api_key,
+ dangerouslyAllowBrowser: true
+ })
+ return true;
+}
+
+export async function setClient(client) {
+ if(!client || !(client instanceof OpenAI)) {
+ await initOpenAIClient();
+ return openai_client;
+ } else {
+ openai_client = client;
+ return null;
+ }
+}
+
+/**
+ * @typedef Message
+ * @property {"user"|"assistant"|"system"} role Sender
+ * @property {String} content Message content
+ */
+
+/**
+ * @typedef UsageObj
+ * @property {Number} inputTokens
+ * @property {Number} outputTokens
+ * @property {Number} totalTokens
+ */
+
+/**
+ * @typedef CompletionResponse
+ * @property { String } content Content of response
+ * @property { UsageObj } usage
+ */
+
+/**
+ * @callback CompletionCallback
+ * @param {String} text Whole text message been generated from start
+ * @param {Boolean} is_finished Specify is response finished or not
+ */
+
+/**
+ * Do completion use aws settings
+ * @param {Message[]} messages Messages you need to send
+ * @param {CompletionCallback} cb Callback function
+ * @returns { Promise }
+ */
+export async function chatCompletions(messages, cb = null) {
+ if(!openai_client && !(await initOpenAIClient())) return;
+
+ const { openai_model:model } = getPlatformSettings();
+
+ if(abort_signal) {
+ abort_signal = false;
+ cb && cb('', true);
+ return null;
+ }
+
+ let response_text = '', usage = {};
+ try {
+ const stream = await openai_client.chat.completions.create({
+ model, stream: true, stream_options: { include_usage: true },
+ messages
+ })
+
+ for await (const chunk of stream) {
+ const delta = chunk.choices[0].delta
+ response_text += delta.content || ''
+ cb && cb(response_text, false);
+ if(chunk.usage) usage = chunk.usage;
+ if(chunk.choices[0].finish_reason) break;
+ if(abort_signal) break;
+ }
+ } catch(error) {
+ console.error(error);
+ cb && cb(`**${error.name}**:\n\`\`\`\n${error.message}\n\`\`\``, true);
+ return null;
+ } finally {
+ abort_signal = false;
+ }
+
+ return { content: response_text, usage }
+}
+
+export function abortCompletion() {
+ abort_signal = true;
+}
\ No newline at end of file