runapi-suno 0.2.7 → 0.2.8

data/lib/runapi/suno/resources/add_instrumental.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/add_vocals.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/boost_style.rb

@@ -14,10 +14,10 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
+        def run(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
         private

data/lib/runapi/suno/resources/check_voice.rb

@@ -14,10 +14,10 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
+        def run(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
         private

data/lib/runapi/suno/resources/convert_audio.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/cover_audio.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/create_mashup.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/extend_music.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/generate_artwork.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/generate_lyrics.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/generate_midi.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/generate_persona.rb

@@ -14,10 +14,10 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
+        def run(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
         private

data/lib/runapi/suno/resources/generate_voice.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/get_timestamped_lyrics.rb

@@ -14,10 +14,10 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
+        def run(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
         private

data/lib/runapi/suno/resources/regenerate_validation_phrase.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/replace_section.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/separate_audio_stems.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/text_to_music.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/text_to_sound.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/visualize_music.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/resources/voice_to_validation_phrase.rb

@@ -15,19 +15,19 @@ module RunApi
           @http = http
         end
 
-        def run(**params)
-          task = create(**params)
-          poll_until_complete { get(task.id) }
+        def run(options: nil, **params)
+          task = create(options: options, **params)
+          poll_until_complete { get(task.id, options: options) }
         end
 
-        def create(**params)
+        def create(options: nil, **params)
           params = compact_params(params)
           validate_params!(params)
-          request(:post, ENDPOINT, body: params)
+          request(:post, ENDPOINT, body: params, options: options)
         end
 
-        def get(id)
-          request(:get, "#{ENDPOINT}/#{id}")
+        def get(id, options: nil)
+          request(:get, "#{ENDPOINT}/#{id}", options: options)
         end
 
         private

data/lib/runapi/suno/validators.rb

@@ -5,15 +5,8 @@ module RunApi
     module Validators
       module_function
 
-      MUSIC_PROMPT_SHAPE_ERROR = "choose a valid vocal_mode: auto_lyrics, exact_lyrics, or instrumental"
-
       def validate_text_to_music!(params, resource)
-        validate_music_prompt_shape!(params, resource)
-        require_param!(resource, params, :model)
-        validate_optional!(resource, params, :vocal_mode, Types::VOCAL_MODES)
-        validate_optional!(resource, params, :model, Types::MODELS)
-        validate_optional!(resource, params, :vocal_gender, Types::VOCAL_GENDERS)
-        validate_optional!(resource, params, :persona_type, Types::PERSONA_TYPES)
+        resource.send(:validate_contract!, CONTRACT["text-to-music"], params)
       end
 
       def validate_extend_music!(params, resource)
@@ -40,13 +33,7 @@ module RunApi
       end
 
       def validate_cover_audio!(params, resource)
-        require_param!(resource, params, :upload_url)
-        require_param!(resource, params, :model)
-        validate_music_prompt_shape!(params, resource)
-        validate_optional!(resource, params, :vocal_mode, Types::VOCAL_MODES)
-        validate_optional!(resource, params, :model, Types::MODELS)
-        validate_optional!(resource, params, :vocal_gender, Types::VOCAL_GENDERS)
-        validate_optional!(resource, params, :persona_type, Types::PERSONA_TYPES)
+        resource.send(:validate_contract!, CONTRACT["cover-audio"], params)
       end
 
       def validate_add_instrumental!(params, resource)
@@ -87,10 +74,18 @@ module RunApi
       end
 
       def validate_replace_section!(params, resource)
-        require_all!(resource, params, :task_id, :audio_id, :lyrics, :tags, :title, :infill_start_time, :infill_end_time)
-        if param(resource, params, :infill_end_time).to_f <= param(resource, params, :infill_start_time).to_f
+        resource.send(:validate_contract!, CONTRACT["replace-section"], params)
+        validate_replace_section_source!(params, resource)
+        start_time = replace_section_time!(params, resource, :infill_start_time)
+        end_time = replace_section_time!(params, resource, :infill_end_time)
+        if end_time <= start_time
           raise Core::ValidationError, "infill_end_time must be greater than infill_start_time"
         end
+
+        duration = end_time - start_time
+        return if duration.between?(6, 60)
+
+        raise Core::ValidationError, "replacement duration must be between 6 and 60 seconds"
       end
 
       def validate_create_mashup!(params, resource)
@@ -98,12 +93,7 @@ module RunApi
         unless upload_url_list.is_a?(Array) && upload_url_list.size == 2
           raise Core::ValidationError, "upload_url_list must contain exactly 2 URLs"
         end
-        require_param!(resource, params, :model)
-        validate_music_prompt_shape!(params, resource)
-        validate_optional!(resource, params, :vocal_mode, Types::VOCAL_MODES)
-        validate_optional!(resource, params, :model, Types::MODELS)
-        validate_optional!(resource, params, :vocal_gender, Types::VOCAL_GENDERS)
-        validate_optional!(resource, params, :persona_type, Types::PERSONA_TYPES)
+        resource.send(:validate_contract!, CONTRACT["create-mashup"], params)
       end
 
       def validate_text_to_sound!(params, resource)
@@ -148,28 +138,6 @@ module RunApi
         require_param!(resource, params, :description)
       end
 
-      def validate_music_prompt_shape!(params, resource)
-        mode = param(resource, params, :vocal_mode).to_s
-        has_prompt = truthy_presence?(param(resource, params, :prompt))
-        has_lyrics = truthy_presence?(param(resource, params, :lyrics))
-        has_style = truthy_presence?(param(resource, params, :style))
-        has_title = truthy_presence?(param(resource, params, :title))
-
-        valid_shape = case mode
-        when "auto_lyrics"
-          has_prompt && !has_lyrics && !has_style && !has_title
-        when "exact_lyrics"
-          !has_prompt && has_lyrics && has_style && has_title
-        when "instrumental"
-          !has_prompt && !has_lyrics && has_style && has_title
-        else
-          false
-        end
-        return if valid_shape
-
-        raise Core::ValidationError, MUSIC_PROMPT_SHAPE_ERROR
-      end
-
       def validate_extend_music_prompt_shape!(params, resource)
         return unless truthy_presence?(param(resource, params, :lyrics))
 
@@ -187,6 +155,30 @@ module RunApi
         raise Core::ValidationError, "lyrics can only be used when extending uploaded audio with custom parameters"
       end
 
+      def validate_replace_section_source!(params, resource)
+        has_existing_source = %i[task_id audio_id].any? { |key| truthy_presence?(param(resource, params, key)) }
+        has_uploaded_source = %i[upload_url model].any? { |key| truthy_presence?(param(resource, params, key)) }
+
+        if has_existing_source && has_uploaded_source
+          raise Core::ValidationError, "task_id/audio_id cannot be combined with upload_url/model"
+        end
+
+        if has_existing_source
+          require_all!(resource, params, :task_id, :audio_id)
+        elsif has_uploaded_source
+          require_all!(resource, params, :upload_url, :model)
+        else
+          raise Core::ValidationError, "task_id and audio_id, or upload_url and model are required"
+        end
+      end
+
+      def replace_section_time!(params, resource, key)
+        value = param(resource, params, key)
+        return value.to_f if value.is_a?(Numeric)
+
+        raise Core::ValidationError, "#{key} must be a number"
+      end
+
       def require_all!(resource, params, *keys)
         keys.each { |key| require_param!(resource, params, key) }
       end

data/lib/runapi/suno.rb

@@ -2,6 +2,7 @@
 
 require "runapi/core"
 require_relative "suno/types"
+require_relative "suno/contract_gen"
 require_relative "suno/validators"
 require_relative "suno/resources/text_to_music"
 require_relative "suno/resources/extend_music"