Skip to content

Commit 44e6082

Browse files
shanhexishanhexi
committed
merge
2 parents 346e3d0 + 5dd737e commit 44e6082

19 files changed

Lines changed: 31 additions & 32 deletions

‎chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/ChatController.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@
2121
import ai.chat2db.server.tools.common.util.EasyEnumUtils;
2222
import ai.chat2db.server.web.api.aspect.ConnectionInfoAspect;
2323
import ai.chat2db.server.web.api.controller.ai.azure.client.AzureOpenAIClient;
24-
import ai.chat2db.server.web.api.controller.ai.azure.models.AzureChatMessage;
25-
import ai.chat2db.server.web.api.controller.ai.azure.models.AzureChatRole;
24+
import ai.chat2db.server.web.api.controller.ai.azure.model.AzureChatMessage;
25+
import ai.chat2db.server.web.api.controller.ai.azure.model.AzureChatRole;
2626
import ai.chat2db.server.web.api.controller.ai.chat2db.client.Chat2dbAIClient;
2727
import ai.chat2db.server.web.api.controller.ai.claude.client.ClaudeAIClient;
2828
import ai.chat2db.server.web.api.controller.ai.claude.model.ClaudeChatCompletionsOptions;
2929
import ai.chat2db.server.web.api.controller.ai.claude.model.ClaudeChatMessage;
3030
import ai.chat2db.server.web.api.controller.ai.config.LocalCache;
3131
import ai.chat2db.server.web.api.controller.ai.converter.ChatConverter;
3232
import ai.chat2db.server.web.api.controller.ai.enums.PromptType;
33-
import ai.chat2db.server.web.api.controller.ai.listener.AzureOpenAIEventSourceListener;
34-
import ai.chat2db.server.web.api.controller.ai.listener.ClaudeAIEventSourceListener;
35-
import ai.chat2db.server.web.api.controller.ai.listener.OpenAIEventSourceListener;
36-
import ai.chat2db.server.web.api.controller.ai.listener.RestAIEventSourceListener;
33+
import ai.chat2db.server.web.api.controller.ai.azure.listener.AzureOpenAIEventSourceListener;
34+
import ai.chat2db.server.web.api.controller.ai.claude.listener.ClaudeAIEventSourceListener;
35+
import ai.chat2db.server.web.api.controller.ai.openai.listener.OpenAIEventSourceListener;
36+
import ai.chat2db.server.web.api.controller.ai.rest.listener.RestAIEventSourceListener;
3737
import ai.chat2db.server.web.api.controller.ai.request.ChatQueryRequest;
3838
import ai.chat2db.server.web.api.controller.ai.request.ChatRequest;
3939
import ai.chat2db.server.web.api.controller.ai.rest.client.RestAIClient;
4040
import ai.chat2db.server.web.api.util.ApplicationContextUtil;
41-
import ai.chat2db.server.web.api.util.OpenAIClient;
41+
import ai.chat2db.server.web.api.controller.ai.openai.client.OpenAIClient;
4242
import ai.chat2db.spi.model.TableColumn;
4343
import cn.hutool.core.util.StrUtil;
4444
import cn.hutool.json.JSONUtil;

‎chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/client/AzureOpenAiStreamClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66

77
import ai.chat2db.server.tools.common.exception.ParamBusinessException;
88
import ai.chat2db.server.web.api.controller.ai.azure.interceptor.AzureHeaderAuthorizationInterceptor;
9-
import ai.chat2db.server.web.api.controller.ai.azure.models.AzureChatCompletionsOptions;
10-
import ai.chat2db.server.web.api.controller.ai.azure.models.AzureChatMessage;
9+
import ai.chat2db.server.web.api.controller.ai.azure.model.AzureChatCompletionsOptions;
10+
import ai.chat2db.server.web.api.controller.ai.azure.model.AzureChatMessage;
1111
import cn.hutool.http.ContentType;
1212
import com.fasterxml.jackson.databind.ObjectMapper;
1313
import lombok.Getter;

chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/listener/AzureOpenAIEventSourceListener.java renamed to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/listener/AzureOpenAIEventSourceListener.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
package ai.chat2db.server.web.api.controller.ai.listener;
1+
package ai.chat2db.server.web.api.controller.ai.azure.listener;
22

33
import java.io.IOException;
44
import java.util.Objects;
55

6-
import ai.chat2db.server.web.api.controller.ai.azure.models.AzureChatChoice;
7-
import ai.chat2db.server.web.api.controller.ai.azure.models.AzureChatCompletions;
8-
import ai.chat2db.server.web.api.controller.ai.azure.models.AzureChatMessage;
9-
import ai.chat2db.server.web.api.controller.ai.azure.models.AzureCompletionsUsage;
10-
import ai.chat2db.server.web.api.controller.ai.response.ChatCompletionResponse;
6+
import ai.chat2db.server.web.api.controller.ai.azure.model.AzureChatChoice;
7+
import ai.chat2db.server.web.api.controller.ai.azure.model.AzureChatCompletions;
8+
import ai.chat2db.server.web.api.controller.ai.azure.model.AzureChatMessage;
9+
import ai.chat2db.server.web.api.controller.ai.azure.model.AzureCompletionsUsage;
1110
import com.fasterxml.jackson.databind.DeserializationFeature;
1211
import com.fasterxml.jackson.databind.ObjectMapper;
1312
import com.unfbx.chatgpt.entity.chat.Message;

chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/models/AzureChatChoice.java renamed to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/model/AzureChatChoice.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33
// Code generated by Microsoft (R) AutoRest Code Generator.
4-
package ai.chat2db.server.web.api.controller.ai.azure.models;
4+
package ai.chat2db.server.web.api.controller.ai.azure.model;
55

66
import com.fasterxml.jackson.annotation.JsonCreator;
77
import com.fasterxml.jackson.annotation.JsonProperty;

chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/models/AzureChatCompletions.java renamed to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/model/AzureChatCompletions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ai.chat2db.server.web.api.controller.ai.azure.models;
1+
package ai.chat2db.server.web.api.controller.ai.azure.model;
22

33
import java.util.List;
44

chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/models/AzureChatCompletionsOptions.java renamed to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/model/AzureChatCompletionsOptions.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33
// Code generated by Microsoft (R) AutoRest Code Generator.
4-
package ai.chat2db.server.web.api.controller.ai.azure.models;
4+
package ai.chat2db.server.web.api.controller.ai.azure.model;
55

66
import java.util.List;
7-
import java.util.Map;
87

98
import com.fasterxml.jackson.annotation.JsonCreator;
109
import com.fasterxml.jackson.annotation.JsonProperty;

chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/models/AzureChatMessage.java renamed to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/model/AzureChatMessage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ai.chat2db.server.web.api.controller.ai.azure.models;
1+
package ai.chat2db.server.web.api.controller.ai.azure.model;
22

33
import com.fasterxml.jackson.annotation.JsonCreator;
44
import com.fasterxml.jackson.annotation.JsonProperty;

chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/models/AzureChatRole.java renamed to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/model/AzureChatRole.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ai.chat2db.server.web.api.controller.ai.azure.models;
1+
package ai.chat2db.server.web.api.controller.ai.azure.model;
22

33
import java.util.Collection;
44

chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/models/AzureChoice.java renamed to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/model/AzureChoice.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33
// Code generated by Microsoft (R) AutoRest Code Generator.
4-
package ai.chat2db.server.web.api.controller.ai.azure.models;
4+
package ai.chat2db.server.web.api.controller.ai.azure.model;
55

66
import com.fasterxml.jackson.annotation.JsonCreator;
77
import com.fasterxml.jackson.annotation.JsonProperty;

chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/models/AzureCompletions.java renamed to chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/model/AzureCompletions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package ai.chat2db.server.web.api.controller.ai.azure.models;
1+
package ai.chat2db.server.web.api.controller.ai.azure.model;
22

33
import java.util.List;
44

0 commit comments

Comments
 (0)