Get hold of the assistant in another way

phillip-kruger · gsmet · commit 07df9e80afdc · 2025-09-02T17:53:21.000+02:00
Signed-off-by: Phillip Kruger <phillip.kruger@gmail.com> (cherry picked from commit aa18649)
diff --git a/extensions/devui/runtime/src/main/java/io/quarkus/devui/runtime/comms/JsonRpcMessage.java b/extensions/devui/runtime/src/main/java/io/quarkus/devui/runtime/comms/JsonRpcMessage.java
@@ -8,7 +8,6 @@
 public class JsonRpcMessage<T> {
     private T response;
     private MessageType messageType;
-    private boolean alreadySerialized = false;
 
     public JsonRpcMessage() {
     }
@@ -33,12 +32,4 @@ public MessageType getMessageType() {
     public void setMessageType(MessageType messageType) {
         this.messageType = messageType;
     }
-
-    public boolean isAlreadySerialized() {
-        return alreadySerialized;
-    }
-
-    public void setAlreadySerialized(boolean alreadySerialized) {
-        this.alreadySerialized = alreadySerialized;
-    }
 }
diff --git a/extensions/devui/runtime/src/main/java/io/quarkus/devui/runtime/comms/JsonRpcRouter.java b/extensions/devui/runtime/src/main/java/io/quarkus/devui/runtime/comms/JsonRpcRouter.java
@@ -202,15 +202,17 @@ private void routeToRuntimeMethod(JsonRpcRequest jsonRpcRequest, JsonRpcResponse
         }
         uni.subscribe()
                 .with(item -> {
-                    if (item != null && JsonRpcMessage.class.isAssignableFrom(item.getClass())) {
-                        JsonRpcMessage<?> jsonRpcMessage = (JsonRpcMessage<?>) item;
-                        Object response = jsonRpcMessage.getResponse();
-                        if (jsonRpcMessage.isAlreadySerialized()) {
+                    if (item != null && Map.class.isAssignableFrom(item.getClass())) {
+                        Map map = (Map) item;
+                        if (map.size() == 3 && map.containsKey("alreadySerialized") && map.containsKey("messageType")
+                                && map.containsKey("response") && map.get("alreadySerialized").equals("true")) {
+                            Object response = map.get("response");
+
                             // The message response was already serialized, write text directly to socket
                             jrrw.write("{\"id\":" + jsonRpcRequest.getId() + ",\"result\":{\"messageType\":\""
-                                    + jsonRpcMessage.getMessageType().name() + "\",\"object\":" + response + "}}");
+                                    + map.get("messageType") + "\",\"object\":" + response + "}}");
                         } else {
-                            codec.writeResponse(jrrw, jsonRpcRequest.getId(), response, jsonRpcMessage.getMessageType());
+                            codec.writeResponse(jrrw, jsonRpcRequest.getId(), item, MessageType.Response);
                         }
                     } else {
                         codec.writeResponse(jrrw, jsonRpcRequest.getId(), item, MessageType.Response);
diff --git a/extensions/hibernate-orm/runtime-dev/pom.xml b/extensions/hibernate-orm/runtime-dev/pom.xml
@@ -19,8 +19,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-devui</artifactId>
-            <optional>true</optional>
+            <artifactId>quarkus-assistant-dev</artifactId>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/extensions/hibernate-orm/runtime-dev/src/main/java/io/quarkus/hibernate/orm/dev/ui/HibernateOrmDevJsonRpcService.java b/extensions/hibernate-orm/runtime-dev/src/main/java/io/quarkus/hibernate/orm/dev/ui/HibernateOrmDevJsonRpcService.java
@@ -11,6 +11,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 
+import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Inject;
 
 import org.eclipse.microprofile.config.ConfigProvider;
@@ -28,9 +29,6 @@
 import io.agroal.api.AgroalDataSource;
 import io.agroal.api.configuration.AgroalDataSourceConfiguration;
 import io.quarkus.assistant.runtime.dev.Assistant;
-import io.quarkus.devui.runtime.comms.JsonRpcMessage;
-import io.quarkus.devui.runtime.comms.JsonRpcRouter;
-import io.quarkus.devui.runtime.comms.MessageType;
 import io.quarkus.hibernate.orm.dev.HibernateOrmDevController;
 import io.quarkus.hibernate.orm.dev.HibernateOrmDevInfo;
 import io.quarkus.hibernate.orm.runtime.customized.QuarkusConnectionProvider;
@@ -44,7 +42,7 @@ public class HibernateOrmDevJsonRpcService {
     private final String allowedHost;
 
     @Inject
-    Optional<Assistant> assistant;
+    Instance<Optional<Assistant>> assistant;
 
     public HibernateOrmDevJsonRpcService() {
         this.isDev = LaunchMode.current().isDev() && !LaunchMode.current().isRemoteDev();
@@ -104,18 +102,18 @@ You are an expert in writing Hibernate Query Language (HQL) queries.
      * based on pageNumber and pageSize are returned. For mutation statements, a custom message including the number of affected
      * records is returned.
      * <p>
-     * This method handles result serialization (to JSON) internally, and returns a {@link JsonRpcMessage<String>} to avoid
-     * further processing by the {@link JsonRpcRouter}.
+     * This method handles result serialization (to JSON) internally, and returns a JsonRpc Message in Map format to avoid
+     * further processing by the Dev UI JsonRpcRouter.
      *
      * @param persistenceUnit The name of the persistence unit within which the query will be executed
      * @param query The user query (be it an HQL query or a plain-text statement when using assistant)
      * @param pageNumber The page number, used for selection query results pagination
      * @param pageSize The page size, used for selection query results pagination
      * @param assistant Whether to use the assistant to generate the HQL query based on the user input
      * @param interactive Enable assistant's interactive mode, answering the original user request in natural language
-     * @return a {@link JsonRpcMessage<String>} containing the resulting {@link DataSet} serialized to JSON.
+     * @return a JsonRpcMessage containing the resulting {@link DataSet} serialized to JSON.
      */
-    public CompletionStage<JsonRpcMessage<String>> executeHQL(
+    public CompletionStage<Map<String, String>> executeHQL(
             String persistenceUnit,
             String query,
             Integer pageNumber,
@@ -150,7 +148,11 @@ public CompletionStage<JsonRpcMessage<String>> executeHQL(
         }
 
         if (Boolean.TRUE.equals(assistant)) {
-            Assistant a = this.assistant.orElse(null);
+            if (!this.assistant.isResolvable()) {
+                return errorDataSet(
+                        "The assistant is not available, please install the Chappie extension.");
+            }
+            Assistant a = this.assistant.get().orElse(null);
             if (a == null || !a.isAvailable()) {
                 return errorDataSet(
                         "The assistant is not available, please check the Quarkus assistant extension is correctly configured.");
@@ -176,7 +178,7 @@ public CompletionStage<JsonRpcMessage<String>> executeHQL(
                 return dataSetCompletionStage.thenCompose(dataSet -> {
                     if (dataSet.error() != null) {
                         // If there was an error executing the query, return it directly
-                        return CompletableFuture.completedStage(toJson(dataSet));
+                        return CompletableFuture.completedStage(toMap(dataSet));
                     }
                     CompletionStage<Map<String, String>> interactiveCompletionStage = a.assistBuilder()
                             .systemMessage(SYSTEM_MESSAGE)
@@ -192,11 +194,11 @@ public CompletionStage<JsonRpcMessage<String>> executeHQL(
                     });
                 });
             } else {
-                return dataSetCompletionStage.thenApply(HibernateOrmDevJsonRpcService::toJson);
+                return dataSetCompletionStage.thenApply(HibernateOrmDevJsonRpcService::toMap);
             }
         } else {
             DataSet result = executeHqlQuery(query, sf, pageNumber, pageSize);
-            return CompletableFuture.completedStage(toJson(result));
+            return CompletableFuture.completedStage(toMap(result));
         }
     }
 
@@ -259,15 +261,15 @@ private static DataSet executeHqlQuery(String hql, SessionFactoryImplementor sf,
         });
     }
 
-    private static CompletionStage<JsonRpcMessage<String>> errorDataSet(String errorMessage) {
-        return CompletableFuture.completedStage(toJson(new DataSet(null, null, -1, null, errorMessage)));
+    private static CompletionStage<Map<String, String>> errorDataSet(String errorMessage) {
+        return CompletableFuture.completedStage(toMap(new DataSet(null, null, -1, null, errorMessage)));
     }
 
-    private static JsonRpcMessage<String> messageDataset(String query, String message, long resultCount) {
-        return toJson(new DataSet(null, query, resultCount, message, null));
+    private static Map<String, String> messageDataset(String query, String message, long resultCount) {
+        return toMap(new DataSet(null, query, resultCount, message, null));
     }
 
-    private static JsonRpcMessage<String> toJson(DataSet dataSet) {
+    private static Map<String, String> toMap(DataSet dataSet) {
         StringBuilder jsonBuilder = new StringBuilder("{");
         jsonBuilder.append("\"resultCount\":").append(dataSet.resultCount());
         if (dataSet.data() != null) {
@@ -277,9 +279,13 @@ private static JsonRpcMessage<String> toJson(DataSet dataSet) {
         appendIfNonNull(jsonBuilder, "message", dataSet.message());
         appendIfNonNull(jsonBuilder, "error", dataSet.error());
         jsonBuilder.append("}");
-        JsonRpcMessage<String> message = new JsonRpcMessage<>(jsonBuilder.toString(), MessageType.Response);
-        message.setAlreadySerialized(true);
-        return message;
+
+        Map<String, String> map = Map.of(
+                "response", jsonBuilder.toString(),
+                "messageType", "Response",
+                "alreadySerialized", "true");
+
+        return map;
     }
 
     private static void appendIfNonNull(StringBuilder sb, String fieldName, String value) {
diff --git a/extensions/hibernate-orm/runtime/pom.xml b/extensions/hibernate-orm/runtime/pom.xml
@@ -41,16 +41,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-narayana-jta</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-http</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-devui</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-junit5-internal</artifactId>

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`	`public class JsonRpcMessage<T> {`
`9`	`9`	`private T response;`
`10`	`10`	`private MessageType messageType;`
`11`		`- private boolean alreadySerialized = false;`
`12`	`11`
`13`	`12`	`public JsonRpcMessage() {`
`14`	`13`	`}`
`@@ -33,12 +32,4 @@ public MessageType getMessageType() {`
`33`	`32`	`public void setMessageType(MessageType messageType) {`
`34`	`33`	`this.messageType = messageType;`
`35`	`34`	`}`
`36`		`-`
`37`		`- public boolean isAlreadySerialized() {`
`38`		`- return alreadySerialized;`
`39`		`- }`
`40`		`-`
`41`		`- public void setAlreadySerialized(boolean alreadySerialized) {`
`42`		`- this.alreadySerialized = alreadySerialized;`
`43`		`- }`
`44`	`35`	`}`