songtradr_api_client_ruby 1.12.23 → 1.13.0

data/lib/songtradr_api_client_ruby/models/musical_features_dto.rb

@@ -3,7 +3,7 @@
 
 #This is the Songtradr API. Use it to retrieve deep music metadata and trigger processes like auto-tagging.  You can also use the API to manage your account and musicube cloud data.  **Authentication**  1. Reach out to support@songtradr.com to receive a free account or use your login data if you are already signed up.  2. To authenticate, you need to login via the POST /api/v1/user/login endpoint.  3. The endpoint responds with a jwtToken which you can use in all following API requests as a bearer token.  **Rate Limiting**  The current limit is 120 Requests per minute. Reach out to us via support@songtradr.com if you need to request more.  **Getting Started with auto-tagging**  1. If you want to get your own files auto-tagged, use the POST /api/v1/user/file/{name}/initUpload endpoint. It responds with a presigned S3 link where you can upload your file. 2. You can check the processing status of your file via the GET /api/v1/user/file/{name}/filesStatus endpoint. 3. As soon as processing is done, you can request the generated data via the GET /api/v1/user/files endpoint.  **Getting Started with search**  You can either search the released music via the /public/recording endpoints or your own private uploaded music via the /user/file/ endpoints.  1. If you want to search the world's released music, a good starting point is the GET /api/v1/public/recording/search endpoint. Please find the extensive list of parameters that serve as semantic search filters. 2. If you want to search your own previously uploaded music, a good starting point is the GET GET /api/v1/user/files endpoint. It has the same extensive list of parameters that serve as semantic search filters.
 
-The version of the OpenAPI document: 1.12.23
+The version of the OpenAPI document: 1.13.0
 Contact: info@songtradr.com
 Generated by: https://openapi-generator.tech
 OpenAPI Generator version: 7.0.0-SNAPSHOT
@@ -21,6 +21,33 @@ module SongtradrApiClientRuby
 
     attr_accessor :language_of_performance
 
+    # Search for an arousal
+    attr_accessor :arousal
+
+    # Search for a dominant instrument
+    attr_accessor :dominant_instrument
+
+    # Search for energy
+    attr_accessor :energy
+
+    # Search for an engagement
+    attr_accessor :engagement
+
+    # Search for groovyness
+    attr_accessor :groovyness
+
+    # Search for a degree of harmoniousness
+    attr_accessor :harmony
+
+    # Search for pleasantness
+    attr_accessor :pleasantness
+
+    # Search for a language of the lyrics
+    attr_accessor :primary_mood_cluster
+
+    # Search for a sound character
+    attr_accessor :primary_sound_character
+
     # Search for rhythm
     attr_accessor :rhythm
 
@@ -63,6 +90,30 @@ module SongtradrApiClientRuby
     # Search for social media suitability
     attr_accessor :channel_suitability
 
+    attr_accessor :primary_mood_cluster_affinity
+
+    # Search for a language of the lyrics
+    attr_accessor :secondary_mood_cluster
+
+    attr_accessor :secondary_mood_cluster_affinity
+
+    # Search for a language of the lyrics
+    attr_accessor :tertiary_mood_cluster
+
+    attr_accessor :tertiary_mood_cluster_affinity
+
+    attr_accessor :vocals_affinity
+
+    attr_accessor :dominant_instrument_affinity
+
+    # Search for a dominant instrument
+    attr_accessor :secondary_instrument
+
+    attr_accessor :secondary_instrument_affinity
+
+    # Search for a dominant instrument
+    attr_accessor :tertiary_instrument
+
     attr_accessor :tertiary_instrument_affinity
 
     attr_accessor :sound_generation_affinity
@@ -125,33 +176,6 @@ module SongtradrApiClientRuby
 
     attr_accessor :use_case_affinity
 
-    # Search for an arousal
-    attr_accessor :arousal
-
-    # Search for a dominant instrument
-    attr_accessor :dominant_instrument
-
-    # Search for energy
-    attr_accessor :energy
-
-    # Search for an engagement
-    attr_accessor :engagement
-
-    # Search for groovyness
-    attr_accessor :groovyness
-
-    # Search for a degree of harmoniousness
-    attr_accessor :harmony
-
-    # Search for pleasantness
-    attr_accessor :pleasantness
-
-    # Search for a language of the lyrics
-    attr_accessor :primary_mood_cluster
-
-    # Search for a sound character
-    attr_accessor :primary_sound_character
-
     # Search for Industry suitability
     attr_accessor :industry_suitability
 
@@ -159,30 +183,6 @@ module SongtradrApiClientRuby
 
     attr_accessor :audience_region
 
-    attr_accessor :primary_mood_cluster_affinity
-
-    # Search for a language of the lyrics
-    attr_accessor :secondary_mood_cluster
-
-    attr_accessor :secondary_mood_cluster_affinity
-
-    # Search for a language of the lyrics
-    attr_accessor :tertiary_mood_cluster
-
-    attr_accessor :tertiary_mood_cluster_affinity
-
-    attr_accessor :vocals_affinity
-
-    attr_accessor :dominant_instrument_affinity
-
-    # Search for a dominant instrument
-    attr_accessor :secondary_instrument
-
-    attr_accessor :secondary_instrument_affinity
-
-    # Search for a dominant instrument
-    attr_accessor :tertiary_instrument
-
     attr_accessor :valence_affinity
 
     attr_accessor :arousal_affinity
@@ -243,6 +243,15 @@ module SongtradrApiClientRuby
       {
         :'space' => :'space',
         :'language_of_performance' => :'languageOfPerformance',
+        :'arousal' => :'arousal',
+        :'dominant_instrument' => :'dominantInstrument',
+        :'energy' => :'energy',
+        :'engagement' => :'engagement',
+        :'groovyness' => :'groovyness',
+        :'harmony' => :'harmony',
+        :'pleasantness' => :'pleasantness',
+        :'primary_mood_cluster' => :'primaryMoodCluster',
+        :'primary_sound_character' => :'primarySoundCharacter',
         :'rhythm' => :'rhythm',
         :'roughness' => :'roughness',
         :'scale' => :'scale',
@@ -257,6 +266,16 @@ module SongtradrApiClientRuby
         :'curateability' => :'curateability',
         :'use_case' => :'useCase',
         :'channel_suitability' => :'channelSuitability',
+        :'primary_mood_cluster_affinity' => :'primaryMoodClusterAffinity',
+        :'secondary_mood_cluster' => :'secondaryMoodCluster',
+        :'secondary_mood_cluster_affinity' => :'secondaryMoodClusterAffinity',
+        :'tertiary_mood_cluster' => :'tertiaryMoodCluster',
+        :'tertiary_mood_cluster_affinity' => :'tertiaryMoodClusterAffinity',
+        :'vocals_affinity' => :'vocalsAffinity',
+        :'dominant_instrument_affinity' => :'dominantInstrumentAffinity',
+        :'secondary_instrument' => :'secondaryInstrument',
+        :'secondary_instrument_affinity' => :'secondaryInstrumentAffinity',
+        :'tertiary_instrument' => :'tertiaryInstrument',
         :'tertiary_instrument_affinity' => :'tertiaryInstrumentAffinity',
         :'sound_generation_affinity' => :'soundGenerationAffinity',
         :'rhythm_affinity' => :'rhythmAffinity',
@@ -288,28 +307,9 @@ module SongtradrApiClientRuby
         :'language_of_performance_affinity' => :'languageOfPerformanceAffinity',
         :'curateability_affinity' => :'curateabilityAffinity',
         :'use_case_affinity' => :'useCaseAffinity',
-        :'arousal' => :'arousal',
-        :'dominant_instrument' => :'dominantInstrument',
-        :'energy' => :'energy',
-        :'engagement' => :'engagement',
-        :'groovyness' => :'groovyness',
-        :'harmony' => :'harmony',
-        :'pleasantness' => :'pleasantness',
-        :'primary_mood_cluster' => :'primaryMoodCluster',
-        :'primary_sound_character' => :'primarySoundCharacter',
         :'industry_suitability' => :'industrySuitability',
         :'industry_suitability_affinity' => :'industrySuitabilityAffinity',
         :'audience_region' => :'audienceRegion',
-        :'primary_mood_cluster_affinity' => :'primaryMoodClusterAffinity',
-        :'secondary_mood_cluster' => :'secondaryMoodCluster',
-        :'secondary_mood_cluster_affinity' => :'secondaryMoodClusterAffinity',
-        :'tertiary_mood_cluster' => :'tertiaryMoodCluster',
-        :'tertiary_mood_cluster_affinity' => :'tertiaryMoodClusterAffinity',
-        :'vocals_affinity' => :'vocalsAffinity',
-        :'dominant_instrument_affinity' => :'dominantInstrumentAffinity',
-        :'secondary_instrument' => :'secondaryInstrument',
-        :'secondary_instrument_affinity' => :'secondaryInstrumentAffinity',
-        :'tertiary_instrument' => :'tertiaryInstrument',
         :'valence_affinity' => :'valenceAffinity',
         :'arousal_affinity' => :'arousalAffinity',
         :'pleasantness_affinity' => :'pleasantnessAffinity',
@@ -339,6 +339,15 @@ module SongtradrApiClientRuby
       {
         :'space' => :'String',
         :'language_of_performance' => :'String',
+        :'arousal' => :'String',
+        :'dominant_instrument' => :'String',
+        :'energy' => :'String',
+        :'engagement' => :'String',
+        :'groovyness' => :'String',
+        :'harmony' => :'String',
+        :'pleasantness' => :'String',
+        :'primary_mood_cluster' => :'String',
+        :'primary_sound_character' => :'String',
         :'rhythm' => :'String',
         :'roughness' => :'String',
         :'scale' => :'String',
@@ -353,6 +362,16 @@ module SongtradrApiClientRuby
         :'curateability' => :'String',
         :'use_case' => :'String',
         :'channel_suitability' => :'String',
+        :'primary_mood_cluster_affinity' => :'Float',
+        :'secondary_mood_cluster' => :'String',
+        :'secondary_mood_cluster_affinity' => :'Float',
+        :'tertiary_mood_cluster' => :'String',
+        :'tertiary_mood_cluster_affinity' => :'Float',
+        :'vocals_affinity' => :'Float',
+        :'dominant_instrument_affinity' => :'Float',
+        :'secondary_instrument' => :'String',
+        :'secondary_instrument_affinity' => :'Float',
+        :'tertiary_instrument' => :'String',
         :'tertiary_instrument_affinity' => :'Float',
         :'sound_generation_affinity' => :'Float',
         :'rhythm_affinity' => :'Float',
@@ -384,28 +403,9 @@ module SongtradrApiClientRuby
         :'language_of_performance_affinity' => :'Float',
         :'curateability_affinity' => :'Float',
         :'use_case_affinity' => :'Float',
-        :'arousal' => :'String',
-        :'dominant_instrument' => :'String',
-        :'energy' => :'String',
-        :'engagement' => :'String',
-        :'groovyness' => :'String',
-        :'harmony' => :'String',
-        :'pleasantness' => :'String',
-        :'primary_mood_cluster' => :'String',
-        :'primary_sound_character' => :'String',
         :'industry_suitability' => :'String',
         :'industry_suitability_affinity' => :'Float',
         :'audience_region' => :'String',
-        :'primary_mood_cluster_affinity' => :'Float',
-        :'secondary_mood_cluster' => :'String',
-        :'secondary_mood_cluster_affinity' => :'Float',
-        :'tertiary_mood_cluster' => :'String',
-        :'tertiary_mood_cluster_affinity' => :'Float',
-        :'vocals_affinity' => :'Float',
-        :'dominant_instrument_affinity' => :'Float',
-        :'secondary_instrument' => :'String',
-        :'secondary_instrument_affinity' => :'Float',
-        :'tertiary_instrument' => :'String',
         :'valence_affinity' => :'Float',
         :'arousal_affinity' => :'Float',
         :'pleasantness_affinity' => :'Float',
@@ -454,6 +454,42 @@ module SongtradrApiClientRuby
         self.language_of_performance = attributes[:'language_of_performance']
       end
 
+      if attributes.key?(:'arousal')
+        self.arousal = attributes[:'arousal']
+      end
+
+      if attributes.key?(:'dominant_instrument')
+        self.dominant_instrument = attributes[:'dominant_instrument']
+      end
+
+      if attributes.key?(:'energy')
+        self.energy = attributes[:'energy']
+      end
+
+      if attributes.key?(:'engagement')
+        self.engagement = attributes[:'engagement']
+      end
+
+      if attributes.key?(:'groovyness')
+        self.groovyness = attributes[:'groovyness']
+      end
+
+      if attributes.key?(:'harmony')
+        self.harmony = attributes[:'harmony']
+      end
+
+      if attributes.key?(:'pleasantness')
+        self.pleasantness = attributes[:'pleasantness']
+      end
+
+      if attributes.key?(:'primary_mood_cluster')
+        self.primary_mood_cluster = attributes[:'primary_mood_cluster']
+      end
+
+      if attributes.key?(:'primary_sound_character')
+        self.primary_sound_character = attributes[:'primary_sound_character']
+      end
+
       if attributes.key?(:'rhythm')
         self.rhythm = attributes[:'rhythm']
       end
@@ -510,6 +546,46 @@ module SongtradrApiClientRuby
         self.channel_suitability = attributes[:'channel_suitability']
       end
 
+      if attributes.key?(:'primary_mood_cluster_affinity')
+        self.primary_mood_cluster_affinity = attributes[:'primary_mood_cluster_affinity']
+      end
+
+      if attributes.key?(:'secondary_mood_cluster')
+        self.secondary_mood_cluster = attributes[:'secondary_mood_cluster']
+      end
+
+      if attributes.key?(:'secondary_mood_cluster_affinity')
+        self.secondary_mood_cluster_affinity = attributes[:'secondary_mood_cluster_affinity']
+      end
+
+      if attributes.key?(:'tertiary_mood_cluster')
+        self.tertiary_mood_cluster = attributes[:'tertiary_mood_cluster']
+      end
+
+      if attributes.key?(:'tertiary_mood_cluster_affinity')
+        self.tertiary_mood_cluster_affinity = attributes[:'tertiary_mood_cluster_affinity']
+      end
+
+      if attributes.key?(:'vocals_affinity')
+        self.vocals_affinity = attributes[:'vocals_affinity']
+      end
+
+      if attributes.key?(:'dominant_instrument_affinity')
+        self.dominant_instrument_affinity = attributes[:'dominant_instrument_affinity']
+      end
+
+      if attributes.key?(:'secondary_instrument')
+        self.secondary_instrument = attributes[:'secondary_instrument']
+      end
+
+      if attributes.key?(:'secondary_instrument_affinity')
+        self.secondary_instrument_affinity = attributes[:'secondary_instrument_affinity']
+      end
+
+      if attributes.key?(:'tertiary_instrument')
+        self.tertiary_instrument = attributes[:'tertiary_instrument']
+      end
+
       if attributes.key?(:'tertiary_instrument_affinity')
         self.tertiary_instrument_affinity = attributes[:'tertiary_instrument_affinity']
       end
@@ -634,42 +710,6 @@ module SongtradrApiClientRuby
         self.use_case_affinity = attributes[:'use_case_affinity']
       end
 
-      if attributes.key?(:'arousal')
-        self.arousal = attributes[:'arousal']
-      end
-
-      if attributes.key?(:'dominant_instrument')
-        self.dominant_instrument = attributes[:'dominant_instrument']
-      end
-
-      if attributes.key?(:'energy')
-        self.energy = attributes[:'energy']
-      end
-
-      if attributes.key?(:'engagement')
-        self.engagement = attributes[:'engagement']
-      end
-
-      if attributes.key?(:'groovyness')
-        self.groovyness = attributes[:'groovyness']
-      end
-
-      if attributes.key?(:'harmony')
-        self.harmony = attributes[:'harmony']
-      end
-
-      if attributes.key?(:'pleasantness')
-        self.pleasantness = attributes[:'pleasantness']
-      end
-
-      if attributes.key?(:'primary_mood_cluster')
-        self.primary_mood_cluster = attributes[:'primary_mood_cluster']
-      end
-
-      if attributes.key?(:'primary_sound_character')
-        self.primary_sound_character = attributes[:'primary_sound_character']
-      end
-
       if attributes.key?(:'industry_suitability')
         self.industry_suitability = attributes[:'industry_suitability']
       end
@@ -682,46 +722,6 @@ module SongtradrApiClientRuby
         self.audience_region = attributes[:'audience_region']
       end
 
-      if attributes.key?(:'primary_mood_cluster_affinity')
-        self.primary_mood_cluster_affinity = attributes[:'primary_mood_cluster_affinity']
-      end
-
-      if attributes.key?(:'secondary_mood_cluster')
-        self.secondary_mood_cluster = attributes[:'secondary_mood_cluster']
-      end
-
-      if attributes.key?(:'secondary_mood_cluster_affinity')
-        self.secondary_mood_cluster_affinity = attributes[:'secondary_mood_cluster_affinity']
-      end
-
-      if attributes.key?(:'tertiary_mood_cluster')
-        self.tertiary_mood_cluster = attributes[:'tertiary_mood_cluster']
-      end
-
-      if attributes.key?(:'tertiary_mood_cluster_affinity')
-        self.tertiary_mood_cluster_affinity = attributes[:'tertiary_mood_cluster_affinity']
-      end
-
-      if attributes.key?(:'vocals_affinity')
-        self.vocals_affinity = attributes[:'vocals_affinity']
-      end
-
-      if attributes.key?(:'dominant_instrument_affinity')
-        self.dominant_instrument_affinity = attributes[:'dominant_instrument_affinity']
-      end
-
-      if attributes.key?(:'secondary_instrument')
-        self.secondary_instrument = attributes[:'secondary_instrument']
-      end
-
-      if attributes.key?(:'secondary_instrument_affinity')
-        self.secondary_instrument_affinity = attributes[:'secondary_instrument_affinity']
-      end
-
-      if attributes.key?(:'tertiary_instrument')
-        self.tertiary_instrument = attributes[:'tertiary_instrument']
-      end
-
       if attributes.key?(:'valence_affinity')
         self.valence_affinity = attributes[:'valence_affinity']
       end
@@ -790,6 +790,7 @@ module SongtradrApiClientRuby
     # 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
       invalid_properties
     end
@@ -797,10 +798,29 @@ module SongtradrApiClientRuby
     # 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'
       space_validator = EnumAttributeValidator.new('String', ["very compact", "compact", "moderate space", "wide", "very wide"])
       return false unless space_validator.valid?(@space)
       language_of_performance_validator = EnumAttributeValidator.new('String', ["en", "de", "no", "fr", "es", "pt", "fi", "ru", "it", "la", "el", "ar", "nl", "ja", "pl", "sv", "zu", "da", "cs", "hu", "af", "hi", "tr", "zh", "ms", "pa", "id", "ko", "vi"])
       return false unless language_of_performance_validator.valid?(@language_of_performance)
+      arousal_validator = EnumAttributeValidator.new('String', ["very calm", "calm", "moderate arousal", "energetic", "very energetic", "varying arousal"])
+      return false unless arousal_validator.valid?(@arousal)
+      dominant_instrument_validator = EnumAttributeValidator.new('String', ["electric guitar", "piano", "electronics", "guitar", "strings", "synthesizer", "wind", "saxophone", "flute", "trumpet", "drum kit", "keys", "accordion", "violin", "harpsichord", "choir", "cello", "electric bass", "organ", "brass", "percussion", "vocals", "double bass", "harp"])
+      return false unless dominant_instrument_validator.valid?(@dominant_instrument)
+      energy_validator = EnumAttributeValidator.new('String', ["very quiet", "quiet", "moderate", "loud", "very loud", "dynamic"])
+      return false unless energy_validator.valid?(@energy)
+      engagement_validator = EnumAttributeValidator.new('String', ["very unengaging", "unengaging", "neutral engagement", "engaging", "very engaging", "varying engagement"])
+      return false unless engagement_validator.valid?(@engagement)
+      groovyness_validator = EnumAttributeValidator.new('String', ["very steady", "steady", "moderate rhythm feel", "groovy", "very groovy"])
+      return false unless groovyness_validator.valid?(@groovyness)
+      harmony_validator = EnumAttributeValidator.new('String', ["very dissonant", "dissonant", "moderate harmonies", "harmonious", "very harmonious"])
+      return false unless harmony_validator.valid?(@harmony)
+      pleasantness_validator = EnumAttributeValidator.new('String', ["very unpleasant", "unpleasant", "neutral pleasantness", "pleasant", "very pleasant", "varying pleasantness"])
+      return false unless pleasantness_validator.valid?(@pleasantness)
+      primary_mood_cluster_validator = EnumAttributeValidator.new('String', ["aggressive", "amusing", "anxious", "calm", "devotional", "dreamy", "energetic", "enigmatic", "epic", "erotic", "positive", "sad", "scary", "wild"])
+      return false unless primary_mood_cluster_validator.valid?(@primary_mood_cluster)
+      primary_sound_character_validator = EnumAttributeValidator.new('String', ["brassy", "bright", "clear", "deep", "distorted", "flat", "full", "groovy", "melodious", "natural", "resonant", "shrill", "steady", "thin", "warm"])
+      return false unless primary_sound_character_validator.valid?(@primary_sound_character)
       rhythm_validator = EnumAttributeValidator.new('String', ["common time", "triple meter", "complex time signature", "binary rhythm", "ternary rhythm"])
       return false unless rhythm_validator.valid?(@rhythm)
       roughness_validator = EnumAttributeValidator.new('String', ["very clear", "clear", "moderate roughness", "distorted", "very distorted"])
@@ -829,6 +849,14 @@ module SongtradrApiClientRuby
       return false unless use_case_validator.valid?(@use_case)
       channel_suitability_validator = EnumAttributeValidator.new('String', ["Spotify", "TikTok", "Unfitting", "YouTube"])
       return false unless channel_suitability_validator.valid?(@channel_suitability)
+      secondary_mood_cluster_validator = EnumAttributeValidator.new('String', ["aggressive", "amusing", "anxious", "calm", "devotional", "dreamy", "energetic", "enigmatic", "epic", "erotic", "positive", "sad", "scary", "wild"])
+      return false unless secondary_mood_cluster_validator.valid?(@secondary_mood_cluster)
+      tertiary_mood_cluster_validator = EnumAttributeValidator.new('String', ["aggressive", "amusing", "anxious", "calm", "devotional", "dreamy", "energetic", "enigmatic", "epic", "erotic", "positive", "sad", "scary", "wild"])
+      return false unless tertiary_mood_cluster_validator.valid?(@tertiary_mood_cluster)
+      secondary_instrument_validator = EnumAttributeValidator.new('String', ["electric guitar", "piano", "electronics", "guitar", "strings", "synthesizer", "wind", "saxophone", "flute", "trumpet", "drum kit", "keys", "accordion", "violin", "harpsichord", "choir", "cello", "electric bass", "organ", "brass", "percussion", "vocals", "double bass", "harp"])
+      return false unless secondary_instrument_validator.valid?(@secondary_instrument)
+      tertiary_instrument_validator = EnumAttributeValidator.new('String', ["electric guitar", "piano", "electronics", "guitar", "strings", "synthesizer", "wind", "saxophone", "flute", "trumpet", "drum kit", "keys", "accordion", "violin", "harpsichord", "choir", "cello", "electric bass", "organ", "brass", "percussion", "vocals", "double bass", "harp"])
+      return false unless tertiary_instrument_validator.valid?(@tertiary_instrument)
       production_rating_validator = EnumAttributeValidator.new('String', ["low production quality", "medium production quality", "high production quality"])
       return false unless production_rating_validator.valid?(@production_rating)
       performance_rating_validator = EnumAttributeValidator.new('String', ["low performance quality", "medium performance quality", "high performance quality"])
@@ -849,36 +877,10 @@ module SongtradrApiClientRuby
       return false unless tertiary_audience_region_validator.valid?(@tertiary_audience_region)
       origin_region_validator = EnumAttributeValidator.new('String', ["Australia and New Zealand", "Central America and the Carribean", "Central and Southern Asia", "Eastern Asia", "Eastern Europe", "Northern Africa and Western Asia", "Northern America", "Oceania", "South America", "South-Eastern Asia", "Southern Europe", "Sub-Saharan Africa", "Western and Northern Europe"])
       return false unless origin_region_validator.valid?(@origin_region)
-      arousal_validator = EnumAttributeValidator.new('String', ["very calm", "calm", "moderate arousal", "energetic", "very energetic", "varying arousal"])
-      return false unless arousal_validator.valid?(@arousal)
-      dominant_instrument_validator = EnumAttributeValidator.new('String', ["electric guitar", "piano", "electronics", "guitar", "strings", "synthesizer", "wind", "saxophone", "flute", "trumpet", "drum kit", "keys", "accordion", "violin", "harpsichord", "choir", "cello", "electric bass", "organ", "brass", "percussion", "vocals", "double bass", "harp"])
-      return false unless dominant_instrument_validator.valid?(@dominant_instrument)
-      energy_validator = EnumAttributeValidator.new('String', ["very quiet", "quiet", "moderate", "loud", "very loud", "dynamic"])
-      return false unless energy_validator.valid?(@energy)
-      engagement_validator = EnumAttributeValidator.new('String', ["very unengaging", "unengaging", "neutral engagement", "engaging", "very engaging", "varying engagement"])
-      return false unless engagement_validator.valid?(@engagement)
-      groovyness_validator = EnumAttributeValidator.new('String', ["very steady", "steady", "moderate rhythm feel", "groovy", "very groovy"])
-      return false unless groovyness_validator.valid?(@groovyness)
-      harmony_validator = EnumAttributeValidator.new('String', ["very dissonant", "dissonant", "moderate harmonies", "harmonious", "very harmonious"])
-      return false unless harmony_validator.valid?(@harmony)
-      pleasantness_validator = EnumAttributeValidator.new('String', ["very unpleasant", "unpleasant", "neutral pleasantness", "pleasant", "very pleasant", "varying pleasantness"])
-      return false unless pleasantness_validator.valid?(@pleasantness)
-      primary_mood_cluster_validator = EnumAttributeValidator.new('String', ["aggressive", "amusing", "anxious", "calm", "devotional", "dreamy", "energetic", "enigmatic", "epic", "erotic", "positive", "sad", "scary", "wild"])
-      return false unless primary_mood_cluster_validator.valid?(@primary_mood_cluster)
-      primary_sound_character_validator = EnumAttributeValidator.new('String', ["brassy", "bright", "clear", "deep", "distorted", "flat", "full", "groovy", "melodious", "natural", "resonant", "shrill", "steady", "thin", "warm"])
-      return false unless primary_sound_character_validator.valid?(@primary_sound_character)
       industry_suitability_validator = EnumAttributeValidator.new('String', ["Automobiles and Parts", "Consumer Products and Services", "Financial Services", "Food, Beverage and Tobacco", "Health Care", "Insurance", "Media", "Politics, Government and Organizations", "Real Estate", "Retail", "Technology", "Telecommunications", "Travel and Leisure"])
       return false unless industry_suitability_validator.valid?(@industry_suitability)
       audience_region_validator = EnumAttributeValidator.new('String', ["Australia and New Zealand", "Central America and the Carribean", "Central and Southern Asia", "Eastern Asia", "Eastern Europe", "Northern Africa and Western Asia", "Northern America", "Oceania", "South America", "South-Eastern Asia", "Southern Europe", "Sub-Saharan Africa", "Western and Northern Europe"])
       return false unless audience_region_validator.valid?(@audience_region)
-      secondary_mood_cluster_validator = EnumAttributeValidator.new('String', ["aggressive", "amusing", "anxious", "calm", "devotional", "dreamy", "energetic", "enigmatic", "epic", "erotic", "positive", "sad", "scary", "wild"])
-      return false unless secondary_mood_cluster_validator.valid?(@secondary_mood_cluster)
-      tertiary_mood_cluster_validator = EnumAttributeValidator.new('String', ["aggressive", "amusing", "anxious", "calm", "devotional", "dreamy", "energetic", "enigmatic", "epic", "erotic", "positive", "sad", "scary", "wild"])
-      return false unless tertiary_mood_cluster_validator.valid?(@tertiary_mood_cluster)
-      secondary_instrument_validator = EnumAttributeValidator.new('String', ["electric guitar", "piano", "electronics", "guitar", "strings", "synthesizer", "wind", "saxophone", "flute", "trumpet", "drum kit", "keys", "accordion", "violin", "harpsichord", "choir", "cello", "electric bass", "organ", "brass", "percussion", "vocals", "double bass", "harp"])
-      return false unless secondary_instrument_validator.valid?(@secondary_instrument)
-      tertiary_instrument_validator = EnumAttributeValidator.new('String', ["electric guitar", "piano", "electronics", "guitar", "strings", "synthesizer", "wind", "saxophone", "flute", "trumpet", "drum kit", "keys", "accordion", "violin", "harpsichord", "choir", "cello", "electric bass", "organ", "brass", "percussion", "vocals", "double bass", "harp"])
-      return false unless tertiary_instrument_validator.valid?(@tertiary_instrument)
       key_validator = EnumAttributeValidator.new('String', ["C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B", "unclear"])
       return false unless key_validator.valid?(@key)
       true
@@ -904,6 +906,96 @@ module SongtradrApiClientRuby
       @language_of_performance = language_of_performance
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] arousal Object to be assigned
+    def arousal=(arousal)
+      validator = EnumAttributeValidator.new('String', ["very calm", "calm", "moderate arousal", "energetic", "very energetic", "varying arousal"])
+      unless validator.valid?(arousal)
+        fail ArgumentError, "invalid value for \"arousal\", must be one of #{validator.allowable_values}."
+      end
+      @arousal = arousal
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] dominant_instrument Object to be assigned
+    def dominant_instrument=(dominant_instrument)
+      validator = EnumAttributeValidator.new('String', ["electric guitar", "piano", "electronics", "guitar", "strings", "synthesizer", "wind", "saxophone", "flute", "trumpet", "drum kit", "keys", "accordion", "violin", "harpsichord", "choir", "cello", "electric bass", "organ", "brass", "percussion", "vocals", "double bass", "harp"])
+      unless validator.valid?(dominant_instrument)
+        fail ArgumentError, "invalid value for \"dominant_instrument\", must be one of #{validator.allowable_values}."
+      end
+      @dominant_instrument = dominant_instrument
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] energy Object to be assigned
+    def energy=(energy)
+      validator = EnumAttributeValidator.new('String', ["very quiet", "quiet", "moderate", "loud", "very loud", "dynamic"])
+      unless validator.valid?(energy)
+        fail ArgumentError, "invalid value for \"energy\", must be one of #{validator.allowable_values}."
+      end
+      @energy = energy
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] engagement Object to be assigned
+    def engagement=(engagement)
+      validator = EnumAttributeValidator.new('String', ["very unengaging", "unengaging", "neutral engagement", "engaging", "very engaging", "varying engagement"])
+      unless validator.valid?(engagement)
+        fail ArgumentError, "invalid value for \"engagement\", must be one of #{validator.allowable_values}."
+      end
+      @engagement = engagement
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] groovyness Object to be assigned
+    def groovyness=(groovyness)
+      validator = EnumAttributeValidator.new('String', ["very steady", "steady", "moderate rhythm feel", "groovy", "very groovy"])
+      unless validator.valid?(groovyness)
+        fail ArgumentError, "invalid value for \"groovyness\", must be one of #{validator.allowable_values}."
+      end
+      @groovyness = groovyness
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] harmony Object to be assigned
+    def harmony=(harmony)
+      validator = EnumAttributeValidator.new('String', ["very dissonant", "dissonant", "moderate harmonies", "harmonious", "very harmonious"])
+      unless validator.valid?(harmony)
+        fail ArgumentError, "invalid value for \"harmony\", must be one of #{validator.allowable_values}."
+      end
+      @harmony = harmony
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] pleasantness Object to be assigned
+    def pleasantness=(pleasantness)
+      validator = EnumAttributeValidator.new('String', ["very unpleasant", "unpleasant", "neutral pleasantness", "pleasant", "very pleasant", "varying pleasantness"])
+      unless validator.valid?(pleasantness)
+        fail ArgumentError, "invalid value for \"pleasantness\", must be one of #{validator.allowable_values}."
+      end
+      @pleasantness = pleasantness
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] primary_mood_cluster Object to be assigned
+    def primary_mood_cluster=(primary_mood_cluster)
+      validator = EnumAttributeValidator.new('String', ["aggressive", "amusing", "anxious", "calm", "devotional", "dreamy", "energetic", "enigmatic", "epic", "erotic", "positive", "sad", "scary", "wild"])
+      unless validator.valid?(primary_mood_cluster)
+        fail ArgumentError, "invalid value for \"primary_mood_cluster\", must be one of #{validator.allowable_values}."
+      end
+      @primary_mood_cluster = primary_mood_cluster
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] primary_sound_character Object to be assigned
+    def primary_sound_character=(primary_sound_character)
+      validator = EnumAttributeValidator.new('String', ["brassy", "bright", "clear", "deep", "distorted", "flat", "full", "groovy", "melodious", "natural", "resonant", "shrill", "steady", "thin", "warm"])
+      unless validator.valid?(primary_sound_character)
+        fail ArgumentError, "invalid value for \"primary_sound_character\", must be one of #{validator.allowable_values}."
+      end
+      @primary_sound_character = primary_sound_character
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] rhythm Object to be assigned
     def rhythm=(rhythm)
@@ -1044,6 +1136,46 @@ module SongtradrApiClientRuby
       @channel_suitability = channel_suitability
     end
 
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] secondary_mood_cluster Object to be assigned
+    def secondary_mood_cluster=(secondary_mood_cluster)
+      validator = EnumAttributeValidator.new('String', ["aggressive", "amusing", "anxious", "calm", "devotional", "dreamy", "energetic", "enigmatic", "epic", "erotic", "positive", "sad", "scary", "wild"])
+      unless validator.valid?(secondary_mood_cluster)
+        fail ArgumentError, "invalid value for \"secondary_mood_cluster\", must be one of #{validator.allowable_values}."
+      end
+      @secondary_mood_cluster = secondary_mood_cluster
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] tertiary_mood_cluster Object to be assigned
+    def tertiary_mood_cluster=(tertiary_mood_cluster)
+      validator = EnumAttributeValidator.new('String', ["aggressive", "amusing", "anxious", "calm", "devotional", "dreamy", "energetic", "enigmatic", "epic", "erotic", "positive", "sad", "scary", "wild"])
+      unless validator.valid?(tertiary_mood_cluster)
+        fail ArgumentError, "invalid value for \"tertiary_mood_cluster\", must be one of #{validator.allowable_values}."
+      end
+      @tertiary_mood_cluster = tertiary_mood_cluster
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] secondary_instrument Object to be assigned
+    def secondary_instrument=(secondary_instrument)
+      validator = EnumAttributeValidator.new('String', ["electric guitar", "piano", "electronics", "guitar", "strings", "synthesizer", "wind", "saxophone", "flute", "trumpet", "drum kit", "keys", "accordion", "violin", "harpsichord", "choir", "cello", "electric bass", "organ", "brass", "percussion", "vocals", "double bass", "harp"])
+      unless validator.valid?(secondary_instrument)
+        fail ArgumentError, "invalid value for \"secondary_instrument\", must be one of #{validator.allowable_values}."
+      end
+      @secondary_instrument = secondary_instrument
+    end
+
+    # Custom attribute writer method checking allowed values (enum).
+    # @param [Object] tertiary_instrument Object to be assigned
+    def tertiary_instrument=(tertiary_instrument)
+      validator = EnumAttributeValidator.new('String', ["electric guitar", "piano", "electronics", "guitar", "strings", "synthesizer", "wind", "saxophone", "flute", "trumpet", "drum kit", "keys", "accordion", "violin", "harpsichord", "choir", "cello", "electric bass", "organ", "brass", "percussion", "vocals", "double bass", "harp"])
+      unless validator.valid?(tertiary_instrument)
+        fail ArgumentError, "invalid value for \"tertiary_instrument\", must be one of #{validator.allowable_values}."
+      end
+      @tertiary_instrument = tertiary_instrument
+    end
+
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] production_rating Object to be assigned
     def production_rating=(production_rating)
@@ -1144,96 +1276,6 @@ module SongtradrApiClientRuby
       @origin_region = origin_region
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] arousal Object to be assigned
-    def arousal=(arousal)
-      validator = EnumAttributeValidator.new('String', ["very calm", "calm", "moderate arousal", "energetic", "very energetic", "varying arousal"])
-      unless validator.valid?(arousal)
-        fail ArgumentError, "invalid value for \"arousal\", must be one of #{validator.allowable_values}."
-      end
-      @arousal = arousal
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] dominant_instrument Object to be assigned
-    def dominant_instrument=(dominant_instrument)
-      validator = EnumAttributeValidator.new('String', ["electric guitar", "piano", "electronics", "guitar", "strings", "synthesizer", "wind", "saxophone", "flute", "trumpet", "drum kit", "keys", "accordion", "violin", "harpsichord", "choir", "cello", "electric bass", "organ", "brass", "percussion", "vocals", "double bass", "harp"])
-      unless validator.valid?(dominant_instrument)
-        fail ArgumentError, "invalid value for \"dominant_instrument\", must be one of #{validator.allowable_values}."
-      end
-      @dominant_instrument = dominant_instrument
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] energy Object to be assigned
-    def energy=(energy)
-      validator = EnumAttributeValidator.new('String', ["very quiet", "quiet", "moderate", "loud", "very loud", "dynamic"])
-      unless validator.valid?(energy)
-        fail ArgumentError, "invalid value for \"energy\", must be one of #{validator.allowable_values}."
-      end
-      @energy = energy
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] engagement Object to be assigned
-    def engagement=(engagement)
-      validator = EnumAttributeValidator.new('String', ["very unengaging", "unengaging", "neutral engagement", "engaging", "very engaging", "varying engagement"])
-      unless validator.valid?(engagement)
-        fail ArgumentError, "invalid value for \"engagement\", must be one of #{validator.allowable_values}."
-      end
-      @engagement = engagement
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] groovyness Object to be assigned
-    def groovyness=(groovyness)
-      validator = EnumAttributeValidator.new('String', ["very steady", "steady", "moderate rhythm feel", "groovy", "very groovy"])
-      unless validator.valid?(groovyness)
-        fail ArgumentError, "invalid value for \"groovyness\", must be one of #{validator.allowable_values}."
-      end
-      @groovyness = groovyness
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] harmony Object to be assigned
-    def harmony=(harmony)
-      validator = EnumAttributeValidator.new('String', ["very dissonant", "dissonant", "moderate harmonies", "harmonious", "very harmonious"])
-      unless validator.valid?(harmony)
-        fail ArgumentError, "invalid value for \"harmony\", must be one of #{validator.allowable_values}."
-      end
-      @harmony = harmony
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] pleasantness Object to be assigned
-    def pleasantness=(pleasantness)
-      validator = EnumAttributeValidator.new('String', ["very unpleasant", "unpleasant", "neutral pleasantness", "pleasant", "very pleasant", "varying pleasantness"])
-      unless validator.valid?(pleasantness)
-        fail ArgumentError, "invalid value for \"pleasantness\", must be one of #{validator.allowable_values}."
-      end
-      @pleasantness = pleasantness
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] primary_mood_cluster Object to be assigned
-    def primary_mood_cluster=(primary_mood_cluster)
-      validator = EnumAttributeValidator.new('String', ["aggressive", "amusing", "anxious", "calm", "devotional", "dreamy", "energetic", "enigmatic", "epic", "erotic", "positive", "sad", "scary", "wild"])
-      unless validator.valid?(primary_mood_cluster)
-        fail ArgumentError, "invalid value for \"primary_mood_cluster\", must be one of #{validator.allowable_values}."
-      end
-      @primary_mood_cluster = primary_mood_cluster
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] primary_sound_character Object to be assigned
-    def primary_sound_character=(primary_sound_character)
-      validator = EnumAttributeValidator.new('String', ["brassy", "bright", "clear", "deep", "distorted", "flat", "full", "groovy", "melodious", "natural", "resonant", "shrill", "steady", "thin", "warm"])
-      unless validator.valid?(primary_sound_character)
-        fail ArgumentError, "invalid value for \"primary_sound_character\", must be one of #{validator.allowable_values}."
-      end
-      @primary_sound_character = primary_sound_character
-    end
-
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] industry_suitability Object to be assigned
     def industry_suitability=(industry_suitability)
@@ -1254,46 +1296,6 @@ module SongtradrApiClientRuby
       @audience_region = audience_region
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] secondary_mood_cluster Object to be assigned
-    def secondary_mood_cluster=(secondary_mood_cluster)
-      validator = EnumAttributeValidator.new('String', ["aggressive", "amusing", "anxious", "calm", "devotional", "dreamy", "energetic", "enigmatic", "epic", "erotic", "positive", "sad", "scary", "wild"])
-      unless validator.valid?(secondary_mood_cluster)
-        fail ArgumentError, "invalid value for \"secondary_mood_cluster\", must be one of #{validator.allowable_values}."
-      end
-      @secondary_mood_cluster = secondary_mood_cluster
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] tertiary_mood_cluster Object to be assigned
-    def tertiary_mood_cluster=(tertiary_mood_cluster)
-      validator = EnumAttributeValidator.new('String', ["aggressive", "amusing", "anxious", "calm", "devotional", "dreamy", "energetic", "enigmatic", "epic", "erotic", "positive", "sad", "scary", "wild"])
-      unless validator.valid?(tertiary_mood_cluster)
-        fail ArgumentError, "invalid value for \"tertiary_mood_cluster\", must be one of #{validator.allowable_values}."
-      end
-      @tertiary_mood_cluster = tertiary_mood_cluster
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] secondary_instrument Object to be assigned
-    def secondary_instrument=(secondary_instrument)
-      validator = EnumAttributeValidator.new('String', ["electric guitar", "piano", "electronics", "guitar", "strings", "synthesizer", "wind", "saxophone", "flute", "trumpet", "drum kit", "keys", "accordion", "violin", "harpsichord", "choir", "cello", "electric bass", "organ", "brass", "percussion", "vocals", "double bass", "harp"])
-      unless validator.valid?(secondary_instrument)
-        fail ArgumentError, "invalid value for \"secondary_instrument\", must be one of #{validator.allowable_values}."
-      end
-      @secondary_instrument = secondary_instrument
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] tertiary_instrument Object to be assigned
-    def tertiary_instrument=(tertiary_instrument)
-      validator = EnumAttributeValidator.new('String', ["electric guitar", "piano", "electronics", "guitar", "strings", "synthesizer", "wind", "saxophone", "flute", "trumpet", "drum kit", "keys", "accordion", "violin", "harpsichord", "choir", "cello", "electric bass", "organ", "brass", "percussion", "vocals", "double bass", "harp"])
-      unless validator.valid?(tertiary_instrument)
-        fail ArgumentError, "invalid value for \"tertiary_instrument\", must be one of #{validator.allowable_values}."
-      end
-      @tertiary_instrument = tertiary_instrument
-    end
-
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] key Object to be assigned
     def key=(key)
@@ -1311,6 +1313,15 @@ module SongtradrApiClientRuby
       self.class == o.class &&
           space == o.space &&
           language_of_performance == o.language_of_performance &&
+          arousal == o.arousal &&
+          dominant_instrument == o.dominant_instrument &&
+          energy == o.energy &&
+          engagement == o.engagement &&
+          groovyness == o.groovyness &&
+          harmony == o.harmony &&
+          pleasantness == o.pleasantness &&
+          primary_mood_cluster == o.primary_mood_cluster &&
+          primary_sound_character == o.primary_sound_character &&
           rhythm == o.rhythm &&
           roughness == o.roughness &&
           scale == o.scale &&
@@ -1325,6 +1336,16 @@ module SongtradrApiClientRuby
           curateability == o.curateability &&
           use_case == o.use_case &&
           channel_suitability == o.channel_suitability &&
+          primary_mood_cluster_affinity == o.primary_mood_cluster_affinity &&
+          secondary_mood_cluster == o.secondary_mood_cluster &&
+          secondary_mood_cluster_affinity == o.secondary_mood_cluster_affinity &&
+          tertiary_mood_cluster == o.tertiary_mood_cluster &&
+          tertiary_mood_cluster_affinity == o.tertiary_mood_cluster_affinity &&
+          vocals_affinity == o.vocals_affinity &&
+          dominant_instrument_affinity == o.dominant_instrument_affinity &&
+          secondary_instrument == o.secondary_instrument &&
+          secondary_instrument_affinity == o.secondary_instrument_affinity &&
+          tertiary_instrument == o.tertiary_instrument &&
           tertiary_instrument_affinity == o.tertiary_instrument_affinity &&
           sound_generation_affinity == o.sound_generation_affinity &&
           rhythm_affinity == o.rhythm_affinity &&
@@ -1356,28 +1377,9 @@ module SongtradrApiClientRuby
           language_of_performance_affinity == o.language_of_performance_affinity &&
           curateability_affinity == o.curateability_affinity &&
           use_case_affinity == o.use_case_affinity &&
-          arousal == o.arousal &&
-          dominant_instrument == o.dominant_instrument &&
-          energy == o.energy &&
-          engagement == o.engagement &&
-          groovyness == o.groovyness &&
-          harmony == o.harmony &&
-          pleasantness == o.pleasantness &&
-          primary_mood_cluster == o.primary_mood_cluster &&
-          primary_sound_character == o.primary_sound_character &&
           industry_suitability == o.industry_suitability &&
           industry_suitability_affinity == o.industry_suitability_affinity &&
           audience_region == o.audience_region &&
-          primary_mood_cluster_affinity == o.primary_mood_cluster_affinity &&
-          secondary_mood_cluster == o.secondary_mood_cluster &&
-          secondary_mood_cluster_affinity == o.secondary_mood_cluster_affinity &&
-          tertiary_mood_cluster == o.tertiary_mood_cluster &&
-          tertiary_mood_cluster_affinity == o.tertiary_mood_cluster_affinity &&
-          vocals_affinity == o.vocals_affinity &&
-          dominant_instrument_affinity == o.dominant_instrument_affinity &&
-          secondary_instrument == o.secondary_instrument &&
-          secondary_instrument_affinity == o.secondary_instrument_affinity &&
-          tertiary_instrument == o.tertiary_instrument &&
           valence_affinity == o.valence_affinity &&
           arousal_affinity == o.arousal_affinity &&
           pleasantness_affinity == o.pleasantness_affinity &&
@@ -1405,44 +1407,37 @@ module SongtradrApiClientRuby
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [space, language_of_performance, rhythm, roughness, scale, sound_generation, tempo, texture, timbre, tonality, valence, vocals, origin_decade, curateability, use_case, channel_suitability, tertiary_instrument_affinity, sound_generation_affinity, rhythm_affinity, primary_sound_character_affinity, tonality_affinity, bpm, production_rating, production_rating_affinity, performance_rating, performance_rating_affinity, song_rating, song_rating_affinity, audience_age, audience_age_affinity, secondary_audience_age, secondary_audience_age_affinity, tertiary_audience_age, tertiary_audience_age_affinity, audience_gender, audience_gender_affinity, audience_region_affinity, secondary_audience_region, secondary_audience_region_affinity, tertiary_audience_region, tertiary_audience_region_affinity, origin_region, origin_region_affinity, origin_decade_affinity, language_of_performance_affinity, curateability_affinity, use_case_affinity, arousal, dominant_instrument, energy, engagement, groovyness, harmony, pleasantness, primary_mood_cluster, primary_sound_character, industry_suitability, industry_suitability_affinity, audience_region, primary_mood_cluster_affinity, secondary_mood_cluster, secondary_mood_cluster_affinity, tertiary_mood_cluster, tertiary_mood_cluster_affinity, vocals_affinity, dominant_instrument_affinity, secondary_instrument, secondary_instrument_affinity, tertiary_instrument, valence_affinity, arousal_affinity, pleasantness_affinity, engagement_affinity, energy_affinity, tempo_affinity, scale_affinity, timbre_affinity, roughness_affinity, harmony_affinity, texture_affinity, groovyness_affinity, space_affinity, key_affinity, channel_suitability_affinity, key].hash
+      [space, language_of_performance, arousal, dominant_instrument, energy, engagement, groovyness, harmony, pleasantness, primary_mood_cluster, primary_sound_character, rhythm, roughness, scale, sound_generation, tempo, texture, timbre, tonality, valence, vocals, origin_decade, curateability, use_case, channel_suitability, primary_mood_cluster_affinity, secondary_mood_cluster, secondary_mood_cluster_affinity, tertiary_mood_cluster, tertiary_mood_cluster_affinity, vocals_affinity, dominant_instrument_affinity, secondary_instrument, secondary_instrument_affinity, tertiary_instrument, tertiary_instrument_affinity, sound_generation_affinity, rhythm_affinity, primary_sound_character_affinity, tonality_affinity, bpm, production_rating, production_rating_affinity, performance_rating, performance_rating_affinity, song_rating, song_rating_affinity, audience_age, audience_age_affinity, secondary_audience_age, secondary_audience_age_affinity, tertiary_audience_age, tertiary_audience_age_affinity, audience_gender, audience_gender_affinity, audience_region_affinity, secondary_audience_region, secondary_audience_region_affinity, tertiary_audience_region, tertiary_audience_region_affinity, origin_region, origin_region_affinity, origin_decade_affinity, language_of_performance_affinity, curateability_affinity, use_case_affinity, industry_suitability, industry_suitability_affinity, audience_region, valence_affinity, arousal_affinity, pleasantness_affinity, engagement_affinity, energy_affinity, tempo_affinity, scale_affinity, timbre_affinity, roughness_affinity, harmony_affinity, texture_affinity, groovyness_affinity, space_affinity, key_affinity, channel_suitability_affinity, key].hash
     end
 
     # Builds the object from hash
     # @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)
       attributes = attributes.transform_keys(&:to_sym)
-      self.class.openapi_types.each_pair do |key, type|
-        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
-          self.send("#{key}=", nil)
+      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[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 :Time
         Time.parse(value)