Release Agents and Projects SDK 2.1.0

sdk/ai/azure-ai-agents/src/main/java/com/azure/ai/agents/implementation/JsonMergePatchHelper.java

@@ -6,9 +6,8 @@
 
 import com.azure.ai.agents.models.AgentCard;
 import com.azure.ai.agents.models.AgentCardSkill;
-import com.azure.ai.agents.models.AgentEndpoint;
 import com.azure.ai.agents.models.AgentEndpointAuthorizationScheme;
-import com.azure.ai.agents.models.IsolationKeySource;
+import com.azure.ai.agents.models.AgentEndpointConfig;
 import com.azure.ai.agents.models.UpdateAgentDetailsOptions;
 import com.azure.ai.agents.models.VersionSelectionRule;
 import com.azure.ai.agents.models.VersionSelector;
@@ -17,20 +16,21 @@
  * This is the Helper class to enable json merge patch serialization for a model.
  */
 public class JsonMergePatchHelper {
-    private static AgentEndpointAccessor agentEndpointAccessor;
+    private static AgentEndpointConfigAccessor agentEndpointConfigAccessor;
 
-    public interface AgentEndpointAccessor {
-        AgentEndpoint prepareModelForJsonMergePatch(AgentEndpoint agentEndpoint, boolean jsonMergePatchEnabled);
+    public interface AgentEndpointConfigAccessor {
+        AgentEndpointConfig prepareModelForJsonMergePatch(AgentEndpointConfig agentEndpointConfig,
+            boolean jsonMergePatchEnabled);
 
-        boolean isJsonMergePatch(AgentEndpoint agentEndpoint);
+        boolean isJsonMergePatch(AgentEndpointConfig agentEndpointConfig);
     }
 
-    public static void setAgentEndpointAccessor(AgentEndpointAccessor accessor) {
-        agentEndpointAccessor = accessor;
+    public static void setAgentEndpointConfigAccessor(AgentEndpointConfigAccessor accessor) {
+        agentEndpointConfigAccessor = accessor;
     }
 
-    public static AgentEndpointAccessor getAgentEndpointAccessor() {
-        return agentEndpointAccessor;
+    public static AgentEndpointConfigAccessor getAgentEndpointConfigAccessor() {
+        return agentEndpointConfigAccessor;
     }
 
     private static VersionSelectorAccessor versionSelectorAccessor;
@@ -85,23 +85,6 @@ public static AgentEndpointAuthorizationSchemeAccessor getAgentEndpointAuthoriza
         return agentEndpointAuthorizationSchemeAccessor;
     }
 
-    private static IsolationKeySourceAccessor isolationKeySourceAccessor;
-
-    public interface IsolationKeySourceAccessor {
-        IsolationKeySource prepareModelForJsonMergePatch(IsolationKeySource isolationKeySource,
-            boolean jsonMergePatchEnabled);
-
-        boolean isJsonMergePatch(IsolationKeySource isolationKeySource);
-    }
-
-    public static void setIsolationKeySourceAccessor(IsolationKeySourceAccessor accessor) {
-        isolationKeySourceAccessor = accessor;
-    }
-
-    public static IsolationKeySourceAccessor getIsolationKeySourceAccessor() {
-        return isolationKeySourceAccessor;
-    }
-
     private static AgentCardAccessor agentCardAccessor;
 
     public interface AgentCardAccessor {

sdk/ai/azure-ai-agents/src/main/java/com/azure/ai/agents/implementation/MultipartFormDataHelper.java

@@ -0,0 +1,209 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+// Code generated by Microsoft (R) TypeSpec Code Generator.
+
+package com.azure.ai.agents.implementation;
+
+import com.azure.core.http.HttpHeaderName;
+import com.azure.core.http.rest.RequestOptions;
+import com.azure.core.util.BinaryData;
+import com.azure.core.util.CoreUtils;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.SequenceInputStream;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.UUID;
+
+// DO NOT modify this helper class
+
+public final class MultipartFormDataHelper {
+    /**
+     * Line separator for the multipart HTTP request.
+     */
+    private static final String CRLF = "\r\n";
+
+    private static final String APPLICATION_OCTET_STREAM = "application/octet-stream";
+
+    /**
+     * Value to be used as part of the divider for the multipart requests.
+     */
+    private final String boundary;
+
+    /**
+     * The actual part separator in the request. This is obtained by prepending "--" to the "boundary".
+     */
+    private final String partSeparator;
+
+    /**
+     * The marker for the ending of a multipart request. This is obtained by post-pending "--" to the "partSeparator".
+     */
+    private final String endMarker;
+
+    /**
+     * Charset used for encoding the multipart HTTP request.
+     */
+    private final Charset encoderCharset = StandardCharsets.UTF_8;
+
+    private InputStream requestDataStream = new ByteArrayInputStream(new byte[0]);
+    private long requestLength = 0;
+
+    private RequestOptions requestOptions;
+    private BinaryData requestBody;
+
+    /**
+     * Default constructor used in the code. The boundary is a random value.
+     *
+     * @param requestOptions the RequestOptions to update
+     */
+    public MultipartFormDataHelper(RequestOptions requestOptions) {
+        this(requestOptions, UUID.randomUUID().toString().substring(0, 16));
+    }
+
+    private MultipartFormDataHelper(RequestOptions requestOptions, String boundary) {
+        this.requestOptions = requestOptions;
+        this.boundary = boundary;
+        this.partSeparator = "--" + boundary;
+        this.endMarker = this.partSeparator + "--";
+    }
+
+    /**
+     * Gets the multipart HTTP request body.
+     *
+     * @return the BinaryData of the multipart HTTP request body
+     */
+    public BinaryData getRequestBody() {
+        return requestBody;
+    }
+
+    // text/plain
+    /**
+     * Formats a text/plain field for a multipart HTTP request.
+     *
+     * @param fieldName the field name
+     * @param value the value of the text/plain field
+     * @return the MultipartFormDataHelper instance
+     */
+    public MultipartFormDataHelper serializeTextField(String fieldName, String value) {
+        if (value != null) {
+            String serialized = partSeparator + CRLF + "Content-Disposition: form-data; name=\"" + escapeName(fieldName)
+                + "\"" + CRLF + CRLF + value + CRLF;
+            byte[] data = serialized.getBytes(encoderCharset);
+            appendBytes(data);
+        }
+        return this;
+    }
+
+    // application/json
+    /**
+     * Formats a application/json field for a multipart HTTP request.
+     *
+     * @param fieldName the field name
+     * @param jsonObject the object of the application/json field
+     * @return the MultipartFormDataHelper instance
+     */
+    public MultipartFormDataHelper serializeJsonField(String fieldName, Object jsonObject) {
+        if (jsonObject != null) {
+            String serialized
+                = partSeparator + CRLF + "Content-Disposition: form-data; name=\"" + escapeName(fieldName) + "\"" + CRLF
+                    + "Content-Type: application/json" + CRLF + CRLF + BinaryData.fromObject(jsonObject) + CRLF;
+            byte[] data = serialized.getBytes(encoderCharset);
+            appendBytes(data);
+        }
+        return this;
+    }
+
+    /**
+     * Formats a file field for a multipart HTTP request.
+     *
+     * @param fieldName the field name
+     * @param file the BinaryData of the file
+     * @param contentType the content-type of the file
+     * @param filename the filename
+     * @return the MultipartFormDataHelper instance
+     */
+    public MultipartFormDataHelper serializeFileField(String fieldName, BinaryData file, String contentType,
+        String filename) {
+        if (file != null) {
+            if (CoreUtils.isNullOrEmpty(contentType)) {
+                contentType = APPLICATION_OCTET_STREAM;
+            }
+            writeFileField(fieldName, file, contentType, filename);
+        }
+        return this;
+    }
+
+    /**
+     * Formats a file field (potentially multiple files) for a multipart HTTP request.
+     *
+     * @param fieldName the field name
+     * @param files the List of BinaryData of the files
+     * @param contentTypes the List of content-type of the files
+     * @param filenames the List of filenames
+     * @return the MultipartFormDataHelper instance
+     */
+    public MultipartFormDataHelper serializeFileFields(String fieldName, List<BinaryData> files,
+        List<String> contentTypes, List<String> filenames) {
+        if (files != null) {
+            for (int i = 0; i < files.size(); ++i) {
+                BinaryData file = files.get(i);
+                String contentType = contentTypes.get(i);
+                if (CoreUtils.isNullOrEmpty(contentType)) {
+                    contentType = APPLICATION_OCTET_STREAM;
+                }
+                String filename = filenames.get(i);
+                writeFileField(fieldName, file, contentType, filename);
+            }
+        }
+        return this;
+    }
+
+    /**
+     * Ends the serialization of the multipart HTTP request.
+     *
+     * @return the MultipartFormDataHelper instance
+     */
+    public MultipartFormDataHelper end() {
+        byte[] data = endMarker.getBytes(encoderCharset);
+        appendBytes(data);
+
+        requestBody = BinaryData.fromStream(requestDataStream, requestLength);
+
+        requestOptions.setHeader(HttpHeaderName.CONTENT_TYPE, "multipart/form-data; boundary=" + this.boundary)
+            .setHeader(HttpHeaderName.CONTENT_LENGTH, String.valueOf(requestLength));
+
+        return this;
+    }
+
+    private void writeFileField(String fieldName, BinaryData file, String contentType, String filename) {
+        String contentDispositionFilename = "";
+        if (!CoreUtils.isNullOrEmpty(filename)) {
+            contentDispositionFilename = "; filename=\"" + escapeName(filename) + "\"";
+        }
+
+        // Multipart preamble
+        String fileFieldPreamble
+            = partSeparator + CRLF + "Content-Disposition: form-data; name=\"" + escapeName(fieldName) + "\""
+                + contentDispositionFilename + CRLF + "Content-Type: " + contentType + CRLF + CRLF;
+        byte[] data = fileFieldPreamble.getBytes(encoderCharset);
+        appendBytes(data);
+
+        // Writing the file into the request as a byte stream
+        requestLength += file.getLength();
+        requestDataStream = new SequenceInputStream(requestDataStream, file.toStream());
+
+        // CRLF
+        data = CRLF.getBytes(encoderCharset);
+        appendBytes(data);
+    }
+
+    private void appendBytes(byte[] bytes) {
+        requestLength += bytes.length;
+        requestDataStream = new SequenceInputStream(requestDataStream, new ByteArrayInputStream(bytes));
+    }
+
+    private static String escapeName(String name) {
+        return name.replace("\n", "%0A").replace("\r", "%0D").replace("\"", "%22");
+    }
+}