This is an automated email from the ASF dual-hosted git repository.
liuhongyu pushed a change to branch fix/fix_data_buffer_leak
in repository https://gitbox.apache.org/repos/asf/shenyu.git
from edc554b2e5 Merge branch 'master' into fix/fix_data_buffer_leak
add ae1702bcfa [refactor] refactor ai plugins (#5986)
add 14a3ee109f Merge branch 'master' into fix/fix_data_buffer_leak
No new revisions were added by this update.
Summary of changes:
db/init/mysql/schema.sql | 2 +-
db/init/ob/schema.sql | 2 +-
db/init/og/create-table.sql | 2 +-
db/init/oracle/schema.sql | 2 +-
db/init/pg/create-table.sql | 2 +-
db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql | 2 +-
db/upgrade/2.7.0-upgrade-2.7.1-ob.sql | 2 +-
db/upgrade/2.7.0-upgrade-2.7.1-og.sql | 2 +-
db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql | 2 +-
db/upgrade/2.7.0-upgrade-2.7.1-pg.sql | 2 +-
.../apache/shenyu/common/constant/Constants.java | 26 +++--
.../dto/convert/rule/AiTokenLimiterHandle.java | 2 +-
.../shenyu/common/enums/AiTokenLimiterEnum.java | 6 +-
shenyu-plugin/pom.xml | 4 +-
.../resources/META-INF/scripts/check-limit.lua | 28 -----
.../resources/META-INF/scripts/increment-token.lua | 35 ------
.../shenyu-plugin-ai}/pom.xml | 29 ++---
.../shenyu-plugin-ai-common}/pom.xml | 4 +-
.../plugin/ai/common/config/AiCommonConfig.java | 8 +-
.../shenyu/plugin/ai/common}/strategy/AiModel.java | 21 +++-
.../plugin/ai/common}/strategy/AiModelFactory.java | 8 +-
.../plugin/ai/common}/strategy/openai/OpenAI.java | 49 +++++++--
.../shenyu-plugin-ai-prompt/pom.xml | 2 +-
.../shenyu/plugin/ai/prompt/AiPromptPlugin.java | 0
.../prompt/handler/AiPromptPluginDataHandler.java | 0
.../shenyu-plugin-ai-proxy/pom.xml | 7 +-
.../shenyu/plugin/ai/proxy/AiProxyPlugin.java | 38 ++++---
.../ai/proxy/handler/AiProxyPluginHandler.java | 8 +-
.../shenyu-plugin-ai-token-limiter/pom.xml | 9 +-
.../ai/token/limiter/AiTokenLimiterPlugin.java | 121 ++++++---------------
.../handler/AiTokenLimiterPluginHandler.java | 0
.../token/limiter/redis/RedisConfigProperties.java | 0
.../limiter/redis/RedisConnectionFactory.java | 0
.../limiter/redis/ShenyuReactiveRedisTemplate.java | 0
.../redis/ShenyuReactiveScriptExecutor.java | 0
.../redis/serializer/ByteArrayRedisSerializer.java | 0
.../ShenyuRedisSerializationContext.java | 0
.../shenyu/plugin/api/result/ShenyuResultEnum.java | 5 +
38 files changed, 187 insertions(+), 243 deletions(-)
delete mode 100644
shenyu-plugin/shenyu-plugin-ai-token-limiter/src/main/resources/META-INF/scripts/check-limit.lua
delete mode 100644
shenyu-plugin/shenyu-plugin-ai-token-limiter/src/main/resources/META-INF/scripts/increment-token.lua
copy {shenyu-integrated-test/shenyu-integrated-test-upload-plugin =>
shenyu-plugin/shenyu-plugin-ai}/pom.xml (76%)
copy shenyu-plugin/{shenyu-plugin-ai-proxy =>
shenyu-plugin-ai/shenyu-plugin-ai-common}/pom.xml (94%)
rename
shenyu-common/src/main/java/org/apache/shenyu/common/dto/convert/plugin/AiProxyConfig.java
=>
shenyu-plugin/shenyu-plugin-ai/shenyu-plugin-ai-common/src/main/java/org/apache/shenyu/plugin/ai/common/config/AiCommonConfig.java
(96%)
rename
shenyu-plugin/{shenyu-plugin-ai-proxy/src/main/java/org/apache/shenyu/plugin/ai/proxy
=>
shenyu-plugin-ai/shenyu-plugin-ai-common/src/main/java/org/apache/shenyu/plugin/ai/common}/strategy/AiModel.java
(68%)
rename
shenyu-plugin/{shenyu-plugin-ai-proxy/src/main/java/org/apache/shenyu/plugin/ai/proxy
=>
shenyu-plugin-ai/shenyu-plugin-ai-common/src/main/java/org/apache/shenyu/plugin/ai/common}/strategy/AiModelFactory.java
(85%)
rename
shenyu-plugin/{shenyu-plugin-ai-proxy/src/main/java/org/apache/shenyu/plugin/ai/proxy
=>
shenyu-plugin-ai/shenyu-plugin-ai-common/src/main/java/org/apache/shenyu/plugin/ai/common}/strategy/openai/OpenAI.java
(64%)
rename shenyu-plugin/{ => shenyu-plugin-ai}/shenyu-plugin-ai-prompt/pom.xml
(96%)
rename shenyu-plugin/{ =>
shenyu-plugin-ai}/shenyu-plugin-ai-prompt/src/main/java/org/apache/shenyu/plugin/ai/prompt/AiPromptPlugin.java
(100%)
rename shenyu-plugin/{ =>
shenyu-plugin-ai}/shenyu-plugin-ai-prompt/src/main/java/org/apache/shenyu/plugin/ai/prompt/handler/AiPromptPluginDataHandler.java
(100%)
rename shenyu-plugin/{ => shenyu-plugin-ai}/shenyu-plugin-ai-proxy/pom.xml
(88%)
rename shenyu-plugin/{ =>
shenyu-plugin-ai}/shenyu-plugin-ai-proxy/src/main/java/org/apache/shenyu/plugin/ai/proxy/AiProxyPlugin.java
(76%)
rename shenyu-plugin/{ =>
shenyu-plugin-ai}/shenyu-plugin-ai-proxy/src/main/java/org/apache/shenyu/plugin/ai/proxy/handler/AiProxyPluginHandler.java
(89%)
rename shenyu-plugin/{ =>
shenyu-plugin-ai}/shenyu-plugin-ai-token-limiter/pom.xml (84%)
rename shenyu-plugin/{ =>
shenyu-plugin-ai}/shenyu-plugin-ai-token-limiter/src/main/java/org/apache/shenyu/plugin/ai/token/limiter/AiTokenLimiterPlugin.java
(71%)
rename shenyu-plugin/{ =>
shenyu-plugin-ai}/shenyu-plugin-ai-token-limiter/src/main/java/org/apache/shenyu/plugin/ai/token/limiter/handler/AiTokenLimiterPluginHandler.java
(100%)
rename shenyu-plugin/{ =>
shenyu-plugin-ai}/shenyu-plugin-ai-token-limiter/src/main/java/org/apache/shenyu/plugin/ai/token/limiter/redis/RedisConfigProperties.java
(100%)
rename shenyu-plugin/{ =>
shenyu-plugin-ai}/shenyu-plugin-ai-token-limiter/src/main/java/org/apache/shenyu/plugin/ai/token/limiter/redis/RedisConnectionFactory.java
(100%)
rename shenyu-plugin/{ =>
shenyu-plugin-ai}/shenyu-plugin-ai-token-limiter/src/main/java/org/apache/shenyu/plugin/ai/token/limiter/redis/ShenyuReactiveRedisTemplate.java
(100%)
rename shenyu-plugin/{ =>
shenyu-plugin-ai}/shenyu-plugin-ai-token-limiter/src/main/java/org/apache/shenyu/plugin/ai/token/limiter/redis/ShenyuReactiveScriptExecutor.java
(100%)
rename shenyu-plugin/{ =>
shenyu-plugin-ai}/shenyu-plugin-ai-token-limiter/src/main/java/org/apache/shenyu/plugin/ai/token/limiter/redis/serializer/ByteArrayRedisSerializer.java
(100%)
rename shenyu-plugin/{ =>
shenyu-plugin-ai}/shenyu-plugin-ai-token-limiter/src/main/java/org/apache/shenyu/plugin/ai/token/limiter/redis/serializer/ShenyuRedisSerializationContext.java
(100%)
