|
1 | 1 | package ai.chat2db.server.web.api.controller.ai.openai.listener;
|
2 | 2 |
|
3 | 3 | import ai.chat2db.server.web.api.controller.ai.openai.client.OpenAIClient;
|
| 4 | +import ai.chat2db.server.web.api.controller.ai.request.ChatQueryRequest; |
4 | 5 | import ai.chat2db.server.web.api.controller.ai.response.ChatCompletionResponse;
|
5 | 6 | import ai.chat2db.spi.MetaData;
|
6 | 7 | import ai.chat2db.spi.sql.Chat2DBContext;
|
@@ -39,13 +40,16 @@ public class OpenAIEventSourceListener extends EventSourceListener {
|
39 | 40 |
|
40 | 41 | private final ConnectInfo connectInfo;
|
41 | 42 |
|
| 43 | + private final ChatQueryRequest queryRequest; |
| 44 | + |
42 | 45 | private List<ToolCalls> toolCalls = new ArrayList<>();
|
43 | 46 |
|
44 | 47 |
|
45 |
| - public OpenAIEventSourceListener(SseEmitter sseEmitter, List<Message> messages, ConnectInfo connectInfo) { |
| 48 | + public OpenAIEventSourceListener(SseEmitter sseEmitter, List<Message> messages, ConnectInfo connectInfo, ChatQueryRequest queryRequest) { |
46 | 49 | this.sseEmitter = sseEmitter;
|
47 | 50 | this.messages = messages;
|
48 | 51 | this.connectInfo = connectInfo;
|
| 52 | + this.queryRequest = queryRequest; |
49 | 53 | }
|
50 | 54 |
|
51 | 55 | public static List<ToolCalls> mergeToolCallsLists(List<ToolCalls> list1, List<ToolCalls> list2) {
|
@@ -142,7 +146,7 @@ public void onEvent(EventSource eventSource, String id, String type, String data
|
142 | 146 | JSONObject arguments = JSONObject.parse(function.getArguments());
|
143 | 147 | if ("get_table_columns".equals(functionName)) {
|
144 | 148 | MetaData metaSchema = Chat2DBContext.getMetaData();
|
145 |
| - String ddl = metaSchema.tableDDL(Chat2DBContext.getConnection(), connectInfo.getDatabaseName(), connectInfo.getSchemaName(), arguments.getString("table_name")); |
| 149 | + String ddl = metaSchema.tableDDL(Chat2DBContext.getConnection(), queryRequest.getDatabaseName(), queryRequest.getSchemaName(), arguments.getString("table_name")); |
146 | 150 | messages.add(Message.builder().role(BaseMessage.Role.TOOL)
|
147 | 151 | .toolCallId(callId)
|
148 | 152 | .name(functionName)
|
|
0 commit comments