From 94ca6fc64fa4398b61f1e2ff36a0e915132f235f Mon Sep 17 00:00:00 2001
From: Anchel135 <yakoveidelman1@gmail.com>
Date: Tue, 2 Sep 2025 19:08:12 +0300
Subject: [PATCH 1/9] commit

---
 app/templates/components/chat_header.j2 | 2 +-
 app/templates/components/chat_input.j2  | 2 +-
 app/ts/app.ts                           | 3 +--
 app/ts/modules/chat.ts                  | 5 +----
 app/ts/modules/graph_select.ts          | 4 ++++
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/templates/components/chat_header.j2 b/app/templates/components/chat_header.j2
index fa53cfe0..4fefff9b 100644
--- a/app/templates/components/chat_header.j2
+++ b/app/templates/components/chat_header.j2
@@ -3,7 +3,7 @@
     <img src="/static/icons/queryweaver.svg" alt="Chat Logo" class="logo">
     <h1>Natural Language to SQL Generator</h1>
     <div class="button-container">
-        <button class="action-button" id="graph-select-refresh">
+        <button class="action-button" id="graph-select-refresh" disabled>
             <svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
                 <path fill="none" stroke="currentColor" stroke-width="2"
                     d="M20,8 C18.5974037,5.04031171 15.536972,3 12,3 C7.02943725,3 3,7.02943725 3,12 C3,16.9705627 7.02943725,21 12,21 L12,21 C16.9705627,21 21,16.9705627 21,12 M21,3 L21,9 L15,9" />
diff --git a/app/templates/components/chat_input.j2 b/app/templates/components/chat_input.j2
index 67b1447e..5b5ad59f 100644
--- a/app/templates/components/chat_input.j2
+++ b/app/templates/components/chat_input.j2
@@ -1,7 +1,7 @@
 {# Chat input area with text input and action buttons #}
 <div class="chat-input">
     <div class="input-container" id="input-container">
-        <input type="text" id="message-input" placeholder="Describe the SQL query you want..." />
+        <input type="text" id="message-input" placeholder="Describe the SQL query you want..." disabled />
         <button class="input-button" title="Submit" id="submit-button">
             <svg width="54" height="54" viewBox="0 0 54 54" fill="none" xmlns="http://www.w3.org/2000/svg">
                 <!-- Rounded rectangle background -->
diff --git a/app/ts/app.ts b/app/ts/app.ts
index 838ef770..6a896ae1 100644
--- a/app/ts/app.ts
+++ b/app/ts/app.ts
@@ -84,8 +84,7 @@ function setupEventListeners() {
 
     if (!refreshButton) return;
 
-    if (!selected || selected === "Select Database")
-      return alert("Please select a database to refresh");
+    if (!selected || selected === "Select Database") return
 
     refreshButton.classList.add("loading");
 
diff --git a/app/ts/modules/chat.ts b/app/ts/modules/chat.ts
index ab684471..d74beb2c 100644
--- a/app/ts/modules/chat.ts
+++ b/app/ts/modules/chat.ts
@@ -11,10 +11,7 @@ export async function sendMessage() {
     if (!message) return;
 
     const selectedValue = getSelectedGraph() || '';
-    if (!selectedValue || selectedValue === "Select Database") {
-        addMessage('Please select a graph from the dropdown before sending a message.', "followup");
-        return;
-    }
+    if (!selectedValue || selectedValue === "Select Database") return
 
     if (state.currentRequestController) {
         state.currentRequestController.abort();
diff --git a/app/ts/modules/graph_select.ts b/app/ts/modules/graph_select.ts
index 4ad003e9..f76a23ba 100644
--- a/app/ts/modules/graph_select.ts
+++ b/app/ts/modules/graph_select.ts
@@ -43,6 +43,10 @@ export function addGraphOption(name: string, onSelect: (n: string) => void, onDe
     row.appendChild(delBtn);
 
     row.addEventListener('click', () => {
+        if (DOM.graphSelectRefresh && DOM.submitButton) {
+            DOM.graphSelectRefresh.disabled = false
+            DOM.submitButton.disabled = false
+        };
         setSelectedGraph(name);
         onSelect(name);
         optionsContainer.classList.remove('open');

From 9e07708c0816a816af41a6b59fd247906552e1e9 Mon Sep 17 00:00:00 2001
From: Anchel135 <yakoveidelman1@gmail.com>
Date: Tue, 2 Sep 2025 22:14:11 +0300
Subject: [PATCH 2/9] commit

---
 app/ts/modules/chat.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/ts/modules/chat.ts b/app/ts/modules/chat.ts
index d74beb2c..ef0c1dbc 100644
--- a/app/ts/modules/chat.ts
+++ b/app/ts/modules/chat.ts
@@ -17,7 +17,7 @@ export async function sendMessage() {
         state.currentRequestController.abort();
     }
 
-    addMessage(message, "user", (window as any).currentUser || null);
+    addMessage(message, "user", false, (window as any).currentUser || null);
     if (DOM.messageInput) DOM.messageInput.value = '';
 
     // Show typing indicator

From d17497d7178e7a32814bf4034362f296e2418201 Mon Sep 17 00:00:00 2001
From: Anchel135 <yakoveidelman1@gmail.com>
Date: Wed, 3 Sep 2025 11:54:13 +0300
Subject: [PATCH 3/9] commit

---
 app/public/css/buttons.css             | 11 +++++++++++
 app/public/css/chat-components.css     |  1 +
 app/public/icons/pause.svg             |  7 -------
 app/templates/components/chat_input.j2 | 17 ++++++++++++-----
 app/ts/app.ts                          | 14 +++++++++++++-
 app/ts/modules/chat.ts                 | 10 ++++++----
 app/ts/modules/graphs.ts               |  7 -------
 7 files changed, 43 insertions(+), 24 deletions(-)
 delete mode 100644 app/public/icons/pause.svg

diff --git a/app/public/css/buttons.css b/app/public/css/buttons.css
index b8c2d957..38cae150 100644
--- a/app/public/css/buttons.css
+++ b/app/public/css/buttons.css
@@ -2,6 +2,7 @@
 
 .input-button {
   background: var(--falkor-primary);
+  color: var(--text-primary);
   cursor: pointer;
   transition: all 0.2s ease;
   border: none;
@@ -15,6 +16,11 @@
   box-shadow: 0 2px 8px rgba(0,0,0,0.15);
 }
 
+.input-button:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
 .input-button img {
   filter: var(--icon-filter) brightness(0.8) saturate(0.3);
   width: 100%;
@@ -46,6 +52,11 @@
   position: relative;
 }
 
+.action-button:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
 .action-button:hover {
   box-shadow: 0 4px 12px rgba(0,0,0,0.25);
   background: var(--falkor-primary);
diff --git a/app/public/css/chat-components.css b/app/public/css/chat-components.css
index 4a62d761..54d4fac0 100644
--- a/app/public/css/chat-components.css
+++ b/app/public/css/chat-components.css
@@ -230,6 +230,7 @@
 
 #pause-button {
   display: none;
+  color: var(--text-primary);
 }
 
 #reset-button {
diff --git a/app/public/icons/pause.svg b/app/public/icons/pause.svg
deleted file mode 100644
index 57c2034f..00000000
--- a/app/public/icons/pause.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="54" height="54" viewBox="0 0 54 54" fill="none" xmlns="http://www.w3.org/2000/svg">
-<!-- Rounded rectangle background -->
-<rect x="2" y="2" width="50" height="50" rx="6" ry="6" fill="#FF66B3"/>
-<!-- Pause bars -->
-<rect x="18.6667" y="16" width="5.3333" height="21.3333" fill="white"/>
-<rect x="29.3333" y="16" width="5.3333" height="21.3333" fill="white"/>
-</svg>
diff --git a/app/templates/components/chat_input.j2 b/app/templates/components/chat_input.j2
index 5b5ad59f..6de0e5af 100644
--- a/app/templates/components/chat_input.j2
+++ b/app/templates/components/chat_input.j2
@@ -1,19 +1,26 @@
 {# Chat input area with text input and action buttons #}
 <div class="chat-input">
     <div class="input-container" id="input-container">
-        <input type="text" id="message-input" placeholder="Describe the SQL query you want..." disabled />
-        <button class="input-button" title="Submit" id="submit-button">
-            <svg width="54" height="54" viewBox="0 0 54 54" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <input type="text" id="message-input" placeholder="Describe the SQL query you want..." />
+        <button class="input-button" title="Submit" id="submit-button" disabled>
+            <svg width="54" height="54" viewBox="0 0 54 54" xmlns="http://www.w3.org/2000/svg">
                 <!-- Rounded rectangle background -->
                 <rect x="2" y="2" width="50" height="50" rx="6" ry="6" fill="none" />
                 <!-- Submit arrow icon -->
                 <path
                     d="M24.332 26.4667V35C24.332 35.7555 24.588 36.3893 25.1 36.9013C25.612 37.4133 26.2449 37.6684 26.9987 37.6667C27.7525 37.6649 28.3863 37.4089 28.9 36.8987C29.4138 36.3884 29.6689 35.7555 29.6654 35V26.4667L32.0654 28.8666C32.5543 29.3555 33.1765 29.6 33.932 29.6C34.6876 29.6 35.3098 29.3555 35.7987 28.8666C36.2876 28.3778 36.532 27.7555 36.532 27C36.532 26.2444 36.2876 25.6222 35.7987 25.1333L28.8654 18.2C28.332 17.6666 27.7098 17.4 26.9987 17.4C26.2876 17.4 25.6654 17.6666 25.132 18.2L18.1987 25.1333C17.7098 25.6222 17.4654 26.2444 17.4654 27C17.4654 27.7555 17.7098 28.3778 18.1987 28.8666C18.6876 29.3555 19.3098 29.6 20.0654 29.6C20.8209 29.6 21.4431 29.3555 21.932 28.8666L24.332 26.4667Z"
-                    fill="white" />
+                    fill="currentColor" />
             </svg>
         </button>
         <button class="input-button" title="Pause" id="pause-button">
-            <img src="/static/icons/pause.svg" alt="Pause">
+            <svg width="54" height="54" viewBox="0 0 54 54" xmlns="http://www.w3.org/2000/svg">
+                <!-- Rounded rectangle background -->
+                <rect x="2" y="2" width="50" height="50" rx="6" ry="6" fill="none" />
+                <!-- Pause bars -->
+                <rect x="18.6667" y="16" width="5.3333" height="21.3333" fill="currentColor" />
+                <rect x="29.3333" y="16" width="5.3333" height="21.3333" fill="currentColor" />
+            </svg>
+
         </button>
         <button id="reset-button" class="action-button" title="Reset session">
             <svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
diff --git a/app/ts/app.ts b/app/ts/app.ts
index 6a896ae1..b75e94a5 100644
--- a/app/ts/app.ts
+++ b/app/ts/app.ts
@@ -65,6 +65,18 @@ function setupEventListeners() {
     if ((e as KeyboardEvent).key === "Enter") sendMessage();
   });
 
+  DOM.messageInput?.addEventListener("input", () => {
+    const submitButton = DOM.submitButton;
+    const messageInput = DOM.messageInput;
+    if (!submitButton || !messageInput) return;
+    const selected = getSelectedGraph();
+    if (messageInput.value && selected && selected !== "Select database") {
+      submitButton.disabled = false;
+    } else {
+      submitButton.disabled = true;
+    }
+  });
+
   DOM.menuButton?.addEventListener("click", () =>
     toggleContainer(DOM.menuContainer as HTMLElement)
   );
@@ -84,7 +96,7 @@ function setupEventListeners() {
 
     if (!refreshButton) return;
 
-    if (!selected || selected === "Select Database") return
+    if (!selected || selected === "Select Database") return console.debug("No selected graph");
 
     refreshButton.classList.add("loading");
 
diff --git a/app/ts/modules/chat.ts b/app/ts/modules/chat.ts
index ef0c1dbc..21957224 100644
--- a/app/ts/modules/chat.ts
+++ b/app/ts/modules/chat.ts
@@ -8,10 +8,12 @@ import { getSelectedGraph } from './graph_select';
 
 export async function sendMessage() {
     const message = (DOM.messageInput?.value || '').trim();
+    
     if (!message) return;
 
-    const selectedValue = getSelectedGraph() || '';
-    if (!selectedValue || selectedValue === "Select Database") return
+    const selectedValue = getSelectedGraph();
+    
+    if (!selectedValue || selectedValue === "Select Database") return console.debug("No selected graph");
 
     if (state.currentRequestController) {
         state.currentRequestController.abort();
@@ -23,7 +25,7 @@ export async function sendMessage() {
     // 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.pauseButton) DOM.pauseButton.style.display = 'flex';
     if (DOM.newChatButton) DOM.newChatButton.disabled = true;
     addMessage('', "loading");
 
@@ -189,7 +191,7 @@ function handleQueryResult(step: any) {
 
 function resetUIState() {
     DOM.inputContainer?.classList.remove('loading');
-    if (DOM.submitButton) DOM.submitButton.style.display = 'block';
+    if (DOM.submitButton) DOM.submitButton.style.display = 'flex';
     if (DOM.pauseButton) DOM.pauseButton.style.display = 'none';
     if (DOM.newChatButton) DOM.newChatButton.disabled = false;
     removeLoadingMessage();
diff --git a/app/ts/modules/graphs.ts b/app/ts/modules/graphs.ts
index 6699e878..c2819150 100644
--- a/app/ts/modules/graphs.ts
+++ b/app/ts/modules/graphs.ts
@@ -121,13 +121,6 @@ export function loadGraphs() {
         console.warn("Custom graph dropdown not available", e);
       }
 
-      // custom dropdown is populated above via addGraphOption
-
-      if (DOM.messageInput) DOM.messageInput.disabled = false;
-      if (DOM.submitButton) DOM.submitButton.disabled = false;
-      if (DOM.messageInput)
-        DOM.messageInput.placeholder = "Describe the SQL query you want...";
-
       // Attach delete button handler if present
       const deleteBtn = document.getElementById("delete-graph-btn");
       if (deleteBtn) {

From d07801d72e0196734954fb8443c66775fe8cce4f Mon Sep 17 00:00:00 2001
From: Anchel135 <yakoveidelman1@gmail.com>
Date: Wed, 3 Sep 2025 12:05:34 +0300
Subject: [PATCH 4/9] commit

---
 app/templates/components/chat_header.j2 |  2 +-
 app/templates/components/chat_input.j2  |  2 +-
 app/ts/app.ts                           | 12 +++++--
 app/ts/modules/chat.ts                  |  6 +++-
 app/ts/modules/config.ts                |  2 +-
 app/ts/modules/input.ts                 | 45 +++++++++++++++++++++++++
 app/ts/modules/messages.ts              |  6 +++-
 7 files changed, 67 insertions(+), 8 deletions(-)
 create mode 100644 app/ts/modules/input.ts

diff --git a/app/templates/components/chat_header.j2 b/app/templates/components/chat_header.j2
index 4fefff9b..b7c73cc2 100644
--- a/app/templates/components/chat_header.j2
+++ b/app/templates/components/chat_header.j2
@@ -1,7 +1,7 @@
 {# Chat header with logo, title, and action buttons #}
 <div class="chat-header">
     <img src="/static/icons/queryweaver.svg" alt="Chat Logo" class="logo">
-    <h1>Natural Language to SQL Generator</h1>
+    <h1>Text-to-SQL for Enterprise Databases</h1>
     <div class="button-container">
         <button class="action-button" id="graph-select-refresh" disabled>
             <svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
diff --git a/app/templates/components/chat_input.j2 b/app/templates/components/chat_input.j2
index 6de0e5af..6c873157 100644
--- a/app/templates/components/chat_input.j2
+++ b/app/templates/components/chat_input.j2
@@ -1,7 +1,7 @@
 {# Chat input area with text input and action buttons #}
 <div class="chat-input">
     <div class="input-container" id="input-container">
-        <input type="text" id="message-input" placeholder="Describe the SQL query you want..." />
+        <textarea type="text" id="message-input" placeholder="Describe the SQL query you want..." rows="1"></textarea>
         <button class="input-button" title="Submit" id="submit-button" disabled>
             <svg width="54" height="54" viewBox="0 0 54 54" xmlns="http://www.w3.org/2000/svg">
                 <!-- Rounded rectangle background -->
diff --git a/app/ts/app.ts b/app/ts/app.ts
index b75e94a5..b7e5047f 100644
--- a/app/ts/app.ts
+++ b/app/ts/app.ts
@@ -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 { setupTextareaAutoResize } from "./modules/input";
 
 async function loadAndShowGraph(selected: string | undefined) {
   if (!selected) return;
@@ -61,8 +62,11 @@ function initializeApp() {
 function setupEventListeners() {
   DOM.submitButton?.addEventListener("click", sendMessage);
   DOM.pauseButton?.addEventListener("click", pauseRequest);
-  DOM.messageInput?.addEventListener("keypress", (e: KeyboardEvent) => {
-    if ((e as KeyboardEvent).key === "Enter") sendMessage();
+  DOM.messageInput?.addEventListener("keydown", (e: KeyboardEvent) => {
+    if ((e as KeyboardEvent).key === "Enter" && !e.shiftKey) {
+      e.preventDefault();
+      sendMessage();
+    }
   });
 
   DOM.messageInput?.addEventListener("input", () => {
@@ -96,7 +100,8 @@ function setupEventListeners() {
 
     if (!refreshButton) return;
 
-    if (!selected || selected === "Select Database") return console.debug("No selected graph");
+    if (!selected || selected === "Select Database")
+      return console.debug("No selected graph");
 
     refreshButton.classList.add("loading");
 
@@ -220,6 +225,7 @@ function setupUIComponents() {
   // initialize left toolbar behavior (burger, responsive default)
   initLeftToolbar();
   setupCustomDropdown();
+  setupTextareaAutoResize()
 }
 
 function loadInitialData() {
diff --git a/app/ts/modules/chat.ts b/app/ts/modules/chat.ts
index 21957224..347417e3 100644
--- a/app/ts/modules/chat.ts
+++ b/app/ts/modules/chat.ts
@@ -5,6 +5,7 @@
 import { DOM, state, MESSAGE_DELIMITER } from './config';
 import { addMessage, removeLoadingMessage, moveLoadingMessageToBottom } from './messages';
 import { getSelectedGraph } from './graph_select';
+import { adjustTextareaHeight } from './input';
 
 export async function sendMessage() {
     const message = (DOM.messageInput?.value || '').trim();
@@ -20,7 +21,10 @@ export async function sendMessage() {
     }
 
     addMessage(message, "user", false, (window as any).currentUser || null);
-    if (DOM.messageInput) DOM.messageInput.value = '';
+    if (DOM.messageInput) {
+        DOM.messageInput.value = '';
+        adjustTextareaHeight();
+    }
 
     // Show typing indicator
     DOM.inputContainer?.classList.add('loading');
diff --git a/app/ts/modules/config.ts b/app/ts/modules/config.ts
index 7717f096..d579f8c4 100644
--- a/app/ts/modules/config.ts
+++ b/app/ts/modules/config.ts
@@ -37,7 +37,7 @@ function getElement<T extends HTMLElement | null>(id: string): T {
 }
 
 export const DOM = {
-    messageInput: getElement<HTMLInputElement | null>('message-input'),
+    messageInput: getElement<HTMLTextAreaElement | null>('message-input'),
     submitButton: getElement<HTMLButtonElement | null>('submit-button'),
     pauseButton: getElement<HTMLButtonElement | null>('pause-button'),
     newChatButton: getElement<HTMLButtonElement | null>('reset-button'),
diff --git a/app/ts/modules/input.ts b/app/ts/modules/input.ts
new file mode 100644
index 00000000..4f47ec18
--- /dev/null
+++ b/app/ts/modules/input.ts
@@ -0,0 +1,45 @@
+/**
+ * Input handling module - textarea auto-resize functionality
+ */
+
+import { DOM } from "./config";
+
+export function adjustTextareaHeight() {
+  const textarea = DOM.messageInput;
+  if (!textarea) return;
+
+  // Reset height to auto to get the correct scrollHeight
+  textarea.style.height = "auto";
+
+  // Calculate the new height based on content
+  const scrollHeight = textarea.scrollHeight;
+  const maxHeight = parseInt(getComputedStyle(textarea).maxHeight);
+
+  if (scrollHeight <= maxHeight) {
+    // Content fits within max height, grow the textarea
+    textarea.style.height = scrollHeight + "px";
+    textarea.style.overflowY = "hidden";
+  } else {
+    // Content exceeds max height, set to max and enable scrolling
+    textarea.style.height = maxHeight + "px";
+    textarea.style.overflowY = "auto";
+  }
+}
+
+export function setupTextareaAutoResize() {
+  const textarea = DOM.messageInput;
+
+  if (!textarea) return;
+
+  // Adjust height on input
+  textarea.addEventListener("input", adjustTextareaHeight);
+
+  // Adjust height on paste
+  textarea.addEventListener("paste", () => {
+    // Use setTimeout to ensure the pasted content is processed
+    setTimeout(adjustTextareaHeight, 0);
+  });
+
+  // Initial adjustment in case there's pre-filled content
+  adjustTextareaHeight();
+}
diff --git a/app/ts/modules/messages.ts b/app/ts/modules/messages.ts
index c46ec226..238ca659 100644
--- a/app/ts/modules/messages.ts
+++ b/app/ts/modules/messages.ts
@@ -4,6 +4,7 @@
 
 import { DOM, state } from "./config";
 import { getSelectedGraph } from "./graph_select";
+import { adjustTextareaHeight } from "./input";
 
 export function addMessage(
   message: string,
@@ -176,7 +177,10 @@ export function formatBlock(text: string) {
 }
 
 export function initChat() {
-  if (DOM.messageInput) DOM.messageInput.value = "";
+  if (DOM.messageInput) {
+    DOM.messageInput.value = "";
+    adjustTextareaHeight();
+  }
   if (DOM.chatMessages) DOM.chatMessages.innerHTML = "";
   [DOM.confValue, DOM.expValue, DOM.missValue].forEach((element) => {
     if (element) element.innerHTML = "";

From c147f69b9048ad1b5733c140025600e93dee4b0c Mon Sep 17 00:00:00 2001
From: Anchel135 <yakoveidelman1@gmail.com>
Date: Wed, 3 Sep 2025 13:06:28 +0300
Subject: [PATCH 5/9] commit

---
 app/public/css/chat-components.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/public/css/chat-components.css b/app/public/css/chat-components.css
index 54d4fac0..91a1d976 100644
--- a/app/public/css/chat-components.css
+++ b/app/public/css/chat-components.css
@@ -89,7 +89,7 @@
 .final-result-message-container::before {
   height: 32px;
   width: 32px;
-  content: 'Bot';
+  content: 'QW';
   color: var(--text-secondary);
   display: flex;
   align-items: center;

From 361f7b05751c90b2399105dd8d1df9efd6439483 Mon Sep 17 00:00:00 2001
From: Gal Shubeli <galshubeli93@gmail.com>
Date: Wed, 3 Sep 2025 13:36:48 +0300
Subject: [PATCH 6/9] fixes-memory-nodes

---
 api/memory/graphiti_tool.py | 186 +++++++++++++++++++++++++++++++-----
 1 file changed, 164 insertions(+), 22 deletions(-)

diff --git a/api/memory/graphiti_tool.py b/api/memory/graphiti_tool.py
index 2b23d29e..3fe2a5ef 100644
--- a/api/memory/graphiti_tool.py
+++ b/api/memory/graphiti_tool.py
@@ -5,6 +5,7 @@
 # pylint: disable=all
 import asyncio
 import os
+import uuid
 from typing import List, Dict, Any, Optional
 from datetime import datetime
 
@@ -26,6 +27,22 @@
 from litellm import completion
 
 
+def extract_embedding_model_name(full_model_name: str) -> str:
+    """
+    Extract just the model name without provider prefix for Graphiti.
+    
+    Args:
+        full_model_name: Model name that may include provider prefix (e.g., "azure/text-embedding-ada-002")
+        
+    Returns:
+        Model name without prefix (e.g., "text-embedding-ada-002")
+    """
+    if "/" in full_model_name:
+        return full_model_name.split("/", 1)[1]  # Remove provider prefix
+    else:
+        return full_model_name
+
+
 class MemoryTool:
     """Memory management tool for handling user memories and interactions."""
 
@@ -43,10 +60,12 @@ def __init__(self, user_id: str, graph_id: str):
 
 
     @classmethod
-    async def create(cls, user_id: str, graph_id: str) -> "MemoryTool":
+    async def create(cls, user_id: str, graph_id: str, use_direct_entities: bool = True) -> "MemoryTool":
         """Async factory to construct and initialize the tool."""
         self = cls(user_id, graph_id)
-        await self._ensure_database_node(graph_id, user_id)
+
+        await self._ensure_entity_nodes_direct(user_id, graph_id)
+
 
         vector_size = Config.EMBEDDING_MODEL.get_vector_size()
         driver = self.graphiti_client.driver
@@ -128,6 +147,114 @@ async def _ensure_database_node(self, database_name: str, user_id: str) -> Optio
             print(f"Error creating database node for {database_name}: {e}")
             return None
 
+    async def _ensure_entity_nodes_direct(self, user_id: str, database_name: str) -> bool:
+        """
+        Ensure user and database entity nodes exist using direct Cypher queries.
+        This function creates Entity nodes similar to what Graphiti does but with hardcoded Cypher.
+        """
+        try:
+            graph_driver = self.graphiti_client.driver
+            
+            # Check if user entity node already exists
+            user_node_name = f"User {user_id}"
+            check_user_query = """
+                MATCH (n:Entity {name: $name})
+                RETURN n.uuid AS uuid
+                LIMIT 1
+            """
+            user_check_result = await graph_driver.execute_query(check_user_query, name=user_node_name)
+            
+            if not user_check_result[0]:  # If no records found, create user node
+                user_uuid = str(uuid.uuid4())
+                user_name_embedding = Config.EMBEDDING_MODEL.embed(user_node_name)[0]
+                
+                user_node_data = {
+                    'uuid': user_uuid,
+                    'name': user_node_name,
+                    'group_id': '\\_',
+                    'created_at': datetime.now().isoformat(),
+                    'summary': f'User {user_id} is using QueryWeaver',
+                    'name_embedding': user_name_embedding
+                }
+                
+                # Execute Cypher query for user entity node
+                user_cypher = """
+                    MERGE (n:Entity {uuid: $node.uuid})
+                    SET n = $node
+                    SET n.timestamp = timestamp()
+                    WITH n, $node AS node
+                    SET n.name_embedding = vecf32(node.name_embedding)
+                    RETURN n.uuid AS uuid
+                """
+                
+                await graph_driver.execute_query(user_cypher, node=user_node_data)
+                print(f"Created user entity node: {user_node_name} with UUID: {user_uuid}")
+            else:
+                print(f"User entity node already exists: {user_node_name}")
+            
+            # Check if database entity node already exists
+            database_node_name = f"Database {database_name}"
+            check_database_query = """
+                MATCH (n:Entity {name: $name})
+                RETURN n.uuid AS uuid
+                LIMIT 1
+            """
+            database_check_result = await graph_driver.execute_query(check_database_query, name=database_node_name)
+            
+            if not database_check_result[0]:  # If no records found, create database node
+                database_uuid = str(uuid.uuid4())
+                database_name_embedding = Config.EMBEDDING_MODEL.embed(database_node_name)[0]
+                
+                database_node_data = {
+                    'uuid': database_uuid,
+                    'name': database_node_name,
+                    'group_id': '\\_',
+                    'created_at': datetime.now().isoformat(),
+                    'summary': f'Database {database_name} available for querying by user {user_id}',
+                    'name_embedding': database_name_embedding
+                }
+                
+                # Execute Cypher query for database entity node
+                database_cypher = """
+                    MERGE (n:Entity {uuid: $node.uuid})
+                    SET n = $node
+                    SET n.timestamp = timestamp()
+                    WITH n, $node AS node
+                    SET n.name_embedding = vecf32(node.name_embedding)
+                    RETURN n.uuid AS uuid
+                """
+                
+                await graph_driver.execute_query(database_cypher, node=database_node_data)
+                print(f"Created database entity node: {database_node_name} with UUID: {database_uuid}")
+            else:
+                print(f"Database entity node already exists: {database_node_name}")
+            
+            # Create HAS_DATABASE relationship between user and database entities
+            try:
+                relationship_query = """
+                    MATCH (user:Entity {name: $user_name})
+                    MATCH (db:Entity {name: $database_name})
+                    MERGE (user)-[r:HAS_DATABASE]->(db)
+                    RETURN r
+                """
+                
+                await graph_driver.execute_query(
+                    relationship_query, 
+                    user_name=user_node_name,
+                    database_name=database_node_name
+                )
+                print(f"Created HAS_DATABASE relationship between {user_node_name} and {database_node_name}")
+                
+            except Exception as rel_error:
+                print(f"Error creating HAS_DATABASE relationship: {rel_error}")
+                # Don't fail the entire function if relationship creation fails
+            
+            return True
+            
+        except Exception as e:
+            print(f"Error creating entity nodes directly for user {user_id} and database {database_name}: {e}")
+            return False
+
     async def add_new_memory(self, conversation: Dict[str, Any]) -> bool:
         # Use LLM to analyze and summarize the conversation with focus on graph-oriented database facts
         analysis = await self.summarize_conversation(conversation)
@@ -177,26 +304,24 @@ async def save_query_memory(self, query: str, sql_query: str, success: bool, err
         """
         try:
             database_name = self.graph_id
-            
-            # Find the database node
             database_node_name = f"Database {database_name}"
-            node_search_config = NODE_HYBRID_SEARCH_RRF.model_copy(deep=True)
-            node_search_config.limit = 1
+            graph_driver = self.graphiti_client.driver
             
-            database_node_results = await self.graphiti_client.search_(
-                query=database_node_name,
-                config=node_search_config,
-            )
+            # Find the database node using direct Cypher query
+            find_database_query = """
+                MATCH (n:Entity {name: $name})
+                RETURN n.uuid AS uuid
+                LIMIT 1
+            """
+            
+            database_result = await graph_driver.execute_query(find_database_query, name=database_node_name)
             
             # Check if database node exists
-            database_node_exists = False
-            for node in database_node_results.nodes:
-                if node.name == database_node_name:
-                    database_node_exists = True
-                    database_node_uuid = node.uuid
-                    break
-            if not database_node_exists:
+            if not database_result[0]:  # If no records found
+                print(f"Database entity node {database_node_name} not found")
                 return False
+            
+            database_node_uuid = database_result[0][0]['uuid']
 
             # Check if Query node with same user_query and sql_query already exists
             relationship_type = "SUCCESS" if success else "FAILED"
@@ -238,7 +363,7 @@ async def save_query_memory(self, query: str, sql_query: str, success: bool, err
             CREATE (db)-[:{relationship_type} {{timestamp: timestamp()}}]->(q)
             RETURN q.uuid as query_uuid
             """
-            
+
             # Execute the Cypher query through Graphiti's graph driver
             try:
                 result = await graph_driver.execute_query(cypher_query, embedding=embeddings)
@@ -598,7 +723,10 @@ def __init__(self):
         self.endpoint = os.getenv('AZURE_API_BASE') 
         self.api_version = os.getenv('AZURE_API_VERSION', '2024-02-01')
         self.model_choice = "gpt-4.1"  # Use the model name directly
-        self.embedding_model = "text-embedding-ada-002"  # Use model name, not deployment
+        
+        # Extract just the model name without provider prefix for Graphiti
+        self.embedding_model = extract_embedding_model_name(Config.EMBEDDING_MODEL_NAME)
+            
         self.small_model = os.getenv('AZURE_SMALL_MODEL', 'gpt-4o-mini')
         
         # Use model names directly instead of deployment names
@@ -652,7 +780,10 @@ def create_graphiti_client(falkor_driver: FalkorDriver) -> Graphiti:
             graph_driver=falkor_driver,
             llm_client=OpenAIClient(config=azure_llm_config, client=llm_client_azure),
             embedder=OpenAIEmbedder(
-                config=OpenAIEmbedderConfig(embedding_model=config.embedding_deployment),
+                config=OpenAIEmbedderConfig(
+                    embedding_model=config.embedding_deployment,
+                    embedding_dim=1536
+                ),
                 client=embedding_client_azure,
             ),
             cross_encoder=OpenAIRerankerClient(
@@ -662,8 +793,19 @@ def create_graphiti_client(falkor_driver: FalkorDriver) -> Graphiti:
                 client=llm_client_azure,
             ),
         )
-    else:  # Fallback to default OpenAI config
-        graphiti_client = Graphiti(graph_driver=falkor_driver)
+    else:  # Fallback to default OpenAI config but use Config's embedding model
+        # Extract just the model name without provider prefix for Graphiti
+        embedding_model_name = extract_embedding_model_name(Config.EMBEDDING_MODEL_NAME)
+            
+        graphiti_client = Graphiti(
+            graph_driver=falkor_driver,
+            embedder=OpenAIEmbedder(
+                config=OpenAIEmbedderConfig(
+                    embedding_model=embedding_model_name,
+                    embedding_dim=1536
+                )
+            ),
+        )
 
     return graphiti_client
 

From dfad26d9fefdb2a26e5542b9f4f5fd48338357cc Mon Sep 17 00:00:00 2001
From: Anchel135 <yakoveidelman1@gmail.com>
Date: Wed, 3 Sep 2025 13:52:04 +0300
Subject: [PATCH 7/9] commit

---
 app/public/css/menu.css                 | 9 ++++-----
 app/templates/components/chat_header.j2 | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/public/css/menu.css b/app/public/css/menu.css
index 30ce1c76..b96ade43 100644
--- a/app/public/css/menu.css
+++ b/app/public/css/menu.css
@@ -202,12 +202,11 @@
   transition: border-color 0.2s;
   min-width: 180px;
   appearance: none;
-  background-image: linear-gradient(45deg, transparent 50%, var(--text-secondary) 50%),
-    linear-gradient(135deg, var(--text-secondary) 50%, transparent 50%);
-  background-position: calc(100% - 20px) center, calc(100% - 15px) center;
-  background-size: 5px 5px, 5px 5px;
-  background-repeat: no-repeat;
   cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 4px;
 }
 
 #open-pg-modal {
diff --git a/app/templates/components/chat_header.j2 b/app/templates/components/chat_header.j2
index b7c73cc2..16673395 100644
--- a/app/templates/components/chat_header.j2
+++ b/app/templates/components/chat_header.j2
@@ -22,7 +22,8 @@
         <input title="Upload Schema" id="schema-upload" type="file" accept=".json" style="display: none;" tabindex="-1"
             disabled />
         <label for="schema-upload" id="custom-file-upload">
-            Upload Schema
+            <span>Upload Schema</span>
+            <span class="dropdown-arrow">▼</span>
         </label>
         <div class="vertical-separator"></div>
         <button class="connect-database-btn header-button">Connect Database</button>

From 0b1049094a695f796119ad62794c0d01ac6aaabe Mon Sep 17 00:00:00 2001
From: Anchel135 <yakoveidelman1@gmail.com>
Date: Wed, 3 Sep 2025 14:16:38 +0300
Subject: [PATCH 8/9] commit

---
 app/templates/components/chat_header.j2    | 2 +-
 app/templates/components/database_modal.j2 | 6 +++---
 app/ts/app.ts                              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/templates/components/chat_header.j2 b/app/templates/components/chat_header.j2
index 16673395..dbdfc829 100644
--- a/app/templates/components/chat_header.j2
+++ b/app/templates/components/chat_header.j2
@@ -11,7 +11,7 @@
         </button>
         <div id="graph-custom-dropdown" class="graph-custom-dropdown">
             <div id="graph-selected" class="graph-selected dropdown-selected" title="Select Database">
-                <span class="dropdown-text">Select database</span>
+                <span class="dropdown-text">Select Database</span>
                 <span class="dropdown-arrow">▼</span>
             </div>
             <div id="graph-options" class="graph-options dropdown-options" aria-hidden="true"></div>
diff --git a/app/templates/components/database_modal.j2 b/app/templates/components/database_modal.j2
index ba7c383a..8d08ccac 100644
--- a/app/templates/components/database_modal.j2
+++ b/app/templates/components/database_modal.j2
@@ -6,12 +6,12 @@
         <!-- Database type selector (custom dropdown with icons) -->
         <div class="custom-dropdown" id="database-type-dropdown">
             <div class="dropdown-selected" title="Select Database Type">
-                <span class="dropdown-text">-- Select database --</span>
+                <span class="dropdown-text">-- Select Database --</span>
                 <span class="dropdown-arrow">▼</span>
             </div>
             <div class="dropdown-options" id="database-dropdown-options">
                 <div class="dropdown-option" data-value="">
-                    <span>-- Select database --</span>
+                    <span>-- Select Database --</span>
                 </div>
                 <div class="dropdown-option" data-value="postgresql">
                     <img src="/static/icons/postgresql.svg" alt="PostgreSQL" class="db-icon"/>
@@ -25,7 +25,7 @@
             <input type="hidden" id="database-type-select" name="database-type" value="">
         </div>
 
-        <input type="text" id="db-url-input" class="db-modal-input" placeholder="Select database type first..." disabled />
+        <input type="text" id="db-url-input" class="db-modal-input" placeholder="Select Database type first..." disabled />
         <div id="db-url-example" style="font-size: 0.9em; color: #666; margin-top:6px; text-align:center"></div>
 
         <!-- Connection progress steps will appear here -->
diff --git a/app/ts/app.ts b/app/ts/app.ts
index b7e5047f..ed60fdf7 100644
--- a/app/ts/app.ts
+++ b/app/ts/app.ts
@@ -74,7 +74,7 @@ function setupEventListeners() {
     const messageInput = DOM.messageInput;
     if (!submitButton || !messageInput) return;
     const selected = getSelectedGraph();
-    if (messageInput.value && selected && selected !== "Select database") {
+    if (messageInput.value && selected && selected !== "Select Database") {
       submitButton.disabled = false;
     } else {
       submitButton.disabled = true;

From b1692da14d9c5fd2d5b1b0794d93860faf3040ea Mon Sep 17 00:00:00 2001
From: Gal Shubeli <galshubeli93@gmail.com>
Date: Wed, 3 Sep 2025 14:28:40 +0300
Subject: [PATCH 9/9] fix

---
 app/ts/app.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/ts/app.ts b/app/ts/app.ts
index ed60fdf7..3f4702c2 100644
--- a/app/ts/app.ts
+++ b/app/ts/app.ts
@@ -225,7 +225,7 @@ function setupUIComponents() {
   // initialize left toolbar behavior (burger, responsive default)
   initLeftToolbar();
   setupCustomDropdown();
-  setupTextareaAutoResize()
+  setupTextareaAutoResize();
 }
 
 function loadInitialData() {