openai 0.115.1 → 0.117.0

data/lib/openai/helpers/responses_websocket/session.rb

@@ -146,6 +146,7 @@ module OpenAI
         @in_flight = false
         @pending_steers = pending_steers
         @response_id = nil
+        @required_input = {}
         @changed = Async::Condition.new
         @accumulator = SessionAccumulator.new(session.limits.max_response_bytes)
       end
@@ -169,7 +170,9 @@ module OpenAI
           end
 
           pending = @pending_steers[@response_id]
-          if @in_flight || queued_response || (pending && pending[:count].positive?)
+          if @in_flight ||
+              queued_response ||
+              (pending && pending[:count].positive? && !required_input_continuation?(data))
             raise SessionError, "Consume the current response before sending another create on this lane."
           end
 
@@ -244,9 +247,15 @@ module OpenAI
                   @in_flight = true
                   @pending_steers.delete(@response_id) if @response_id != event.response.id
                   @response_id = event.response.id.dup.freeze
+                  @required_input.clear
                 elsif %w[response.completed response.failed response.incomplete error].include?(event.type.to_s)
                   @in_flight = false
-                  @response_id = event.response.id.dup.freeze unless event.type.to_s == "error"
+                  if event.type.to_s == "error"
+                    @required_input.clear
+                  else
+                    @required_input = required_input_keys(@accumulator.final_response&.output || [])
+                    @response_id = event.response.id.dup.freeze
+                  end
                 end
               end
 
@@ -262,6 +271,69 @@ module OpenAI
         end
       end
 
+      private def required_input_continuation?(data)
+        return false unless data[:previous_response_id] == @response_id
+
+        input = data[:input]
+        return false unless input.is_a?(Array) && !input.empty?
+
+        keys = input.map do |item|
+          return false unless item.is_a?(Hash)
+
+          required_input_key(item)
+        end
+
+        keys.uniq.length == keys.length && keys.all? { |key| @required_input.key?(key) }
+      end
+
+      private def required_input_key(data)
+        type = data[:type].to_s
+        id = case type
+        when
+            "function_call_output",
+            "custom_tool_call_output",
+            "computer_call_output",
+            "shell_call_output",
+            "apply_patch_call_output"
+          data[:call_id]
+        when "tool_search_output"
+          data[:call_id] if data[:execution].to_s == "client"
+        when "mcp_approval_response"
+          data[:approval_request_id]
+        end
+
+        [type, id] if id.is_a?(String) && !id.empty?
+      end
+
+      private def required_input_keys(items)
+        required = {}
+        items.each do |item|
+          data = item.to_h
+          type = data[:type].to_s
+          next if type != "mcp_approval_request" && data[:status] && data[:status].to_s != "completed"
+
+          result_type = case type
+          when "function_call", "custom_tool_call", "computer_call", "apply_patch_call"
+            "#{type}_output"
+          when "shell_call"
+            "shell_call_output" if data[:environment].to_h[:type].to_s == "local"
+          when "tool_search_call"
+            "tool_search_output" if data[:execution].to_s == "client"
+          when "mcp_approval_request"
+            "mcp_approval_response"
+          end
+
+          next unless result_type
+
+          id = data[type == "mcp_approval_request" ? :id : :call_id]
+          # Retain only detached IDs when get_final_response releases its collector.
+          required[[result_type, id.dup.freeze]] = true if id.is_a?(String) && !id.empty?
+        end
+
+        items.each { |item| required.delete(required_input_key(item.to_h)) }
+        required
+      end
+
       def get_final_response
         @session.assert_owner!
         loop do
@@ -306,6 +378,7 @@ module OpenAI
         @queue.clear
         @bytes = 0
         @accumulator = SessionAccumulator.new(@session.limits.max_response_bytes)
+        @required_input.clear
         @changed.signal
       end
 

data/lib/openai/models/admin/organization/workload_identity_provider.rb

@@ -0,0 +1,158 @@
+# frozen_string_literal: true
+
+module OpenAI
+  module Models
+    module Admin
+      module Organization
+        # @see OpenAI::Resources::Admin::Organization::WorkloadIdentityProviders#create
+        class WorkloadIdentityProvider < OpenAI::Internal::Type::BaseModel
+          # @!attribute id
+          #
+          #   @return [String]
+          required :id, String
+
+          # @!attribute attribute_transformations
+          #
+          #   @return [Array<OpenAI::Models::Admin::Organization::WorkloadIdentityProvider::AttributeTransformation>]
+          required(
+            :attribute_transformations,
+            -> {
+              OpenAI::Internal::Type::ArrayOf[
+                OpenAI::Admin::Organization::WorkloadIdentityProvider::AttributeTransformation
+              ]
+            }
+          )
+
+          # @!attribute audience
+          #
+          #   @return [String]
+          required :audience, String
+
+          # @!attribute created_at
+          #
+          #   @return [Integer]
+          required :created_at, Integer
+
+          # @!attribute description
+          #
+          #   @return [String, nil]
+          required :description, String, nil?: true
+
+          # @!attribute enabled
+          #
+          #   @return [Boolean]
+          required :enabled, OpenAI::Internal::Type::Boolean
+
+          # @!attribute issuer
+          #
+          #   @return [String]
+          required :issuer, String
+
+          # @!attribute name
+          #
+          #   @return [String]
+          required :name, String
+
+          # @!attribute object
+          #
+          #   @return [Symbol, :"organization.workload_identity_provider"]
+          required :object, const: :"organization.workload_identity_provider"
+
+          # @!attribute type
+          #
+          #   @return [Symbol, :oidc]
+          required :type, const: :oidc
+
+          # @!attribute updated_at
+          #
+          #   @return [Integer]
+          required :updated_at, Integer
+
+          # @!attribute verification
+          #
+          #   @return [OpenAI::Models::Admin::Organization::WorkloadIdentityProvider::Verification::Discovery, OpenAI::Models::Admin::Organization::WorkloadIdentityProvider::Verification::UploadedJwks]
+          required :verification, union: -> { OpenAI::Admin::Organization::WorkloadIdentityProvider::Verification }
+
+          # @!method initialize(id:, attribute_transformations:, audience:, created_at:, description:, enabled:, issuer:, name:, updated_at:, verification:, object: :"organization.workload_identity_provider", type: :oidc)
+          #   @param id [String]
+          #   @param attribute_transformations [Array<OpenAI::Models::Admin::Organization::WorkloadIdentityProvider::AttributeTransformation>]
+          #   @param audience [String]
+          #   @param created_at [Integer]
+          #   @param description [String, nil]
+          #   @param enabled [Boolean]
+          #   @param issuer [String]
+          #   @param name [String]
+          #   @param updated_at [Integer]
+          #   @param verification [OpenAI::Models::Admin::Organization::WorkloadIdentityProvider::Verification::Discovery, OpenAI::Models::Admin::Organization::WorkloadIdentityProvider::Verification::UploadedJwks]
+          #   @param object [Symbol, :"organization.workload_identity_provider"]
+          #   @param type [Symbol, :oidc]
+
+          class AttributeTransformation < OpenAI::Internal::Type::BaseModel
+            # @!attribute attribute
+            #
+            #   @return [String]
+            required :attribute, String
+
+            # @!attribute expression
+            #
+            #   @return [String]
+            required :expression, String
+
+            # @!method initialize(attribute:, expression:)
+            #   @param attribute [String]
+            #   @param expression [String]
+          end
+
+          # @see OpenAI::Models::Admin::Organization::WorkloadIdentityProvider#verification
+          module Verification
+            extend OpenAI::Internal::Type::Union
+
+            discriminator :type
+
+            variant :discovery, -> { OpenAI::Admin::Organization::WorkloadIdentityProvider::Verification::Discovery }
+
+            variant(
+              :uploaded_jwks,
+              -> { OpenAI::Admin::Organization::WorkloadIdentityProvider::Verification::UploadedJwks }
+            )
+
+            class Discovery < OpenAI::Internal::Type::BaseModel
+              # @!attribute discovery_url
+              #
+              #   @return [String, nil]
+              required :discovery_url, String, nil?: true
+
+              # @!attribute type
+              #
+              #   @return [Symbol, :discovery]
+              required :type, const: :discovery
+
+              # @!method initialize(discovery_url:, type: :discovery)
+              #   @param discovery_url [String, nil]
+              #   @param type [Symbol, :discovery]
+            end
+
+            class UploadedJwks < OpenAI::Internal::Type::BaseModel
+              # @!attribute jwks
+              #
+              #   @return [Hash{Symbol=>Object}]
+              required :jwks, OpenAI::Internal::Type::HashOf[OpenAI::Internal::Type::Unknown]
+
+              # @!attribute type
+              #
+              #   @return [Symbol, :uploaded_jwks]
+              required :type, const: :uploaded_jwks
+
+              # @!method initialize(jwks:, type: :uploaded_jwks)
+              #   @param jwks [Hash{Symbol=>Object}]
+              #   @param type [Symbol, :uploaded_jwks]
+            end
+
+            # @!method self.variants
+            #   @return [Array(OpenAI::Models::Admin::Organization::WorkloadIdentityProvider::Verification::Discovery, OpenAI::Models::Admin::Organization::WorkloadIdentityProvider::Verification::UploadedJwks)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/openai/models/admin/organization/workload_identity_provider_create_params.rb

@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+module OpenAI
+  module Models
+    module Admin
+      module Organization
+        # @see OpenAI::Resources::Admin::Organization::WorkloadIdentityProviders#create
+        class WorkloadIdentityProviderCreateParams < OpenAI::Internal::Type::BaseModel
+          extend OpenAI::Internal::Type::RequestParameters::Converter
+          include OpenAI::Internal::Type::RequestParameters
+
+          # @!attribute audience
+          #
+          #   @return [String]
+          required :audience, String
+
+          # @!attribute issuer
+          #
+          #   @return [String]
+          required :issuer, String
+
+          # @!attribute name
+          #
+          #   @return [String]
+          required :name, String
+
+          # @!attribute type
+          #
+          #   @return [Symbol, :oidc]
+          required :type, const: :oidc
+
+          # @!attribute attribute_transformations
+          #
+          #   @return [Array<OpenAI::Models::Admin::Organization::WorkloadIdentityProviderCreateParams::AttributeTransformation>, nil]
+          optional(
+            :attribute_transformations,
+            -> {
+              OpenAI::Internal::Type::ArrayOf[
+                OpenAI::Admin::Organization::WorkloadIdentityProviderCreateParams::AttributeTransformation
+              ]
+            }
+          )
+
+          # @!attribute description
+          #
+          #   @return [String, nil]
+          optional :description, String
+
+          # @!attribute enabled
+          #
+          #   @return [Boolean, nil]
+          optional :enabled, OpenAI::Internal::Type::Boolean
+
+          # @!attribute verification
+          #
+          #   @return [OpenAI::Models::Admin::Organization::WorkloadIdentityProviderCreateParams::Verification::Discovery, OpenAI::Models::Admin::Organization::WorkloadIdentityProviderCreateParams::Verification::UploadedJwks, nil]
+          optional(
+            :verification,
+            union: -> { OpenAI::Admin::Organization::WorkloadIdentityProviderCreateParams::Verification }
+          )
+
+          # @!method initialize(audience:, issuer:, name:, attribute_transformations: nil, description: nil, enabled: nil, verification: nil, type: :oidc, request_options: {})
+          #   @param audience [String]
+          #   @param issuer [String]
+          #   @param name [String]
+          #   @param attribute_transformations [Array<OpenAI::Models::Admin::Organization::WorkloadIdentityProviderCreateParams::AttributeTransformation>]
+          #   @param description [String]
+          #   @param enabled [Boolean]
+          #   @param verification [OpenAI::Models::Admin::Organization::WorkloadIdentityProviderCreateParams::Verification::Discovery, OpenAI::Models::Admin::Organization::WorkloadIdentityProviderCreateParams::Verification::UploadedJwks]
+          #   @param type [Symbol, :oidc]
+          #   @param request_options [OpenAI::RequestOptions, Hash{Symbol=>Object}]
+
+          class AttributeTransformation < OpenAI::Internal::Type::BaseModel
+            # @!attribute attribute
+            #
+            #   @return [String]
+            required :attribute, String
+
+            # @!attribute expression
+            #
+            #   @return [String]
+            required :expression, String
+
+            # @!method initialize(attribute:, expression:)
+            #   @param attribute [String]
+            #   @param expression [String]
+          end
+
+          module Verification
+            extend OpenAI::Internal::Type::Union
+
+            discriminator :type
+
+            variant(
+              :discovery,
+              -> { OpenAI::Admin::Organization::WorkloadIdentityProviderCreateParams::Verification::Discovery }
+            )
+
+            variant(
+              :uploaded_jwks,
+              -> { OpenAI::Admin::Organization::WorkloadIdentityProviderCreateParams::Verification::UploadedJwks }
+            )
+
+            class Discovery < OpenAI::Internal::Type::BaseModel
+              # @!attribute discovery_url
+              #
+              #   @return [String, nil]
+              required :discovery_url, String, nil?: true
+
+              # @!attribute type
+              #
+              #   @return [Symbol, :discovery]
+              required :type, const: :discovery
+
+              # @!method initialize(discovery_url:, type: :discovery)
+              #   @param discovery_url [String, nil]
+              #   @param type [Symbol, :discovery]
+            end
+
+            class UploadedJwks < OpenAI::Internal::Type::BaseModel
+              # @!attribute jwks
+              #
+              #   @return [Hash{Symbol=>Object}]
+              required :jwks, OpenAI::Internal::Type::HashOf[OpenAI::Internal::Type::Unknown]
+
+              # @!attribute type
+              #
+              #   @return [Symbol, :uploaded_jwks]
+              required :type, const: :uploaded_jwks
+
+              # @!method initialize(jwks:, type: :uploaded_jwks)
+              #   @param jwks [Hash{Symbol=>Object}]
+              #   @param type [Symbol, :uploaded_jwks]
+            end
+
+            # @!method self.variants
+            #   @return [Array(OpenAI::Models::Admin::Organization::WorkloadIdentityProviderCreateParams::Verification::Discovery, OpenAI::Models::Admin::Organization::WorkloadIdentityProviderCreateParams::Verification::UploadedJwks)]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/openai/models/admin/organization/workload_identity_provider_delete_params.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module OpenAI
+  module Models
+    module Admin
+      module Organization
+        # @see OpenAI::Resources::Admin::Organization::WorkloadIdentityProviders#delete
+        class WorkloadIdentityProviderDeleteParams < OpenAI::Internal::Type::BaseModel
+          extend OpenAI::Internal::Type::RequestParameters::Converter
+          include OpenAI::Internal::Type::RequestParameters
+
+          # @!attribute workload_identity_provider_id
+          #
+          #   @return [String]
+          required :workload_identity_provider_id, String
+
+          # @!method initialize(workload_identity_provider_id:, request_options: {})
+          #   @param workload_identity_provider_id [String]
+          #   @param request_options [OpenAI::RequestOptions, Hash{Symbol=>Object}]
+        end
+      end
+    end
+  end
+end

data/lib/openai/models/admin/organization/workload_identity_provider_deleted.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module OpenAI
+  module Models
+    module Admin
+      module Organization
+        # @see OpenAI::Resources::Admin::Organization::WorkloadIdentityProviders#delete
+        class WorkloadIdentityProviderDeleted < OpenAI::Internal::Type::BaseModel
+          # @!attribute id
+          #
+          #   @return [String]
+          required :id, String
+
+          # @!attribute deleted
+          #
+          #   @return [Boolean]
+          required :deleted, OpenAI::Internal::Type::Boolean
+
+          # @!attribute object
+          #
+          #   @return [Symbol, :"organization.workload_identity_provider.deleted"]
+          required :object, const: :"organization.workload_identity_provider.deleted"
+
+          # @!method initialize(id:, deleted:, object: :"organization.workload_identity_provider.deleted")
+          #   @param id [String]
+          #   @param deleted [Boolean]
+          #   @param object [Symbol, :"organization.workload_identity_provider.deleted"]
+        end
+      end
+    end
+  end
+end

data/lib/openai/models/admin/organization/workload_identity_provider_list_params.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+module OpenAI
+  module Models
+    module Admin
+      module Organization
+        # @see OpenAI::Resources::Admin::Organization::WorkloadIdentityProviders#list
+        class WorkloadIdentityProviderListParams < OpenAI::Internal::Type::BaseModel
+          extend OpenAI::Internal::Type::RequestParameters::Converter
+          include OpenAI::Internal::Type::RequestParameters
+
+          # @!attribute after
+          #
+          #   @return [String, nil]
+          optional :after, String
+
+          # @!attribute limit
+          #
+          #   @return [Integer, nil]
+          optional :limit, Integer
+
+          # @!attribute order
+          #
+          #   @return [Symbol, OpenAI::Models::Admin::Organization::WorkloadIdentityProviderListParams::Order, nil]
+          optional :order, union: -> { OpenAI::Admin::Organization::WorkloadIdentityProviderListParams::Order }
+
+          # @!method initialize(after: nil, limit: nil, order: nil, request_options: {})
+          #   @param after [String]
+          #   @param limit [Integer]
+          #   @param order [Symbol, OpenAI::Models::Admin::Organization::WorkloadIdentityProviderListParams::Order]
+          #   @param request_options [OpenAI::RequestOptions, Hash{Symbol=>Object}]
+
+          module Order
+            extend OpenAI::Internal::Type::Union
+
+            variant const: -> { OpenAI::Models::Admin::Organization::WorkloadIdentityProviderListParams::Order::ASC }
+
+            variant const: -> { OpenAI::Models::Admin::Organization::WorkloadIdentityProviderListParams::Order::DESC }
+
+            # @!method self.variants
+            #   @return [Array(Symbol)]
+
+            define_sorbet_constant!(:Variants) do
+              T.type_alias { OpenAI::Admin::Organization::WorkloadIdentityProviderListParams::Order::TaggedSymbol }
+            end
+
+            # @!group
+
+            ASC = :asc
+            DESC = :desc
+
+            # @!endgroup
+          end
+        end
+      end
+    end
+  end
+end

data/lib/openai/models/admin/organization/workload_identity_provider_retrieve_params.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module OpenAI
+  module Models
+    module Admin
+      module Organization
+        # @see OpenAI::Resources::Admin::Organization::WorkloadIdentityProviders#retrieve
+        class WorkloadIdentityProviderRetrieveParams < OpenAI::Internal::Type::BaseModel
+          extend OpenAI::Internal::Type::RequestParameters::Converter
+          include OpenAI::Internal::Type::RequestParameters
+
+          # @!attribute workload_identity_provider_id
+          #
+          #   @return [String]
+          required :workload_identity_provider_id, String
+
+          # @!method initialize(workload_identity_provider_id:, request_options: {})
+          #   @param workload_identity_provider_id [String]
+          #   @param request_options [OpenAI::RequestOptions, Hash{Symbol=>Object}]
+        end
+      end
+    end
+  end
+end