From 2d0f0d107c9d79809bfa6d305d21c20a8925d415 Mon Sep 17 00:00:00 2001 From: Akhilesh Airen Date: Wed, 11 Mar 2026 17:24:08 +0530 Subject: [PATCH 1/2] schema change for custom endpoints --- src/common/js/scl-app.js | 64 +++++++++++++++++++++++++++------- src/index.html | 9 +++++ src/public/js/sqlite-worker.js | 2 +- 3 files changed, 61 insertions(+), 14 deletions(-) diff --git a/src/common/js/scl-app.js b/src/common/js/scl-app.js index 5e63aa4..cdfecf4 100644 --- a/src/common/js/scl-app.js +++ b/src/common/js/scl-app.js @@ -52,6 +52,7 @@ const ENABLE_SQL_AUTOCOMPLETE = true; const TEXT_TO_SQL_PROVIDER_DEFAULT = 'chatgpt'; const TEXT_TO_SQL_MODEL_DEFAULT = 'gpt-4o-mini'; const TEXT_TO_SQL_CUSTOM_ENDPOINT_DEFAULT = ''; +const TEXT_TO_SQL_CUSTOM_AUTH_TYPE_DEFAULT = 'Bearer'; const SQL_KEYWORDS = [ 'SELECT', 'FROM', @@ -298,6 +299,7 @@ const textToSqlProviderInput = $('#text-to-sql-provider-input'); const textToSqlModelInput = $('#text-to-sql-model-input'); const textToSqlApiKeyInput = $('#text-to-sql-api-key-input'); const textToSqlCustomEndpointInput = $('#text-to-sql-custom-endpoint-input'); +const textToSqlCustomAuthTypeInput = $('#text-to-sql-custom-auth-type-input'); const textToSqlCustomEndpointGroup = $('#text-to-sql-custom-endpoint-group'); const saveSettingsBtn = $('#save-settings-btn'); const settingsModal = $('#settingsModal'); @@ -565,6 +567,13 @@ function resolveCustomTextToSqlEndpoint(settings) { return rawEndpoint; } +function resolveCustomTextToSqlAuthType(settings) { + const rawAuthType = ( + settings?.textToSqlCustomAuthType || TEXT_TO_SQL_CUSTOM_AUTH_TYPE_DEFAULT + ).trim(); + return rawAuthType || TEXT_TO_SQL_CUSTOM_AUTH_TYPE_DEFAULT; +} + function handleTextToSqlHttpError(response, bodyText) { const msg = bodyText || `${response.status} ${response.statusText}`; throw new Error(`Text-to-SQL request failed: ${msg}`); @@ -583,7 +592,8 @@ async function requestChatGptSql({ apiKey, model, finalPrompt }) { messages: [ { role: 'system', - content: 'You are a SQLite SQL generator. Return only SQL.', + content: + 'You are a SQLite SQL generator. Use "," for cross joins. Do not use aliases unless necessary. Return only SQL.', }, { role: 'user', @@ -612,7 +622,8 @@ async function requestClaudeSql({ apiKey, model, finalPrompt }) { model, max_tokens: 1024, temperature: 0, - system: 'You are a SQLite SQL generator. Return only SQL.', + system: + 'You are a SQLite SQL generator. Use "," for cross joins. Do not use aliases unless necessary. Return only SQL.', messages: [{ role: 'user', content: finalPrompt }], }), }); @@ -637,6 +648,14 @@ async function requestGeminiSql({ apiKey, model, finalPrompt }) { temperature: 0, }, contents: [ + { + role: 'system', + parts: [ + { + text: 'You are a SQLite SQL generator. Use "," for cross joins. Do not use aliases unless necessary. Return only SQL.', + }, + ], + }, { role: 'user', parts: [{ text: finalPrompt }], @@ -652,19 +671,32 @@ async function requestGeminiSql({ apiKey, model, finalPrompt }) { return data?.candidates?.[0]?.content?.parts?.[0]?.text || ''; } -async function requestCustomSql({ endpoint, apiKey, model, promptText, schema }) { +async function requestCustomSql({ endpoint, authType, apiKey, model, finalPrompt }) { + const headers = { + 'Content-Type': 'application/json', + }; + if (authType === 'Bearer') { + headers['Authorization'] = `Bearer ${apiKey}`; + } else if (authType) { + headers[authType] = `${apiKey}`; + } const response = await fetch(endpoint, { method: 'POST', - headers: { - 'Content-Type': 'application/json', - Authorization: `Bearer ${apiKey}`, - 'x-api-key': apiKey, - }, + headers, body: JSON.stringify({ - prompt: promptText, - dialect: 'sqlite', - schema, model, + temperature: 0, + messages: [ + { + role: 'system', + content: + 'You are a SQLite SQL generator. Use "," for cross joins. Do not use aliases unless necessary. Return only SQL.', + }, + { + role: 'user', + content: finalPrompt, + }, + ], }), }); @@ -705,12 +737,13 @@ async function generateSqlFromPrompt(promptText) { generatedRaw = await requestGeminiSql({ apiKey, model, finalPrompt }); } else if (provider === 'custom') { const customEndpoint = resolveCustomTextToSqlEndpoint(settings); + const customAuthType = resolveCustomTextToSqlAuthType(settings); const customResponse = await requestCustomSql({ endpoint: customEndpoint, + authType: customAuthType, apiKey, model, - promptText, - schema, + finalPrompt, }); generatedRaw = extractGeneratedSql(customResponse); } else { @@ -1491,6 +1524,8 @@ function bindEvents() { textToSqlModelInput.value = settings.textToSqlModel || TEXT_TO_SQL_MODEL_DEFAULT; textToSqlApiKeyInput.value = settings.textToSqlApiKey || ''; textToSqlCustomEndpointInput.value = settings.textToSqlCustomEndpoint || ''; + textToSqlCustomAuthTypeInput.value = + settings.textToSqlCustomAuthType || TEXT_TO_SQL_CUSTOM_AUTH_TYPE_DEFAULT; toggleCustomEndpointField(); }); } @@ -1516,6 +1551,9 @@ function bindEvents() { textToSqlModel: textToSqlModelInput.value.trim(), textToSqlApiKey: textToSqlApiKeyInput.value.trim(), textToSqlCustomEndpoint: customEndpoint, + textToSqlCustomAuthType: + (textToSqlCustomAuthTypeInput?.value || TEXT_TO_SQL_CUSTOM_AUTH_TYPE_DEFAULT).trim() || + TEXT_TO_SQL_CUSTOM_AUTH_TYPE_DEFAULT, }); // Close modal via Bootstrap const modal = window.bootstrap.Modal.getInstance(settingsModal); diff --git a/src/index.html b/src/index.html index 1d79cfa..dc5e711 100644 --- a/src/index.html +++ b/src/index.html @@ -369,6 +369,15 @@ id="text-to-sql-custom-endpoint-input" placeholder="https://openrouter.ai/api/v1/chat/completions" /> + +
diff --git a/src/public/js/sqlite-worker.js b/src/public/js/sqlite-worker.js index 86691de..5ab119e 100644 --- a/src/public/js/sqlite-worker.js +++ b/src/public/js/sqlite-worker.js @@ -5,7 +5,7 @@ * It imports sqlite-wasm from /sqlite-wasm/ which is copied from node_modules. */ -import sqlite3InitModule from './sqlite-wasm/index.mjs'; +import sqlite3InitModule from '../sqlite-wasm/index.mjs'; let sqlite3 = null; let db = null; From ed87b25635a8aa3e1c21bc1fb126487e9d51361b Mon Sep 17 00:00:00 2001 From: Akhilesh Airen Date: Wed, 11 Mar 2026 17:52:36 +0530 Subject: [PATCH 2/2] updated code and made changes as per codeRabbit --- src/common/js/scl-app.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/common/js/scl-app.js b/src/common/js/scl-app.js index cdfecf4..e590f90 100644 --- a/src/common/js/scl-app.js +++ b/src/common/js/scl-app.js @@ -517,6 +517,8 @@ async function buildSchemaContext() { function extractGeneratedSql(response) { if (!response) return ''; if (typeof response === 'string') return response.trim(); + const chatContent = response?.choices?.[0]?.message?.content; + if (typeof chatContent === 'string') return chatContent.trim(); if (typeof response.sql === 'string') return response.sql.trim(); if (typeof response.query === 'string') return response.query.trim(); if (response.data && typeof response.data.sql === 'string') return response.data.sql.trim(); @@ -571,7 +573,8 @@ function resolveCustomTextToSqlAuthType(settings) { const rawAuthType = ( settings?.textToSqlCustomAuthType || TEXT_TO_SQL_CUSTOM_AUTH_TYPE_DEFAULT ).trim(); - return rawAuthType || TEXT_TO_SQL_CUSTOM_AUTH_TYPE_DEFAULT; + if (!rawAuthType) return TEXT_TO_SQL_CUSTOM_AUTH_TYPE_DEFAULT; + return rawAuthType.toLowerCase() === 'bearer' ? 'Bearer' : rawAuthType; } function handleTextToSqlHttpError(response, bodyText) { @@ -638,24 +641,21 @@ async function requestClaudeSql({ apiKey, model, finalPrompt }) { async function requestGeminiSql({ apiKey, model, finalPrompt }) { const endpoint = `https://generativelanguage.googleapis.com/v1beta/models/${encodeURIComponent(model)}:generateContent?key=${encodeURIComponent(apiKey)}`; + const systemPrompt = + 'You are a SQLite SQL generator. Use "," for cross joins. Do not use aliases unless necessary. Return only SQL.'; const response = await fetch(endpoint, { method: 'POST', headers: { 'Content-Type': 'application/json', }, body: JSON.stringify({ + systemInstruction: { + parts: [{ text: systemPrompt }], + }, generationConfig: { temperature: 0, }, contents: [ - { - role: 'system', - parts: [ - { - text: 'You are a SQLite SQL generator. Use "," for cross joins. Do not use aliases unless necessary. Return only SQL.', - }, - ], - }, { role: 'user', parts: [{ text: finalPrompt }],