fix: fetch models and abort

longy2k · Jul 8, 2024 · 2046596 · 2046596
1 parent d76b987
commit 2046596
Show file tree

Hide file tree

Showing 13 changed files with 985 additions and 264 deletions.
diff --git a/src/components/BMOCodeBlockProcessor.ts b/src/components/BMOCodeBlockProcessor.ts
@@ -141,7 +141,7 @@ export function bmoCodeBlockProcessor(plugin: Plugin, settings: BMOSettings) {
                 }
                 button.textContent = 'Generate';
                 loaderCircle.style.display = 'none';
-                bmoGenerationNotice.textContent = 'Cancelled.';
+                bmoGenerationNotice.textContent = 'Aborted.';
                 bmoGenerationNotice.style.color = '#ff6666';
                 bmoGenerationNotice.style.display = 'inline';
                 setTimeout(() => {
@@ -176,13 +176,10 @@ export function bmoCodeBlockProcessor(plugin: Plugin, settings: BMOSettings) {
                 } else if (settings.APIConnections.googleGemini.geminiModels.includes(modelName)) {
                     modelResponse = await fetchGoogleGeminiDataEditor(settings, prompt, modelName, temperature, maxTokens, signal) || contentToRender;
                 } else if (settings.APIConnections.mistral.mistralModels.includes(modelName)) {
-                    button.disabled = true;
                     modelResponse = await fetchMistralDataEditor(settings, prompt, modelName, temperature, maxTokens, signal) || contentToRender;
                 } else if (settings.APIConnections.openAI.openAIBaseModels.includes(modelName)) {
-                    button.disabled = true;
                     modelResponse = await fetchOpenAIBaseAPIResponseEditor(settings, prompt, modelName, temperature, maxTokens, signal) || contentToRender;
                 } else if (settings.APIConnections.openRouter.openRouterModels.includes(modelName)) {
-                    button.disabled = true;
                     modelResponse = await fetchOpenRouterEditor(settings, prompt, modelName, temperature, maxTokens, signal) || contentToRender;
                 } else {
                     bmoGenerationNotice.textContent = 'Model not found.';
@@ -238,7 +235,7 @@ export function bmoCodeBlockProcessor(plugin: Plugin, settings: BMOSettings) {
 
             } catch (error) {
                 if (error.name === 'AbortError') {
-                    console.log('Generation aborted');
+                    console.log('BMO Generate Aborted.');
                     button.textContent = 'Generate';
                     loaderCircle.style.display = 'none';
                     bmoGenerationNotice.textContent = 'Aborted.';

diff --git a/src/components/FetchModelEditor.ts b/src/components/FetchModelEditor.ts
@@ -1,9 +1,7 @@
 import { requestUrl } from 'obsidian';
 import { BMOSettings } from 'src/main';
-import OpenAI from 'openai';
 
-// Request response from Ollama
-// NOTE: Abort does not work for requestUrl
+// Request response from Ollama REST API URL (editor)
 export async function fetchOllamaResponseEditor(settings: BMOSettings, prompt: string, model?: string, temperature?: string, maxTokens?: string, signal?: AbortSignal) {
     const ollamaRESTAPIURL = settings.OllamaConnection.RESTAPIURL;
 
@@ -41,7 +39,7 @@ export async function fetchOllamaResponseEditor(settings: BMOSettings, prompt: s
             },
             body: JSON.stringify({
                 model: model || settings.general.model,
-                system: settings.editor.prompt_select_generate_system_role,
+                system: settings.editor.systen_role,
                 prompt: prompt,
                 images: imagesVaultPath,
                 stream: false,
@@ -79,7 +77,7 @@ export async function fetchRESTAPIURLDataEditor(settings: BMOSettings, prompt: s
             body: JSON.stringify({
                 model: model || settings.general.model,
                 messages: [
-                    { role: 'system', content: settings.editor.prompt_select_generate_system_role || 'You are a helpful assistant.' },
+                    { role: 'system', content: settings.editor.systen_role || 'You are a helpful assistant.' },
                     { role: 'user', content: prompt }
                 ],
                 max_tokens: parseInt(maxTokens || settings.general.max_tokens || '-1'),
@@ -115,7 +113,7 @@ export async function fetchAnthropicResponseEditor(settings: BMOSettings, prompt
             },
             body: JSON.stringify({
                 model: model || settings.general.model,
-                system: settings.editor.prompt_select_generate_system_role,
+                system: settings.editor.systen_role,
                 messages: [
                     { role: 'user', content: prompt}
                 ],
@@ -134,7 +132,6 @@ export async function fetchAnthropicResponseEditor(settings: BMOSettings, prompt
 
 // Fetch Google Gemini API Editor
 export async function fetchGoogleGeminiDataEditor(settings: BMOSettings, prompt: string, model?: string, temperature?: string, maxTokens?: string, signal?: AbortSignal) {
-    console.log(prompt);
     try {
         const response = await fetch(`https://generativelanguage.googleapis.com/v1beta/models/gemini-pro:generateContent?key=${settings.APIConnections.googleGemini.APIKey}`, {
             method: 'POST',
@@ -145,7 +142,7 @@ export async function fetchGoogleGeminiDataEditor(settings: BMOSettings, prompt:
                 contents: [
                     {
                         parts: [
-                            { text: settings.editor.prompt_select_generate_system_role + prompt }
+                            { text: settings.editor.systen_role + prompt }
                         ]
                     }
                 ],
@@ -169,25 +166,26 @@ export async function fetchGoogleGeminiDataEditor(settings: BMOSettings, prompt:
 // Fetch Mistral API Editor
 export async function fetchMistralDataEditor(settings: BMOSettings, prompt: string, model?: string, temperature?: string, maxTokens?: string, signal?: AbortSignal) {
     try {
-        const response = await requestUrl({
-            url: 'https://api.mistral.ai/v1/chat/completions',
+        const response = await fetch('https://api.mistral.ai/v1/chat/completions', {
             method: 'POST',
             headers: {
-                'Content-Type': 'application/json',
-                'Authorization': `Bearer ${settings.APIConnections.mistral.APIKey}`
+              'Content-Type': 'application/json',
+              'Authorization': `Bearer ${settings.APIConnections.mistral.APIKey}`
             },
             body: JSON.stringify({
-                model: model || settings.general.model,
-                messages: [
-                    { role: 'system', content: settings.editor.prompt_select_generate_system_role },
-                    { role: 'user', content: prompt}
-                ],
-                max_tokens: parseInt(maxTokens || settings.general.max_tokens),
-                temperature: parseInt(temperature || settings.general.temperature),
+              model: model || settings.general.model,
+              messages: [
+                { role: 'system', content: settings.editor.systen_role },
+                { role: 'user', content: prompt }
+              ],
+              max_tokens: parseInt(maxTokens || settings.general.max_tokens),
+              temperature: parseInt(temperature || settings.general.temperature),
             }),
+            signal: signal,
         });
-
-        const message = response.json.choices[0].message.content.trim();
+
+        const data = await response.json();
+        const message = data.choices[0].message.content.trim();
         return message;
 
     } catch (error) {
@@ -197,32 +195,34 @@ export async function fetchMistralDataEditor(settings: BMOSettings, prompt: stri
 
 // Fetch OpenAI-Based API Editor
 export async function fetchOpenAIBaseAPIResponseEditor(settings: BMOSettings, prompt: string, model?: string, temperature?: string, maxTokens?: string, signal?: AbortSignal) {
-    const openai = new OpenAI({
-        apiKey: settings.APIConnections.openAI.APIKey,
-        baseURL: settings.APIConnections.openAI.openAIBaseUrl,
-        dangerouslyAllowBrowser: true, // apiKey is stored within data.json
-    });
-
-    const completion = await openai.chat.completions.create({
-        model: model ||settings.general.model,
-        max_tokens: parseInt(maxTokens || settings.general.max_tokens),
-        temperature: parseInt(temperature || settings.general.temperature),
-        messages: [
-            { role: 'system', content: settings.editor.prompt_select_generate_system_role },
+    const response = await fetch('https://api.openai.com/v1/chat/completions', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Authorization': `Bearer ${settings.APIConnections.openAI.APIKey}`,
+        },
+        body: JSON.stringify({
+          model: model || settings.general.model,
+          max_tokens: parseInt(maxTokens || settings.general.max_tokens),
+          temperature: parseInt(temperature || settings.general.temperature),
+          stream: false,
+          messages: [
+            { role: 'system', content: settings.editor.systen_role },
             { role: 'user', content: prompt}
         ],
+        }),
+        signal: signal,
     });
-
-
-    const message = completion.choices[0].message.content?.trim();
+      
+    const data = await response.json();
+    const message = data.choices[0].message.content || '';
     return message;
 }
 
 // Request response from openai-based rest api url (editor)
 export async function fetchOpenRouterEditor(settings: BMOSettings, prompt: string, model?: string, temperature?: string, maxTokens?: string, signal?: AbortSignal) {
     try {
-        const response = await requestUrl({
-            url: 'https://openrouter.ai/api/v1/chat/completions',
+        const response = await fetch('https://openrouter.ai/api/v1/chat/completions', {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
@@ -231,15 +231,17 @@ export async function fetchOpenRouterEditor(settings: BMOSettings, prompt: strin
             body: JSON.stringify({
                 model: model || settings.general.model,
                 messages: [
-                    { role: 'system', content: settings.editor.prompt_select_generate_system_role },
+                    { role: 'system', content: settings.editor.systen_role },
                     { role: 'user', content: prompt}
                 ],
                 max_tokens: parseInt(maxTokens || settings.general.max_tokens),
                 temperature: parseInt(temperature || settings.general.temperature),
             }),
+            signal: signal,
         });
-
-        const message = response.json.choices[0].message.content.trim();
+
+        const data = await response.json();
+        const message = data.choices[0].message.content.trim();
         return message;
 
     } catch (error) {

diff --git a/src/components/FetchModelList.ts b/src/components/FetchModelList.ts
@@ -108,6 +108,7 @@ export async function fetchMistralModels(plugin: BMOGPT) {
         if (response.json && response.json.data) {
             const models = response.json.data.map((model: { id: number; }) => model.id);
             plugin.settings.APIConnections.mistral.mistralModels = models;
+            console.log(models);
             return models;
         }
     } catch (error) {