Merge pull request #1 from ageerle/main

Albert

2025-05-13 3666157d14201d39a0e61588582fee97fac95ad1

 ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiStreamClient.java

@@ -53,7 +53,7 @@
import java.util.concurrent.TimeUnit;

/**
 * 描述： open ai 客户端
 *   open ai 客户端
 *
 * @author https:www.unfbx.com
 * 2023-02-28
@@ -70,6 +70,11 @@
     * 自定义api host使用builder的方式构造client
     */
    private String apiHost;

    /**
     * 自定义url 兼容多个平台
     */
    private String apiUrl;

    /**
     * 自定义的okHttpClient
@@ -112,6 +117,11 @@
        }
        apiHost = builder.apiHost;

        if (StrUtil.isBlank(builder.apiUrl)) {
            builder.apiUrl = OpenAIConst.apiUrl;
        }
        apiUrl = builder.apiUrl;

        if (Objects.isNull(builder.keyStrategy)) {
            builder.keyStrategy = new KeyRandomStrategy();
        }
@@ -136,12 +146,12 @@
        }
        okHttpClient = builder.okHttpClient;

        this.openAiApi = new Retrofit.Builder()
            .baseUrl(apiHost)
            .client(okHttpClient)
            .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
            .addConverterFactory(JacksonConverterFactory.create())
            .build().create(OpenAiApi.class);
//        this.openAiApi = new Retrofit.Builder()
//            .baseUrl(apiHost)
//            .client(okHttpClient)
//            .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
//            .addConverterFactory(JacksonConverterFactory.create())
//            .build().create(OpenAiApi.class);
    }

    /**
@@ -180,7 +190,7 @@
            ObjectMapper mapper = new ObjectMapper();
            String requestBody = mapper.writeValueAsString(chatCompletion);
            Request request = new Request.Builder()
                .url(this.apiHost + "v1/chat/completions")
                .url(this.apiHost)
                .post(RequestBody.create(MediaType.parse(ContentType.JSON.getValue()), requestBody))
                .build();
            factory.newEventSource(request, eventSourceListener);
@@ -334,7 +344,6 @@

        BillingUsage billingUsage = billingUsage(start.toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), end.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
        double totalUsage = billingUsage.getTotalUsage().doubleValue() / 100;
        System.out.println(totalUsage);
        Subscription subscription = subscription();
        KeyInfo keyInfo = new KeyInfo();
        String start_key = key.substring(0, 6);
@@ -611,6 +620,8 @@
         */
        private String apiHost;

        private String apiUrl;

        /**
         * 自定义OkhttpClient
         */
@@ -645,6 +656,16 @@
            return this;
        }

        /**
         * @param val 自定义请求后缀
         * @return Builder
         * @see OpenAIConst
         */
        public Builder apiUrl(String val) {
            apiUrl = val;
            return this;
        }

        public Builder keyStrategy(KeyStrategyFunction val) {
            keyStrategy = val;
            return this;