Merge pull request openai#404 from openai/spec-2025-01-22

Remove spec errors

Author: kwhinnery-openai

openapi.yaml

@@ -4028,11 +4028,6 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/ApiKeyList"
-      security:
-        - bearer_identity_edge:
-            - key.secret
-            - api.management.read
-        - basic_identity_edge: []
       x-oaiMeta:
         name: List admin API keys
         group: administration
@@ -4092,11 +4087,6 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/AdminApiKey"
-      security:
-        - bearer_identity_edge:
-            - key.secret
-            - api.management.write
-        - basic_identity_edge: []
       x-oaiMeta:
         name: Create admin API key
         group: administration
@@ -4147,11 +4137,6 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/AdminApiKey"
-      security:
-        - bearer_identity_edge:
-            - key.secret
-            - api.management.read
-        - basic_identity_edge: []
       x-oaiMeta:
         name: Retrieve admin API key
         group: administration
@@ -4207,11 +4192,6 @@ paths:
                   deleted:
                     type: boolean
                     example: true
-      security:
-        - bearer_identity_edge:
-            - key.secret
-            - api.management.write
-        - basic_identity_edge: []
       x-oaiMeta:
         name: Delete admin API key
         group: administration
@@ -11704,8 +11684,9 @@ components:
 
             We generally recommend altering this or temperature but not both.
         response_format:
-          $ref: "#/components/schemas/AssistantsApiResponseFormatOption"
-          nullable: true
+          allOf:
+            - $ref: "#/components/schemas/AssistantsApiResponseFormatOption"
+            - nullable: true
       required:
         - id
         - object
@@ -12301,10 +12282,8 @@ components:
             - session
             - api_key
         session:
-          type: object
           $ref: "#/components/schemas/AuditLogActorSession"
         api_key:
-          type: object
           $ref: "#/components/schemas/AuditLogActorApiKey"
     AuditLogActorApiKey:
       type: object
@@ -13725,8 +13704,9 @@ components:
 
             We generally recommend altering this or temperature but not both.
         response_format:
-          $ref: "#/components/schemas/AssistantsApiResponseFormatOption"
-          nullable: true
+          allOf:
+            - $ref: "#/components/schemas/AssistantsApiResponseFormatOption"
+            - nullable: true
       required:
         - model
     CreateChatCompletionFunctionResponse:
@@ -16302,16 +16282,19 @@ components:
             for more info.
           minimum: 256
         truncation_strategy:
-          $ref: "#/components/schemas/TruncationObject"
-          nullable: true
+          allOf:
+            - $ref: "#/components/schemas/TruncationObject"
+            - nullable: true
         tool_choice:
-          $ref: "#/components/schemas/AssistantsApiToolChoiceOption"
-          nullable: true
+          allOf:
+            - $ref: "#/components/schemas/AssistantsApiToolChoiceOption"
+            - nullable: true
         parallel_tool_calls:
           $ref: "#/components/schemas/ParallelToolCalls"
         response_format:
-          $ref: "#/components/schemas/AssistantsApiResponseFormatOption"
-          nullable: true
+          allOf:
+            - $ref: "#/components/schemas/AssistantsApiResponseFormatOption"
+            - nullable: true
       required:
         - assistant_id
     CreateSpeechRequest:
@@ -16383,7 +16366,6 @@ components:
           type: string
         thread:
           $ref: "#/components/schemas/CreateThreadRequest"
-          description: If no thread is provided, an empty thread will be created.
         model:
           description: The ID of the [Model](/docs/api-reference/models) to be used to
             execute this run. If a value is provided here, it will override the
@@ -16535,20 +16517,26 @@ components:
             for more info.
           minimum: 256
         truncation_strategy:
-          $ref: "#/components/schemas/TruncationObject"
-          nullable: true
+          allOf:
+            - $ref: "#/components/schemas/TruncationObject"
+            - nullable: true
         tool_choice:
-          $ref: "#/components/schemas/AssistantsApiToolChoiceOption"
-          nullable: true
+          allOf:
+            - $ref: "#/components/schemas/AssistantsApiToolChoiceOption"
+            - nullable: true
         parallel_tool_calls:
           $ref: "#/components/schemas/ParallelToolCalls"
         response_format:
-          $ref: "#/components/schemas/AssistantsApiResponseFormatOption"
-          nullable: true
+          allOf:
+            - $ref: "#/components/schemas/AssistantsApiResponseFormatOption"
+            - nullable: true
       required:
         - assistant_id
     CreateThreadRequest:
       type: object
+      description: |
+        Options to create a new thread. If no thread is provided when running a 
+        request, an empty thread will be created.
       additionalProperties: false
       properties:
         messages:
@@ -17432,10 +17420,8 @@ components:
             - supervised
             - dpo
         supervised:
-          type: object
           $ref: "#/components/schemas/FineTuneSupervisedMethod"
         dpo:
-          type: object
           $ref: "#/components/schemas/FineTuneDPOMethod"
     FineTunePreferenceRequestInput:
       type: object
@@ -19395,8 +19381,9 @@ components:
 
             We generally recommend altering this or temperature but not both.
         response_format:
-          $ref: "#/components/schemas/AssistantsApiResponseFormatOption"
-          nullable: true
+          allOf:
+            - $ref: "#/components/schemas/AssistantsApiResponseFormatOption"
+            - nullable: true
     ModifyMessageRequest:
       type: object
       additionalProperties: false
@@ -23569,16 +23556,19 @@ components:
             over the course of the run.
           minimum: 256
         truncation_strategy:
-          $ref: "#/components/schemas/TruncationObject"
-          nullable: true
+          allOf:
+            - $ref: "#/components/schemas/TruncationObject"
+            - nullable: true
         tool_choice:
-          $ref: "#/components/schemas/AssistantsApiToolChoiceOption"
-          nullable: true
+          allOf:
+            - $ref: "#/components/schemas/AssistantsApiToolChoiceOption"
+            - nullable: true
         parallel_tool_calls:
           $ref: "#/components/schemas/ParallelToolCalls"
         response_format:
-          $ref: "#/components/schemas/AssistantsApiResponseFormatOption"
-          nullable: true
+          allOf:
+            - $ref: "#/components/schemas/AssistantsApiResponseFormatOption"
+            - nullable: true
       required:
         - id
         - object
@@ -24897,8 +24887,9 @@ components:
           type: string
           nullable: true
         expires_after:
-          $ref: "#/components/schemas/VectorStoreExpirationAfter"
-          nullable: true
+          allOf:
+            - $ref: "#/components/schemas/VectorStoreExpirationAfter"
+            - nullable: true
         metadata:
           description: >
             Set of 16 key-value pairs that can be attached to an object. This
@@ -24950,9 +24941,10 @@ components:
             - upload
           x-stainless-const: true
         file:
-          $ref: "#/components/schemas/OpenAIFile"
-          nullable: true
-          description: The ready File object after the Upload is completed.
+          allOf:
+            - $ref: "#/components/schemas/OpenAIFile"
+            - nullable: true
+              description: The ready File object after the Upload is completed.
       required:
         - bytes
         - created_at