Skip to content

Commit 482b199

Browse files
author
jinhaiyang
committed
glm-4.5 model
1 parent a5aa713 commit 482b199

File tree

5 files changed

+88
-30
lines changed

5 files changed

+88
-30
lines changed

src/main/java/com/zhipu/oapi/service/v4/model/ChatCompletionRequest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,10 @@ public class ChatCompletionRequest extends CommonRequest implements ClientReque
102102
*/
103103
private Object toolChoice;
104104

105-
105+
/**
106+
* 推理相关参数
107+
*/
108+
private ChatThinking thinking;
106109

107110

108111
private String invokeMethod;
@@ -126,6 +129,7 @@ public Map<String, Object> getOptions() {
126129
paramsMap.put("stop", this.getStop());
127130
paramsMap.put("meta", this.getMeta());
128131
paramsMap.put("extra", this.getExtra());
132+
paramsMap.put("thinking", this.getThinking());
129133
if(this.getExtraJson() !=null){
130134
paramsMap.putAll(this.getExtraJson());
131135
}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.zhipu.oapi.service.v4.model;
2+
3+
4+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
5+
import lombok.AllArgsConstructor;
6+
import lombok.Builder;
7+
import lombok.Data;
8+
import lombok.NoArgsConstructor;
9+
10+
@Data
11+
@Builder
12+
@AllArgsConstructor
13+
@NoArgsConstructor
14+
@JsonIgnoreProperties(ignoreUnknown = true)
15+
public class ChatThinking {
16+
17+
/**
18+
* Model thinking type
19+
*/
20+
private String type;
21+
22+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.zhipu.oapi.service.v4.model;
2+
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
5+
import lombok.AllArgsConstructor;
6+
import lombok.Builder;
7+
import lombok.Data;
8+
import lombok.NoArgsConstructor;
9+
10+
@Data
11+
@Builder
12+
@AllArgsConstructor
13+
@NoArgsConstructor
14+
@JsonIgnoreProperties(ignoreUnknown = true)
15+
public class CompletionTokensDetails {
16+
17+
@JsonProperty("reasoning_tokens")
18+
private int reasoningTokens;
19+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package com.zhipu.oapi.service.v4.model;
2+
3+
4+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
5+
import com.fasterxml.jackson.annotation.JsonProperty;
6+
import lombok.AllArgsConstructor;
7+
import lombok.Builder;
8+
import lombok.Data;
9+
import lombok.NoArgsConstructor;
10+
11+
@Data
12+
@Builder
13+
@AllArgsConstructor
14+
@NoArgsConstructor
15+
@JsonIgnoreProperties(ignoreUnknown = true)
16+
public class PromptTokensDetails {
17+
@JsonProperty("cached_tokens")
18+
private int cachedTokens;
19+
}

src/main/java/com/zhipu/oapi/service/v4/model/Usage.java

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ public class Usage {
1717
private int completionTokens;
1818
@JsonProperty("total_tokens")
1919
private int totalTokens;
20-
// @SerializedName("prompt_chars")
21-
// private int promptChars;
22-
// @SerializedName("completion_chars")
23-
// private int completionChars;
24-
// @SerializedName("total_chars")
25-
// private int totalChars;
2620

2721
@JsonProperty("total_calls")
2822
private int totalCalls;
2923

24+
@JsonProperty("prompt_tokens_details")
25+
private PromptTokensDetails promptTokensDetails;
26+
27+
@JsonProperty("completion_tokens_details")
28+
private CompletionTokensDetails completionTokensDetails;
29+
30+
3031
public int getPromptTokens() {
3132
return promptTokens;
3233
}
@@ -51,28 +52,21 @@ public void setTotalTokens(int totalTokens) {
5152
this.totalTokens = totalTokens;
5253
}
5354

54-
// public int getPromptChars() {
55-
// return promptChars;
56-
// }
57-
//
58-
// public void setPromptChars(int promptChars) {
59-
// this.promptChars = promptChars;
60-
// }
61-
//
62-
// public int getCompletionChars() {
63-
// return completionChars;
64-
// }
65-
//
66-
// public void setCompletionChars(int completionChars) {
67-
// this.completionChars = completionChars;
68-
// }
69-
//
70-
// public int getTotalChars() {
71-
// return totalChars;
72-
// }
73-
//
74-
// public void setTotalChars(int totalChars) {
75-
// this.totalChars = totalChars;
76-
// }
55+
public PromptTokensDetails getPromptTokensDetails(){
56+
return promptTokensDetails;
57+
}
58+
59+
public void setPromptTokensDetails(PromptTokensDetails promptTokensDetails) {
60+
this.promptTokensDetails = promptTokensDetails;
61+
}
62+
63+
public CompletionTokensDetails getCompletionTokensDetails(){
64+
return completionTokensDetails;
65+
}
66+
67+
public void setCompletionTokensDetails(CompletionTokensDetails completionTokensDetails) {
68+
this.completionTokensDetails = completionTokensDetails;
69+
}
70+
7771

7872
}

0 commit comments

Comments
 (0)