feat: ollama流式应答接口实现
This commit is contained in:
18
ai-rag-app/src/main/java/com/storm/dev/Application.java
Normal file
18
ai-rag-app/src/main/java/com/storm/dev/Application.java
Normal file
@@ -0,0 +1,18 @@
|
||||
package com.storm.dev;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Configurable;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
|
||||
/**
|
||||
* 会扫描com.storm.dev的包
|
||||
*/
|
||||
@SpringBootApplication
|
||||
@Configurable
|
||||
public class Application {
|
||||
|
||||
public static void main(String[] args) {
|
||||
SpringApplication.run(Application.class);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.storm.dev.config;
|
||||
|
||||
import org.springframework.ai.ollama.OllamaChatClient;
|
||||
import org.springframework.ai.ollama.api.OllamaApi;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* 注入OllamaApi、OllamaChatClient对象
|
||||
* @author: lyd
|
||||
* @date: 2025/6/7 22:28
|
||||
*/
|
||||
@Configuration
|
||||
public class OllamaConfig {
|
||||
|
||||
@Bean
|
||||
public OllamaApi ollamaApi(@Value("${spring.ai.ollama.base-url}") String baseUrl) {
|
||||
return new OllamaApi(baseUrl);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public OllamaChatClient ollamaChatClient(OllamaApi ollamaApi) {
|
||||
return new OllamaChatClient(ollamaApi);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
package com.storm.dev.config;
|
||||
|
||||
import org.redisson.Redisson;
|
||||
import org.redisson.api.RedissonClient;
|
||||
import org.redisson.codec.JsonJacksonCodec;
|
||||
import org.redisson.config.Config;
|
||||
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||
import org.springframework.context.ConfigurableApplicationContext;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
/**
|
||||
* Redis 客户端，使用 Redisson <a href="https://github.com/redisson/redisson">Redisson</a>
|
||||
*
|
||||
*/
|
||||
@Configuration
|
||||
@EnableConfigurationProperties(RedisClientConfigProperties.class)
|
||||
public class RedisClientConfig {
|
||||
|
||||
@Bean("redissonClient")
|
||||
public RedissonClient redissonClient(ConfigurableApplicationContext applicationContext, RedisClientConfigProperties properties) {
|
||||
Config config = new Config();
|
||||
// 根据需要可以设定编解码器；https://github.com/redisson/redisson/wiki/4.-%E6%95%B0%E6%8D%AE%E5%BA%8F%E5%88%97%E5%8C%96
|
||||
config.setCodec(JsonJacksonCodec.INSTANCE);
|
||||
|
||||
config.useSingleServer()
|
||||
.setAddress("redis://" + properties.getHost() + ":" + properties.getPort())
|
||||
// .setPassword(properties.getPassword())
|
||||
.setConnectionPoolSize(properties.getPoolSize())
|
||||
.setConnectionMinimumIdleSize(properties.getMinIdleSize())
|
||||
.setIdleConnectionTimeout(properties.getIdleTimeout())
|
||||
.setConnectTimeout(properties.getConnectTimeout())
|
||||
.setRetryAttempts(properties.getRetryAttempts())
|
||||
.setRetryInterval(properties.getRetryInterval())
|
||||
.setPingConnectionInterval(properties.getPingInterval())
|
||||
.setKeepAlive(properties.isKeepAlive())
|
||||
;
|
||||
|
||||
return Redisson.create(config);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package com.storm.dev.config;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
|
||||
/**
|
||||
* @author Fuzhengwei bugstack.cn @小傅哥
|
||||
* Redis 连接配置 <a href="https://github.com/redisson/redisson/tree/master/redisson-spring-boot-starter">redisson-spring-boot-starter</a>
|
||||
*/
|
||||
@Data
|
||||
@ConfigurationProperties(prefix = "redis.sdk.config", ignoreInvalidFields = true)
|
||||
public class RedisClientConfigProperties {
|
||||
|
||||
/** host:ip */
|
||||
private String host;
|
||||
/** 端口 */
|
||||
private int port;
|
||||
/** 账密 */
|
||||
private String password;
|
||||
/** 设置连接池的大小，默认为64 */
|
||||
private int poolSize = 64;
|
||||
/** 设置连接池的最小空闲连接数，默认为10 */
|
||||
private int minIdleSize = 10;
|
||||
/** 设置连接的最大空闲时间（单位：毫秒），超过该时间的空闲连接将被关闭，默认为10000 */
|
||||
private int idleTimeout = 10000;
|
||||
/** 设置连接超时时间（单位：毫秒），默认为10000 */
|
||||
private int connectTimeout = 10000;
|
||||
/** 设置连接重试次数，默认为3 */
|
||||
private int retryAttempts = 3;
|
||||
/** 设置连接重试的间隔时间（单位：毫秒），默认为1000 */
|
||||
private int retryInterval = 1000;
|
||||
/** 设置定期检查连接是否可用的时间间隔（单位：毫秒），默认为0，表示不进行定期检查 */
|
||||
private int pingInterval = 0;
|
||||
/** 设置是否保持长连接，默认为true */
|
||||
private boolean keepAlive = true;
|
||||
|
||||
}
|
||||
6
ai-rag-app/src/main/java/com/storm/dev/package-info.java
Normal file
6
ai-rag-app/src/main/java/com/storm/dev/package-info.java
Normal file
@@ -0,0 +1,6 @@
|
||||
/**
|
||||
* 启动模块
|
||||
* @author: lyd
|
||||
* @date: 2025/6/7 22:04
|
||||
*/
|
||||
package com.storm.dev;
|
||||
27
ai-rag-app/src/main/resources/application-dev.yml
Normal file
27
ai-rag-app/src/main/resources/application-dev.yml
Normal file
@@ -0,0 +1,27 @@
|
||||
server:
|
||||
port: 8090
|
||||
|
||||
spring:
|
||||
ai:
|
||||
ollama:
|
||||
base-url: http://117.72.202.142:11434
|
||||
|
||||
# Redis
|
||||
redis:
|
||||
sdk:
|
||||
config:
|
||||
host: 117.72.202.142
|
||||
port: 16379
|
||||
pool-size: 10
|
||||
min-idle-size: 5
|
||||
idle-timeout: 30000
|
||||
connect-timeout: 5000
|
||||
retry-attempts: 3
|
||||
retry-interval: 1000
|
||||
ping-interval: 60000
|
||||
keep-alive: true
|
||||
|
||||
logging:
|
||||
level:
|
||||
root: info
|
||||
config: classpath:logback-spring.xml
|
||||
7
ai-rag-app/src/main/resources/application-prod.yml
Normal file
7
ai-rag-app/src/main/resources/application-prod.yml
Normal file
@@ -0,0 +1,7 @@
|
||||
server:
|
||||
port: 8090
|
||||
|
||||
logging:
|
||||
level:
|
||||
root: info
|
||||
config: classpath:logback-spring.xml
|
||||
7
ai-rag-app/src/main/resources/application-test.yml
Normal file
7
ai-rag-app/src/main/resources/application-test.yml
Normal file
@@ -0,0 +1,7 @@
|
||||
server:
|
||||
port: 8090
|
||||
|
||||
logging:
|
||||
level:
|
||||
root: info
|
||||
config: classpath:logback-spring.xml
|
||||
5
ai-rag-app/src/main/resources/application.yml
Normal file
5
ai-rag-app/src/main/resources/application.yml
Normal file
@@ -0,0 +1,5 @@
|
||||
spring:
|
||||
application:
|
||||
name: ai-rag-knowledge
|
||||
profiles:
|
||||
active: dev
|
||||
113
ai-rag-app/src/main/resources/logback-spring.xml
Normal file
113
ai-rag-app/src/main/resources/logback-spring.xml
Normal file
@@ -0,0 +1,113 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- 日志级别从低到高分为TRACE < DEBUG < INFO < WARN < ERROR < FATAL，如果设置为WARN，则低于WARN的信息都不会输出 -->
|
||||
<configuration scan="true" scanPeriod="10 seconds">
|
||||
|
||||
<contextName>logback</contextName>
|
||||
<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
|
||||
<springProperty scope="context" name="log.path" source="logging.path"/>
|
||||
<!-- 日志格式 -->
|
||||
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
|
||||
<conversionRule conversionWord="wex"
|
||||
converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
|
||||
<conversionRule conversionWord="wEx"
|
||||
converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
|
||||
|
||||
<!-- 输出到控制台 -->
|
||||
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<!-- 此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息 -->
|
||||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
||||
<level>info</level>
|
||||
</filter>
|
||||
<encoder>
|
||||
<pattern>%d{yy-MM-dd.HH:mm:ss.SSS} [%-16t] %-5p %-22c{0}%X{ServiceId} -%X{trace-id} %m%n</pattern>
|
||||
<charset>UTF-8</charset>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
<!--输出到文件-->
|
||||
<!-- 时间滚动输出 level为 INFO 日志 -->
|
||||
<appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<!-- 正在记录的日志文件的路径及文件名 -->
|
||||
<file>./data/log/log_info.log</file>
|
||||
<!--日志文件输出格式-->
|
||||
<encoder>
|
||||
<pattern>%d{yy-MM-dd.HH:mm:ss.SSS} [%-16t] %-5p %-22c{0}%X{ServiceId} -%X{trace-id} %m%n</pattern>
|
||||
<charset>UTF-8</charset>
|
||||
</encoder>
|
||||
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 每天日志归档路径以及格式 -->
|
||||
<fileNamePattern>./data/log/log-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
|
||||
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
|
||||
<maxFileSize>100MB</maxFileSize>
|
||||
</timeBasedFileNamingAndTriggeringPolicy>
|
||||
<!--日志文件保留天数-->
|
||||
<maxHistory>15</maxHistory>
|
||||
<totalSizeCap>10GB</totalSizeCap>
|
||||
</rollingPolicy>
|
||||
</appender>
|
||||
|
||||
<!-- 时间滚动输出 level为 ERROR 日志 -->
|
||||
<appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<!-- 正在记录的日志文件的路径及文件名 -->
|
||||
<file>./data/log/log_error.log</file>
|
||||
<!--日志文件输出格式-->
|
||||
<encoder>
|
||||
<pattern>%d{yy-MM-dd.HH:mm:ss.SSS} [%-16t] %-5p %-22c{0}%X{ServiceId} -%X{trace-id} %m%n</pattern>
|
||||
<charset>UTF-8</charset>
|
||||
</encoder>
|
||||
<!-- 日志记录器的滚动策略，按日期，按大小记录 -->
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<fileNamePattern>./data/log/log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
|
||||
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
|
||||
<maxFileSize>100MB</maxFileSize>
|
||||
</timeBasedFileNamingAndTriggeringPolicy>
|
||||
<!-- 日志文件保留天数【根据服务器预留，可自行调整】 -->
|
||||
<maxHistory>7</maxHistory>
|
||||
<totalSizeCap>5GB</totalSizeCap>
|
||||
</rollingPolicy>
|
||||
<!-- WARN 级别及以上 -->
|
||||
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
||||
<level>WARN</level>
|
||||
</filter>
|
||||
</appender>
|
||||
|
||||
<!-- 异步输出 -->
|
||||
<appender name="ASYNC_FILE_INFO" class="ch.qos.logback.classic.AsyncAppender">
|
||||
<!-- 队列剩余容量小于discardingThreshold,则会丢弃TRACT、DEBUG、INFO级别的日志;默认值-1,为queueSize的20%;0不丢失日志 -->
|
||||
<discardingThreshold>0</discardingThreshold>
|
||||
<!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
|
||||
<queueSize>8192</queueSize>
|
||||
<!-- neverBlock:true 会丢失日志,但业务性能不受影响 -->
|
||||
<neverBlock>true</neverBlock>
|
||||
<!--是否提取调用者数据-->
|
||||
<includeCallerData>false</includeCallerData>
|
||||
<appender-ref ref="INFO_FILE"/>
|
||||
</appender>
|
||||
|
||||
<appender name="ASYNC_FILE_ERROR" class="ch.qos.logback.classic.AsyncAppender">
|
||||
<!-- 队列剩余容量小于discardingThreshold,则会丢弃TRACT、DEBUG、INFO级别的日志;默认值-1,为queueSize的20%;0不丢失日志 -->
|
||||
<discardingThreshold>0</discardingThreshold>
|
||||
<!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
|
||||
<queueSize>1024</queueSize>
|
||||
<!-- neverBlock:true 会丢失日志,但业务性能不受影响 -->
|
||||
<neverBlock>true</neverBlock>
|
||||
<!--是否提取调用者数据-->
|
||||
<includeCallerData>false</includeCallerData>
|
||||
<appender-ref ref="ERROR_FILE"/>
|
||||
</appender>
|
||||
|
||||
<!-- 开发环境：控制台打印 -->
|
||||
<springProfile name="dev">
|
||||
<logger name="com.nmys.view" level="debug"/>
|
||||
</springProfile>
|
||||
|
||||
<root level="info">
|
||||
<appender-ref ref="CONSOLE"/>
|
||||
<!-- 异步日志-INFO -->
|
||||
<appender-ref ref="ASYNC_FILE_INFO"/>
|
||||
<!-- 异步日志-ERROR -->
|
||||
<appender-ref ref="ASYNC_FILE_ERROR"/>
|
||||
</root>
|
||||
|
||||
</configuration>
|
||||
Reference in New Issue
Block a user