Added more tests

Author: jayantjha

.vscode/cspell.json

@@ -1382,6 +1382,16 @@
         "gcch",
         "updation" // current typo in a swagger
       ]
+    },
+    {
+      "filename": "sdk/ai/azure-ai-projects/**",
+      "words": [
+        "AISEARCH",
+	      "AISERVICES",
+        "SUBSCRIPTIONID",
+        "RESOURCEGROUPNAME",
+        "PROJECTNAME"
+      ]
     }
   ],
   "allowCompoundWords": true

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

@@ -21,7 +21,7 @@ public void customize(LibraryCustomization customization, Logger logger) {
             connectionsImpl.getFileName(),
             "{endpoint}/agents/v1.0");
 
-        for (Range r : toReplace ) {
+        for (Range r : toReplace) {
             logger.info("customizing");
             connectionsImpl.getEditor().replace(
                 connectionsImpl.getFileName(),
@@ -30,5 +30,23 @@ public void customize(LibraryCustomization customization, Logger logger) {
                 "{endpoint}"
             );
         }
+
+        ClassCustomization telemetriesImpl = customization.getClass(
+            "com.azure.ai.projects.implementation",
+            "TelemetriesImpl");
+
+        List<Range> 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/pom.xml

@@ -46,6 +46,7 @@ Code generated by Microsoft (R) TypeSpec Code Generator.
     <spotless.skip>false</spotless.skip>
 
     <javaModulesSurefireArgLine>
+      --add-exports com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
       --add-opens com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
     </javaModulesSurefireArgLine>
   </properties>

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

@@ -44,7 +44,7 @@ public final class TelemetriesImpl {
 
     /**
      * Initializes an instance of TelemetriesImpl.
-     * 
+     *
      * @param client the instance of the service client containing this operation class.
      */
     TelemetriesImpl(AIProjectClientImpl client) {
@@ -55,7 +55,7 @@ public final class TelemetriesImpl {
 
     /**
      * Gets Service version.
-     * 
+     *
      * @return the serviceVersion value.
      */
     public ProjectsServiceVersion getServiceVersion() {
@@ -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}/agents/v1.0/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{projectName}")
+    @Host("{endpoint}/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{projectName}")
     @ServiceInterface(name = "AIProjectClientTelem")
     public interface TelemetriesService {
         @Get("/{appInsightsResourceUrl}")
@@ -99,7 +99,7 @@ Response<BinaryData> getAppInsightsSync(@HostParam("endpoint") String endpoint,
     /**
      * Gets the properties of the specified Application Insights resource.
      * <p><strong>Response Body Schema</strong></p>
-     * 
+     *
      * <pre>
      * {@code
      * {
@@ -111,16 +111,16 @@ Response<BinaryData> getAppInsightsSync(@HostParam("endpoint") String endpoint,
      * }
      * }
      * </pre>
-     * 
+     *
      * @param appInsightsResourceUrl The AppInsights Azure resource Url. It should have the format:
      * '/subscriptions/{subscription_id}/resourceGroups/{resource_group_name}/providers/microsoft.insights/components/{resourcename}'.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
+     * @return the properties of the specified Application Insights resource along with {@link Response} on successful
+     * completion of {@link Mono}.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the properties of the specified Application Insights resource along with {@link Response} on successful
-     * completion of {@link Mono}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Mono<Response<BinaryData>> getAppInsightsWithResponseAsync(String appInsightsResourceUrl,
@@ -134,7 +134,7 @@ public Mono<Response<BinaryData>> getAppInsightsWithResponseAsync(String appInsi
     /**
      * Gets the properties of the specified Application Insights resource.
      * <p><strong>Response Body Schema</strong></p>
-     * 
+     *
      * <pre>
      * {@code
      * {
@@ -146,15 +146,15 @@ public Mono<Response<BinaryData>> getAppInsightsWithResponseAsync(String appInsi
      * }
      * }
      * </pre>
-     * 
+     *
      * @param appInsightsResourceUrl The AppInsights Azure resource Url. It should have the format:
      * '/subscriptions/{subscription_id}/resourceGroups/{resource_group_name}/providers/microsoft.insights/components/{resourcename}'.
      * @param requestOptions The options to configure the HTTP request before HTTP client sends it.
+     * @return the properties of the specified Application Insights resource along with {@link Response}.
      * @throws HttpResponseException thrown if the request is rejected by server.
      * @throws ClientAuthenticationException thrown if the request is rejected by server on status code 401.
      * @throws ResourceNotFoundException thrown if the request is rejected by server on status code 404.
      * @throws ResourceModifiedException thrown if the request is rejected by server on status code 409.
-     * @return the properties of the specified Application Insights resource along with {@link Response}.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     public Response<BinaryData> getAppInsightsWithResponse(String appInsightsResourceUrl,

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

@@ -5,6 +5,7 @@
 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.logging.ClientLogger;
 import reactor.core.publisher.Flux;
 import reactor.core.scheduler.Schedulers;
 
@@ -27,6 +28,8 @@ public final class AgentServerSentEvents {
     // Server sent events are divided by 2 CRLF or single LF character
     private static final int SSE_CHUNK_LINE_BREAK_COUNT_MARKER = 2;
 
+    private final ClientLogger logger = new ClientLogger(AgentServerSentEvents.class);
+
     /**
      * A factory that determines into which type to deserialize the server sent events.
      */
@@ -147,6 +150,8 @@ private boolean isByteCarriageReturn(byte character) {
      * @param currentEvent The current line of the server sent event.
      * @param outputValues The list of values to add the current line to.
      * @throws IllegalStateException If the current event contains a server side error.
+     * @throws IllegalArgumentException If there's an error processing the event data.
+     * @throws UncheckedIOException If there's an error deserializing the event data.
      */
     public void handleCurrentEvent(String currentEvent, List<StreamUpdate> outputValues)
         throws IllegalArgumentException {
@@ -172,7 +177,7 @@ public void handleCurrentEvent(String currentEvent, List<StreamUpdate> outputVal
             return;
         }
         if (ERROR.equals(AgentStreamEvent.fromString(eventName))) {
-            throw new IllegalArgumentException(eventJson);
+            throw logger.logExceptionAsError(new IllegalArgumentException(eventJson));
         }
 
         outputValues.add(this.eventDeserializer.deserializeEvent(eventName, BinaryData.fromString(eventJson)));

sdk/ai/azure-ai-projects/src/custom/java/com/azure/ai/projects/models/AgentServerSentEvents.java renamed to sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/models/AgentServerSentEvents.java

@@ -1,3 +1,5 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 package com.azure.ai.projects.models.streaming;
 
 // Copyright (c) Microsoft Corporation. All rights reserved.
@@ -10,6 +12,7 @@
 import com.azure.ai.projects.models.ThreadMessage;
 import com.azure.ai.projects.models.ThreadRun;
 import com.azure.core.util.BinaryData;
+import com.azure.core.util.logging.ClientLogger;
 
 import static com.azure.ai.projects.models.AgentStreamEvent.THREAD_CREATED;
 import static com.azure.ai.projects.models.AgentStreamEvent.THREAD_MESSAGE_COMPLETED;
@@ -40,6 +43,14 @@
  * data.
  */
 public final class StreamTypeFactory {
+    private final ClientLogger logger = new ClientLogger(StreamTypeFactory.class);
+
+    /**
+     * Default constructor for creating a new instance of StreamTypeFactory.
+     */
+    public StreamTypeFactory() {
+        // Default constructor
+    }
 
     /**
      * Deserializes the server sent event into the appropriate type.
@@ -82,7 +93,7 @@ public StreamUpdate deserializeEvent(String eventName, BinaryData eventJson) thr
         } else if (THREAD_RUN_REQUIRES_ACTION.equals(event)) {
             return new StreamRequiredAction(eventJson.toObject(ThreadRun.class), event);
         } else {
-            throw new IllegalArgumentException("Unknown event type: " + event);
+            throw logger.logExceptionAsError(new IllegalArgumentException("Unknown event type: " + event));
         }
     }
 }

sdk/ai/azure-ai-projects/src/custom/java/com/azure/ai/projects/models/streaming/StreamMessageCreation.java renamed to sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/models/streaming/StreamMessageCreation.java

@@ -0,0 +1,8 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+/**
+ * Package containing classes for handling streaming updates from AI Project services.
+ * This package provides models for different types of stream events and updates.
+ */
+package com.azure.ai.projects.models.streaming;

sdk/ai/azure-ai-projects/src/custom/java/com/azure/ai/projects/models/streaming/StreamMessageUpdate.java renamed to sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/models/streaming/StreamMessageUpdate.java

@@ -10,6 +10,8 @@
 
     opens com.azure.ai.projects.models to com.azure.core;
     opens com.azure.ai.projects.implementation.models to com.azure.core;
+
     exports com.azure.ai.projects.models.streaming;
+
     opens com.azure.ai.projects.models.streaming to com.azure.core;
 }

sdk/ai/azure-ai-projects/src/custom/java/com/azure/ai/projects/models/streaming/StreamRequiredAction.java renamed to sdk/ai/azure-ai-projects/src/main/java/com/azure/ai/projects/models/streaming/StreamRequiredAction.java

@@ -1,18 +1,29 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
 package com.azure.ai.projects.usage.agent;
 
 
 import com.azure.ai.projects.AIProjectClientBuilder;
 import com.azure.ai.projects.AgentsClient;
-import com.azure.ai.projects.models.*;
-import com.azure.core.http.policy.HttpLogDetailLevel;
-import com.azure.core.http.policy.HttpLogOptions;
+import com.azure.ai.projects.models.Agent;
+import com.azure.ai.projects.models.AgentThread;
+import com.azure.ai.projects.models.CodeInterpreterToolDefinition;
+import com.azure.ai.projects.models.CreateAgentOptions;
+import com.azure.ai.projects.models.CreateRunOptions;
+import com.azure.ai.projects.models.MessageContent;
+import com.azure.ai.projects.models.MessageImageFileContent;
+import com.azure.ai.projects.models.MessageRole;
+import com.azure.ai.projects.models.MessageTextContent;
+import com.azure.ai.projects.models.OpenAIPageableListOfThreadMessage;
+import com.azure.ai.projects.models.RunStatus;
+import com.azure.ai.projects.models.ThreadMessage;
+import com.azure.ai.projects.models.ThreadMessageOptions;
+import com.azure.ai.projects.models.ThreadRun;
 import com.azure.core.util.Configuration;
 import com.azure.identity.DefaultAzureCredentialBuilder;
 import org.junit.jupiter.api.Test;
 
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import java.util.Arrays;
 
 public final class SampleAgentAdditionalMessage {
 
@@ -26,27 +37,27 @@ void additionalMessageExample() {
             .credential(new DefaultAzureCredentialBuilder().build())
             .buildAgentsClient();
 
-        var agentName = "additional_message_example";
-        var createAgentOptions = new CreateAgentOptions("gpt-4o-mini")
+        String agentName = "additional_message_example";
+        CreateAgentOptions createAgentOptions = new CreateAgentOptions("gpt-4o-mini")
             .setName(agentName)
             .setInstructions("You are a personal electronics tutor. Write and run code to answer questions.")
-            .setTools(List.of(new CodeInterpreterToolDefinition()));
+            .setTools(Arrays.asList(new CodeInterpreterToolDefinition()));
         Agent agent = agentsClient.createAgent(createAgentOptions);
 
-        var thread = agentsClient.createThread();
-        var createdMessage = agentsClient.createMessage(
+        AgentThread thread = agentsClient.createThread();
+        ThreadMessage createdMessage = agentsClient.createMessage(
             thread.getId(),
             MessageRole.USER,
             "What is the impedance formula?");
 
         //run agent
-        var createRunOptions = new CreateRunOptions(thread.getId(), agent.getId())
-            .setAdditionalMessages(List.of(new ThreadMessageOptions(
+        CreateRunOptions createRunOptions = new CreateRunOptions(thread.getId(), agent.getId())
+            .setAdditionalMessages(Arrays.asList(new ThreadMessageOptions(
                 MessageRole.AGENT, "E=mc^2"
             ), new ThreadMessageOptions(
                 MessageRole.USER, "What is the impedance formula?"
             )));
-        var threadRun = agentsClient.createRun(createRunOptions);
+        ThreadRun threadRun = agentsClient.createRun(createRunOptions);
 
         try {
             do {
@@ -62,18 +73,13 @@ void additionalMessageExample() {
                 System.out.println(threadRun.getLastError().getMessage());
             }
 
-            var runMessages = agentsClient.listMessages(thread.getId());
-            for (ThreadMessage message : runMessages.getData())
-            {
+            OpenAIPageableListOfThreadMessage runMessages = agentsClient.listMessages(thread.getId());
+            for (ThreadMessage message : runMessages.getData()) {
                 System.out.print(String.format("%1$s - %2$s : ", message.getCreatedAt(), message.getRole()));
-                for (MessageContent contentItem : message.getContent())
-                {
-                    if (contentItem instanceof MessageTextContent)
-                    {
+                for (MessageContent contentItem : message.getContent()) {
+                    if (contentItem instanceof MessageTextContent) {
                         System.out.print((((MessageTextContent) contentItem).getText().getValue()));
-                    }
-                    else if (contentItem instanceof MessageImageFileContent)
-                    {
+                    } else if (contentItem instanceof MessageImageFileContent) {
                         String imageFileId = (((MessageImageFileContent) contentItem).getImageFile().getFileId());
                         System.out.print("Image from ID: " + imageFileId);
                     }
@@ -82,8 +88,7 @@ else if (contentItem instanceof MessageImageFileContent)
             }
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
-        }
-        finally {
+        } finally {
             //cleanup
             agentsClient.deleteThread(thread.getId());
             agentsClient.deleteAgent(agent.getId());