Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,10 @@ public class ChatCompletionRequest extends CommonRequest implements ClientReque
*/
private Object toolChoice;


/**
* 推理相关参数
*/
private ChatThinking thinking;


private String invokeMethod;
Expand All @@ -126,6 +129,7 @@ public Map<String, Object> 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());
}
Expand Down
22 changes: 22 additions & 0 deletions src/main/java/com/zhipu/oapi/service/v4/model/ChatThinking.java
Original file line number Diff line number Diff line change
@@ -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;

}
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
@@ -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;
}
52 changes: 23 additions & 29 deletions src/main/java/com/zhipu/oapi/service/v4/model/Usage.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}


}
11 changes: 11 additions & 0 deletions src/main/java/com/zhipu/oapi/service/v4/model/WebSearch.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ public class WebSearch extends ObjectNode {
private String content_size;


/**
* 是否开启意图识别
*/
private Boolean search_intent;


public WebSearch(){
super(JsonNodeFactory.instance);
}
Expand Down Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ public class WebSearchRequest implements ClientRequest<WebSearchRequest> {
@JsonProperty("content_size")
private String contentSize;


@JsonProperty("search_intent")
private Boolean searchIntent;

@Override
public WebSearchRequest getOptions() {
return this;
Expand Down