Merge pull request #386 from devoxx/issue-384

Corrected webSearchRequest validation
devoxx · Dec 12, 2024 · 4e6e068 · 4e6e068
2 parents 079f62a + db1ead6
commit 4e6e068
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/com/devoxx/genie/controller/PromptExecutionController.java b/src/main/java/com/devoxx/genie/controller/PromptExecutionController.java
@@ -46,8 +46,6 @@ public boolean handlePromptSubmission(ChatMessageContext currentChatMessageConte
 
         startPromptExecution();
 
-        isPromptRunning = true;
-
         AtomicBoolean response = new AtomicBoolean(true);
         chatPromptExecutor.updatePromptWithCommandIfPresent(currentChatMessageContext, promptOutputPanel)
                 .ifPresentOrElse(
@@ -76,6 +74,7 @@ public void stopPromptExecution() {
 
     @Override
     public void startPromptExecution() {
+        isPromptRunning = true;
         actionButtonsPanel.disableSubmitBtn();
         actionButtonsPanel.disableButtons();
         actionButtonsPanel.startGlowing();

diff --git a/src/main/java/com/devoxx/genie/util/ChatMessageContextUtil.java b/src/main/java/com/devoxx/genie/util/ChatMessageContextUtil.java
@@ -48,7 +48,7 @@ private ChatMessageContextUtil() {
             .userPrompt(userPromptText)
             .userMessage(UserMessage.userMessage(userPromptText))
             .languageModel(languageModel)
-            .webSearchRequested(stateService.getIsWebSearchEnabled() && (stateService.isGoogleSearchEnabled() || stateService.isTavilySearchEnabled()))
+            .webSearchRequested(stateService.getWebSearchActivated() && (stateService.isGoogleSearchEnabled() || stateService.isTavilySearchEnabled()))
             .totalFileCount(FileListManager.getInstance().size())
             .executionTimeMs(0)
             .cost(0)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -1,2 +1,2 @@
-#Thu Dec 12 18:13:55 CET 2024
+#Thu Dec 12 19:55:03 CET 2024
 version=0.4.5