Revert "Dev/optimization (#223)"

This reverts commit 680d6f6.

Author: zhansheng.lzs

README.md

@@ -33,7 +33,7 @@ Conversation conversation = new Conversation(Protocol.HTTP.getValue());
 Conversation conversation = new Conversation(Protocol.WEBSOCKET.getValue());
 ```
 
-The conversation interface supports both stream and non-stream queries. These queries all accept `ConversationParam`  as input, and returns `ConversationResult` as output . Each model has a unique input structure and output structure which derives from the two data classes mentioned above. Please use these sub classes when you are using the coordinating model.
+The conversation interface supports both stream and non-stream queries. These queries all accept `ConversationParam`  as input, and returns `ConversationResult` as output . Each model has a unique input structure and output structure which derives from the two data classes mentioned above. Please use these sub classes when you are using the coordinating model. 
 
 Here shows the usages of each method, with the examples of `qwen-turbo` model.
 

pom.xml

@@ -40,7 +40,7 @@
     <name>DashScope Java SDK</name>
     <groupId>com.alibaba</groupId>
     <artifactId>dashscope-sdk-java</artifactId>
-    <version>2.22.21</version>
+    <version>2.22.20</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

src/main/java/com/alibaba/dashscope/aigc/codegeneration/CodeGeneration.java

@@ -1,26 +1,16 @@
-// Copyright (c) Alibaba, Inc. and its affiliates.
 package com.alibaba.dashscope.aigc.codegeneration;
 
 import com.alibaba.dashscope.api.SynchronizeHalfDuplexApi;
-import com.alibaba.dashscope.common.DashScopeResult;
-import com.alibaba.dashscope.common.Function;
-import com.alibaba.dashscope.common.OutputMode;
-import com.alibaba.dashscope.common.ResultCallback;
-import com.alibaba.dashscope.common.Task;
-import com.alibaba.dashscope.common.TaskGroup;
+import com.alibaba.dashscope.common.*;
 import com.alibaba.dashscope.exception.ApiException;
 import com.alibaba.dashscope.exception.InputRequiredException;
 import com.alibaba.dashscope.exception.NoApiKeyException;
-import com.alibaba.dashscope.protocol.ApiServiceOption;
-import com.alibaba.dashscope.protocol.ConnectionOptions;
-import com.alibaba.dashscope.protocol.HttpMethod;
-import com.alibaba.dashscope.protocol.Protocol;
-import com.alibaba.dashscope.protocol.StreamingMode;
+import com.alibaba.dashscope.protocol.*;
 import io.reactivex.Flowable;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-public final class CodeGeneration {
+public class CodeGeneration {
   private final SynchronizeHalfDuplexApi<CodeGenerationParam> syncApi;
   private final ApiServiceOption serviceOption;
 

src/main/java/com/alibaba/dashscope/aigc/completion/ChatCompletion.java

@@ -1,4 +1,3 @@
-// Copyright (c) Alibaba, Inc. and its affiliates.
 package com.alibaba.dashscope.aigc.completion;
 
 import com.alibaba.dashscope.common.DashScopeResult;

src/main/java/com/alibaba/dashscope/aigc/completion/ChatCompletionStreamOptions.java

@@ -1,16 +1,12 @@
-// Copyright (c) Alibaba, Inc. and its affiliates.
 package com.alibaba.dashscope.aigc.completion;
 
+import com.google.gson.annotations.SerializedName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.SuperBuilder;
 
-/**
- * @deprecated Use {@link com.alibaba.dashscope.common.StreamOptions} instead for a shared
- *     implementation across all service classes.
- */
-@Deprecated
 @Data
 @SuperBuilder
-@EqualsAndHashCode(callSuper = true)
-public class ChatCompletionStreamOptions extends com.alibaba.dashscope.common.StreamOptions {}
+public class ChatCompletionStreamOptions {
+  @SerializedName("include_usage")
+  private Boolean includeUsage;
+}

src/main/java/com/alibaba/dashscope/aigc/completion/ChatCompletions.java

@@ -1,4 +1,3 @@
-// Copyright (c) Alibaba, Inc. and its affiliates.
 package com.alibaba.dashscope.aigc.completion;
 
 import com.alibaba.dashscope.api.GeneralApi;