Changes to resolve PR comments and updated typespec

commit bda4dac2fc4700d11f63c3a4df0d12f412be1bcc
Author: Jayant Kumar <[email protected]>
Date:   Mon Apr 21 21:17:19 2025 +0530

    updated

commit b7ded3fa1dcd6d656b75e7f8e11eb593872227a5
Author: Jayant Kumar <[email protected]>
Date:   Mon Apr 21 20:39:59 2025 +0530

    tests passing

commit dcde6c06699a222afd0013ec2bd80c7776658b28
Author: Jayant Kumar <[email protected]>
Date:   Mon Apr 21 19:09:23 2025 +0530

    updated

commit 305e167747a6c9486b46f524b5c02d23831471a9
Author: Jayant Kumar <[email protected]>
Date:   Mon Apr 21 18:04:38 2025 +0530

    tsp-client updated

commit 9cfd86b
Author: Jayant Kumar <[email protected]>
Date:   Thu Apr 17 12:55:09 2025 +0530

    resolving PR comments

Author: jayantjha

sdk/ai/azure-ai-projects/customization/src/main/java/AIProjectsCustomizations.java

@@ -13,40 +13,5 @@ public class AIProjectsCustomizations extends Customization {
     public void customize(LibraryCustomization customization, Logger logger) {
         // remove unused class (no reference to them, after partial-update)
 
-        ClassCustomization connectionsImpl = customization.getClass(
-            "com.azure.ai.projects.implementation",
-            "ConnectionsImpl");
-
-        List<Range> toReplace = connectionsImpl.getEditor().searchText(
-            connectionsImpl.getFileName(),
-            "{endpoint}/agents/v1.0");
-
-        for (Range r : toReplace) {
-            logger.info("customizing");
-            connectionsImpl.getEditor().replace(
-                connectionsImpl.getFileName(),
-                r.getStart(),
-                r.getEnd(),
-                "{endpoint}"
-            );
-        }
-
-        ClassCustomization telemetriesImpl = customization.getClass(
-            "com.azure.ai.projects.implementation",
-            "TelemetriesImpl");
-
-        toReplace = telemetriesImpl.getEditor().searchText(
-            telemetriesImpl.getFileName(),
-            "{endpoint}/agents/v1.0");
-
-        for (Range r : toReplace) {
-            logger.info("customizing");
-            telemetriesImpl.getEditor().replace(
-                telemetriesImpl.getFileName(),
-                r.getStart(),
-                r.getEnd(),
-                "{endpoint}"
-            );
-        }
     }
 }

sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/AgentsAsyncClient.java

@@ -68,7 +68,7 @@ public ProjectsServiceVersion getServiceVersion() {
      * The interface defining all the services for AIProjectClientConnections to be used by the proxy service to perform
      * REST calls.
      */
-    @Host("{endpoint}/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{projectName}")
+    @Host("{endpoint}/agents/v1.0/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{projectName}")
     @ServiceInterface(name = "AIProjectClientConne")
     public interface ConnectionsService {
         @Get("/")

sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/AgentsClient.java

@@ -66,7 +66,7 @@ public ProjectsServiceVersion getServiceVersion() {
      * The interface defining all the services for AIProjectClientTelemetries to be used by the proxy service to perform
      * REST calls.
      */
-    @Host("{endpoint}/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{projectName}")
+    @Host("{endpoint}/agents/v1.0/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{projectName}")
     @ServiceInterface(name = "AIProjectClientTelem")
     public interface TelemetriesService {
         @Get("/{appInsightsResourceUrl}")

sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/implementation/AgentsImpl.java

@@ -7,6 +7,7 @@
 import com.azure.ai.projects.models.MessageRole;
 import com.azure.core.annotation.Fluent;
 import com.azure.core.annotation.Generated;
+import com.azure.core.util.BinaryData;
 import com.azure.json.JsonReader;
 import com.azure.json.JsonSerializable;
 import com.azure.json.JsonToken;
@@ -23,22 +24,21 @@ public final class CreateMessageRequest implements JsonSerializable<CreateMessag
 
     /*
      * The role of the entity that is creating the message. Allowed values include:
-     * - `user`: Indicates the message is sent by an actual user and should be used in most
-     * cases to represent user-generated messages.
-     * - `assistant`: Indicates the message is generated by the agent. Use this value to insert
-     * messages from the agent into the
-     * conversation.
+     * `user`, which indicates the message is sent by an actual user (and should be
+     * used in most cases to represent user-generated messages), and `assistant`,
+     * which indicates the message is generated by the agent (use this value to insert
+     * messages from the agent into the conversation).
      */
     @Generated
     private final MessageRole role;
 
     /*
-     * The textual content of the initial message. Currently, robust input including images and annotated text may only
-     * be provided via
-     * a separate call to the create message API.
+     * The content of the initial message. This may be a basic string (if you only
+     * need text) or an array of typed content blocks (for example, text, image_file,
+     * image_url, and so on).
      */
     @Generated
-    private final String content;
+    private final BinaryData content;
 
     /*
      * A list of files attached to the message, and the tools they should be added to.
@@ -54,25 +54,12 @@ public final class CreateMessageRequest implements JsonSerializable<CreateMessag
     @Generated
     private Map<String, String> metadata;
 
-    /**
-     * Creates an instance of CreateMessageRequest class.
-     *
-     * @param role the role value to set.
-     * @param content the content value to set.
-     */
-    @Generated
-    public CreateMessageRequest(MessageRole role, String content) {
-        this.role = role;
-        this.content = content;
-    }
-
     /**
      * Get the role property: The role of the entity that is creating the message. Allowed values include:
-     * - `user`: Indicates the message is sent by an actual user and should be used in most
-     * cases to represent user-generated messages.
-     * - `assistant`: Indicates the message is generated by the agent. Use this value to insert
-     * messages from the agent into the
-     * conversation.
+     * `user`, which indicates the message is sent by an actual user (and should be
+     * used in most cases to represent user-generated messages), and `assistant`,
+     * which indicates the message is generated by the agent (use this value to insert
+     * messages from the agent into the conversation).
      *
      * @return the role value.
      */
@@ -82,14 +69,14 @@ public MessageRole getRole() {
     }
 
     /**
-     * Get the content property: The textual content of the initial message. Currently, robust input including images
-     * and annotated text may only be provided via
-     * a separate call to the create message API.
+     * Get the content property: The content of the initial message. This may be a basic string (if you only
+     * need text) or an array of typed content blocks (for example, text, image_file,
+     * image_url, and so on).
      *
      * @return the content value.
      */
     @Generated
-    public String getContent() {
+    public BinaryData getContent() {
         return this.content;
     }
 
@@ -149,7 +136,8 @@ public CreateMessageRequest setMetadata(Map<String, String> metadata) {
     public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
         jsonWriter.writeStartObject();
         jsonWriter.writeStringField("role", this.role == null ? null : this.role.toString());
-        jsonWriter.writeStringField("content", this.content);
+        jsonWriter.writeFieldName("content");
+        this.content.writeTo(jsonWriter);
         jsonWriter.writeArrayField("attachments", this.attachments, (writer, element) -> writer.writeJson(element));
         jsonWriter.writeMapField("metadata", this.metadata, (writer, element) -> writer.writeString(element));
         return jsonWriter.writeEndObject();
@@ -168,7 +156,7 @@ public JsonWriter toJson(JsonWriter jsonWriter) throws IOException {
     public static CreateMessageRequest fromJson(JsonReader jsonReader) throws IOException {
         return jsonReader.readObject(reader -> {
             MessageRole role = null;
-            String content = null;
+            BinaryData content = null;
             List<MessageAttachment> attachments = null;
             Map<String, String> metadata = null;
             while (reader.nextToken() != JsonToken.END_OBJECT) {
@@ -177,7 +165,7 @@ public static CreateMessageRequest fromJson(JsonReader jsonReader) throws IOExce
                 if ("role".equals(fieldName)) {
                     role = MessageRole.fromString(reader.getString());
                 } else if ("content".equals(fieldName)) {
-                    content = reader.getString();
+                    content = reader.getNullable(nonNullReader -> BinaryData.fromObject(nonNullReader.readUntyped()));
                 } else if ("attachments".equals(fieldName)) {
                     attachments = reader.readArray(reader1 -> MessageAttachment.fromJson(reader1));
                 } else if ("metadata".equals(fieldName)) {
@@ -192,4 +180,16 @@ public static CreateMessageRequest fromJson(JsonReader jsonReader) throws IOExce
             return deserializedCreateMessageRequest;
         });
     }
+
+    /**
+     * Creates an instance of CreateMessageRequest class.
+     *
+     * @param role the role value to set.
+     * @param content the content value to set.
+     */
+    @Generated
+    public CreateMessageRequest(MessageRole role, BinaryData content) {
+        this.role = role;
+        this.content = content;
+    }
 }

sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/implementation/ConnectionsImpl.java

@@ -26,7 +26,7 @@ public final class AOAIModelConfig extends TargetModelConfig {
     private String type = "AOAI";
 
     /*
-     * Endpoint URL for AOAI model.
+     * Endpoint targetURI for AOAI model.
      */
     @Generated
     private String azureEndpoint;
@@ -68,7 +68,7 @@ public String getType() {
     }
 
     /**
-     * Get the azureEndpoint property: Endpoint URL for AOAI model.
+     * Get the azureEndpoint property: Endpoint targetURI for AOAI model.
      *
      * @return the azureEndpoint value.
      */
@@ -78,7 +78,7 @@ public String getAzureEndpoint() {
     }
 
     /**
-     * Set the azureEndpoint property: Endpoint URL for AOAI model.
+     * Set the azureEndpoint property: Endpoint targetURI for AOAI model.
      * <p>Required when create the resource.</p>
      *
      * @param azureEndpoint the azureEndpoint value to set.

sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/implementation/TelemetriesImpl.java

@@ -5,10 +5,10 @@
 import com.azure.ai.projects.models.streaming.StreamTypeFactory;
 import com.azure.ai.projects.models.streaming.StreamUpdate;
 import com.azure.core.util.BinaryData;
+import com.azure.core.util.FluxUtil;
 import com.azure.core.util.logging.ClientLogger;
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Schedulers;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -72,20 +72,22 @@ public Flux<StreamUpdate> getEvents() {
     private Flux<StreamUpdate> mapEventStream() {
         return source.publishOn(Schedulers.boundedElastic()).concatMap(byteBuffer -> {
             List<StreamUpdate> values = new ArrayList<>();
-            byte[] byteArray = byteBuffer.array();
-            // We check whether we ended the last byteBuffer with a line feed or not, in case we need to close this
-            // chunk soon after
+            byte[] byteArray = FluxUtil.byteBufferToArray(byteBuffer);
+
             byte[] outByteArray = outStream.toByteArray();
             int lineBreakCharsEncountered
                 = outByteArray.length > 0 && isByteLineFeed(outByteArray[outByteArray.length - 1]) ? 1 : 0;
 
-            for (byte currentByte : byteArray) {
-                outStream.write(currentByte);
+            int startIndex = 0;
+            for (int i = 0; i < byteArray.length; i++) {
+                byte currentByte = byteArray[i];
                 if (isByteLineFeed(currentByte)) {
                     lineBreakCharsEncountered++;
 
-                    // We are looking for 2 line breaks to signify the end of a server sent event.
+                    // 2 line breaks signify the end of a server sent event.
                     if (lineBreakCharsEncountered == SSE_CHUNK_LINE_BREAK_COUNT_MARKER) {
+                        outStream.write(byteArray, startIndex, i - startIndex + 1);
+
                         String currentLine;
                         try {
                             currentLine = outStream.toString(StandardCharsets.UTF_8.name());
@@ -94,6 +96,7 @@ private Flux<StreamUpdate> mapEventStream() {
                             return Flux.error(e);
                         }
                         outStream = new ByteArrayOutputStream();
+                        startIndex = i + 1;
                     }
                 } else {
                     // In some cases line breaks can contain both the line feed and carriage return characters.
@@ -106,6 +109,10 @@ private Flux<StreamUpdate> mapEventStream() {
                 }
             }
 
+            if (startIndex < byteArray.length) {
+                outStream.write(byteArray, startIndex, byteArray.length - startIndex);
+            }
+
             try {
                 String remainingBytes = outStream.toString(StandardCharsets.UTF_8.name());
                 // If this is in fact, the last event, it will be appropriately chunked. Otherwise, we will cache and
@@ -170,8 +177,18 @@ public void handleCurrentEvent(String currentEvent, List<StreamUpdate> outputVal
             return;
         }
 
-        String eventName = lines[0].substring(6).trim(); // removing "event:" prefix
-        String eventJson = lines[1].substring(5).trim(); // removing "data:" prefix
+        String[] eventParts = lines[0].split(":", 2);
+        String[] dataParts = lines[1].split(":", 2);
+
+        if (eventParts.length != 2 || !eventParts[0].trim().equals("event")) {
+            throw logger.logExceptionAsError(new IllegalArgumentException("Invalid event format: missing event name"));
+        }
+        String eventName = eventParts[1].trim();
+
+        if (dataParts.length != 2 || !dataParts[0].trim().equals("data")) {
+            throw logger.logExceptionAsError(new IllegalArgumentException("Invalid event format: missing event data"));
+        }
+        String eventJson = dataParts[1].trim();
 
         if (DONE.equals(AgentStreamEvent.fromString(eventName))) {
             return;

sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/implementation/models/CreateMessageRequest.java

@@ -84,4 +84,16 @@ public static AgentsNamedToolChoiceType fromString(String name) {
     public static Collection<AgentsNamedToolChoiceType> values() {
         return values(AgentsNamedToolChoiceType.class);
     }
+
+    /**
+     * Tool type `bing_custom_search`.
+     */
+    @Generated
+    public static final AgentsNamedToolChoiceType BING_CUSTOM_SEARCH = fromString("bing_custom_search");
+
+    /**
+     * Tool type `connected_agent`.
+     */
+    @Generated
+    public static final AgentsNamedToolChoiceType CONNECTED_AGENT = fromString("connected_agent");
 }