Merge csharp feature branch into main ai inference branch

specification/ai/ModelClient/client.tsp

@@ -39,12 +39,12 @@ namespace Customizations; // The actual name here doesn't matter and is here for
 @@access(AI.Model.ChatRole, Access.public);
 @@access(AI.Model.CompletionsFinishReason, Access.public);
 @@access(AI.Model.CompletionsUsage, Access.public);
-@@access(AI.Model.EmbeddingEncodingFormat, Access.public, "python");
-@@access(AI.Model.EmbeddingInput, Access.public, "python");
-@@access(AI.Model.EmbeddingInputType, Access.public, "python");
-@@access(AI.Model.EmbeddingItem, Access.public, "python");
-@@access(AI.Model.EmbeddingsResult, Access.public, "python");
-@@access(AI.Model.EmbeddingsUsage, Access.public, "python");
+@@access(AI.Model.EmbeddingEncodingFormat, Access.public, "python,csharp");
+@@access(AI.Model.EmbeddingInput, Access.public, "python,csharp");
+@@access(AI.Model.EmbeddingInputType, Access.public, "python,csharp");
+@@access(AI.Model.EmbeddingItem, Access.public, "python,csharp");
+@@access(AI.Model.EmbeddingsResult, Access.public, "python,csharp");
+@@access(AI.Model.EmbeddingsUsage, Access.public, "python,csharp");
 @@access(AI.Model.FunctionCall, Access.public);
 @@access(AI.Model.FunctionDefinition, Access.public);
 @@access(AI.Model.ModelInfo, Access.public);
@@ -54,18 +54,18 @@ namespace Customizations; // The actual name here doesn't matter and is here for
 @@access(AI.Model.ChatMessageImageContentItem, Access.public);
 @@access(AI.Model.ChatMessageImageUrl, Access.public);
 @@access(AI.Model.ChatMessageImageDetailLevel, Access.public);
-@@access(AI.Model.StreamingChatCompletionsUpdate, Access.public, "python");
-@@access(AI.Model.StreamingChatChoiceUpdate, Access.public, "python");
-@@access(AI.Model.StreamingChatResponseMessageUpdate, Access.public, "python");
-@@access(AI.Model.StreamingChatResponseToolCallUpdate, Access.public, "python");
+@@access(AI.Model.StreamingChatCompletionsUpdate, Access.public, "python,csharp");
+@@access(AI.Model.StreamingChatChoiceUpdate, Access.public, "python,csharp");
+@@access(AI.Model.StreamingChatResponseMessageUpdate, Access.public, "python,csharp");
+@@access(AI.Model.StreamingChatResponseToolCallUpdate, Access.public, "python,csharp");
 
 // The operators need to be hidden, since we hand-write the public versions of those to
 // 1. Add chat completions streaming (to getChatCompletions operator)
 // 2. Add hyper-params (to getChatCompletions/Embeddings/ImageEmbeddings, all clients)
 // 3. Cache model info (to getModelInfo, all clients, Python only)
 @@access(AI.Model.getChatCompletions, Access.internal);
-@@access(AI.Model.getEmbeddings, Access.internal);
-@@access(AI.Model.getImageEmbeddings, Access.internal);
+@@access(AI.Model.getEmbeddings, Access.internal, "python");
+@@access(AI.Model.getImageEmbeddings, Access.internal, "python");
 @@access(AI.Model.getModelInfo, Access.internal, "python");
 
 // We use shorter names in the Python client library
@@ -102,7 +102,7 @@ interface Client1 {
     name: "EmbeddingsClient",
     service: AI.Model,
   },
-  "python"
+  "python,csharp"
 )
 interface Client2 {
   embed is AI.Model.getEmbeddings;

specification/ai/ModelClient/main.tsp

@@ -10,7 +10,7 @@ using Azure.Core;
 
 #suppress "@azure-tools/typespec-autorest/unsupported-http-auth-scheme"
 @useAuth(
-  BearerAuth | ApiKeyAuth<ApiKeyLocation.header, "api-key"> | OAuth2Auth<[
+  BearerAuth | OAuth2Auth<[
     {
       type: OAuth2FlowType.implicit,
       authorizationUrl: "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",

specification/ai/ModelClient/models/chat_completions.tsp

@@ -9,7 +9,12 @@ using Azure.ClientGenerator.Core;
 
 namespace AI.Model;
 
-alias ChatCompletionsOptions = {
+@doc("""
+The configuration information for a chat completions request.
+Completions support a wide variety of tasks and generate text that continues from or "completes"
+provided prompt data.
+""")
+model ChatCompletionsOptions {
   @doc("""
     The collection of context messages associated with this chat completions request.
     Typical usage begins with a chat message for the System role that provides instructions for
@@ -116,7 +121,7 @@ alias ChatCompletionsOptions = {
   `model`?: string;
 
   ...Record<unknown>;
-};
+}
 
 alias ChatCompletionsCommon = {
   @doc("A unique identifier associated with this chat completions response.")

specification/ai/ModelClient/models/embeddings.tsp

@@ -6,7 +6,10 @@ using TypeSpec.Http;
 
 namespace AI.Model;
 
-alias EmbeddingsOptions = {
+@doc("""
+The configuration information for an embeddings request.
+""")
+model EmbeddingsOptions {
   @doc("""
     Input text to embed, encoded as a string or array of tokens.
     To embed multiple inputs in a single request, pass an array

specification/ai/ModelClient/models/image_embeddings.tsp

@@ -6,7 +6,10 @@ using TypeSpec.Http;
 
 namespace AI.Model;
 
-alias ImageEmbeddingsOptions = {
+@doc("""
+The configuration information for an image embeddings request.
+""")
+model ImageEmbeddingsOptions {
   @doc("""
     Input image to embed. To embed multiple inputs in a single request, pass an array.
     The input must not exceed the max input tokens for the model.

specification/ai/ModelClient/routes.tsp

@@ -18,15 +18,16 @@ namespace AI.Model;
 @doc("""
   Gets chat completions for the provided chat messages.
   Completions support a wide variety of tasks and generate text that continues from or "completes"
-  provided prompt data. The method makes a REST API call to the `/chat/completions` route 
+  provided prompt data. The method makes a REST API call to the `/chat/completions` route
   on the given endpoint.
   """)
 @actionSeparator("/")
 @route("chat/completions")
 op getChatCompletions is Azure.Core.RpcOperation<
   {
-    ...ChatCompletionsOptions;
-    ...AdditionalRequestHeaders;
+    chatCompletionsOptions: ChatCompletionsOptions,
+    @header("extra-parameters")
+    extraParams?: ExtraParameters,
   },
   ChatCompletions
 >;
@@ -39,7 +40,7 @@ op getChatCompletions is Azure.Core.RpcOperation<
 @route("embeddings")
 op getEmbeddings is Azure.Core.RpcOperation<
   {
-    ...EmbeddingsOptions;
+    embeddingsOptions: EmbeddingsOptions;
     ...AdditionalRequestHeaders;
   },
   EmbeddingsResult
@@ -53,7 +54,7 @@ op getEmbeddings is Azure.Core.RpcOperation<
 @route("images/embeddings")
 op getImageEmbeddings is Azure.Core.RpcOperation<
   {
-    ...ImageEmbeddingsOptions;
+    imageEmbeddingsOptions: ImageEmbeddingsOptions;
     ...AdditionalRequestHeaders;
   },
   EmbeddingsResult

specification/ai/ModelClient/tspconfig.yaml

@@ -28,4 +28,4 @@ options:
     namespace: "Azure.AI.Inference"
     clear-output-folder: true
     model-namespace: false
-    flavor: azure
+    flavor: azure