Merge branch 'main' into main

Author: flystar32

.github/ISSUE_TEMPLATE/bug_report.md

@@ -27,7 +27,7 @@ Detailed error messages.
 
 **Environment (please complete the following information):**
 
-- AgentScope-Java Version: [e.g. 1.0.8, check your pom.xml dependency version or run `mvn dependency:tree | grep agentscope-parent:pom`(only mac/linux)]
+- AgentScope-Java Version: [e.g. 1.0.9, check your pom.xml dependency version or run `mvn dependency:tree | grep agentscope-parent:pom`(only mac/linux)]
 - Java Version: [e.g. 17]
 - OS: [e.g. macos, windows]
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 ## AgentScope-Java Version
 
-[The version of AgentScope-Java you are working on, e.g. 1.0.8, check your pom.xml dependency version or run `mvn dependency:tree | grep agentscope-parent:pom`(only mac/linux)]
+[The version of AgentScope-Java you are working on, e.g. 1.0.9, check your pom.xml dependency version or run `mvn dependency:tree | grep agentscope-parent:pom`(only mac/linux)]
 
 ## Description
 

README.md

@@ -77,7 +77,7 @@ Built for enterprise deployment requirements:
 <dependency>
     <groupId>io.agentscope</groupId>
     <artifactId>agentscope</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.9</version>
 </dependency>
 ```
 

README_zh.md

@@ -77,7 +77,7 @@ AgentScope 设计上能够与现有企业基础设施集成，无需大规模改
 <dependency>
     <groupId>io.agentscope</groupId>
     <artifactId>agentscope</artifactId>
-    <version>1.0.8</version>
+    <version>1.0.9</version>
 </dependency>
 ```
 

SKILL.md

@@ -100,15 +100,15 @@ public static void main(String[] args) {
     <dependency>
         <groupId>io.agentscope</groupId>
         <artifactId>agentscope</artifactId>
-        <version>1.0.8</version>
+        <version>1.0.9</version>
     </dependency>
 </dependencies>
 ```
 
 **For local development (if working with source code):**
 ```xml
 <properties>
-    <agentscope.version>1.0.8</agentscope.version>
+    <agentscope.version>1.0.9</agentscope.version>
     <java.version>17</java.version>
 </properties>
 
@@ -122,8 +122,8 @@ public static void main(String[] args) {
 ```
 
 **⚠️ IMPORTANT: Version Selection**
-- **Use `agentscope:1.0.8`** for production (stable, from Maven Central)
-- **Use `agentscope-core:1.0.8`** only if you're developing AgentScope itself
+- **Use `agentscope:1.0.9`** for production (stable, from Maven Central)
+- **Use `agentscope-core:1.0.9`** only if you're developing AgentScope itself
 - **NEVER use version `0.1.0-SNAPSHOT`** - this version doesn't exist
 
 ### ⚠️ CRITICAL: Common Dependency Mistakes
@@ -161,7 +161,7 @@ public static void main(String[] args) {
 <dependency>
     <groupId>io.agentscope</groupId>
     <artifactId>agentscope</artifactId>
-    <version>1.0.8</version>  <!-- ✅ CORRECT -->
+    <version>1.0.9</version>  <!-- ✅ CORRECT -->
 </dependency>
 ```
 

agentscope-core/src/main/java/io/agentscope/core/Version.java

@@ -24,7 +24,7 @@
 public final class Version {
 
     /** AgentScope Java version */
-    public static final String VERSION = "1.0.9-SNAPSHOT";
+    public static final String VERSION = "1.0.10-SNAPSHOT";
 
     private Version() {
         // Utility class - prevent instantiation
@@ -35,7 +35,7 @@ private Version() {
      *
      * <p>Format: {@code agentscope-java/{version}; java/{java_version}; platform/{os}}
      *
-     * <p>Example: {@code agentscope-java/1.0.9-SNAPSHOT; java/17.0.1; platform/Mac OS X}
+     * <p>Example: {@code agentscope-java/1.0.10-SNAPSHOT; java/17.0.1; platform/Mac OS X}
      *
      * @return unified User-Agent string
      */

agentscope-core/src/main/java/io/agentscope/core/agent/AgentBase.java

@@ -160,24 +160,29 @@ public final String getDescription() {
      */
     @Override
     public final Mono<Msg> call(List<Msg> msgs) {
-        if (!running.compareAndSet(false, true) && checkRunning) {
-            return Mono.error(
-                    new IllegalStateException(
-                            "Agent is still running, please wait for it to finish"));
-        }
-        resetInterruptFlag();
-
-        return TracerRegistry.get()
-                .callAgent(
-                        this,
-                        msgs,
-                        () ->
-                                notifyPreCall(msgs)
-                                        .flatMap(this::doCall)
-                                        .flatMap(this::notifyPostCall)
-                                        .onErrorResume(
-                                                createErrorHandler(msgs.toArray(new Msg[0]))))
-                .doFinally(signalType -> running.set(false));
+        return Mono.using(
+                () -> {
+                    if (checkRunning && !running.compareAndSet(false, true)) {
+                        throw new IllegalStateException(
+                                "Agent is still running, please wait for it to finish");
+                    }
+                    resetInterruptFlag();
+                    return this;
+                },
+                resource ->
+                        TracerRegistry.get()
+                                .callAgent(
+                                        this,
+                                        msgs,
+                                        () ->
+                                                notifyPreCall(msgs)
+                                                        .flatMap(this::doCall)
+                                                        .flatMap(this::notifyPostCall)
+                                                        .onErrorResume(
+                                                                createErrorHandler(
+                                                                        msgs.toArray(new Msg[0])))),
+                resource -> running.set(false),
+                true);
     }
 
     /**
@@ -191,24 +196,33 @@ public final Mono<Msg> call(List<Msg> msgs) {
      */
     @Override
     public final Mono<Msg> call(List<Msg> msgs, Class<?> structuredOutputClass) {
-        if (!running.compareAndSet(false, true) && checkRunning) {
-            return Mono.error(
-                    new IllegalStateException(
-                            "Agent is still running, please wait for it to finish"));
-        }
-        resetInterruptFlag();
-
-        return TracerRegistry.get()
-                .callAgent(
-                        this,
-                        msgs,
-                        () ->
-                                notifyPreCall(msgs)
-                                        .flatMap(m -> doCall(m, structuredOutputClass))
-                                        .flatMap(this::notifyPostCall)
-                                        .onErrorResume(
-                                                createErrorHandler(msgs.toArray(new Msg[0]))))
-                .doFinally(signalType -> running.set(false));
+        return Mono.using(
+                () -> {
+                    if (checkRunning && !running.compareAndSet(false, true)) {
+                        throw new IllegalStateException(
+                                "Agent is still running, please wait for it to finish");
+                    }
+                    resetInterruptFlag();
+                    return this;
+                },
+                resource ->
+                        TracerRegistry.get()
+                                .callAgent(
+                                        this,
+                                        msgs,
+                                        () ->
+                                                notifyPreCall(msgs)
+                                                        .flatMap(
+                                                                m ->
+                                                                        doCall(
+                                                                                m,
+                                                                                structuredOutputClass))
+                                                        .flatMap(this::notifyPostCall)
+                                                        .onErrorResume(
+                                                                createErrorHandler(
+                                                                        msgs.toArray(new Msg[0])))),
+                resource -> running.set(false),
+                true);
     }
 
     /**
@@ -222,24 +236,29 @@ public final Mono<Msg> call(List<Msg> msgs, Class<?> structuredOutputClass) {
      */
     @Override
     public final Mono<Msg> call(List<Msg> msgs, JsonNode schema) {
-        if (!running.compareAndSet(false, true) && checkRunning) {
-            return Mono.error(
-                    new IllegalStateException(
-                            "Agent is still running, please wait for it to finish"));
-        }
-        resetInterruptFlag();
-
-        return TracerRegistry.get()
-                .callAgent(
-                        this,
-                        msgs,
-                        () ->
-                                notifyPreCall(msgs)
-                                        .flatMap(m -> doCall(m, schema))
-                                        .flatMap(this::notifyPostCall)
-                                        .onErrorResume(
-                                                createErrorHandler(msgs.toArray(new Msg[0]))))
-                .doFinally(signalType -> running.set(false));
+        return Mono.using(
+                () -> {
+                    if (checkRunning && !running.compareAndSet(false, true)) {
+                        throw new IllegalStateException(
+                                "Agent is still running, please wait for it to finish");
+                    }
+                    resetInterruptFlag();
+                    return this;
+                },
+                resource ->
+                        TracerRegistry.get()
+                                .callAgent(
+                                        this,
+                                        msgs,
+                                        () ->
+                                                notifyPreCall(msgs)
+                                                        .flatMap(m -> doCall(m, schema))
+                                                        .flatMap(this::notifyPostCall)
+                                                        .onErrorResume(
+                                                                createErrorHandler(
+                                                                        msgs.toArray(new Msg[0])))),
+                resource -> running.set(false),
+                true);
     }
 
     /**

agentscope-core/src/main/java/io/agentscope/core/formatter/dashscope/dto/DashScopeRequest.java

@@ -15,8 +15,10 @@
  */
 package io.agentscope.core.formatter.dashscope.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.agentscope.core.model.EndpointType;
 
 /**
  * DashScope API request DTO.
@@ -53,12 +55,23 @@ public class DashScopeRequest {
     @JsonProperty("parameters")
     private DashScopeParameters parameters;
 
-    public DashScopeRequest() {}
+    /**
+     * The endpoint type for endpoint selection (not serialized to JSON).
+     *
+     * <p>This is an internal field used to determine which DashScope API endpoint to use.
+     * It does not get sent to the API.
+     */
+    @JsonIgnore private EndpointType endpointType;
+
+    public DashScopeRequest() {
+        this.endpointType = EndpointType.AUTO;
+    }
 
     public DashScopeRequest(String model, DashScopeInput input, DashScopeParameters parameters) {
         this.model = model;
         this.input = input;
         this.parameters = parameters;
+        this.endpointType = EndpointType.AUTO;
     }
 
     public String getModel() {
@@ -85,6 +98,24 @@ public void setParameters(DashScopeParameters parameters) {
         this.parameters = parameters;
     }
 
+    /**
+     * Gets the endpoint type for endpoint selection.
+     *
+     * @return the endpoint type (defaults to AUTO)
+     */
+    public EndpointType getEndpointType() {
+        return endpointType;
+    }
+
+    /**
+     * Sets the endpoint type for endpoint selection.
+     *
+     * @param endpointType the endpoint type
+     */
+    public void setEndpointType(EndpointType endpointType) {
+        this.endpointType = endpointType;
+    }
+
     public static Builder builder() {
         return new Builder();
     }
@@ -93,6 +124,7 @@ public static class Builder {
         private String model;
         private DashScopeInput input;
         private DashScopeParameters parameters;
+        private EndpointType endpointType = EndpointType.AUTO;
 
         public Builder model(String model) {
             this.model = model;
@@ -109,8 +141,21 @@ public Builder parameters(DashScopeParameters parameters) {
             return this;
         }
 
+        /**
+         * Sets the endpoint type for endpoint selection.
+         *
+         * @param endpointType the endpoint type
+         * @return this builder
+         */
+        public Builder endpointType(EndpointType endpointType) {
+            this.endpointType = endpointType;
+            return this;
+        }
+
         public DashScopeRequest build() {
-            return new DashScopeRequest(model, input, parameters);
+            DashScopeRequest request = new DashScopeRequest(model, input, parameters);
+            request.setEndpointType(endpointType);
+            return request;
         }
     }
 }