Merge remote-tracking branch 'origin/main' into feature/file-parsing

# Conflicts:
#	core/src/main/java/ai/z/openapi/AbstractAiClient.java

Author: mengqian

README.md

@@ -30,7 +30,7 @@ Add the following dependency to your `pom.xml`:
 <dependency>
     <groupId>ai.z.openapi</groupId>
     <artifactId>zai-sdk</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
 </dependency>
 ```
 
@@ -39,7 +39,7 @@ Add the following dependency to your `build.gradle` (for Groovy DSL):
 
 ```groovy
 dependencies {
-    implementation 'ai.z.openapi:zai-sdk:0.0.5'
+    implementation 'ai.z.openapi:zai-sdk:0.0.6'
 }
 ```
 
@@ -124,7 +124,7 @@ ZaiClient client = ZaiClient.builder()
 
 // Create chat request
 ChatCompletionCreateParams request = ChatCompletionCreateParams.builder()
-    .model(Constants.ModelChatGLM4)
+    .model("glm-4.6")
     .messages(Arrays.asList(
         ChatMessage.builder()
             .role(ChatMessageRole.USER.value())
@@ -152,7 +152,7 @@ if (response.isSuccess()) {
 ```java
 // Create streaming request
 ChatCompletionCreateParams streamRequest = ChatCompletionCreateParams.builder()
-    .model(Constants.ModelChatGLM4)
+    .model("glm-4.6")
     .messages(Arrays.asList(
         ChatMessage.builder()
             .role(ChatMessageRole.USER.value())
@@ -281,7 +281,7 @@ public class AIController {
     @PostMapping("/chat")
     public ResponseEntity<String> chat(@RequestBody ChatRequest request) {
         ChatCompletionCreateParams params = ChatCompletionCreateParams.builder()
-            .model(Constants.ModelChatGLM4)
+            .model("glm-4.6")
             .messages(Arrays.asList(
                 ChatMessage.builder()
                     .role(ChatMessageRole.USER.value())

README_CN.md

@@ -30,7 +30,7 @@ Z.ai AI 平台官方 Java SDK，提供统一接口访问强大的AI能力，包
 <dependency>
     <groupId>ai.z.openapi</groupId>
     <artifactId>zai-sdk</artifactId>
-    <version>0.0.5</version>
+    <version>0.0.6</version>
 </dependency>
 ```
 
@@ -39,7 +39,7 @@ Z.ai AI 平台官方 Java SDK，提供统一接口访问强大的AI能力，包
 
 ```groovy
 dependencies {
-    implementation 'ai.z.openapi:zai-sdk:0.0.5'
+    implementation 'ai.z.openapi:zai-sdk:0.0.6'
 }
 ```
 
@@ -123,7 +123,7 @@ ZaiClient client = ZaiClient.builder()
 
 // 创建对话请求
 ChatCompletionCreateParams request = ChatCompletionCreateParams.builder()
-    .model(Constants.ModelChatGLM4)
+    .model("glm-4.6")
     .messages(Arrays.asList(
         ChatMessage.builder()
             .role(ChatMessageRole.USER.value())
@@ -151,7 +151,7 @@ if (response.isSuccess()) {
 ```java
 // 创建流式请求
 ChatCompletionCreateParams streamRequest = ChatCompletionCreateParams.builder()
-    .model(Constants.ModelChatGLM4)
+    .model("glm-4.6")
     .messages(Arrays.asList(
         ChatMessage.builder()
             .role(ChatMessageRole.USER.value())
@@ -282,7 +282,7 @@ public class AIController {
     @PostMapping("/chat")
     public ResponseEntity<String> chat(@RequestBody ChatRequest request) {
         ChatCompletionCreateParams params = ChatCompletionCreateParams.builder()
-            .model(Constants.ModelChatGLM4)
+            .model("glm-4.6")
             .messages(Arrays.asList(
                 ChatMessage.builder()
                     .role(ChatMessageRole.USER.value())

core/src/main/java/ai/z/openapi/AbstractAiClient.java

@@ -27,6 +27,8 @@
 import ai.z.openapi.service.assistant.AssistantServiceImpl;
 import ai.z.openapi.service.voiceclone.VoiceCloneService;
 import ai.z.openapi.service.voiceclone.VoiceCloneServiceImpl;
+import ai.z.openapi.service.moderations.ModerationService;
+import ai.z.openapi.service.moderations.ModerationServiceImpl;
 import ai.z.openapi.core.config.ZaiConfig;
 import ai.z.openapi.core.model.BiFlowableClientResponse;
 import ai.z.openapi.core.model.ClientRequest;
@@ -109,6 +111,9 @@ public abstract class AbstractAiClient extends AbstractClientBaseService {
 	/** FileParsing service for fileParsing operations */
 	private FileParsingService fileParsingService;
 
+	/** Moderation service for content safety detection */
+	private ModerationService moderationService;
+
 	/**
 	 * Constructs a new AbstractAiClient with the specified configuration.
 	 * @param config the configuration object containing API keys, timeouts, and other
@@ -273,6 +278,18 @@ public synchronized FileParsingService fileParsing() {
 		return fileParsingService;
 	}
 
+	/**
+	 * Returns the moderation service for content safety detection. This service handles
+	 * content moderation for text, image, video, and audio inputs.
+	 * @return the ModerationService instance (lazily initialized)
+	 */
+	public synchronized ModerationService moderations() {
+		if (moderationService == null) {
+			this.moderationService = new ModerationServiceImpl(this);
+		}
+		return moderationService;
+	}
+
 	// ==================== Utility Methods ====================
 
 	/**

core/src/main/java/ai/z/openapi/api/audio/AudioApi.java

@@ -39,6 +39,20 @@ public interface AudioApi {
 	@POST("audio/speech")
 	Single<ResponseBody> audioSpeech(@Body AudioSpeechRequest request);
 
+	/**
+	 * Text-to-Speech (TTS) conversion using GLM-4-Voice Converts text input into
+	 * natural-sounding speech audio with emotion and tone control Supports multiple
+	 * voices, languages, speed adjustment, and various audio formats Features advanced
+	 * voice synthesis with customizable emotional expressions and dialects
+	 * @param request TTS parameters including text, voice selection, emotion, speed,
+	 * tone, and output format
+	 * @return Generated high-quality audio streaming in specified format with natural
+	 * prosody
+	 */
+	@Streaming
+	@POST("audio/speech")
+	Call<ResponseBody> audioSpeechStreaming(@Body AudioSpeechRequest request);
+
 	/**
 	 * Voice cloning and customization using advanced neural models Creates custom voice
 	 * models from provided audio samples with high fidelity Enables personalized speech

core/src/main/java/ai/z/openapi/api/moderations/ModerationApi.java

@@ -0,0 +1,32 @@
+package ai.z.openapi.api.moderations;
+
+import ai.z.openapi.service.moderations.ModerationCreateParams;
+import ai.z.openapi.service.moderations.ModerationResult;
+import io.reactivex.rxjava3.core.Single;
+import retrofit2.http.Body;
+import retrofit2.http.POST;
+
+/**
+ * Moderation API for content safety detection Provides content moderation capabilities
+ * for text, image, audio, and video formats Accurately identifies risky content including
+ * adult content, violence, illegal content, etc. Returns structured moderation results
+ * including content type, risk type, and specific risk segments
+ */
+public interface ModerationApi {
+
+	/**
+	 * Create a content moderation request for safety detection Analyzes content for
+	 * potential risks including adult content, violence, illegal activities Supports
+	 * multiple content types: text strings, images, audio, and video files Returns
+	 * detailed risk assessment with structured results and specific risk segments
+	 * @param request Moderation parameters including content to analyze (text string or
+	 * multimedia object) Text: maximum 2000 characters Images: less than 10M, minimum
+	 * resolution 20x20, maximum 6000x6000 Video: recommended duration 30 seconds Audio:
+	 * recommended duration 60 seconds
+	 * @return Moderation response with risk level (PASS/REVIEW/REJECT), content type,
+	 * risk types, and processing time information
+	 */
+	@POST("moderations")
+	Single<ModerationResult> createModeration(@Body ModerationCreateParams request);
+
+}

core/src/main/java/ai/z/openapi/core/Constants.java

@@ -35,6 +35,21 @@ private Constants() {
 	// Text Generation Models
 	// =============================================================================
 
+	/**
+	 * GLM-4.6 model code
+	 */
+	public static final String ModelGLM4_6 = "glm-4.6";
+
+	/**
+	 * GLM-4.6-air model code
+	 */
+	public static final String ModelGLM4_6_AIR = "glm-4.6-air";
+
+	/**
+	 * GLM-4.6-flash model code
+	 */
+	public static final String ModelGLM4_6_FLASH = "glm-4.6-flash";
+
 	/**
 	 * GLM-4.5 model code
 	 */

core/src/main/java/ai/z/openapi/core/config/ZaiConfig.java

@@ -54,16 +54,6 @@ public class ZaiConfig {
 	 */
 	private String apiKey;
 
-	/**
-	 * API id component.
-	 */
-	private String apiId;
-
-	/**
-	 * API secret component.
-	 */
-	private String apiSecret;
-
 	/**
 	 * Custom Http Request Headers
 	 */
@@ -84,7 +74,8 @@ public class ZaiConfig {
 	/**
 	 * Flag to disable token caching.
 	 */
-	private boolean disableTokenCache;
+	@Builder.Default
+	private boolean disableTokenCache = true;
 
 	/**
 	 * Maximum number of idle connections in the connection pool.
@@ -96,7 +87,7 @@ public class ZaiConfig {
 	 * Keep alive duration for connections in the pool (in seconds).
 	 */
 	@Builder.Default
-	private long connectionPoolKeepAliveDuration = 1;
+	private long connectionPoolKeepAliveDuration = 10;
 
 	/**
 	 * Time unit for connection pool keep alive duration.
@@ -149,10 +140,8 @@ public ZaiConfig(String apiKey) {
 		this.apiKey = apiKey;
 		String[] arrStr = apiKey.split("\\.");
 		if (arrStr.length != 2) {
-			throw new RuntimeException("invalid apiSecretKey");
+			throw new RuntimeException("invalid api Key");
 		}
-		this.apiId = arrStr[0];
-		this.apiSecret = arrStr[1];
 	}
 
 	/**
@@ -166,8 +155,6 @@ public void setApiKey(String apiKey) {
 		if (arrStr.length != 2) {
 			throw new RuntimeException("invalid api Key");
 		}
-		this.apiId = arrStr[0];
-		this.apiSecret = arrStr[1];
 	}
 
 	/**
@@ -194,38 +181,10 @@ public String getApiKey() {
 		if (value != null && !value.isEmpty()) {
 			// Parse value and set components
 			this.apiKey = value;
-			String[] arrStr = value.split("\\.");
-			if (arrStr.length == 2) {
-				this.apiId = arrStr[0];
-				this.apiSecret = arrStr[1];
-			}
-			return value;
 		}
 		return apiKey;
 	}
 
-	/**
-	 * Gets API key with system property and environment variable fallback.
-	 */
-	public String getApiId() {
-		if (apiId != null && !apiId.isEmpty()) {
-			return apiId;
-		}
-		getApiKey();
-		return apiId;
-	}
-
-	/**
-	 * Gets API secret with system property and environment variable fallback.
-	 */
-	public String getApiSecret() {
-		if (apiSecret != null && !apiSecret.isEmpty()) {
-			return apiSecret;
-		}
-		getApiKey();
-		return apiSecret;
-	}
-
 	/**
 	 * Gets expire millis with system property and environment variable fallback.
 	 */

core/src/main/java/ai/z/openapi/core/token/HttpRequestInterceptor.java

@@ -40,7 +40,7 @@ public Response intercept(Chain chain) throws IOException {
 			.newBuilder()
 			.header("Authorization", "Bearer " + accessToken)
 			.header("x-source-channel", source_channel)
-			.header("Zai-SDK-Ver", "0.0.5")
+			.header("Zai-SDK-Ver", "0.0.6")
 			.header("Accept-Language", "en-US,en");
 		if (Objects.nonNull(config.getCustomHeaders())) {
 			for (Map.Entry<String, String> entry : config.getCustomHeaders().entrySet()) {

core/src/main/java/ai/z/openapi/core/token/TokenManager.java

@@ -44,7 +44,12 @@ public TokenManager(ICache cache) {
 	 * @return valid JWT token
 	 */
 	public String getToken(ZaiConfig config) {
-		String tokenCacheKey = genTokenCacheKey(config.getApiId());
+		String[] arrStr = config.getApiKey().split("\\.");
+		if (arrStr.length != 2) {
+			throw new RuntimeException("invalid api Key");
+		}
+		String appId = arrStr[0];
+		String tokenCacheKey = genTokenCacheKey(appId);
 		String cacheToken = cache.get(tokenCacheKey);
 		if (StringUtils.isNotEmpty(cacheToken)) {
 			return cacheToken;
@@ -62,9 +67,15 @@ public String getToken(ZaiConfig config) {
 	private static String createJwt(ZaiConfig config) {
 		Algorithm alg;
 		String algId = config.getAlg();
+		String[] arrStr = config.getApiKey().split("\\.");
+		if (arrStr.length != 2) {
+			throw new RuntimeException("invalid api Key");
+		}
+		String appId = arrStr[0];
+		String apiSecret = arrStr[1];
 		if ("HS256".equals(algId)) {
 			try {
-				alg = Algorithm.HMAC256(config.getApiSecret().getBytes(StandardCharsets.UTF_8));
+				alg = Algorithm.HMAC256(apiSecret.getBytes(StandardCharsets.UTF_8));
 			}
 			catch (Exception e) {
 				logger.error("Failed to create HMAC256 algorithm", e);
@@ -79,7 +90,7 @@ private static String createJwt(ZaiConfig config) {
 
 		Map<String, Object> payload = new HashMap<>();
 		// here the api_key is the apiId
-		payload.put("api_key", config.getApiId());
+		payload.put("api_key", appId);
 		payload.put("exp", System.currentTimeMillis() + config.getExpireMillis() + DELAY_EXPIRE_TIME);
 		payload.put("timestamp", Calendar.getInstance().getTimeInMillis());
 		Map<String, Object> headerClaims = new HashMap<>();

core/src/main/java/ai/z/openapi/service/audio/AudioService.java

@@ -12,6 +12,13 @@ public interface AudioService {
 	 */
 	AudioSpeechResponse createSpeech(AudioSpeechRequest request);
 
+	/**
+	 * Creates speech from text using text-to-speech.
+	 * @param request the speech generation request
+	 * @return AudioSpeechStreamingResponse containing the generated speech streaming
+	 */
+	AudioSpeechStreamingResponse createStreamingSpeechStreaming(AudioSpeechRequest request);
+
 	/**
 	 * Creates customized speech with specific voice characteristics.
 	 * @param request the speech customization request