Azure · lmazuel · Jun 26, 2024 · Jun 18, 2024 · Jun 18, 2024 · Jun 18, 2024
diff --git a/specification/cognitiveservices/OpenAI.Inference/models/audio/common.tsp b/specification/cognitiveservices/OpenAI.Inference/models/audio/common.tsp
@@ -23,3 +23,7 @@ alias AudioTextResponse = {
   @bodyRoot
   body: string;
 };
+
+model KeepModel<T> {
+  @bodyRoot body: T;
+}
@@ -72,3 +72,7 @@ union ChatRole {
   @added(ServiceApiVersions.v2024_02_15_Preview)
   tool: "tool",
 }
+
+model KeepModel<T> {
+  @bodyRoot body: T;
+}
@@ -102,3 +102,7 @@ model EmbeddingsUsage {
   @encodedName("application/json", "total_tokens")
   totalTokens: int32;
 }
+
+model KeepModel<T> {
+  @bodyRoot body: T;
+}
diff --git a/specification/cognitiveservices/OpenAI.Inference/models/images/common.tsp b/specification/cognitiveservices/OpenAI.Inference/models/images/common.tsp
@@ -61,3 +61,7 @@ op OaiLongRunningRpcOperation<
   Traits,
   TErrorResponse
 >;
+
+model KeepModel<T> {
+  @bodyRoot body: T;
+}
@@ -28,7 +28,7 @@ namespace Azure.OpenAI;
 @sharedRoute
 op getAudioTranscriptionAsPlainText is Azure.Core.ResourceAction<
   Deployment,
-  AudioTranscriptionOptions,  // response_format must be one of: text, srt, vtt
+  KeepModel<AudioTranscriptionOptions>,  // response_format must be one of: text, srt, vtt
   AudioTextResponse,
   MultipartFormDataRequestHeadersTraits & TextPlainResponseHeadersTraits
 >;
@@ -44,7 +44,7 @@ op getAudioTranscriptionAsPlainText is Azure.Core.ResourceAction<
 @sharedRoute
 op getAudioTranscriptionAsResponseObject is Azure.Core.ResourceAction<
   Deployment,
-  AudioTranscriptionOptions,  // response_format must be unspecified (json) or one of: json, verbose_json
+  KeepModel<AudioTranscriptionOptions>,  // response_format must be unspecified (json) or one of: json, verbose_json
   AudioTranscription,
   MultipartFormDataRequestHeadersTraits
 >;
@@ -27,7 +27,7 @@ namespace Azure.OpenAI;
 @sharedRoute
 op getAudioTranslationAsPlainText is Azure.Core.ResourceAction<
   Deployment,
-  AudioTranslationOptions,  // response_format must be one of: text, srt, vtt
+  KeepModel<AudioTranslationOptions>,  // response_format must be one of: text, srt, vtt
   AudioTextResponse,
   MultipartFormDataRequestHeadersTraits & TextPlainResponseHeadersTraits
 >;
@@ -42,7 +42,7 @@ op getAudioTranslationAsPlainText is Azure.Core.ResourceAction<
 @sharedRoute
 op getAudioTranslationAsResponseObject is Azure.Core.ResourceAction<
   Deployment,
-  AudioTranslationOptions,  // response_format must be unspecified (json) or one of: json, verbose_json
+  KeepModel<AudioTranslationOptions>,  // response_format must be unspecified (json) or one of: json, verbose_json
   AudioTranslation,
   MultipartFormDataRequestHeadersTraits
 >;
@@ -23,7 +23,7 @@ namespace Azure.OpenAI;
 @action("completions") //@convenientAPI(true)
 op getCompletions is Azure.Core.ResourceAction<
   Deployment,
-  CompletionsOptions,
+  KeepModel<CompletionsOptions>,
   Completions
 >;
 

@@ -18,6 +18,6 @@ namespace Azure.OpenAI;
 @action("embeddings") //@convenientAPI(true)
 op getEmbeddings is Azure.Core.ResourceAction<
   Deployment,
-  EmbeddingsOptions,
+  KeepModel<EmbeddingsOptions>,
   Embeddings
 >;
@@ -20,7 +20,7 @@ namespace Azure.OpenAI;
 @action("images/generations")
 op getImageGenerations is Azure.Core.ResourceAction<
   Deployment,
-  ImageGenerationOptions,
+  KeepModel<ImageGenerationOptions>,
   ImageGenerations
 >;
 
@@ -54,7 +54,7 @@ op getAzureBatchImageGenerationOperationStatus is RpcOperation<
   }
 )
 op beginAzureBatchImageGeneration is OaiLongRunningRpcOperation<
-  ImageGenerationOptions,
+  KeepModel<ImageGenerationOptions>,
   BatchImageGenerationOperationResponse,
   BatchImageGenerationOperationResponse
 >;
diff --git a/specification/communication/Communication.Messages/models.tsp b/specification/communication/Communication.Messages/models.tsp
@@ -374,3 +374,7 @@ enum Versions {
   @useDependency(Azure.Core.Versions.v1_0_Preview_2)
   c2024_02_01: "2024-02-01",
 }
+
+model KeepModel<T> {
+  @bodyRoot body: T;
+}
diff --git a/specification/communication/Communication.Messages/routes.tsp b/specification/communication/Communication.Messages/routes.tsp
@@ -35,7 +35,7 @@ interface NotificationMessagesOperations {
   @doc("Sends a notification message from Business to User.")
   send is Operations.ResourceCollectionAction<
     Notifications,
-    NotificationContent,
+    KeepModel<NotificationContent>,
     AcceptedResponse & SendMessageResult
   >;
 }

diff --git a/specification/confidentialledger/Microsoft.CodeTransparency/entries.tsp b/specification/confidentialledger/Microsoft.CodeTransparency/entries.tsp
@@ -3,14 +3,16 @@ using Azure.Core.Traits;
 using TypeSpec.Rest;
 using TypeSpec.Http;
 
+import "./models.tsp";
+
 namespace Microsoft.CodeTransparency;
 
 #suppress "@azure-tools/typespec-azure-core/use-standard-operations"
 @doc("Post an entry to be registered on the CodeTransparency instance.")
 @post
 @route("/entries")
 op createEntry is Foundations.Operation<
-  CoseEntry,
+  KeepModel<CoseEntry>,
   CreateEntryResult,
   ServiceTraits
 >;
@@ -22,7 +24,7 @@ op createEntry is Foundations.Operation<
 @doc("Get the status the entry operation")
 @route("/operations/{operationId}")
 op getEntryStatus is Foundations.Operation<
-  OperationIdParameter,
+  KeepModel<OperationIdParameter>,
   GetOperationResult,
   ServiceTraits
 >;
@@ -40,7 +42,7 @@ op listEntryStatuses is Foundations.Operation<
 @doc("Get Entry with or without receipt embedded in its unprotected header")
 @route("/entries/{entryId}")
 op getEntry is Foundations.Operation<
-  EmbedReceiptParameter,
+  KeepModel<EmbedReceiptParameter>,
   CoseEntry,
   ServiceTraits
 >;
@@ -49,7 +51,7 @@ op getEntry is Foundations.Operation<
 @doc("Get the receipt of an entry given a specific entry id.")
 @route("/entries/{entryId}/receipt")
 op getEntryReceipt is Foundations.Operation<
-  EntryIdParameter,
+  KeepModel<EntryIdParameter>,
   RawEntry,
   ServiceTraits
 >;
@@ -58,7 +60,7 @@ op getEntryReceipt is Foundations.Operation<
 @doc("Historical query to get a list of entries of a given range")
 @route("/entries/txIds")
 op listEntryIds is Foundations.Operation<
-  TransactionsRange,
+  KeepModel<TransactionsRange>,
   EntryIds,
   ServiceTraits,
   ServiceUnavailableError | Foundations.ErrorResponse

diff --git a/specification/confidentialledger/Microsoft.CodeTransparency/models.tsp b/specification/confidentialledger/Microsoft.CodeTransparency/models.tsp
@@ -269,3 +269,7 @@ model CodeTransparencyConfigurationPolicy {
   accepted_algorithms?: string[];
   accepted_did_issuers?: string[];
 }
+
+model KeepModel<T> {
+  @bodyRoot body: T;
+}
diff --git a/specification/developersigning/DeveloperSigning/main.tsp b/specification/developersigning/DeveloperSigning/main.tsp
@@ -68,7 +68,7 @@ interface CertificateProfileOperations {
   @pollingOperation(CertificateProfileOperations.getSigningStatus)
   sign is StandardResourceOperations.LongRunningResourceAction<
     CertificateProfileName,
-    SigningPayloadOptions,
+    KeepModel<SigningPayloadOptions>,
     SignResult,
     Foundations.ErrorResponse,
     SigningRequestHeadersTraits
@@ -188,6 +188,10 @@ model BytesBody<ContentType> {
   contentType: ContentType;
 }
 
+model KeepModel<T> {
+  @bodyRoot body: T;
+}
+
 alias SigningRequestHeadersTraits = Azure.Core.Traits.RequestHeadersTrait<{
   @doc("An optional client version.")
   @header

diff --git a/specification/programmableconnectivity/Azure.ProgrammableConnectivity/apis/common.tsp b/specification/programmableconnectivity/Azure.ProgrammableConnectivity/apis/common.tsp
@@ -104,3 +104,7 @@ model Ipv6Address {
   @doc("User equipment port.")
   port: int32;
 }
+
+model KeepModel<T> {
+  @bodyRoot body: T;
+}
diff --git a/specification/programmableconnectivity/Azure.ProgrammableConnectivity/apis/location.tsp b/specification/programmableconnectivity/Azure.ProgrammableConnectivity/apis/location.tsp
@@ -13,7 +13,7 @@ interface DeviceLocation {
   @doc("Verifies whether a device is within a specified location area, defined as an accuracy (radius) around a point, specified by longitude and latitude.")
   verify is Operations.ResourceAction<
     DeviceLocationEndpoint,
-    DeviceLocationVerificationContent,
+    KeepModel<DeviceLocationVerificationContent>,
     DeviceLocationVerificationResult
   >;
 }

diff --git a/specification/programmableconnectivity/Azure.ProgrammableConnectivity/apis/network.tsp b/specification/programmableconnectivity/Azure.ProgrammableConnectivity/apis/network.tsp
@@ -14,7 +14,7 @@ interface DeviceNetwork {
   @doc("Retrieves the network a given device is on. Returns network in a networkCode format that can be used for other APIs.")
   retrieve is Operations.ResourceAction<
     DeviceNetworkRetrievalEndpoint,
-    NetworkIdentifier,
+    KeepModel<NetworkIdentifier>,
     NetworkRetrievalResult
   >;
 }

diff --git a/specification/programmableconnectivity/Azure.ProgrammableConnectivity/apis/number.tsp b/specification/programmableconnectivity/Azure.ProgrammableConnectivity/apis/number.tsp
@@ -29,7 +29,7 @@ interface NumberVerification {
   @action("verify")
   verifyWithoutCode is Operations.ResourceAction<
     NumberVerificationEndpoint,
-    NumberVerificationWithoutCodeContent,
+    KeepModel<NumberVerificationWithoutCodeContent>,
     TypeSpec.Http.Response<302> & {},
     TraitOverride<ResponseHeadersTrait<{
       @doc("The URI of the network's authorization endpoint, which should be followed by the front-end application.")
@@ -43,7 +43,7 @@ interface NumberVerification {
   @action("verify")
   verifyWithCode is Operations.ResourceAction<
     NumberVerificationEndpoint,
-    NumberVerificationWithCodeContent,
+    KeepModel<NumberVerificationWithCodeContent>,
     NumberVerificationResult
   >;
 }

diff --git a/specification/programmableconnectivity/Azure.ProgrammableConnectivity/apis/simswap.tsp b/specification/programmableconnectivity/Azure.ProgrammableConnectivity/apis/simswap.tsp
@@ -14,14 +14,14 @@ interface SimSwap {
   @doc("Provides timestamp of latest SIM swap")
   retrieve is Operations.ResourceAction<
     SimSwapEndpoint,
-    SimSwapRetrievalContent,
+    KeepModel<SimSwapRetrievalContent>,
     SimSwapRetrievalResult
   >;
 
   @doc("Verifies if a SIM swap has been performed during a past period (defined in the request with 'maxAgeHours' attribute). Returns 'True' if a SIM swap has occured.")
   verify is Operations.ResourceAction<
     SimSwapEndpoint,
-    SimSwapVerificationContent,
+    KeepModel<SimSwapVerificationContent>,
     SimSwapVerificationResult
   >;
 }

diff --git a/specification/purview/Azure.Analytics.Purview.DataMap/models.tsp b/specification/purview/Azure.Analytics.Purview.DataMap/models.tsp
@@ -1983,3 +1983,7 @@ model AtlasTypeDefHeader {
   @doc("The name of the type definition.")
   name?: string;
 }
+
+model KeepModel<T> {
+  @bodyRoot body: T;
+}
diff --git a/specification/purview/Azure.Analytics.Purview.DataMap/routes.tsp b/specification/purview/Azure.Analytics.Purview.DataMap/routes.tsp
@@ -1623,7 +1623,7 @@ interface Discovery {
   @route("/search/query")
   @post
   query is Azure.Core.Foundations.Operation<
-    QueryOptions,
+    KeepModel<QueryOptions>,
     QueryResult,
     {},
     AtlasErrorResponse
@@ -1634,7 +1634,7 @@ interface Discovery {
   @route("/search/suggest")
   @post
   suggest is Azure.Core.Foundations.Operation<
-    SuggestOptions,
+    KeepModel<SuggestOptions>,
     SuggestResult,
     {},
     AtlasErrorResponse
@@ -1645,7 +1645,7 @@ interface Discovery {
   @route("/search/autocomplete")
   @post
   autoComplete is Azure.Core.Foundations.Operation<
-    AutoCompleteOptions,
+    KeepModel<AutoCompleteOptions>,
     AutoCompleteResult,
     {},
     AtlasErrorResponse

diff --git a/specification/riskiq/Easm/models.tsp b/specification/riskiq/Easm/models.tsp
@@ -2155,3 +2155,7 @@ model DiscoGroupSummaryResult {
   @doc("The name that can be used for display purposes.")
   displayName: string;
 }
+
+model KeepModel<T> {
+  @bodyRoot body: T;
+}