v1.0.2

- 用java8编译打包

Author: wangzihaogithub

README.md

@@ -16,7 +16,7 @@ AI助手jar包，可二次开发复用 (基于langchain4j的java8版本开发)
 <dependency>
     <groupId>com.github.wangzihaogithub</groupId>
     <artifactId>ai-assistant</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
 </dependency>
 
 <!-- Required Dependencies -->

pom.xml

@@ -5,19 +5,13 @@
 
     <groupId>com.github.wangzihaogithub</groupId>
     <artifactId>ai-assistant</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <packaging>jar</packaging>
 
     <name>ai-assistant</name>
     <description>ai-assistant</description>
     <url>https://github.com/wangzihaogithub/ai-assistant.git</url>
 
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>9</version>
-    </parent>
-
     <properties>
         <argLine>-Dfile.encoding=UTF-8</argLine>
         <!-- 文件拷贝时的编码 -->
@@ -49,7 +43,7 @@
         <connection>scm:git:https://github.com/wangzihaogithub/ai-assistant.git</connection>
         <developerConnection>scm:git:[email protected]:wangzihaogithub/ai-assistant.git</developerConnection>
         <url>[email protected]:wangzihaogithub/ai-assistant.git</url>
-        <tag>v1.0.1</tag>
+        <tag>v1.0.2</tag>
     </scm>
 
     <!-- 开发者信息 -->

src/main/java/com/github/aiassistant/platform/AliyunAppsClient.java

@@ -76,14 +76,14 @@ public class AliyunAppsClient {
     private final String apiKey;
     private final String appId;
     private final ApiKeyStatus apiKeyStatus;
-    private Semaphore maxCurrentRequestCount = new Semaphore(2000);
     // 将重试请求均匀分担到未来的几秒内
     private final SecondIncr retrySecondIncr = new SecondIncr(60);
     // 将超时延迟任务合并
     private final SecondIncr autoCancelTimeoutScheduledFutureIdIncr = new SecondIncr(300);
+    private final AtomicLong futureIdIncr = new AtomicLong();
+    private Semaphore maxCurrentRequestCount = new Semaphore(2000);
     // 两分钟超时自动取消(毫秒)
     private long autoCancelTimeoutMs = 120_000;
-    private final AtomicLong futureIdIncr = new AtomicLong();
     private boolean close = false;
 
     public AliyunAppsClient(String apiKey, String appId) {
@@ -129,17 +129,18 @@ public void setMaxCurrentRequestCount(int maxCurrentRequestCount) {
         this.maxCurrentRequestCount = new Semaphore(maxCurrentRequestCount);
     }
 
-    public void setAutoCancelTimeoutMs(long autoCancelTimeoutMs) {
-        this.autoCancelTimeoutMs = autoCancelTimeoutMs;
-    }
-
     public long getAutoCancelTimeoutMs() {
         return autoCancelTimeoutMs;
     }
 
+    public void setAutoCancelTimeoutMs(long autoCancelTimeoutMs) {
+        this.autoCancelTimeoutMs = autoCancelTimeoutMs;
+    }
+
     /**
      * 向阿里云发起请求
      *
+     * @param userMessage   用户消息
      * @param maxRetryCount 最大重试次数
      * @return 大模型返回结果 com.alibaba.dashscope.common.DashScopeResult
      */
@@ -151,6 +152,7 @@ public CompletableFuture<DashScopeResult> request(String userMessage, int maxRet
     /**
      * 向阿里云发起请求
      *
+     * @param userMessage             用户消息
      * @param responseContextConsumer 用户重试逻辑
      * @param maxRetryCount           最大重试次数
      * @return 大模型返回结果 com.alibaba.dashscope.common.DashScopeResult
@@ -500,9 +502,9 @@ public T get(long timeout, TimeUnit unit) throws InterruptedException, Execution
      * 将重试请求均匀分担到每一秒内
      */
     private static class SecondIncr {
+        private final int futureSecond;
         private int secondIncr;
         private int lastSecond;
-        private final int futureSecond;
 
         /**
          * 分摊到未来的几秒内
@@ -538,11 +540,11 @@ private static class ApiKeyStatus {
         final LinkedList<RequestListener> listeners = new LinkedList<>();
         // 当前请求未完成的数量
         final NavigableSet<TimeOutCancelCompletableFuture<DashScopeResult>> currentRequestCount = new ConcurrentSkipListSet<>(Comparator.comparing(e -> e.timestamp));
+        private final SecondIncr secondIncr = new SecondIncr(60);
         // 平均完成用户完整请求的耗时，一次用户完整请求如果出发限流会包含多次阿里云调用的耗时
         volatile long avgRequestMs = 0;
         // 平均一次阿里云调用的耗时
         volatile long avgOnceRequestMs = 0;
-        private final SecondIncr secondIncr = new SecondIncr(60);
 
         private ApiKeyStatus(String apiKey) {
             this.apiKey = apiKey;

src/main/java/com/github/aiassistant/service/jsonschema/LlmJsonSchemaApiService.java

@@ -237,6 +237,7 @@ public <T> T getSchema(MemoryIdVO memoryIdVO, Class<T> type) throws JsonSchemaCr
      * @param memoryIdVO            memoryIdVO
      * @param type                  type
      * @param useChatMemoryProvider 是否给AI提供多伦对话历史记录
+     * @param jsonSchemaEnum jsonSchemaEnum
      * @param <T>                   类型
      * @return JsonSchema类型的模型
      * @throws JsonSchemaCreateException JsonSchema创建失败

src/main/java/com/github/aiassistant/util/FutureUtil.java

@@ -116,6 +116,7 @@ public static <T> void accept(CompletableFuture<T> future, CompletableFuture<?>
     /**
      * 加入到原异步完成之后执行
      *
+     * @param <F>    CompletionStage
      * @param future 原异步
      * @param join   新异步
      * @param <T>    数据类型
@@ -147,6 +148,7 @@ public static <T, F extends CompletionStage<T>> CompletableFuture<T> join(F futu
      * 将装有异步的MapList的格式转为扁平格式（依次等待结果聚合为等待全部结束）
      *
      * @param map 装有异步的MapList
+     * @param <F> CompletionStage
      * @param <K> Key数据格式
      * @param <V> Value数据格式
      * @return 扁平格式（等待全部结束）
@@ -337,6 +339,7 @@ public static <V> CompletableFuture<V> allOf(CompletableFuture<CompletableFuture
      * 将装有异步的List的格式转为扁平格式（依次等待结果聚合为等待全部结束）
      *
      * @param list 装有异步的List
+     * @param <F>  CompletionStage
      * @param <V>  Value数据格式
      * @return 扁平格式（等待全部结束）
      */
@@ -351,6 +354,7 @@ public static <V, F extends CompletionStage<V>> CompletableFuture<List<List<V>>>
     /**
      * 将装有异步的Map的格式转为扁平格式（依次等待结果聚合为等待全部结束）
      *
+     * @param <F> CompletionStage
      * @param map 装有异步的Map
      * @param <K> Key数据格式
      * @param <V> Value数据格式