Revert "fix(api)!: declare required local shell output call IDs (#1044)"

.castiron.stats.yml

@@ -1,8 +1,8 @@
 schema_version: 1
-generation_id: d66d942a-5c41-42fc-ae6d-0be56422f8a9
-openapi_spec_hash: 1ed71fc8e894116bb22f5ef57b7042c9
-openapi_transformed_spec_hash: d25d1c0ad7d91b71798878c81622fc74
-config_hash: 4b829cf550bc8e7f104da50d664100c4
-codegen_sha: 2921b00a04cd701ee27d6e98f7b2952ce448bd83
-codegen_hash: 15c14e7c6f2576c80bb64276f8289d1c83d87245ff6aac7dc14ee3f808898fcd
-public_codegen_sha: d07a8dcab0b433be6b296a64a04de6118620193a
+generation_id: bf3df9de-61e0-4ac3-aba8-bc72a0e6ad7c
+openapi_spec_hash: c7a2088dc0fb8d92f9a934ba4dca2d80
+openapi_transformed_spec_hash: 7281a983306f72fc39720d7057f11ef7
+config_hash: 60435bd668a5724c530fe7e9d6869e9a
+codegen_sha: 04ef2db20d0b32b277242a48487634d885e71cfd
+codegen_hash: 6d6c043d25782a4d8090ccdfcc621f32341ba1116513d40b535b89085b9704bd
+public_codegen_sha: 5ccf425b618de67fb7c595d8bc1aabaf3d699888

api_reference/openapi.transformed.yml

@@ -44672,7 +44672,7 @@ components:
         id:
           type: string
           description: |
-            The unique ID of the local shell tool call output.
+            The unique ID of the local shell tool call generated by the model.
         output:
           type: string
           description: |
@@ -44687,10 +44687,6 @@ components:
             description: |
               The status of the item. One of `in_progress`, `completed`, or `incomplete`.
           - type: 'null'
-        call_id:
-          type: string
-          description: |
-            The unique ID of the local shell tool call generated by the model.
       required:
       - id
       - type
@@ -44789,6 +44785,7 @@ components:
           - type: 'null'
       required:
       - type
+      - request_id
       - approve
       - approval_request_id
     MCPApprovalResponseResource:
@@ -44825,6 +44822,7 @@ components:
       required:
       - type
       - id
+      - request_id
       - approve
       - approval_request_id
     MCPListTools:
@@ -86287,6 +86285,7 @@ components:
           - type: 'null'
       required:
       - type
+      - request_id
       - approve
       - approval_request_id
     BetaMCPApprovalRequest:
@@ -86798,7 +86797,7 @@ components:
         id:
           type: string
           description: |
-            The unique ID of the local shell tool call output.
+            The unique ID of the local shell tool call generated by the model.
         output:
           type: string
           description: |
@@ -86813,10 +86812,6 @@ components:
             description: |
               The status of the item. One of `in_progress`, `completed`, or `incomplete`.
           - type: 'null'
-        call_id:
-          type: string
-          description: |
-            The unique ID of the local shell tool call generated by the model.
       required:
       - id
       - type
@@ -89336,6 +89331,7 @@ components:
       required:
       - type
       - id
+      - request_id
       - approve
       - approval_request_id
     BetaApplyPatchToolCallOutput:

openai-java-core/src/main/kotlin/com/openai/models/beta/responses/BetaResponseInputItem.kt

@@ -13804,7 +13804,6 @@ private constructor(
     @JsonCreator(mode = JsonCreator.Mode.DISABLED)
     private constructor(
         private val id: JsonField<String>,
-        private val callId: JsonField<String>,
         private val output: JsonField<String>,
         private val type: JsonValue,
         private val agent: JsonField<Agent>,
@@ -13815,28 +13814,19 @@ private constructor(
         @JsonCreator
         private constructor(
             @JsonProperty("id") @ExcludeMissing id: JsonField<String> = JsonMissing.of(),
-            @JsonProperty("call_id") @ExcludeMissing callId: JsonField<String> = JsonMissing.of(),
             @JsonProperty("output") @ExcludeMissing output: JsonField<String> = JsonMissing.of(),
             @JsonProperty("type") @ExcludeMissing type: JsonValue = JsonMissing.of(),
             @JsonProperty("agent") @ExcludeMissing agent: JsonField<Agent> = JsonMissing.of(),
             @JsonProperty("status") @ExcludeMissing status: JsonField<Status> = JsonMissing.of(),
-        ) : this(id, callId, output, type, agent, status, mutableMapOf())
-
-        /**
-         * The unique ID of the local shell tool call output.
-         *
-         * @throws OpenAIInvalidDataException if the JSON field has an unexpected type or is
-         *   unexpectedly missing or null (e.g. if the server responded with an unexpected value).
-         */
-        fun id(): String = id.getRequired("id")
+        ) : this(id, output, type, agent, status, mutableMapOf())
 
         /**
          * The unique ID of the local shell tool call generated by the model.
          *
          * @throws OpenAIInvalidDataException if the JSON field has an unexpected type or is
          *   unexpectedly missing or null (e.g. if the server responded with an unexpected value).
          */
-        fun callId(): String = callId.getRequired("call_id")
+        fun id(): String = id.getRequired("id")
 
         /**
          * A JSON string of the output of the local shell tool call.
@@ -13882,13 +13872,6 @@ private constructor(
          */
         @JsonProperty("id") @ExcludeMissing fun _id(): JsonField<String> = id
 
-        /**
-         * Returns the raw JSON value of [callId].
-         *
-         * Unlike [callId], this method doesn't throw if the JSON field has an unexpected type.
-         */
-        @JsonProperty("call_id") @ExcludeMissing fun _callId(): JsonField<String> = callId
-
         /**
          * Returns the raw JSON value of [output].
          *
@@ -13930,7 +13913,6 @@ private constructor(
              * The following fields are required:
              * ```java
              * .id()
-             * .callId()
              * .output()
              * ```
              */
@@ -13941,7 +13923,6 @@ private constructor(
         class Builder internal constructor() {
 
             private var id: JsonField<String>? = null
-            private var callId: JsonField<String>? = null
             private var output: JsonField<String>? = null
             private var type: JsonValue = JsonValue.from("local_shell_call_output")
             private var agent: JsonField<Agent> = JsonMissing.of()
@@ -13951,15 +13932,14 @@ private constructor(
             @JvmSynthetic
             internal fun from(localShellCallOutput: LocalShellCallOutput) = apply {
                 id = localShellCallOutput.id
-                callId = localShellCallOutput.callId
                 output = localShellCallOutput.output
                 type = localShellCallOutput.type
                 agent = localShellCallOutput.agent
                 status = localShellCallOutput.status
                 additionalProperties = localShellCallOutput.additionalProperties.toMutableMap()
             }
 
-            /** The unique ID of the local shell tool call output. */
+            /** The unique ID of the local shell tool call generated by the model. */
             fun id(id: String) = id(JsonField.of(id))
 
             /**
@@ -13971,18 +13951,6 @@ private constructor(
              */
             fun id(id: JsonField<String>) = apply { this.id = id }
 
-            /** The unique ID of the local shell tool call generated by the model. */
-            fun callId(callId: String) = callId(JsonField.of(callId))
-
-            /**
-             * Sets [Builder.callId] to an arbitrary JSON value.
-             *
-             * You should usually call [Builder.callId] with a well-typed [String] value instead.
-             * This method is primarily for setting the field to an undocumented or not yet
-             * supported value.
-             */
-            fun callId(callId: JsonField<String>) = apply { this.callId = callId }
-
             /** A JSON string of the output of the local shell tool call. */
             fun output(output: String) = output(JsonField.of(output))
 
@@ -14066,7 +14034,6 @@ private constructor(
              * The following fields are required:
              * ```java
              * .id()
-             * .callId()
              * .output()
              * ```
              *
@@ -14075,7 +14042,6 @@ private constructor(
             fun build(): LocalShellCallOutput =
                 LocalShellCallOutput(
                     checkRequired("id", id),
-                    checkRequired("callId", callId),
                     checkRequired("output", output),
                     type,
                     agent,
@@ -14101,7 +14067,6 @@ private constructor(
             }
 
             id()
-            callId()
             output()
             _type().let {
                 if (it != JsonValue.from("local_shell_call_output")) {
@@ -14130,7 +14095,6 @@ private constructor(
         @JvmSynthetic
         internal fun validity(): Int =
             (if (id.asKnown().isPresent) 1 else 0) +
-                (if (callId.asKnown().isPresent) 1 else 0) +
                 (if (output.asKnown().isPresent) 1 else 0) +
                 type.let { if (it == JsonValue.from("local_shell_call_output")) 1 else 0 } +
                 (agent.asKnown().getOrNull()?.validity() ?: 0) +
@@ -14469,7 +14433,6 @@ private constructor(
 
             return other is LocalShellCallOutput &&
                 id == other.id &&
-                callId == other.callId &&
                 output == other.output &&
                 type == other.type &&
                 agent == other.agent &&
@@ -14478,13 +14441,13 @@ private constructor(
         }
 
         private val hashCode: Int by lazy {
-            Objects.hash(id, callId, output, type, agent, status, additionalProperties)
+            Objects.hash(id, output, type, agent, status, additionalProperties)
         }
 
         override fun hashCode(): Int = hashCode
 
         override fun toString() =
-            "LocalShellCallOutput{id=$id, callId=$callId, output=$output, type=$type, agent=$agent, status=$status, additionalProperties=$additionalProperties}"
+            "LocalShellCallOutput{id=$id, output=$output, type=$type, agent=$agent, status=$status, additionalProperties=$additionalProperties}"
     }
 
     /** A tool representing a request to execute one or more shell commands. */