openapi_openai 1.2.0 → 1.4.0

data/lib/openapi_openai/api/usage_api.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 2.3.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.18.0
+Generator version: 7.26.0
 
 =end
 

data/lib/openapi_openai/api/users_api.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 2.3.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.18.0
+Generator version: 7.26.0
 
 =end
 
@@ -41,7 +41,7 @@ module OpenApiOpenAIClient
         fail ArgumentError, "Missing the required parameter 'user_id' when calling UsersApi.delete_user"
       end
       # resource path
-      local_var_path = '/organization/users/{user_id}'.sub('{' + 'user_id' + '}', CGI.escape(user_id.to_s))
+      local_var_path = '/organization/users/{user_id}'.sub('{user_id}', CGI.escape(user_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -169,7 +169,7 @@ module OpenApiOpenAIClient
         fail ArgumentError, "Missing the required parameter 'user_role_update_request' when calling UsersApi.modify_user"
       end
       # resource path
-      local_var_path = '/organization/users/{user_id}'.sub('{' + 'user_id' + '}', CGI.escape(user_id.to_s))
+      local_var_path = '/organization/users/{user_id}'.sub('{user_id}', CGI.escape(user_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -235,7 +235,7 @@ module OpenApiOpenAIClient
         fail ArgumentError, "Missing the required parameter 'user_id' when calling UsersApi.retrieve_user"
       end
       # resource path
-      local_var_path = '/organization/users/{user_id}'.sub('{' + 'user_id' + '}', CGI.escape(user_id.to_s))
+      local_var_path = '/organization/users/{user_id}'.sub('{user_id}', CGI.escape(user_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}

data/lib/openapi_openai/api/vector_stores_api.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 2.3.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.18.0
+Generator version: 7.26.0
 
 =end
 
@@ -47,7 +47,7 @@ module OpenApiOpenAIClient
         fail ArgumentError, "Missing the required parameter 'batch_id' when calling VectorStoresApi.cancel_vector_store_file_batch"
       end
       # resource path
-      local_var_path = '/vector_stores/{vector_store_id}/file_batches/{batch_id}/cancel'.sub('{' + 'vector_store_id' + '}', CGI.escape(vector_store_id.to_s)).sub('{' + 'batch_id' + '}', CGI.escape(batch_id.to_s))
+      local_var_path = '/vector_stores/{vector_store_id}/file_batches/{batch_id}/cancel'.sub('{vector_store_id}', CGI.escape(vector_store_id.to_s)).sub('{batch_id}', CGI.escape(batch_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -180,7 +180,7 @@ module OpenApiOpenAIClient
         fail ArgumentError, "Missing the required parameter 'create_vector_store_file_request' when calling VectorStoresApi.create_vector_store_file"
       end
       # resource path
-      local_var_path = '/vector_stores/{vector_store_id}/files'.sub('{' + 'vector_store_id' + '}', CGI.escape(vector_store_id.to_s))
+      local_var_path = '/vector_stores/{vector_store_id}/files'.sub('{vector_store_id}', CGI.escape(vector_store_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -252,7 +252,7 @@ module OpenApiOpenAIClient
         fail ArgumentError, "Missing the required parameter 'create_vector_store_file_batch_request' when calling VectorStoresApi.create_vector_store_file_batch"
       end
       # resource path
-      local_var_path = '/vector_stores/{vector_store_id}/file_batches'.sub('{' + 'vector_store_id' + '}', CGI.escape(vector_store_id.to_s))
+      local_var_path = '/vector_stores/{vector_store_id}/file_batches'.sub('{vector_store_id}', CGI.escape(vector_store_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -318,7 +318,7 @@ module OpenApiOpenAIClient
         fail ArgumentError, "Missing the required parameter 'vector_store_id' when calling VectorStoresApi.delete_vector_store"
       end
       # resource path
-      local_var_path = '/vector_stores/{vector_store_id}'.sub('{' + 'vector_store_id' + '}', CGI.escape(vector_store_id.to_s))
+      local_var_path = '/vector_stores/{vector_store_id}'.sub('{vector_store_id}', CGI.escape(vector_store_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -385,7 +385,7 @@ module OpenApiOpenAIClient
         fail ArgumentError, "Missing the required parameter 'file_id' when calling VectorStoresApi.delete_vector_store_file"
       end
       # resource path
-      local_var_path = '/vector_stores/{vector_store_id}/files/{file_id}'.sub('{' + 'vector_store_id' + '}', CGI.escape(vector_store_id.to_s)).sub('{' + 'file_id' + '}', CGI.escape(file_id.to_s))
+      local_var_path = '/vector_stores/{vector_store_id}/files/{file_id}'.sub('{vector_store_id}', CGI.escape(vector_store_id.to_s)).sub('{file_id}', CGI.escape(file_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -446,7 +446,7 @@ module OpenApiOpenAIClient
         fail ArgumentError, "Missing the required parameter 'vector_store_id' when calling VectorStoresApi.get_vector_store"
       end
       # resource path
-      local_var_path = '/vector_stores/{vector_store_id}'.sub('{' + 'vector_store_id' + '}', CGI.escape(vector_store_id.to_s))
+      local_var_path = '/vector_stores/{vector_store_id}'.sub('{vector_store_id}', CGI.escape(vector_store_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -513,7 +513,7 @@ module OpenApiOpenAIClient
         fail ArgumentError, "Missing the required parameter 'file_id' when calling VectorStoresApi.get_vector_store_file"
       end
       # resource path
-      local_var_path = '/vector_stores/{vector_store_id}/files/{file_id}'.sub('{' + 'vector_store_id' + '}', CGI.escape(vector_store_id.to_s)).sub('{' + 'file_id' + '}', CGI.escape(file_id.to_s))
+      local_var_path = '/vector_stores/{vector_store_id}/files/{file_id}'.sub('{vector_store_id}', CGI.escape(vector_store_id.to_s)).sub('{file_id}', CGI.escape(file_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -580,7 +580,7 @@ module OpenApiOpenAIClient
         fail ArgumentError, "Missing the required parameter 'batch_id' when calling VectorStoresApi.get_vector_store_file_batch"
       end
       # resource path
-      local_var_path = '/vector_stores/{vector_store_id}/file_batches/{batch_id}'.sub('{' + 'vector_store_id' + '}', CGI.escape(vector_store_id.to_s)).sub('{' + 'batch_id' + '}', CGI.escape(batch_id.to_s))
+      local_var_path = '/vector_stores/{vector_store_id}/file_batches/{batch_id}'.sub('{vector_store_id}', CGI.escape(vector_store_id.to_s)).sub('{batch_id}', CGI.escape(batch_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -665,7 +665,7 @@ module OpenApiOpenAIClient
         fail ArgumentError, "invalid value for \"filter\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/vector_stores/{vector_store_id}/file_batches/{batch_id}/files'.sub('{' + 'vector_store_id' + '}', CGI.escape(vector_store_id.to_s)).sub('{' + 'batch_id' + '}', CGI.escape(batch_id.to_s))
+      local_var_path = '/vector_stores/{vector_store_id}/file_batches/{batch_id}/files'.sub('{vector_store_id}', CGI.escape(vector_store_id.to_s)).sub('{batch_id}', CGI.escape(batch_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -749,7 +749,7 @@ module OpenApiOpenAIClient
         fail ArgumentError, "invalid value for \"filter\", must be one of #{allowable_values}"
       end
       # resource path
-      local_var_path = '/vector_stores/{vector_store_id}/files'.sub('{' + 'vector_store_id' + '}', CGI.escape(vector_store_id.to_s))
+      local_var_path = '/vector_stores/{vector_store_id}/files'.sub('{vector_store_id}', CGI.escape(vector_store_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}
@@ -892,7 +892,7 @@ module OpenApiOpenAIClient
         fail ArgumentError, "Missing the required parameter 'update_vector_store_request' when calling VectorStoresApi.modify_vector_store"
       end
       # resource path
-      local_var_path = '/vector_stores/{vector_store_id}'.sub('{' + 'vector_store_id' + '}', CGI.escape(vector_store_id.to_s))
+      local_var_path = '/vector_stores/{vector_store_id}'.sub('{vector_store_id}', CGI.escape(vector_store_id.to_s))
 
       # query parameters
       query_params = opts[:query_params] || {}

data/lib/openapi_openai/api_client.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 2.3.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.18.0
+Generator version: 7.26.0
 
 =end
 

data/lib/openapi_openai/api_error.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 2.3.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.18.0
+Generator version: 7.26.0
 
 =end
 

data/lib/openapi_openai/api_model_base.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 2.3.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.18.0
+Generator version: 7.26.0
 
 =end
 

data/lib/openapi_openai/configuration.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 2.3.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.18.0
+Generator version: 7.26.0
 
 =end
 

data/lib/openapi_openai/models/admin_api_key.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 2.3.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.18.0
+Generator version: 7.26.0
 
 =end
 
@@ -71,6 +71,16 @@ module OpenApiOpenAIClient
       ])
     end
 
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -163,18 +173,20 @@ module OpenApiOpenAIClient
     def self.build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
       transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[map[key]].nil?
           transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          if attributes[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
         end
       end
       new(transformed_hash)
@@ -184,10 +196,11 @@ module OpenApiOpenAIClient
     # @return [Hash] Returns the object in the form of hash
     def to_hash
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
 

data/lib/openapi_openai/models/admin_api_key_owner.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 2.3.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.18.0
+Generator version: 7.26.0
 
 =end
 
@@ -63,6 +63,16 @@ module OpenApiOpenAIClient
       ])
     end
 
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -145,18 +155,20 @@ module OpenApiOpenAIClient
     def self.build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
       transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[map[key]].nil?
           transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          if attributes[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
         end
       end
       new(transformed_hash)
@@ -166,10 +178,11 @@ module OpenApiOpenAIClient
     # @return [Hash] Returns the object in the form of hash
     def to_hash
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
 

data/lib/openapi_openai/models/admin_api_keys_create_request.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 2.3.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.18.0
+Generator version: 7.26.0
 
 =end
 
@@ -47,6 +47,16 @@ module OpenApiOpenAIClient
       ])
     end
 
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -126,18 +136,20 @@ module OpenApiOpenAIClient
     def self.build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
       transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[map[key]].nil?
           transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          if attributes[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
         end
       end
       new(transformed_hash)
@@ -147,10 +159,11 @@ module OpenApiOpenAIClient
     # @return [Hash] Returns the object in the form of hash
     def to_hash
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
 

data/lib/openapi_openai/models/admin_api_keys_delete200_response.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 2.3.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.18.0
+Generator version: 7.26.0
 
 =end
 
@@ -55,6 +55,16 @@ module OpenApiOpenAIClient
       ])
     end
 
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -127,18 +137,20 @@ module OpenApiOpenAIClient
     def self.build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
       transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[map[key]].nil?
           transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          if attributes[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
         end
       end
       new(transformed_hash)
@@ -148,10 +160,11 @@ module OpenApiOpenAIClient
     # @return [Hash] Returns the object in the form of hash
     def to_hash
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
 

data/lib/openapi_openai/models/api_key_list.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 2.3.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.18.0
+Generator version: 7.26.0
 
 =end
 
@@ -63,6 +63,16 @@ module OpenApiOpenAIClient
       ])
     end
 
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -147,18 +157,20 @@ module OpenApiOpenAIClient
     def self.build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
       transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[map[key]].nil?
           transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          if attributes[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
         end
       end
       new(transformed_hash)
@@ -168,10 +180,11 @@ module OpenApiOpenAIClient
     # @return [Hash] Returns the object in the form of hash
     def to_hash
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end
 

data/lib/openapi_openai/models/array_of_content_parts_inner.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 2.3.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.18.0
+Generator version: 7.26.0
 
 =end
 

data/lib/openapi_openai/models/assistant_object.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: 2.3.0
 Contact: blah+oapicf@cliffano.com
 Generated by: https://openapi-generator.tech
-Generator version: 7.18.0
+Generator version: 7.26.0
 
 =end
 
@@ -136,6 +136,16 @@ module OpenApiOpenAIClient
       ])
     end
 
+    # Returns attribute type mapping
+    def self.acceptable_openapi_types
+      openapi_types
+    end
+
+    # Returns the nullable attributes
+    def self.acceptable_openapi_nullable
+      openapi_nullable
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -461,18 +471,20 @@ module OpenApiOpenAIClient
     def self.build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       attributes = attributes.transform_keys(&:to_sym)
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      map = acceptable_attribute_map
       transformed_hash = {}
-      openapi_types.each_pair do |key, type|
-        if attributes.key?(attribute_map[key]) && attributes[attribute_map[key]].nil?
+      acceptable_openapi_types.each_pair do |key, type|
+        if attributes.key?(map[key]) && attributes[map[key]].nil?
           transformed_hash["#{key}"] = nil
         elsif type =~ /\AArray<(.*)>/i
           # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
-          if attributes[attribute_map[key]].is_a?(Array)
-            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
+          if attributes[map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[attribute_map[key]].nil?
-          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
+        elsif !attributes[map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[map[key]])
         end
       end
       new(transformed_hash)
@@ -482,10 +494,11 @@ module OpenApiOpenAIClient
     # @return [Hash] Returns the object in the form of hash
     def to_hash
       hash = {}
-      self.class.attribute_map.each_pair do |attr, param|
+      # include attributes inherited from allOf parents (the nearest declaration wins)
+      self.class.acceptable_attribute_map.each_pair do |attr, param|
         value = self.send(attr)
         if value.nil?
-          is_nullable = self.class.openapi_nullable.include?(attr)
+          is_nullable = self.class.acceptable_openapi_nullable.include?(attr)
           next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
         end