Solve class conflicts in studio (alibaba#977)

Author: skippy-404

spring-ai-alibaba-graph/spring-ai-alibaba-graph-core/pom.xml

@@ -38,8 +38,6 @@
         <url>https://github.com/alibaba/spring-ai-alibaba</url>
     </scm>
 
-    <properties></properties>
-
     <dependencies>
         <!--
             <dependency>

spring-ai-alibaba-graph/spring-ai-alibaba-graph-example/src/main/resources/application.yml

@@ -27,6 +27,7 @@ spring:
         weather:
           enabled: enable
           api-key: ${WEATHER_API_KEY}
+
     dashscope:
       api-key: ${DASH_SCOPE_API_KEY}
     openai:

spring-ai-alibaba-studio/src/main/java/com/alibaba/cloud/ai/api/ChatModelAPI.java

@@ -17,7 +17,7 @@
 
 import com.alibaba.cloud.ai.common.ModelType;
 import com.alibaba.cloud.ai.common.R;
-import com.alibaba.cloud.ai.model.ChatModel;
+import com.alibaba.cloud.ai.model.ChatModelConfig;
 import com.alibaba.cloud.ai.param.ModelRunActionParam;
 import com.alibaba.cloud.ai.service.ChatModelDelegate;
 import com.alibaba.cloud.ai.vo.ChatModelRunResult;
@@ -47,15 +47,15 @@ default ChatModelDelegate getDelegate() {
 
 	@Operation(summary = "list chat models", description = "", tags = { "chat-model" })
 	@GetMapping(value = "", produces = { "application/json" })
-	default R<List<ChatModel>> list() {
-		List<ChatModel> res = getDelegate().list();
+	default R<List<ChatModelConfig>> list() {
+		List<ChatModelConfig> res = getDelegate().list();
 		return R.success(res);
 	}
 
 	@Operation(summary = "get chat model by model name", description = "", tags = { "chat-model" })
 	@GetMapping(value = "/{modelName}", produces = { "application/json" })
-	default R<ChatModel> get(@PathVariable String modelName) {
-		ChatModel res = getDelegate().getByModelName(modelName);
+	default R<ChatModelConfig> get(@PathVariable String modelName) {
+		ChatModelConfig res = getDelegate().getByModelName(modelName);
 		return R.success(res);
 	}
 

spring-ai-alibaba-studio/src/main/java/com/alibaba/cloud/ai/model/ChatClient.java

@@ -38,7 +38,7 @@ public class ChatClient {
 	private Map<String, Object> defaultSystemParams;
 
 	@Schema(description = "ChatModel of ChatClient")
-	private ChatModel chatModel;
+	private ChatModelConfig chatModel;
 
 	private ChatOptions chatOptions;
 

spring-ai-alibaba-studio/src/main/java/com/alibaba/cloud/ai/model/ChatModel.java renamed to spring-ai-alibaba-studio/src/main/java/com/alibaba/cloud/ai/model/ChatModelConfig.java

@@ -24,7 +24,7 @@
 
 @Data
 @Builder
-public class ChatModel {
+public class ChatModelConfig {
 
 	@Schema(description = "ChatModel bean name", examples = { "chatModel", "chatModel1" })
 	private String name;

spring-ai-alibaba-studio/src/main/java/com/alibaba/cloud/ai/service/ChatModelDelegate.java

@@ -16,19 +16,19 @@
 package com.alibaba.cloud.ai.service;
 
 import com.alibaba.cloud.ai.common.ModelType;
-import com.alibaba.cloud.ai.model.ChatModel;
+import com.alibaba.cloud.ai.model.ChatModelConfig;
 import com.alibaba.cloud.ai.param.ModelRunActionParam;
 import com.alibaba.cloud.ai.vo.ChatModelRunResult;
 import java.util.ArrayList;
 import java.util.List;
 
 public interface ChatModelDelegate {
 
-	default List<ChatModel> list() {
+	default List<ChatModelConfig> list() {
 		return new ArrayList<>();
 	}
 
-	default ChatModel getByModelName(String modelName) {
+	default ChatModelConfig getByModelName(String modelName) {
 		return null;
 	}
 

spring-ai-alibaba-studio/src/main/java/com/alibaba/cloud/ai/service/impl/ChatClientDelegateImpl.java

@@ -26,6 +26,7 @@
 import com.alibaba.cloud.ai.dashscope.chat.DashScopeChatOptions;
 import com.alibaba.cloud.ai.exception.ServiceInternalException;
 import com.alibaba.cloud.ai.model.ChatClient;
+import com.alibaba.cloud.ai.model.ChatModelConfig;
 import com.alibaba.cloud.ai.param.ClientRunActionParam;
 import com.alibaba.cloud.ai.service.ChatClientDelegate;
 import com.alibaba.cloud.ai.utils.SpringApplicationUtil;
@@ -153,7 +154,7 @@ private ChatClient getChatClientVo(org.springframework.ai.chat.client.ChatClient
 						ReflectionUtils.makeAccessible(chatModelField);
 						try {
 							ChatModel chatModel = (ChatModel) chatModelField.get(defaultChatClientRequest);
-							com.alibaba.cloud.ai.model.ChatModel model = com.alibaba.cloud.ai.model.ChatModel.builder()
+							ChatModelConfig model = ChatModelConfig.builder()
 								.name("chatModel")
 								.model(chatModel.getDefaultOptions().getModel())
 								.modelType(ModelType.CHAT)

spring-ai-alibaba-studio/src/main/java/com/alibaba/cloud/ai/service/impl/ChatModelDelegateImpl.java

@@ -23,7 +23,7 @@
 import com.alibaba.cloud.ai.dashscope.image.DashScopeImageModel;
 import com.alibaba.cloud.ai.dashscope.image.DashScopeImageOptions;
 import com.alibaba.cloud.ai.exception.NotFoundException;
-import com.alibaba.cloud.ai.model.ChatModel;
+import com.alibaba.cloud.ai.model.ChatModelConfig;
 import com.alibaba.cloud.ai.param.ModelRunActionParam;
 import com.alibaba.cloud.ai.service.ChatModelDelegate;
 import com.alibaba.cloud.ai.utils.SpringApplicationUtil;
@@ -108,10 +108,10 @@ private ImageModel getImageModel(String modelName) {
 	}
 
 	@Override
-	public ChatModel getByModelName(String modelName) {
+	public ChatModelConfig getByModelName(String modelName) {
 		org.springframework.ai.chat.model.ChatModel chatModel = getChatModel(modelName);
 		if (chatModel != null) {
-			ChatModel model = ChatModel.builder()
+			ChatModelConfig model = ChatModelConfig.builder()
 				.name(modelName)
 				.model(chatModel.getDefaultOptions().getModel())
 				.modelType(ModelType.CHAT)
@@ -125,7 +125,7 @@ public ChatModel getByModelName(String modelName) {
 
 		ImageModel imageModel = getImageModel(modelName);
 		if (imageModel != null) {
-			ChatModel model = ChatModel.builder().name(modelName).modelType(ModelType.IMAGE).build();
+			ChatModelConfig model = ChatModelConfig.builder().name(modelName).modelType(ModelType.IMAGE).build();
 			if (imageModel.getClass().equals(DashScopeImageModel.class)) {
 				DashScopeImageModel dashScopeImageModel = (DashScopeImageModel) imageModel;
 				model.setModel(dashScopeImageModel.getOptions().getModel());
@@ -231,8 +231,8 @@ public String runImageGenTask(ModelRunActionParam runActionParam) {
 	}
 
 	@Override
-	public List<ChatModel> list() {
-		List<ChatModel> res = new ArrayList<>();
+	public List<ChatModelConfig> list() {
+		List<ChatModelConfig> res = new ArrayList<>();
 
 		// ChatModel
 		Map<String, org.springframework.ai.chat.model.ChatModel> chatModelMap = SpringApplicationUtil
@@ -241,7 +241,7 @@ public List<ChatModel> list() {
 			org.springframework.ai.chat.model.ChatModel chatModel = entry.getValue();
 			log.info("bean name:{}, bean Class:{}", entry.getKey(), chatModel.getClass());
 
-			ChatModel model = ChatModel.builder()
+			ChatModelConfig model = ChatModelConfig.builder()
 				.name(entry.getKey())
 				.model(chatModel.getDefaultOptions().getModel())
 				.modelType(ModelType.CHAT)
@@ -260,7 +260,7 @@ public List<ChatModel> list() {
 		for (Map.Entry<String, ImageModel> entry : imageModelMap.entrySet()) {
 			ImageModel imageModel = entry.getValue();
 			log.info("bean name:{}, bean Class:{}", entry.getKey(), imageModel.getClass());
-			ChatModel model = ChatModel.builder().name(entry.getKey()).modelType(ModelType.IMAGE).build();
+			ChatModelConfig model = ChatModelConfig.builder().name(entry.getKey()).modelType(ModelType.IMAGE).build();
 
 			if (imageModel.getClass() == DashScopeImageModel.class) {
 				DashScopeImageModel dashScopeImageModel = (DashScopeImageModel) imageModel;