update samples for generated code

Author: sophia-ramsey

sdk/ai/Azure.AI.Projects/src/Custom/Connections/Connections.cs

@@ -0,0 +1,62 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+using Azure.Storage.Blobs;
+using Azure.Core;
+using Azure.Core.Pipeline;
+
+namespace Azure.AI.Projects
+{
+    public partial class Connections
+    {
+        /// <summary>
+        /// Get a connection by name.
+        /// </summary>
+        /// <param name="connectionName">The name of the connection. Required.</param>
+        /// <param name="includeCredentials">Whether to include credentials in the response. Default is false.</param>
+        /// <returns>A <see cref="Connection"/> object.</returns>
+        /// <exception cref="RequestFailedException">Thrown when the request fails.</exception>
+        public Connection Get(string connectionName, bool includeCredentials = false)
+        {
+            if (string.IsNullOrWhiteSpace(connectionName))
+            {
+                throw new ArgumentException("Connection name cannot be null or empty.", nameof(connectionName));
+            }
+
+            // Use the instance method instead of incorrectly calling it as static
+            if (includeCredentials)
+            {
+                return GetWithCredentials(connectionName);
+            }
+
+            return GetConnection(connectionName);
+        }
+
+        /// <summary>
+        /// Get a connection by name.
+        /// </summary>
+        /// <param name="connectionName">The name of the connection. Required.</param>
+        /// <param name="includeCredentials">Whether to include credentials in the response. Default is false.</param>
+        /// <returns>A <see cref="Connection"/> object.</returns>
+        /// <exception cref="RequestFailedException">Thrown when the request fails.</exception>
+        public async Task<Response<Connection>> GetAsync(string connectionName, bool includeCredentials = false)
+        {
+            if (string.IsNullOrWhiteSpace(connectionName))
+            {
+                throw new ArgumentException("Connection name cannot be null or empty.", nameof(connectionName));
+            }
+
+            // Use the instance method instead of incorrectly calling it as static
+            if (includeCredentials)
+            {
+                return await GetWithCredentialsAsync(connectionName).ConfigureAwait(false);
+            }
+
+            return await GetConnectionAsync(connectionName).ConfigureAwait(false);
+        }
+    }
+}

sdk/ai/Azure.AI.Projects/src/Custom/Datasets/Datasets.cs

@@ -8,7 +8,7 @@
 using Azure.Storage.Blobs;
 using Azure.Core;
 using Azure.Core.Pipeline;
-using Azure.AI.Projects;
+using System.Runtime.InteropServices.ComTypes;
 
 namespace Azure.AI.Projects
 {
@@ -19,10 +19,10 @@ public partial class Datasets
         /// </summary>
         private (BlobContainerClient ContainerClient, string OutputVersion) CreateDatasetAndGetContainerClient(string name, string inputVersion)
         {
-            var pendingUploadResponse = StartPendingUploadVersion(
+            var pendingUploadResponse = PendingUpload(
                 name,
                 inputVersion,
-                new PendingUploadRequest(null, null, PendingUploadType.TemporaryBlobReference, null)
+                new PendingUploadRequest(null, null, PendingUploadType.BlobReference, null)
             );
 
             string outputVersion = inputVersion;
@@ -34,14 +34,14 @@ public partial class Datasets
             //    throw new InvalidOperationException("Invalid blob reference for consumption.");
             //}
 
-            var containerClient = new BlobContainerClient(new Uri(pendingUploadResponse.Value.BlobReferenceForConsumption.BlobUri));
+            var containerClient = new BlobContainerClient(new Uri(pendingUploadResponse.Value.BlobReference.BlobUri));
             return (containerClient, outputVersion);
         }
 
         /// <summary>
         /// Uploads a file to blob storage and creates a dataset that references this file.
         /// </summary>
-        public DatasetVersion UploadFileAndCreate(string name, string version, string filePath)
+        public Response UploadFile(string name, string version, string filePath)
         {
             if (!File.Exists(filePath))
             {
@@ -57,22 +57,20 @@ public DatasetVersion UploadFileAndCreate(string name, string version, string fi
                 var blobClient = containerClient.GetBlobClient(blobName);
                 blobClient.Upload(fileStream);
 
-                return CreateVersion(
+                RequestContent content = RequestContent.Create(new FileDatasetVersion(dataUri: blobClient.Uri.AbsoluteUri));
+
+                return CreateOrUpdate(
                     name,
                     outputVersion,
-                    new FileDatasetVersion
-                    {
-                        DatasetUri = blobClient.Uri.AbsoluteUri,
-                        Type = DatasetType.UriFile
-                    }
+                    content
                 );
             }
         }
 
         /// <summary>
         /// Uploads all files in a folder to blob storage and creates a dataset that references this folder.
         /// </summary>
-        public DatasetVersion UploadFolderAndCreate(string name, string version, string folderPath)
+        public Response UploadFolder(string name, string version, string folderPath)
         {
             if (!Directory.Exists(folderPath))
             {
@@ -99,14 +97,11 @@ public DatasetVersion UploadFolderAndCreate(string name, string version, string
                 throw new ArgumentException("The provided folder is empty.");
             }
 
-            return CreateVersion(
+            RequestContent content = RequestContent.Create(new FolderDatasetVersion(dataUri: containerClient.Uri.AbsoluteUri));
+            return CreateOrUpdate(
                 name,
                 outputVersion,
-                new FolderDatasetVersion
-                {
-                    DatasetUri = containerClient.Uri.AbsoluteUri,
-                    Type = DatasetType.UriFolder
-                }
+                content
             );
         }
         public static string GetRelativePath(string folderPath, string filePath)

sdk/ai/Azure.AI.Projects/src/Custom/Evaluations/EvaluatorIDs.cs

@@ -5,7 +5,6 @@
 
 using System;
 using System.Collections.Generic;
-using Azure.AI.OpenAI;
 
 namespace Azure.AI.Projects
 {

sdk/ai/Azure.AI.Projects/tests/Samples/Connections/Sample_Connections.cs

@@ -42,11 +42,11 @@ public void ConnectionsExample()
             }
 
             Console.WriteLine($"Get the properties of a connection named `{connectionName}`:");
-            var specificConnection = connectionsClient.GetConnection(connectionName);
+            var specificConnection = connectionsClient.Get(connectionName, includeCredentials: false);
             Console.WriteLine(specificConnection);
 
             Console.WriteLine("Get the properties of a connection with credentials:");
-            var specificConnectionCredentials = connectionsClient.GetWithCredentials(connectionName);
+            var specificConnectionCredentials = connectionsClient.Get(connectionName, includeCredentials: true);
             Console.WriteLine(specificConnectionCredentials);
 
             #endregion
@@ -81,11 +81,11 @@ public async Task ConnectionsExampleAsync()
             }
 
             Console.WriteLine($"Get the properties of a connection named `{connectionName}`:");
-            var specificConnection = await connectionsClient.GetConnectionAsync(connectionName);
+            var specificConnection = await connectionsClient.GetAsync(connectionName, includeCredentials: false);
             Console.WriteLine(specificConnection);
 
             Console.WriteLine("Get the properties of a connection with credentials:");
-            var specificConnectionCredentials = await connectionsClient.GetWithCredentialsAsync(connectionName);
+            var specificConnectionCredentials = await connectionsClient.GetAsync(connectionName, includeCredentials: true);
             Console.WriteLine(specificConnectionCredentials);
 
             #endregion

sdk/ai/Azure.AI.Projects/tests/Samples/Datasets/Sample_Datasets.cs

@@ -33,38 +33,38 @@ public void DatasetsExample()
             Datasets datasets = projectClient.GetDatasetsClient();
 
             Console.WriteLine("Uploading a single file to create Dataset version '1'...");
-            var dataset = datasets.UploadFileAndCreate(
+            var datasetResponse = datasets.UploadFile(
                 name: datasetName,
                 version: "1",
                 filePath: "sample_folder/sample_file1.txt"
                 );
-            Console.WriteLine(dataset);
+            Console.WriteLine(datasetResponse);
 
             Console.WriteLine("Uploading folder to create Dataset version '2'...");
-            dataset = datasets.UploadFolderAndCreate(
+            datasetResponse = datasets.UploadFolder(
                 name: datasetName,
                 version: "2",
                 folderPath: "sample_folder"
             );
-            Console.WriteLine(dataset.DatasetUri);
+            Console.WriteLine(datasetResponse);
 
             Console.WriteLine("Retrieving Dataset version '1'...");
-            dataset = datasets.GetVersion(datasetName, "1");
-            Console.WriteLine(dataset.DatasetUri);
+            DatasetVersion dataset = datasets.GetDataset(datasetName, "1");
+            Console.WriteLine(dataset);
 
             Console.WriteLine($"Listing all versions for Dataset '{datasetName}':");
             foreach (var ds in datasets.GetVersions(datasetName))
             {
-                Console.WriteLine(ds.DatasetUri);
+                Console.WriteLine(ds);
             }
 
             Console.WriteLine("Retrieving Dataset version '1' credentials...");
             var credentials = datasets.GetCredentials(datasetName, "1", new GetCredentialsRequest());
             Console.WriteLine(credentials);
 
             Console.WriteLine("Deleting Dataset versions '1' and '2'...");
-            datasets.DeleteVersion(datasetName, "1");
-            datasets.DeleteVersion(datasetName, "2");
+            datasets.Delete(datasetName, "1");
+            datasets.Delete(datasetName, "2");
             #endregion
         }
 
@@ -84,38 +84,38 @@ public async void DatasetsExampleAsync()
             Datasets datasets = projectClient.GetDatasetsClient();
 
             Console.WriteLine("Uploading a single file to create Dataset version '1'...");
-            var dataset = datasets.UploadFileAndCreate(
+            var datasetResponse = datasets.UploadFile(
                 name: datasetName,
                 version: "1",
                 filePath: "sample_folder/sample_file1.txt"
                 );
-            Console.WriteLine(dataset);
+            Console.WriteLine(datasetResponse);
 
             Console.WriteLine("Uploading folder to create Dataset version '2'...");
-            dataset = datasets.UploadFolderAndCreate(
+            datasetResponse = datasets.UploadFolder(
                 name: datasetName,
                 version: "2",
                 folderPath: "sample_folder"
             );
-            Console.WriteLine(dataset.DatasetUri);
+            Console.WriteLine(datasetResponse);
 
             Console.WriteLine("Retrieving Dataset version '1'...");
-            dataset = await datasets.GetVersionAsync(datasetName, "1");
-            Console.WriteLine(dataset.DatasetUri);
+            DatasetVersion dataset = await datasets.GetDatasetAsync(datasetName, "1");
+            Console.WriteLine(dataset);
 
             Console.WriteLine($"Listing all versions for Dataset '{datasetName}':");
             await foreach (var ds in datasets.GetVersionsAsync(datasetName))
             {
-                Console.WriteLine(ds.DatasetUri);
+                Console.WriteLine(ds);
             }
 
             Console.WriteLine("Retrieving Dataset version '1' credentials...");
             var credentials = await datasets.GetCredentialsAsync(datasetName, "1", new GetCredentialsRequest());
             Console.WriteLine(credentials);
 
             Console.WriteLine("Deleting Dataset versions '1' and '2'...");
-            await datasets.DeleteVersionAsync(datasetName, "1");
-            await datasets.DeleteVersionAsync(datasetName, "2");
+            await datasets.DeleteAsync(datasetName, "1");
+            await datasets.DeleteAsync(datasetName, "2");
             #endregion
         }
     }

sdk/ai/Azure.AI.Projects/tests/Samples/Evaluation/Sample_Evaluation.cs

@@ -59,7 +59,7 @@ public void EvaluationsExampleSync()
         Console.WriteLine(evaluationResponse);
 
         Console.WriteLine("Get evaluation");
-        Evaluation getEvaluationResponse = evaluations.GetEvaluation(evaluationResponse.Id);
+        Evaluation getEvaluationResponse = evaluations.GetEvaluation(evaluationResponse.Name);
         Console.WriteLine(getEvaluationResponse);
 
         Console.WriteLine("List evaluations");
@@ -113,7 +113,7 @@ public async Task EvaluationsExampleAsync()
         Console.WriteLine(evaluationResponse);
 
         Console.WriteLine("Get evaluation");
-        Evaluation getEvaluationResponse = await evaluations.GetEvaluationAsync(evaluationResponse.Id);
+        Evaluation getEvaluationResponse = await evaluations.GetEvaluationAsync(evaluationResponse.Name);
         Console.WriteLine(getEvaluationResponse);
 
         Console.WriteLine("List evaluations");

sdk/ai/Azure.AI.Projects/tests/Samples/Indexes/Sample_Indexes.cs

@@ -6,6 +6,7 @@
 using System;
 using System.Threading.Tasks;
 using Azure.AI.Projects;
+using Azure.Core;
 using Azure.Core.TestFramework;
 using NUnit.Framework;
 
@@ -34,16 +35,26 @@ public void IndexesExample()
             AIProjectClient projectClient = new(new Uri(endpoint), new DefaultAzureCredential());
             Indexes indexesClient = projectClient.GetIndexesClient();
 
+            RequestContent content = RequestContent.Create(new
+            {
+                connectionName = aiSearchConnectionName,
+                indexName = aiSearchIndexName,
+                indexVersion = indexVersion,
+                //indexType = IndexType.AzureSearch,
+                description = "Sample Index for testing",
+                displayName = "Sample Index"
+            });
+
             Console.WriteLine($"Create an Index named `{indexName}` referencing an existing AI Search resource:");
-            var index = indexesClient.CreateVersion(
+            var index = indexesClient.CreateOrUpdate(
                 name: indexName,
                 version: indexVersion,
-                body: new AzureAISearchIndex(connectionName: aiSearchConnectionName, indexName: aiSearchIndexName)
-                );
+                content: content
+            );
             Console.WriteLine(index);
 
             Console.WriteLine($"Get an existing Index named `{indexName}`, version `{indexVersion}`:");
-            var retrievedIndex = indexesClient.GetVersion(name: indexName, version: indexVersion);
+            var retrievedIndex = indexesClient.GetIndex(name: indexName, version: indexVersion);
             Console.WriteLine(retrievedIndex);
 
             Console.WriteLine($"Listing all versions of the Index named `{indexName}`:");
@@ -52,14 +63,8 @@ public void IndexesExample()
                 Console.WriteLine(version);
             }
 
-            Console.WriteLine("List latest versions of all Indexes:");
-            foreach (var latestIndex in indexesClient.GetLatests())
-            {
-                Console.WriteLine(latestIndex);
-            }
-
-            Console.WriteLine("Delete the Index versions created above:");
-            indexesClient.DeleteVersion(name: indexName, version: indexVersion);
+            Console.WriteLine("Delete the Index version created above:");
+            indexesClient.Delete(name: indexName, version: indexVersion);
             #endregion
         }
     }