Starting point for AOAI + OAI

audio/models.tsp

@@ -1,7 +1,14 @@
-namespace OpenAI;
+import "../versions.tsp";
+
+namespace ModelDefinitions;
+
 using TypeSpec.OpenAPI;
+using TypeSpec.Versioning;
 
 model CreateTranscriptionRequest {
+  @azure
+  @TypeSpec.Http.path deploymentId: string;
+
   /**
    * The audio file object (not file name) to transcribe, in one of these formats: flac, mp3, mp4,
    * mpeg, mpga, m4a, ogg, wav, or webm.
@@ -50,6 +57,9 @@ model CreateTranscriptionResponse {
 }
 
 model CreateTranslationRequest {
+  @azure
+  @TypeSpec.Http.path deploymentId: string;
+
   /**
    * The audio file object (not file name) to translate, in one of these formats: flac, mp3, mp4,
    * mpeg, mpga, m4a, ogg, wav, or webm.
@@ -83,6 +93,7 @@ model CreateTranslationRequest {
    */
   @minValue(0)
   @maxValue(1)
+  @azure
   temperature?: float64 = 0;
 }
 

audio/operations.tsp

@@ -7,6 +7,9 @@ using TypeSpec.Http;
 using TypeSpec.OpenAPI;
 
 namespace OpenAI;
+
+using ModelDefinitions;
+
 @route("/audio")
 namespace Audio {
   @route("transcriptions")

azuremain.tsp

@@ -0,0 +1,88 @@
+import "@typespec/http";
+import "@typespec/openapi3";
+import "@typespec/openapi";
+import "@typespec/versioning";
+
+import "./audio";
+import "./completions";
+import "./edits";
+import "./embeddings";
+import "./files";
+import "./fine-tuning";
+import "./images";
+import "./moderation";
+import "./versions.tsp";
+
+import "./main.tsp";
+
+using TypeSpec.Http;
+
+/** The OpenAI REST API. Please see https://platform.openai.com/docs/api-reference for more details. */
+@service({
+  title: "Azure OpenAI API",
+  termsOfService: "https://openai.com/policies/terms-of-use",
+  contact: {
+    name: "OpenAI Support",
+    url: "https://help.openai.com",
+  },
+  license: {
+    name: "MIT",
+    url: "https://github.com/openai/openai-openapi/blob/master/LICENSE",
+  },
+})
+@server("{base_url}/openai", "OpenAI Endpoint", {
+    base_url: url;
+})
+@useAuth(BearerAuth)
+@TypeSpec.Versioning.useDependency(ModelDefinitions.OpenAIFlavors.Azure)
+namespace AzureOpenAI {
+    @route("deployments/{deploymentId}/chat")
+    namespace Chat {
+        interface Completions {
+            @route("completions")
+            op createCompletion is OpenAI.Chat.Completions.createChatCompletion;
+        };
+    }
+
+    @route("deployments/{deploymentId}/extensions/chat")
+    namespace ChatExtensions {
+      @route("completions")
+      op createCompletionOnYourOwnData(... ModelDefinitions.CreateChatCompletionRequest, dataSources: DataSource[]): ModelDefinitions.CreateChatCompletionResponse;
+    }
+
+    @route("deployments/{deploymentId}/completions")
+    namespace Completions {
+      op createCompletion is OpenAI.Completions.createCompletion;
+    }
+
+    @route("deployments/{deploymentId}/embeddings")
+    namespace Embeddings {
+      op createEmbedding is OpenAI.Embeddings.createEmbedding;
+    }
+
+    @route("deployments/{deploymentId}/audio")
+    namespace Audio {
+      @route("transcriptions")
+      op transcriptions is OpenAI.Audio.Transcriptions.createTranscription;
+
+      @route("translations")
+      op translations is OpenAI.Audio.Translations.createTranslation;
+    }
+
+    @route("/files")
+    interface Files extends OpenAI.Files {};
+
+    @route("/fine-tunes")
+    interface FineTunes extends OpenAI.FineTunes {};
+
+    @route("/fine-tuning")
+    interface FineTuning extends OpenAI.FineTunes {};
+
+    @route("/models")
+    interface Models extends OpenAI.Models {};
+
+    @route("/models")
+    interface Images extends OpenAI.Images {};
+
+    model DataSource {};
+}

common/models.tsp

@@ -1,4 +1,4 @@
-namespace OpenAI;
+namespace ModelDefinitions;
 using TypeSpec.OpenAPI;
 
 model ListModelsResponse {

completions/azuremodels.tsp

@@ -0,0 +1,27 @@
+import "../versions.tsp";
+
+namespace ModelDefinitions;
+
+using TypeSpec.Versioning;
+
+@azure
+model ContentFilterResult {
+  severity: "safe" | "low" | "medium" | "high";
+  filtered: boolean;
+}
+
+@azure
+model ErrorBase {
+  code?: string;
+  message?: string;
+};
+
+@azure
+model ContentFilterResults {
+  sexual: ContentFilterResult;
+  violence: ContentFilterResult;
+  hate: ContentFilterResult;
+  self_harm: ContentFilterResult;
+  error: ErrorBase;
+}
+

completions/models.tsp

@@ -1,5 +1,10 @@
-namespace OpenAI;
+import "../versions.tsp";
+import "./azuremodels.tsp";
+
+namespace ModelDefinitions;
+
 using TypeSpec.OpenAPI;
+using TypeSpec.Versioning;
 
 alias CHAT_COMPLETION_MODELS =
   | "gpt4"
@@ -142,6 +147,10 @@ scalar N extends safeint;
 scalar MaxTokens extends safeint;
 
 model CreateChatCompletionRequest {
+  @azure
+  @TypeSpec.Http.path
+  deploymentId: string;
+
   /**
    * ID of the model to use. See the [model endpoint compatibility](/docs/models/model-endpoint-compatibility)
    * table for details on which models work with the Chat API.
@@ -204,6 +213,10 @@ model ChatCompletionFunctions {
 model ChatCompletionFunctionParameters is Record<unknown>;
 
 model ChatCompletionRequestMessage {
+  @azure
+  @TypeSpec.Http.path
+  deploymentId: string;
+
   /** The role of the messages author. One of `system`, `user`, `assistant`, or `function`. */
   role: "system" | "user" | "assistant" | "function";
 
@@ -259,6 +272,9 @@ model CreateChatCompletionResponse {
   /** The model used for the chat completion. */
   `model`: string;
 
+  @azure
+  promp_filter_results: ContentFilterResult[];
+
   /** A list of chat completion choices. Can be more than one if `n` is greater than 1. */
   choices: {
     /** The index of the choice in the list of choices. */
@@ -273,6 +289,9 @@ model CreateChatCompletionResponse {
      * a flag from our content filters, or `function_call` if the model called a function.
      */
     finish_reason: "stop" | "length" | "function_call" | "content_filter";
+
+    @azure
+    content_filter_results?: ContentFilterResult;
   }[];
 
   usage?: CompletionUsage;
@@ -309,9 +328,16 @@ model ChatCompletionResponseMessage {
      */
     arguments: string;
   };
+
+  @azure
+  content_filter_results?: ContentFilterResults
 }
 
 model CreateCompletionRequest {
+  @azure
+  @TypeSpec.Http.path
+  deploymentId: string;
+
   /**
    * ID of the model to use. You can use the [List models](/docs/api-reference/models/list) API to
    * see all of your available models, or see our [Model overview](/docs/models/overview) for
@@ -359,6 +385,9 @@ model CreateCompletionRequest {
    * quota. Use carefully and ensure that you have reasonable settings for `max_tokens` and `stop`.
    */
   best_of?: safeint | null = 1;
+
+  @azure
+  completion_config?: string | null;
 }
 
 @oneOf
@@ -417,4 +446,7 @@ model CreateCompletionResponse {
   }[];
 
   usage?: CompletionUsage;
-}
+
+  @azure
+  content_filter_results?: ContentFilterResults
+}

completions/operations.tsp

@@ -10,6 +10,8 @@ using TypeSpec.OpenAPI;
 
 namespace OpenAI;
 
+using ModelDefinitions;
+
 @route("/chat")
 namespace Chat {
   @route("/completions")

edits/models.tsp

@@ -1,4 +1,5 @@
-namespace OpenAI;
+namespace ModelDefinitions;
+
 using TypeSpec.OpenAPI;
 
 model CreateEditRequest {

edits/operations.tsp

@@ -9,6 +9,8 @@ using TypeSpec.OpenAPI;
 
 namespace OpenAI;
 
+using ModelDefinitions;
+
 @route("/edits")
 interface Edits {
   #deprecated "deprecated"

embeddings/models.tsp

@@ -1,9 +1,14 @@
 import "../common/models.tsp";
+import "../versions.tsp";
 
-namespace OpenAI;
+namespace ModelDefinitions;
 using TypeSpec.OpenAPI;
+using TypeSpec.Versioning;
 
 model CreateEmbeddingRequest {
+  @azure
+  @TypeSpec.Http.path deploymentId: string;
+
   /** ID of the model to use. You can use the [List models](/docs/api-reference/models/list) API to see all of your available models, or see our [Model overview](/docs/models/overview) for descriptions of them. */
   @extension("x-oaiTypeLabel", "string")
   `model`: string | "text-embedding-ada-002";
@@ -18,6 +23,9 @@ model CreateEmbeddingRequest {
   input: string | string[] | TokenArray | TokenArrayArray;
 
   user?: User;
+
+  @azure
+  input_type?: string;
 }
 model CreateEmbeddingResponse {
   /** The object type, which is always "embedding". */

embeddings/operations.tsp

@@ -9,6 +9,8 @@ using TypeSpec.OpenAPI;
 
 namespace OpenAI;
 
+using ModelDefinitions;
+
 @route("/embeddings")
 interface Embeddings {
   @tag("OpenAI")

files/models.tsp

@@ -1,4 +1,4 @@
-namespace OpenAI;
+namespace ModelDefinitions;
 using TypeSpec.OpenAPI;
 
 model ListFilesResponse {

files/operations.tsp

@@ -9,6 +9,8 @@ using TypeSpec.OpenAPI;
 
 namespace OpenAI;
 
+using ModelDefinitions;
+
 @route("/files")
 interface Files {
   @tag("OpenAI")

fine-tuning/models.tsp

@@ -1,4 +1,4 @@
-namespace OpenAI;
+namespace ModelDefinitions;
 using TypeSpec.OpenAPI;
 
 model FineTuningJob {

fine-tuning/operations.tsp

@@ -9,6 +9,8 @@ using TypeSpec.OpenAPI;
 
 namespace OpenAI;
 
+using ModelDefinitions;
+
 @route("/fine_tuning")
 namespace FineTuning {
   @route("jobs")

images/models.tsp

@@ -1,6 +1,6 @@
 import "../common/models.tsp";
 
-namespace OpenAI;
+namespace ModelDefinitions;
 using TypeSpec.OpenAPI;
 
 alias SharedImageProperties = {

images/operations.tsp

@@ -9,6 +9,8 @@ using TypeSpec.OpenAPI;
 
 namespace OpenAI;
 
+using ModelDefinitions;
+
 @route("/images")
 interface Images {
   @route("generations")

main.tsp

@@ -1,6 +1,7 @@
 import "@typespec/http";
 import "@typespec/openapi3";
 import "@typespec/openapi";
+import "@typespec/versioning";
 
 import "./audio";
 import "./completions";
@@ -10,8 +11,11 @@ import "./files";
 import "./fine-tuning";
 import "./images";
 import "./moderation";
+import "./versions.tsp";
 
 using TypeSpec.Http;
+using TypeSpec.Versioning;
+
 
 /** The OpenAI REST API. Please see https://platform.openai.com/docs/api-reference for more details. */
 @service({
@@ -24,9 +28,10 @@ using TypeSpec.Http;
   license: {
     name: "MIT",
     url: "https://github.com/openai/openai-openapi/blob/master/LICENSE",
-  },
-  version: "2.0.0",
+  }
 })
 @server("https://api.openai.com/v1", "OpenAI Endpoint")
 @useAuth(BearerAuth)
+@useDependency(ModelDefinitions.OpenAIFlavors.OpenAI)
 namespace OpenAI;
+