venice_client 1.0.1 → 1.0.3

data/lib/venice_client/models/{inline_response_200_1_timing.rb → generate_image200_response_timing.rb}

@@ -3,16 +3,18 @@
 
 #The Venice.ai API.
 
-OpenAPI spec version: 20250521.233203
+The version of the OpenAPI document: 20250709.013306
+
+Generated by: https://openapi-generator.tech
+Generator version: 7.14.0
 
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.68
 =end
 
 require 'date'
+require 'time'
 
 module VeniceClient
-  class InlineResponse2001Timing
+  class GenerateImage200ResponseTiming
     # Duration of inference in milliseconds
     attr_accessor :inference_duration
 
@@ -35,13 +37,23 @@ module VeniceClient
       }
     end
 
+    # Returns attribute mapping this model knows about
+    def self.acceptable_attribute_map
+      attribute_map
+    end
+
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      acceptable_attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'inference_duration' => :'Object',
-        :'inference_preprocessing_time' => :'Object',
-        :'inference_queue_time' => :'Object',
-        :'total' => :'Object'
+        :'inference_duration' => :'Float',
+        :'inference_preprocessing_time' => :'Float',
+        :'inference_queue_time' => :'Float',
+        :'total' => :'Float'
       }
     end
 
@@ -50,42 +62,52 @@ module VeniceClient
       Set.new([
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
       if (!attributes.is_a?(Hash))
-        fail ArgumentError, "The input argument (attributes) must be a hash in `VeniceClient::InlineResponse2001Timing` initialize method"
+        fail ArgumentError, "The input argument (attributes) must be a hash in `VeniceClient::GenerateImage200ResponseTiming` initialize method"
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
+      acceptable_attribute_map = self.class.acceptable_attribute_map
       attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `VeniceClient::InlineResponse2001Timing`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        if (!acceptable_attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `VeniceClient::GenerateImage200ResponseTiming`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
 
       if attributes.key?(:'inference_duration')
         self.inference_duration = attributes[:'inference_duration']
+      else
+        self.inference_duration = nil
       end
 
       if attributes.key?(:'inference_preprocessing_time')
         self.inference_preprocessing_time = attributes[:'inference_preprocessing_time']
+      else
+        self.inference_preprocessing_time = nil
       end
 
       if attributes.key?(:'inference_queue_time')
         self.inference_queue_time = attributes[:'inference_queue_time']
+      else
+        self.inference_queue_time = nil
       end
 
       if attributes.key?(:'total')
         self.total = attributes[:'total']
+      else
+        self.total = nil
       end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
       if @inference_duration.nil?
         invalid_properties.push('invalid value for "inference_duration", inference_duration cannot be nil.')
@@ -109,6 +131,7 @@ module VeniceClient
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @inference_duration.nil?
       return false if @inference_preprocessing_time.nil?
       return false if @inference_queue_time.nil?
@@ -116,6 +139,46 @@ module VeniceClient
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] inference_duration Value to be assigned
+    def inference_duration=(inference_duration)
+      if inference_duration.nil?
+        fail ArgumentError, 'inference_duration cannot be nil'
+      end
+
+      @inference_duration = inference_duration
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] inference_preprocessing_time Value to be assigned
+    def inference_preprocessing_time=(inference_preprocessing_time)
+      if inference_preprocessing_time.nil?
+        fail ArgumentError, 'inference_preprocessing_time cannot be nil'
+      end
+
+      @inference_preprocessing_time = inference_preprocessing_time
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] inference_queue_time Value to be assigned
+    def inference_queue_time=(inference_queue_time)
+      if inference_queue_time.nil?
+        fail ArgumentError, 'inference_queue_time cannot be nil'
+      end
+
+      @inference_queue_time = inference_queue_time
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] total Value to be assigned
+    def total=(total)
+      if total.nil?
+        fail ArgumentError, 'total cannot be nil'
+      end
+
+      @total = total
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -143,39 +206,33 @@ module VeniceClient
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+      attributes = attributes.transform_keys(&:to_sym)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_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[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
         end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -205,7 +262,9 @@ module VeniceClient
           end
         end
       else # model
-        VeniceClient.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = VeniceClient.const_get(type)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -253,5 +312,8 @@ module VeniceClient
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end

data/lib/venice_client/models/generate_image_request.rb

@@ -3,13 +3,15 @@
 
 #The Venice.ai API.
 
-OpenAPI spec version: 20250521.233203
+The version of the OpenAPI document: 20250709.013306
+
+Generated by: https://openapi-generator.tech
+Generator version: 7.14.0
 
-Generated by: https://github.com/swagger-api/swagger-codegen.git
-Swagger Codegen version: 3.0.68
 =end
 
 require 'date'
+require 'time'
 
 module VeniceClient
   class GenerateImageRequest
@@ -52,7 +54,7 @@ module VeniceClient
     # Random seed for generation. If not provided, a random seed will be used.
     attr_accessor :seed
 
-    # Number of inference steps. The following models have reduced max steps from the global max: venice-sd35: 30 max steps, flux-dev: 30 max steps, flux-dev-uncensored: 30 max steps, stable-diffusion-3.5: 30 max steps. These constraints are exposed in the model list endpoint for each model.
+    # Number of inference steps. The following models have reduced max steps from the global max: venice-sd35: 30 max steps, hidream: 50 max steps, fluently-xl: 50 max steps, flux-dev: 30 max steps, flux-dev-uncensored-11: 30 max steps, flux-dev-uncensored: 30 max steps, lustify-sdxl: 50 max steps, pony-realism: 50 max steps, stable-diffusion-3.5: 30 max steps. These constraints are exposed in the model list endpoint for each model.
     attr_accessor :steps
 
     # An image style to apply to the image. Visit https://docs.venice.ai/api-reference/endpoint/image/styles for more details.
@@ -105,25 +107,35 @@ module VeniceClient
       }
     end
 
+    # Returns attribute mapping this model knows about
+    def self.acceptable_attribute_map
+      attribute_map
+    end
+
+    # Returns all the JSON keys this model knows about
+    def self.acceptable_attributes
+      acceptable_attribute_map.values
+    end
+
     # Attribute type mapping.
     def self.openapi_types
       {
-        :'cfg_scale' => :'Object',
-        :'embed_exif_metadata' => :'Object',
-        :'format' => :'Object',
-        :'height' => :'Object',
-        :'hide_watermark' => :'Object',
+        :'cfg_scale' => :'Float',
+        :'embed_exif_metadata' => :'Boolean',
+        :'format' => :'String',
+        :'height' => :'Integer',
+        :'hide_watermark' => :'Boolean',
         :'inpaint' => :'Object',
-        :'lora_strength' => :'Object',
-        :'model' => :'Object',
-        :'negative_prompt' => :'Object',
-        :'prompt' => :'Object',
-        :'return_binary' => :'Object',
-        :'safe_mode' => :'Object',
-        :'seed' => :'Object',
-        :'steps' => :'Object',
-        :'style_preset' => :'Object',
-        :'width' => :'Object'
+        :'lora_strength' => :'Integer',
+        :'model' => :'String',
+        :'negative_prompt' => :'String',
+        :'prompt' => :'String',
+        :'return_binary' => :'Boolean',
+        :'safe_mode' => :'Boolean',
+        :'seed' => :'Integer',
+        :'steps' => :'Integer',
+        :'style_preset' => :'String',
+        :'width' => :'Integer'
       }
     end
 
@@ -133,7 +145,7 @@ module VeniceClient
         :'inpaint',
       ])
     end
-  
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
@@ -142,9 +154,10 @@ module VeniceClient
       end
 
       # check to see if the attribute exists and convert string to symbol for hash key
+      acceptable_attribute_map = self.class.acceptable_attribute_map
       attributes = attributes.each_with_object({}) { |(k, v), h|
-        if (!self.class.attribute_map.key?(k.to_sym))
-          fail ArgumentError, "`#{k}` is not a valid attribute in `VeniceClient::GenerateImageRequest`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        if (!acceptable_attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `VeniceClient::GenerateImageRequest`. Please check the name to make sure it's valid. List of attributes: " + acceptable_attribute_map.keys.inspect
         end
         h[k.to_sym] = v
       }
@@ -187,6 +200,8 @@ module VeniceClient
 
       if attributes.key?(:'model')
         self.model = attributes[:'model']
+      else
+        self.model = nil
       end
 
       if attributes.key?(:'negative_prompt')
@@ -195,6 +210,8 @@ module VeniceClient
 
       if attributes.key?(:'prompt')
         self.prompt = attributes[:'prompt']
+      else
+        self.prompt = nil
       end
 
       if attributes.key?(:'return_binary')
@@ -235,38 +252,265 @@ module VeniceClient
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
+      warn '[DEPRECATED] the `list_invalid_properties` method is obsolete'
       invalid_properties = Array.new
+      if !@cfg_scale.nil? && @cfg_scale > 20
+        invalid_properties.push('invalid value for "cfg_scale", must be smaller than or equal to 20.')
+      end
+
+      if !@cfg_scale.nil? && @cfg_scale <= 0
+        invalid_properties.push('invalid value for "cfg_scale", must be greater than 0.')
+      end
+
+      if !@height.nil? && @height > 1280
+        invalid_properties.push('invalid value for "height", must be smaller than or equal to 1280.')
+      end
+
+      if !@height.nil? && @height <= 0
+        invalid_properties.push('invalid value for "height", must be greater than 0.')
+      end
+
+      if !@lora_strength.nil? && @lora_strength > 100
+        invalid_properties.push('invalid value for "lora_strength", must be smaller than or equal to 100.')
+      end
+
+      if !@lora_strength.nil? && @lora_strength < 0
+        invalid_properties.push('invalid value for "lora_strength", must be greater than or equal to 0.')
+      end
+
       if @model.nil?
         invalid_properties.push('invalid value for "model", model cannot be nil.')
       end
 
+      if !@negative_prompt.nil? && @negative_prompt.to_s.length > 1500
+        invalid_properties.push('invalid value for "negative_prompt", the character length must be smaller than or equal to 1500.')
+      end
+
       if @prompt.nil?
         invalid_properties.push('invalid value for "prompt", prompt cannot be nil.')
       end
 
+      if @prompt.to_s.length > 1500
+        invalid_properties.push('invalid value for "prompt", the character length must be smaller than or equal to 1500.')
+      end
+
+      if @prompt.to_s.length < 1
+        invalid_properties.push('invalid value for "prompt", the character length must be greater than or equal to 1.')
+      end
+
+      if !@seed.nil? && @seed > 999999999
+        invalid_properties.push('invalid value for "seed", must be smaller than or equal to 999999999.')
+      end
+
+      if !@seed.nil? && @seed < -999999999
+        invalid_properties.push('invalid value for "seed", must be greater than or equal to -999999999.')
+      end
+
+      if !@steps.nil? && @steps > 50
+        invalid_properties.push('invalid value for "steps", must be smaller than or equal to 50.')
+      end
+
+      if !@steps.nil? && @steps <= 0
+        invalid_properties.push('invalid value for "steps", must be greater than 0.')
+      end
+
+      if !@width.nil? && @width > 1280
+        invalid_properties.push('invalid value for "width", must be smaller than or equal to 1280.')
+      end
+
+      if !@width.nil? && @width <= 0
+        invalid_properties.push('invalid value for "width", must be greater than 0.')
+      end
+
       invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      format_validator = EnumAttributeValidator.new('Object', ['jpeg', 'png', 'webp'])
+      warn '[DEPRECATED] the `valid?` method is obsolete'
+      return false if !@cfg_scale.nil? && @cfg_scale > 20
+      return false if !@cfg_scale.nil? && @cfg_scale <= 0
+      format_validator = EnumAttributeValidator.new('String', ["jpeg", "png", "webp"])
       return false unless format_validator.valid?(@format)
+      return false if !@height.nil? && @height > 1280
+      return false if !@height.nil? && @height <= 0
+      return false if !@lora_strength.nil? && @lora_strength > 100
+      return false if !@lora_strength.nil? && @lora_strength < 0
       return false if @model.nil?
+      return false if !@negative_prompt.nil? && @negative_prompt.to_s.length > 1500
       return false if @prompt.nil?
+      return false if @prompt.to_s.length > 1500
+      return false if @prompt.to_s.length < 1
+      return false if !@seed.nil? && @seed > 999999999
+      return false if !@seed.nil? && @seed < -999999999
+      return false if !@steps.nil? && @steps > 50
+      return false if !@steps.nil? && @steps <= 0
+      return false if !@width.nil? && @width > 1280
+      return false if !@width.nil? && @width <= 0
       true
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] cfg_scale Value to be assigned
+    def cfg_scale=(cfg_scale)
+      if cfg_scale.nil?
+        fail ArgumentError, 'cfg_scale cannot be nil'
+      end
+
+      if cfg_scale > 20
+        fail ArgumentError, 'invalid value for "cfg_scale", must be smaller than or equal to 20.'
+      end
+
+      if cfg_scale <= 0
+        fail ArgumentError, 'invalid value for "cfg_scale", must be greater than 0.'
+      end
+
+      @cfg_scale = cfg_scale
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] format Object to be assigned
     def format=(format)
-      validator = EnumAttributeValidator.new('Object', ['jpeg', 'png', 'webp'])
+      validator = EnumAttributeValidator.new('String', ["jpeg", "png", "webp"])
       unless validator.valid?(format)
         fail ArgumentError, "invalid value for \"format\", must be one of #{validator.allowable_values}."
       end
       @format = format
     end
 
+    # Custom attribute writer method with validation
+    # @param [Object] height Value to be assigned
+    def height=(height)
+      if height.nil?
+        fail ArgumentError, 'height cannot be nil'
+      end
+
+      if height > 1280
+        fail ArgumentError, 'invalid value for "height", must be smaller than or equal to 1280.'
+      end
+
+      if height <= 0
+        fail ArgumentError, 'invalid value for "height", must be greater than 0.'
+      end
+
+      @height = height
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] lora_strength Value to be assigned
+    def lora_strength=(lora_strength)
+      if lora_strength.nil?
+        fail ArgumentError, 'lora_strength cannot be nil'
+      end
+
+      if lora_strength > 100
+        fail ArgumentError, 'invalid value for "lora_strength", must be smaller than or equal to 100.'
+      end
+
+      if lora_strength < 0
+        fail ArgumentError, 'invalid value for "lora_strength", must be greater than or equal to 0.'
+      end
+
+      @lora_strength = lora_strength
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] model Value to be assigned
+    def model=(model)
+      if model.nil?
+        fail ArgumentError, 'model cannot be nil'
+      end
+
+      @model = model
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] negative_prompt Value to be assigned
+    def negative_prompt=(negative_prompt)
+      if negative_prompt.nil?
+        fail ArgumentError, 'negative_prompt cannot be nil'
+      end
+
+      if negative_prompt.to_s.length > 1500
+        fail ArgumentError, 'invalid value for "negative_prompt", the character length must be smaller than or equal to 1500.'
+      end
+
+      @negative_prompt = negative_prompt
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] prompt Value to be assigned
+    def prompt=(prompt)
+      if prompt.nil?
+        fail ArgumentError, 'prompt cannot be nil'
+      end
+
+      if prompt.to_s.length > 1500
+        fail ArgumentError, 'invalid value for "prompt", the character length must be smaller than or equal to 1500.'
+      end
+
+      if prompt.to_s.length < 1
+        fail ArgumentError, 'invalid value for "prompt", the character length must be greater than or equal to 1.'
+      end
+
+      @prompt = prompt
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] seed Value to be assigned
+    def seed=(seed)
+      if seed.nil?
+        fail ArgumentError, 'seed cannot be nil'
+      end
+
+      if seed > 999999999
+        fail ArgumentError, 'invalid value for "seed", must be smaller than or equal to 999999999.'
+      end
+
+      if seed < -999999999
+        fail ArgumentError, 'invalid value for "seed", must be greater than or equal to -999999999.'
+      end
+
+      @seed = seed
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] steps Value to be assigned
+    def steps=(steps)
+      if steps.nil?
+        fail ArgumentError, 'steps cannot be nil'
+      end
+
+      if steps > 50
+        fail ArgumentError, 'invalid value for "steps", must be smaller than or equal to 50.'
+      end
+
+      if steps <= 0
+        fail ArgumentError, 'invalid value for "steps", must be greater than 0.'
+      end
+
+      @steps = steps
+    end
+
+    # Custom attribute writer method with validation
+    # @param [Object] width Value to be assigned
+    def width=(width)
+      if width.nil?
+        fail ArgumentError, 'width cannot be nil'
+      end
+
+      if width > 1280
+        fail ArgumentError, 'invalid value for "width", must be smaller than or equal to 1280.'
+      end
+
+      if width <= 0
+        fail ArgumentError, 'invalid value for "width", must be greater than 0.'
+      end
+
+      @width = width
+    end
+
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -306,39 +550,33 @@ module VeniceClient
     # @param [Hash] attributes Model attributes in the form of hash
     # @return [Object] Returns the model itself
     def self.build_from_hash(attributes)
-      new.build_from_hash(attributes)
-    end
-
-    # Builds the object from hash
-    # @param [Hash] attributes Model attributes in the form of hash
-    # @return [Object] Returns the model itself
-    def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
-      self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
+      attributes = attributes.transform_keys(&:to_sym)
+      transformed_hash = {}
+      openapi_types.each_pair do |key, type|
+        if attributes.key?(attribute_map[key]) && attributes[attribute_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[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+          if attributes[attribute_map[key]].is_a?(Array)
+            transformed_hash["#{key}"] = attributes[attribute_map[key]].map { |v| _deserialize($1, v) }
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        elsif attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+        elsif !attributes[attribute_map[key]].nil?
+          transformed_hash["#{key}"] = _deserialize(type, attributes[attribute_map[key]])
         end
       end
-
-      self
+      new(transformed_hash)
     end
 
     # Deserializes the data based on type
     # @param string type Data type
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
-    def _deserialize(type, value)
+    def self._deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -368,7 +606,9 @@ module VeniceClient
           end
         end
       else # model
-        VeniceClient.const_get(type).build_from_hash(value)
+        # models (e.g. Pet) or oneOf
+        klass = VeniceClient.const_get(type)
+        klass.respond_to?(:openapi_any_of) || klass.respond_to?(:openapi_one_of) ? klass.build(value) : klass.build_from_hash(value)
       end
     end
 
@@ -416,5 +656,8 @@ module VeniceClient
       else
         value
       end
-    end  end
+    end
+
+  end
+
 end