Merge branch 'llm-382' into wip

Author: nuwangeek

DSL/Ruuter.private/rag-search/POST/prompt-configuration/save.yml

@@ -15,6 +15,12 @@ declaration:
 extract_request_data:
   assign:
     prompt: ${incoming.body.prompt ?? ""}
+  next: initialize_results
+
+initialize_results:
+  assign:
+    update_result: null
+    insert_result: null
   next: get_existing_prompt
 
 get_existing_prompt:

GUI/src/components/FormElements/FormTextarea/index.tsx

@@ -67,6 +67,7 @@ const FormTextarea = forwardRef<HTMLTextAreaElement, TextareaProps>((
           defaultValue={defaultValue}
           className={textareaAutosizeClasses}
           aria-label={hideLabel ? label : undefined}
+          disabled={disabled}
           onChange={(e) => {
             if (onChange) onChange(e);
             handleOnChange(e);

GUI/src/pages/PromptConfigurations/PromptConfigurations.scss

@@ -29,11 +29,59 @@
     padding: 2rem;
     box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
 
+    .toggle-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin-bottom: 1.5rem;
+
+      .switch {
+        margin: 0;
+        gap: 0;
+
+        &__label {
+          display: none;
+        }
+
+        &__button {
+          width: 65px;
+          height:auto;
+          min-width: 44px;
+          padding: 2px;
+          gap: 0;
+        }
+
+        &__on,
+        &__off {
+          display: none;
+        }
+
+        &__thumb {
+          display: block;
+          width: 30px;
+          height: 30px;
+          background-color: white;
+          border-radius: 50%;
+          transition: transform 0.25s ease-out;
+          transform: translateX(2px);
+        }
+
+        &__button[aria-checked="true"] .switch__thumb {
+          transform: translateX(30px);
+        }
+      }
+    }
+
+    .separator {
+      border-bottom: 1px solid #e0e0e0;
+      margin-bottom: 1.5rem;
+    }
+
     .form-actions {
       margin-top: 1.5rem;
       display: flex;
       justify-content: flex-end;
       gap: 1rem;
     }
   }
-}
+}

GUI/src/pages/PromptConfigurations/index.tsx

@@ -1,10 +1,10 @@
 import { FC, useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { Button, FormTextarea } from 'components';
+import { Button, FormTextarea, Switch } from 'components';
 import { ButtonAppearanceTypes, ToastTypes } from 'enums/commonEnums';
 import CircularSpinner from 'components/molecules/CircularSpinner/CircularSpinner';
-import { getPromptConfiguration, savePromptConfiguration } from 'services/promptConfiguration';
+import { getPromptConfiguration, savePromptConfiguration, disablePromptConfiguration } from 'services/promptConfiguration';
 import { promptConfigurationQueryKeys } from 'utils/queryKeys';
 import { useToast } from 'hooks/useToast';
 import './PromptConfigurations.scss';
@@ -15,6 +15,7 @@ const PromptConfigurations: FC = () => {
     const queryClient = useQueryClient();
     const [promptText, setPromptText] = useState('');
     const [isUpdating, setIsUpdating] = useState(false);
+    const [isEnabled, setIsEnabled] = useState(false);
 
     // Fetch prompt configuration
     const { data: promptConfig, isLoading } = useQuery({
@@ -25,9 +26,14 @@ const PromptConfigurations: FC = () => {
 
     // Update promptText when data is loaded
     useEffect(() => {
-        if (promptConfig && promptConfig.length > 0) {
-            setPromptText(promptConfig[0].prompt || '');
+        if (promptConfig && promptConfig.length > 0 && promptConfig[0].prompt) {
+            setPromptText(promptConfig[0].prompt);
             setIsUpdating(true);
+            setIsEnabled(true);
+        } else {
+            setPromptText('');
+            setIsUpdating(promptConfig !== undefined && promptConfig.length > 0);
+            setIsEnabled(false);
         }
     }, [promptConfig]);
 
@@ -52,13 +58,47 @@ const PromptConfigurations: FC = () => {
         },
     });
 
+    // Disable prompt mutation (saves empty prompt)
+    const disableMutation = useMutation({
+        mutationFn: disablePromptConfiguration,
+        onSuccess: () => {
+            queryClient.invalidateQueries({ queryKey: promptConfigurationQueryKeys.current() });
+            setPromptText('');
+            setIsEnabled(false);
+            toast.open({
+                type: ToastTypes.SUCCESS,
+                title: t('toast.success.title'),
+                message: t('promptConfigurations.deleteSuccess'),
+            });
+        },
+        onError: (error: any) => {
+            console.error('Error disabling prompt:', error);
+            toast.open({
+                type: ToastTypes.ERROR,
+                title: t('toast.error.title'),
+                message: t('promptConfigurations.deleteError'),
+            });
+        },
+    });
+
     const handleSubmit = () => {
         if (!promptText.trim()) {
             return;
         }
         saveMutation.mutate(promptText);
     };
 
+    const handleToggleChange = (checked: boolean) => {
+        if (!checked) {
+            // Disable: save empty prompt to clear configuration
+            setPromptText('');
+            if (isUpdating) {
+                disableMutation.mutate();
+            }
+        }
+        setIsEnabled(checked);
+    };
+
     if (isLoading) {
         return <CircularSpinner />;
     }
@@ -71,6 +111,20 @@ const PromptConfigurations: FC = () => {
                 </div>
 
                 <div className="prompt-form">
+                    <div className="toggle-header">
+                        <span>{t('promptConfigurations.enableToggleLabel')}</span>
+                        <Switch
+                            label=""
+                            hideLabel={true}
+                            checked={isEnabled}
+                            onCheckedChange={handleToggleChange}
+                            name="enableCustomPrompt"
+                            onLabel=""
+                            offLabel=""
+                        />
+                    </div>
+                    <div className="separator"></div>
+
                     <FormTextarea
                         label={t('promptConfigurations.promptLabel')}
                         name="promptText"
@@ -84,7 +138,7 @@ const PromptConfigurations: FC = () => {
                         <Button
                             appearance={ButtonAppearanceTypes.PRIMARY}
                             onClick={handleSubmit}
-                            disabled={saveMutation.isLoading || !promptText.trim()}
+                            disabled={!isEnabled || saveMutation.isLoading || !promptText.trim()}
                         >
                             {saveMutation.isLoading 
                                 ? (isUpdating ? t('promptConfigurations.updating') : t('promptConfigurations.saving'))
@@ -98,4 +152,4 @@ const PromptConfigurations: FC = () => {
     );
 };
 
-export default PromptConfigurations;
+export default PromptConfigurations;

GUI/src/services/promptConfiguration.ts

@@ -21,3 +21,10 @@ export const savePromptConfiguration = async (prompt: string): Promise<PromptCon
     });
     return data?.response;
 };
+
+export const disablePromptConfiguration = async (): Promise<PromptConfiguration[]> => {
+    const { data } = await apiDev.post(promptConfigurationEndpoints.SAVE_PROMPT_CONFIGURATION(), {
+        prompt: "",
+    });
+    return data?.response;
+};

GUI/translations/en/common.json

@@ -432,13 +432,16 @@
   "promptConfigurations": {
     "title": "Prompt Configurations",
     "subtitle": "Configure and manage your prompt templates",
+    "enableToggleLabel": "Enable Custom Prompt Configuration",
     "promptLabel": "Prompt Template",
     "promptPlaceholder": "Enter your prompt template here...",
     "submitButton": "Save",
     "updateButton": "Update",
     "saving": "Saving...",
     "updating": "Updating...",
     "submitSuccess": "Prompt configuration saved successfully",
-    "submitError": "Failed to save prompt configuration. Please try again."
+    "submitError": "Failed to save prompt configuration. Please try again.",
+    "deleteSuccess": "Prompt configuration deleted successfully",
+    "deleteError": "Failed to delete prompt configuration. Please try again."
   }
 }

GUI/translations/et/common.json

@@ -433,13 +433,16 @@
   "promptConfigurations": {
     "title": "Viiba Seaded",
     "subtitle": "Seadista ja halda oma viiba malle",
+    "enableToggleLabel": "Luba kohandatud viiba seadistus",
     "promptLabel": "Viiba Mall",
     "promptPlaceholder": "Sisesta siia oma viiba mall...",
     "submitButton": "Salvesta",
     "updateButton": "Uuenda",
     "saving": "Salvestan...",
     "updating": "Uuendan...",
     "submitSuccess": "Viiba seadistus salvestati edukalt",
-    "submitError": "Viiba seadistuse salvestamine ebaõnnestus. Palun proovi uuesti."
+    "submitError": "Viiba seadistuse salvestamine ebaõnnestus. Palun proovi uuesti.",
+    "deleteSuccess": "Viiba seadistus kustutati edukalt",
+    "deleteError": "Viiba seadistuse kustutamine ebaõnnestus. Palun proovi uuesti."
   }
 }

src/utils/prompt_config_loader.py

@@ -148,9 +148,9 @@ def get_custom_instructions(self) -> str:
                     return prompt_text
 
                 elif prompt_text is None and fetch_error is None:
-                    # No configuration found - cache empty result to avoid repeated loads
+                    # Prompt field not found - cache empty result to avoid repeated loads
                     logger.warning(
-                        "No prompt configuration found in database; caching empty result"
+                        "Prompt field not found in database; caching empty result"
                     )
                     self._cached_prompt = ""
                     self._cache_timestamp = time.time()
@@ -233,6 +233,8 @@ def _load_from_ruuter_with_retry(self) -> Optional[str]:
                         data = data["response"]
 
                     # Now extract prompt from the unwrapped data
+                    prompt = None  # None means field doesn't exist (not found)
+
                     if isinstance(data, list) and len(data) > 0:
                         # Array format: [{"id": 1, "prompt": "..."}]
                         first_elem_keys = (
@@ -241,28 +243,33 @@ def _load_from_ruuter_with_retry(self) -> Optional[str]:
                         logger.debug(
                             f"Extracting from list, first element keys: {first_elem_keys}"
                         )
-                        prompt = data[0].get("prompt", "").strip()
+                        # Check if 'prompt' KEY exists (distinguish from missing field)
+                        if isinstance(data[0], dict) and "prompt" in data[0]:
+                            prompt = data[0].get("prompt", "").strip()
                     elif isinstance(data, dict):
                         # Dict format: {"id": 1, "prompt": "..."}
                         logger.debug(f"Extracting from dict, keys: {list(data.keys())}")
-                        prompt = data.get("prompt", "").strip()
+                        # Check if 'prompt' KEY exists (distinguish from missing field)
+                        if "prompt" in data:
+                            prompt = data.get("prompt", "").strip()
                     else:
                         logger.warning(
                             f"Unexpected data type: {type(data).__name__}, structure not recognized"
                         )
 
-                    logger.debug(
-                        f"Extracted prompt length: {len(prompt) if prompt else 0}"
-                    )
-
-                    if prompt:
+                    # Distinguish between: exists and empty ("") vs doesn't exist (None)
+                    if prompt is not None:
+                        # Field exists - valid state (even if empty)
                         logger.debug(
                             f"Loaded prompt on attempt {attempt} ({len(prompt)} chars)"
                         )
-                        return prompt
+                        return prompt  # Return actual value (may be empty string)
                     else:
-                        logger.warning(f"Prompt field is empty (attempt {attempt})")
-                        return None  # Database has no configuration
+                        # Field doesn't exist - configuration not found
+                        logger.warning(
+                            f"Prompt field not found or missing (attempt {attempt})"
+                        )
+                        return None
 
                 else:
                     logger.warning(
@@ -348,8 +355,8 @@ def force_refresh_with_status(self) -> Dict[str, Any]:
 
         # Determine status and update cache
         with self._cache_condition:
-            if prompt_text:
-                # Success - update cache
+            if prompt_text is not None:
+                # Success - field exists
                 self._cached_prompt = prompt_text
                 self._cache_timestamp = time.time()
                 self._last_error = None
@@ -363,14 +370,14 @@ def force_refresh_with_status(self) -> Dict[str, Any]:
                 }
 
             elif prompt_text is None and fetch_error is None:
-                # No configuration found (explicit empty response from Ruuter)
+                # No configuration found (prompt field missing in response from Ruuter)
                 self._cached_prompt = ""
                 self._cache_timestamp = time.time()
                 self._last_error = None
-                logger.warning("No prompt configuration found in database")
+                logger.warning("Prompt field not found in database")
                 return {
                     "status": RefreshStatus.NOT_FOUND,
-                    "message": "No prompt configuration found in database",
+                    "message": "Prompt field not found in database",
                     "error": None,
                 }