feat: add missing param and fix some issue (#91)

hanzeINGH · web-flow · commit fc03b09e9438 · 2025-04-25T16:04:51.000+08:00
diff --git a/api/pom.xml b/api/pom.xml
@@ -43,7 +43,7 @@
     </parent>
 
     <artifactId>coze-api</artifactId>
-    <version>0.3.0</version>
+    <version>0.3.1</version>
 
     <scm>
         <connection>scm:git:git://github.com/coze-dev/coze-java.git</connection>
@@ -93,7 +93,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.12</version>
+            <version>1.7.30</version>
         </dependency>
 
         <!-- HTTP Client -->
diff --git a/api/src/main/java/com/coze/openapi/api/CozeAuthAPI.java b/api/src/main/java/com/coze/openapi/api/CozeAuthAPI.java
@@ -22,4 +22,18 @@ Single<Response<OAuthToken>> retrieve(
   @POST("/api/permission/oauth2/workspace_id/{workspace_id}/device/code")
   Single<Response<DeviceAuthResp>> device(
       @Path("workspace_id") String workspaceID, @Body DeviceAuthReq req);
+
+  @Headers({"Content-Type: application/json"})
+  @POST("/api/permission/oauth2/account/{account_id}/token")
+  Single<Response<OAuthToken>> account(
+      @HeaderMap Map<String, String> headers,
+      @Path("account_id") String accountID,
+      @Body GetAccessTokenReq req);
+
+  @Headers({"Content-Type: application/json"})
+  @POST("/api/permission/oauth2/enterprise_id/{enterprise_id}/token")
+  Single<Response<OAuthToken>> enterprise(
+      @HeaderMap Map<String, String> headers,
+      @Path("enterprise_id") String enterpriseID,
+      @Body GetAccessTokenReq req);
 }
diff --git a/api/src/main/java/com/coze/openapi/client/auth/GetAccessTokenReq.java b/api/src/main/java/com/coze/openapi/client/auth/GetAccessTokenReq.java
@@ -44,4 +44,10 @@ public class GetAccessTokenReq extends BaseReq {
 
   @JsonProperty("scope")
   private Scope scope;
+
+  @JsonProperty("account_id")
+  private Long accountID;
+
+  @JsonProperty("enterprise_id")
+  private String enterpriseID;
 }
diff --git a/api/src/main/java/com/coze/openapi/client/auth/GetJWTAccessTokenReq.java b/api/src/main/java/com/coze/openapi/client/auth/GetJWTAccessTokenReq.java
@@ -0,0 +1,22 @@
+package com.coze.openapi.client.auth;
+
+import com.coze.openapi.client.auth.model.SessionContext;
+import com.coze.openapi.client.auth.scope.Scope;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetJWTAccessTokenReq {
+  private Integer ttl;
+  private Scope scope;
+  private String sessionName;
+  private Long accountID;
+  private String enterpriseID;
+  private SessionContext sessionContext;
+}
diff --git a/api/src/main/java/com/coze/openapi/client/auth/model/DeviceInfo.java b/api/src/main/java/com/coze/openapi/client/auth/model/DeviceInfo.java
@@ -0,0 +1,16 @@
+package com.coze.openapi.client.auth.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class DeviceInfo {
+  @JsonProperty("device_id")
+  private String deviceID;
+
+  @JsonProperty("custom_consumer")
+  private String customConsumer;
+}
diff --git a/api/src/main/java/com/coze/openapi/client/auth/model/SessionContext.java b/api/src/main/java/com/coze/openapi/client/auth/model/SessionContext.java
@@ -0,0 +1,17 @@
+package com.coze.openapi.client.auth.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SessionContext {
+  @JsonProperty("device_info")
+  private DeviceInfo deviceInfo;
+}
diff --git a/api/src/main/java/com/coze/openapi/client/auth/scope/Scope.java b/api/src/main/java/com/coze/openapi/client/auth/scope/Scope.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -13,7 +14,10 @@
 @Data
 @AllArgsConstructor
 public class Scope {
+  @JsonProperty("account_permission")
   private ScopeAccountPermission accountPermission;
+
+  @JsonProperty("attribute_constraint")
   private ScopeAttributeConstraint attributeConstraint;
 
   public Map<String, Object> toMap() {
diff --git a/api/src/main/java/com/coze/openapi/client/auth/scope/ScopeAccountPermission.java b/api/src/main/java/com/coze/openapi/client/auth/scope/ScopeAccountPermission.java
@@ -2,11 +2,14 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
 @AllArgsConstructor
 public class ScopeAccountPermission {
+  @JsonProperty("permission_list")
   private List<String> permissionList;
 }
diff --git a/api/src/main/java/com/coze/openapi/client/auth/scope/ScopeAttributeConstraint.java b/api/src/main/java/com/coze/openapi/client/auth/scope/ScopeAttributeConstraint.java
@@ -1,10 +1,13 @@
 package com.coze.openapi.client.auth.scope;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
 @AllArgsConstructor
 public class ScopeAttributeConstraint {
+  @JsonProperty("connector_bot_chat_attribute")
   private ScopeAttributeConstraintConnectorBotChatAttribute connectorBotChatAttribute;
 }
diff --git a/api/src/main/java/com/coze/openapi/client/auth/scope/ScopeAttributeConstraintConnectorBotChatAttribute.java b/api/src/main/java/com/coze/openapi/client/auth/scope/ScopeAttributeConstraintConnectorBotChatAttribute.java
@@ -2,11 +2,14 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @AllArgsConstructor
 @Data
 public class ScopeAttributeConstraintConnectorBotChatAttribute {
+  @JsonProperty("bot_id_list")
   private List<String> botIDList;
 }
diff --git a/api/src/main/java/com/coze/openapi/client/dataset/document/model/DocumentBase.java b/api/src/main/java/com/coze/openapi/client/dataset/document/model/DocumentBase.java
@@ -39,6 +39,13 @@ public static DocumentBase buildWebPage(String name, String url, Integer interva
         .build();
   }
 
+  public static DocumentBase buildLocalFile(String name, byte[] content, String fileType) {
+    return DocumentBase.builder()
+        .name(name)
+        .sourceInfo(DocumentSourceInfo.buildLocalFile(content, fileType))
+        .build();
+  }
+
   public static DocumentBase buildLocalFile(String name, String content, String fileType) {
     return DocumentBase.builder()
         .name(name)
diff --git a/api/src/main/java/com/coze/openapi/client/dataset/document/model/DocumentSourceInfo.java b/api/src/main/java/com/coze/openapi/client/dataset/document/model/DocumentSourceInfo.java
@@ -41,6 +41,14 @@ public static DocumentSourceInfo buildLocalFile(String content, String fileType)
     return info;
   }
 
+  public static DocumentSourceInfo buildLocalFile(byte[] content, String fileType) {
+    String encodedContent = Base64.getEncoder().encodeToString(content);
+    DocumentSourceInfo info = new DocumentSourceInfo();
+    info.setFileBase64(encodedContent);
+    info.setFileType(fileType);
+    return info;
+  }
+
   public static DocumentSourceInfo buildWebPage(String url) {
     DocumentSourceInfo info = new DocumentSourceInfo();
     info.setWebUrl(url);
diff --git a/api/src/main/java/com/coze/openapi/client/websocket/event/model/AsrConfig.java b/api/src/main/java/com/coze/openapi/client/websocket/event/model/AsrConfig.java
@@ -0,0 +1,23 @@
+package com.coze.openapi.client.websocket.event.model;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.*;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode
+public class AsrConfig {
+  @JsonProperty("hot_words")
+  private List<String> hotWords;
+
+  @JsonProperty("context")
+  private String context;
+
+  @JsonProperty("user_language")
+  private String userLanguage;
+}
diff --git a/api/src/main/java/com/coze/openapi/client/websocket/event/model/InterruptConfig.java b/api/src/main/java/com/coze/openapi/client/websocket/event/model/InterruptConfig.java
@@ -0,0 +1,20 @@
+package com.coze.openapi.client.websocket.event.model;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.*;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode
+public class InterruptConfig {
+  @JsonProperty("mode")
+  private String mode;
+
+  @JsonProperty("keywords")
+  private List<String> keywords;
+}
diff --git a/api/src/main/java/com/coze/openapi/client/websocket/event/model/TurnDetection.java b/api/src/main/java/com/coze/openapi/client/websocket/event/model/TurnDetection.java
@@ -12,11 +12,17 @@
 public class TurnDetection {
   @Builder.Default
   @JsonProperty("type")
-  private String type = "client_vad";
+  private String type = "client_interrupt";
 
   @JsonProperty("prefix_padding_ms")
   private Integer prefixPaddingMs;
 
   @JsonProperty("suffix_padding_ms")
   private Integer silenceDurationMs;
+
+  @JsonProperty("interrupt_config")
+  private InterruptConfig interruptConfig;
+
+  @JsonProperty("asr_config")
+  private AsrConfig asrConfig;
 }
diff --git a/api/src/main/java/com/coze/openapi/service/auth/DefaultJWTBuilder.java b/api/src/main/java/com/coze/openapi/service/auth/DefaultJWTBuilder.java
@@ -26,6 +26,9 @@ public String generateJWT(PrivateKey privateKey, Map<String, Object> header, JWT
       if (payload.getSessionName() != null) {
         jwtBuilder.claim("session_name", payload.getSessionName());
       }
+      if (payload.getSessionContext() != null) {
+        jwtBuilder.claim("session_context", payload.getSessionContext());
+      }
       return jwtBuilder.compact();
 
     } catch (Exception e) {
diff --git a/api/src/main/java/com/coze/openapi/service/auth/JWTOAuth.java b/api/src/main/java/com/coze/openapi/service/auth/JWTOAuth.java
@@ -2,20 +2,27 @@
 
 import java.util.Objects;
 
+import com.coze.openapi.client.auth.GetJWTAccessTokenReq;
 import com.coze.openapi.client.auth.OAuthToken;
+import com.coze.openapi.client.auth.model.SessionContext;
 import com.coze.openapi.client.auth.scope.Scope;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.NonNull;
+import lombok.*;
 
-@Builder
+@Getter
+@Builder(builderClassName = "OAuthJWTBuilder")
+@Setter(AccessLevel.PRIVATE)
 @AllArgsConstructor
+@NoArgsConstructor
 public class JWTOAuth extends Auth {
 
   private Integer ttl;
   private String sessionName;
   private Scope scope;
+  private String enterpriseID;
+  private Long accountID;
+  private SessionContext sessionContext;
+
   @NonNull private JWTOAuthClient jwtClient;
 
   public JWTOAuth(JWTOAuthClient client) {
@@ -32,7 +39,16 @@ public String token() {
     if (!this.needRefresh()) {
       return accessToken;
     }
-    OAuthToken resp = this.jwtClient.getAccessToken(this.ttl, this.scope, this.sessionName);
+    GetJWTAccessTokenReq req =
+        GetJWTAccessTokenReq.builder()
+            .enterpriseID(enterpriseID)
+            .scope(scope)
+            .ttl(ttl)
+            .sessionName(sessionName)
+            .sessionContext(sessionContext)
+            .accountID(accountID)
+            .build();
+    OAuthToken resp = this.jwtClient.getAccessToken(req);
     this.accessToken = resp.getAccessToken();
     this.expiresIn = resp.getExpiresIn();
     this.refreshAt = this.expiresIn - getRefreshBefore();
@@ -49,4 +65,25 @@ private long getRefreshBefore() {
     }
     return 0;
   }
+
+  public static class OAuthJWTBuilder {
+    public JWTOAuth build() {
+      JWTOAuth jwt = new JWTOAuth();
+      if (this.jwtClient == null) {
+        throw new IllegalStateException("jwtClient is required");
+      }
+      jwt.setJwtClient(this.jwtClient);
+      if (this.ttl != null) {
+        jwt.ttl = this.ttl;
+      } else {
+        jwt.setTtl(this.jwtClient.getTtl());
+      }
+      jwt.setSessionName(this.sessionName);
+      jwt.setSessionContext(this.sessionContext);
+      jwt.setAccountID(this.accountID);
+      jwt.setEnterpriseID(this.enterpriseID);
+      jwt.setScope(this.scope);
+      return jwt;
+    }
+  }
 }
diff --git a/api/src/main/java/com/coze/openapi/service/auth/JWTOAuthClient.java b/api/src/main/java/com/coze/openapi/service/auth/JWTOAuthClient.java
diff --git a/api/src/main/java/com/coze/openapi/service/auth/JWTPayload.java b/api/src/main/java/com/coze/openapi/service/auth/JWTPayload.java
diff --git a/api/src/main/java/com/coze/openapi/service/auth/OAuthClient.java b/api/src/main/java/com/coze/openapi/service/auth/OAuthClient.java
diff --git a/api/src/main/java/com/coze/openapi/service/utils/UserAgentInterceptor.java b/api/src/main/java/com/coze/openapi/service/utils/UserAgentInterceptor.java
diff --git a/api/src/test/java/com/coze/openapi/service/auth/JWTOAuthClientTest.java b/api/src/test/java/com/coze/openapi/service/auth/JWTOAuthClientTest.java
diff --git a/api/src/test/java/com/coze/openapi/service/auth/JWTOAuthTest.java b/api/src/test/java/com/coze/openapi/service/auth/JWTOAuthTest.java
diff --git a/example/pom.xml b/example/pom.xml
