diff --git a/src/main/java/com/zhipu/oapi/service/v4/model/ChatCompletionRequest.java b/src/main/java/com/zhipu/oapi/service/v4/model/ChatCompletionRequest.java index d3a7fc0..136ea65 100644 --- a/src/main/java/com/zhipu/oapi/service/v4/model/ChatCompletionRequest.java +++ b/src/main/java/com/zhipu/oapi/service/v4/model/ChatCompletionRequest.java @@ -102,7 +102,10 @@ public class ChatCompletionRequest extends CommonRequest implements ClientReque */ private Object toolChoice; - + /** + * 推理相关参数 + */ + private ChatThinking thinking; private String invokeMethod; @@ -126,6 +129,7 @@ public Map getOptions() { paramsMap.put("stop", this.getStop()); paramsMap.put("meta", this.getMeta()); paramsMap.put("extra", this.getExtra()); + paramsMap.put("thinking", this.getThinking()); if(this.getExtraJson() !=null){ paramsMap.putAll(this.getExtraJson()); } diff --git a/src/main/java/com/zhipu/oapi/service/v4/model/ChatThinking.java b/src/main/java/com/zhipu/oapi/service/v4/model/ChatThinking.java new file mode 100644 index 0000000..4c1aa3e --- /dev/null +++ b/src/main/java/com/zhipu/oapi/service/v4/model/ChatThinking.java @@ -0,0 +1,22 @@ +package com.zhipu.oapi.service.v4.model; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) +public class ChatThinking { + + /** + * Model thinking type + */ + private String type; + +} diff --git a/src/main/java/com/zhipu/oapi/service/v4/model/CompletionTokensDetails.java b/src/main/java/com/zhipu/oapi/service/v4/model/CompletionTokensDetails.java new file mode 100644 index 0000000..1c2579b --- /dev/null +++ b/src/main/java/com/zhipu/oapi/service/v4/model/CompletionTokensDetails.java @@ -0,0 +1,19 @@ +package com.zhipu.oapi.service.v4.model; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) +public class CompletionTokensDetails { + + @JsonProperty("reasoning_tokens") + private int reasoningTokens; +} diff --git a/src/main/java/com/zhipu/oapi/service/v4/model/PromptTokensDetails.java b/src/main/java/com/zhipu/oapi/service/v4/model/PromptTokensDetails.java new file mode 100644 index 0000000..858379e --- /dev/null +++ b/src/main/java/com/zhipu/oapi/service/v4/model/PromptTokensDetails.java @@ -0,0 +1,19 @@ +package com.zhipu.oapi.service.v4.model; + + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) +public class PromptTokensDetails { + @JsonProperty("cached_tokens") + private int cachedTokens; +} diff --git a/src/main/java/com/zhipu/oapi/service/v4/model/Usage.java b/src/main/java/com/zhipu/oapi/service/v4/model/Usage.java index 1e3cd2b..7b9359a 100644 --- a/src/main/java/com/zhipu/oapi/service/v4/model/Usage.java +++ b/src/main/java/com/zhipu/oapi/service/v4/model/Usage.java @@ -17,16 +17,17 @@ public class Usage { private int completionTokens; @JsonProperty("total_tokens") private int totalTokens; -// @SerializedName("prompt_chars") -// private int promptChars; -// @SerializedName("completion_chars") -// private int completionChars; -// @SerializedName("total_chars") -// private int totalChars; @JsonProperty("total_calls") private int totalCalls; + @JsonProperty("prompt_tokens_details") + private PromptTokensDetails promptTokensDetails; + + @JsonProperty("completion_tokens_details") + private CompletionTokensDetails completionTokensDetails; + + public int getPromptTokens() { return promptTokens; } @@ -51,28 +52,21 @@ public void setTotalTokens(int totalTokens) { this.totalTokens = totalTokens; } -// public int getPromptChars() { -// return promptChars; -// } -// -// public void setPromptChars(int promptChars) { -// this.promptChars = promptChars; -// } -// -// public int getCompletionChars() { -// return completionChars; -// } -// -// public void setCompletionChars(int completionChars) { -// this.completionChars = completionChars; -// } -// -// public int getTotalChars() { -// return totalChars; -// } -// -// public void setTotalChars(int totalChars) { -// this.totalChars = totalChars; -// } + public PromptTokensDetails getPromptTokensDetails(){ + return promptTokensDetails; + } + + public void setPromptTokensDetails(PromptTokensDetails promptTokensDetails) { + this.promptTokensDetails = promptTokensDetails; + } + + public CompletionTokensDetails getCompletionTokensDetails(){ + return completionTokensDetails; + } + + public void setCompletionTokensDetails(CompletionTokensDetails completionTokensDetails) { + this.completionTokensDetails = completionTokensDetails; + } + } \ No newline at end of file diff --git a/src/main/java/com/zhipu/oapi/service/v4/model/WebSearch.java b/src/main/java/com/zhipu/oapi/service/v4/model/WebSearch.java index df3c651..e6fbfc3 100644 --- a/src/main/java/com/zhipu/oapi/service/v4/model/WebSearch.java +++ b/src/main/java/com/zhipu/oapi/service/v4/model/WebSearch.java @@ -74,6 +74,12 @@ public class WebSearch extends ObjectNode { private String content_size; + /** + * 是否开启意图识别 + */ + private Boolean search_intent; + + public WebSearch(){ super(JsonNodeFactory.instance); } @@ -134,4 +140,9 @@ public void setContent_size(String content_size) { this.content_size = content_size; this.put("content_size",content_size); } + + public void setSearch_intent(Boolean search_intent) { + this.search_intent = search_intent; + this.put("search_intent",search_intent); + } } diff --git a/src/main/java/com/zhipu/oapi/service/v4/web_search/WebSearchRequest.java b/src/main/java/com/zhipu/oapi/service/v4/web_search/WebSearchRequest.java index 7706149..c8456eb 100644 --- a/src/main/java/com/zhipu/oapi/service/v4/web_search/WebSearchRequest.java +++ b/src/main/java/com/zhipu/oapi/service/v4/web_search/WebSearchRequest.java @@ -67,6 +67,10 @@ public class WebSearchRequest implements ClientRequest { @JsonProperty("content_size") private String contentSize; + + @JsonProperty("search_intent") + private Boolean searchIntent; + @Override public WebSearchRequest getOptions() { return this;