Skip to content

Fix #158 fix query result #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Naseem77 merged 7 commits into from
Sep 2, 2025
Merged

Fix #158 fix query result #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
96a13fb
fix query result
Anchel123 Sep 1, 2025
f24ec68
Merge branch 'fix-schema' into fix-query-result
Anchel123 Sep 1, 2025
35341c5
Merge remote-tracking branch 'origin/staging' into fix-query-result
Anchel123 Sep 1, 2025
4467058
Merge branch 'staging' into fix-query-result
Naseem77 Sep 2, 2025
75b231c
Merge branch 'staging' into fix-query-result
Anchel123 Sep 2, 2025
4b1d65a
Update .env.example
Anchel123 Sep 2, 2025
84699d2
Merge branch 'staging' into fix-query-result
Naseem77 Sep 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion app/public/css/menu.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,24 @@
border-color: var(--text-secondary);
}

#query-final-result-table {
border-collapse: collapse;
}

#query-final-result-table th,
#query-final-result-table td {
padding: 4px 8px;
}

#query-final-result-table th:not(:first-child),
#query-final-result-table td:not(:first-child) {
border-left: 1px solid var(--text-primary);
}

#query-final-result-table td {
border-top: 1px solid var(--text-primary);
}

#graph-select {
height: 100%;
padding: 8px 12px;
Expand Down Expand Up @@ -143,7 +161,7 @@
#schema-content {
position: relative;
width: 100%;
height: 100%;
height: 100%;
}

#schema-controls {
Expand Down
1 change: 1 addition & 0 deletions app/ts/app.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { setupAuthenticationModal, setupDatabaseModal } from './modules/modals';
import { resizeGraph, showGraph } from './modules/schema';
import { setupTokenManagement } from './modules/tokens';
import { initLeftToolbar } from './modules/left_toolbar';
import { resizeGraph } from './modules/schema';

async function loadAndShowGraph(selected: string | undefined) {
if (!selected) return;
Expand Down
41 changes: 21 additions & 20 deletions app/ts/modules/chat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ export async function sendMessage() {

const selectedValue = getSelectedGraph() || '';
if (!selectedValue) {
addMessage('Please select a graph from the dropdown before sending a message.', false, true);
addMessage('Please select a graph from the dropdown before sending a message.', "followup");
return;
}

if (state.currentRequestController) {
state.currentRequestController.abort();
}

addMessage(message, true, false, false, false, (window as any).currentUser || null);
addMessage(message, "user", (window as any).currentUser || null);
if (DOM.messageInput) DOM.messageInput.value = '';

// Show typing indicator
DOM.inputContainer?.classList.add('loading');
if (DOM.submitButton) DOM.submitButton.style.display = 'none';
if (DOM.pauseButton) DOM.pauseButton.style.display = 'block';
if (DOM.newChatButton) DOM.newChatButton.disabled = true;
addMessage('', false, false, false, true);
addMessage('', "loading");

[DOM.confValue, DOM.expValue, DOM.missValue, DOM.ambValue].forEach((element) => {
if (element) element.innerHTML = '';
Expand Down Expand Up @@ -62,7 +62,7 @@ export async function sendMessage() {
} else {
console.error('Error:', error);
resetUIState();
addMessage('Sorry, there was an error processing your message: ' + (error.message || String(error)), false);
addMessage('Sorry, there was an error processing your message: ' + (error.message || String(error)));
}
state.currentRequestController = null;
}
Expand All @@ -80,9 +80,9 @@ async function processStreamingResponse(response: Response) {
if (buffer.trim()) {
try {
const step = JSON.parse(buffer);
addMessage(step.message || JSON.stringify(step), false);
addMessage(step.message || JSON.stringify(step));
} catch {
addMessage(buffer, false);
addMessage(buffer);
}
}
break;
Expand All @@ -102,7 +102,7 @@ async function processStreamingResponse(response: Response) {
const step = JSON.parse(message);
handleStreamMessage(step);
} catch {
addMessage('Failed: ' + message, false);
addMessage('Failed: ' + message);
}
}
}
Expand All @@ -115,7 +115,7 @@ function handleStreamMessage(step: any) {
}

if (step.type === 'reasoning_step') {
addMessage(step.message, false);
addMessage(step.message);
moveLoadingMessageToBottom();
} else if (step.type === 'final_result') {
handleFinalResult(step);
Expand All @@ -124,13 +124,13 @@ function handleStreamMessage(step: any) {
} else if (step.type === 'query_result') {
handleQueryResult(step);
} else if (step.type === 'ai_response') {
addMessage(step.message, false, false, true);
addMessage(step.message, "final-result");
} else if (step.type === 'destructive_confirmation') {
addDestructiveConfirmationMessage(step);
} else if (step.type === 'operation_cancelled') {
addMessage(step.message, false, true);
addMessage(step.message, "followup");
} else {
addMessage(step.message || JSON.stringify(step), false);
addMessage(step.message || JSON.stringify(step));
}

if (step.type !== 'reasoning_step') {
Expand Down Expand Up @@ -166,9 +166,9 @@ function handleFinalResult(step: any) {

const message = step.message || JSON.stringify(step.data, null, 2);
if (step.is_valid) {
addMessage(message, false, false, true);
addMessage(message, "final-result");
} else {
addMessage("Sorry, we couldn't generate a valid SQL query. Please try rephrasing your question or add more details. For help, check the explanation window.", false, true);
addMessage("Sorry, we couldn't generate a valid SQL query. Please try rephrasing your question or add more details. For help, check the explanation window.", "followup");
}
}

Expand All @@ -177,14 +177,15 @@ function handleFollowupQuestions(step: any) {
if (DOM.confValue) DOM.confValue.textContent = 'N/A';
if (DOM.missValue) DOM.missValue.textContent = 'N/A';
if (DOM.ambValue) DOM.ambValue.textContent = 'N/A';
addMessage(step.message, false, true);
addMessage(step.message, "followup");
}

function handleQueryResult(step: any) {
if (step.data) {
addMessage(`Query Result: ${JSON.stringify(step.data)}`, false, false, true);
console.log(step.data);
addMessage("Query Result", "query-final-result", null, step.data);
} else {
addMessage('No results found for the query.', false);
addMessage('No results found for the query.');
}
}
Comment thread
Anchel123 marked this conversation as resolved.

Expand All @@ -202,7 +203,7 @@ export function pauseRequest() {
state.currentRequestController = null;

resetUIState();
addMessage('Request was paused by user.', false, true);
addMessage('Request was paused by user.', "followup");
}
}

Expand Down Expand Up @@ -255,10 +256,10 @@ export async function handleDestructiveConfirmation(confirmation: string, sqlQue
if (DOM.messageInput) DOM.messageInput.disabled = false;
if (DOM.submitButton) DOM.submitButton.disabled = false;

addMessage(`User choice: ${confirmation}`, true, false, false, false, (window as any).currentUser || null);
addMessage(`User choice: ${confirmation}`, "user", (window as any).currentUser || null);

if (confirmation === 'CANCEL') {
addMessage('Operation cancelled. The destructive SQL query was not executed.', false, true);
addMessage('Operation cancelled. The destructive SQL query was not executed.', "followup");
return;
}

Expand All @@ -282,7 +283,7 @@ export async function handleDestructiveConfirmation(confirmation: string, sqlQue
await processStreamingResponse(response);
} catch (error: any) {
console.error('Error:', error);
addMessage('Sorry, there was an error processing the confirmation: ' + (error.message || String(error)), false);
addMessage('Sorry, there was an error processing the confirmation: ' + (error.message || String(error)));
}
}

Expand Down
Loading