fix nova

Author: SamSaffron

lib/completions/dialects/nova.rb

@@ -155,7 +155,7 @@ def user_msg(msg)
             end
           end
 
-          { role: "user", content: msg[:content], images: images }
+          { role: "user", content: prompt.text_only(msg), images: images }
         end
 
         def model_msg(msg)

lib/completions/prompt.rb

@@ -89,7 +89,6 @@ def push(
         content:,
         id: nil,
         name: nil,
-        upload_ids: nil,
         thinking: nil,
         thinking_signature: nil,
         redacted_thinking_signature: nil
@@ -98,7 +97,6 @@ def push(
         new_message = { type: type, content: content }
         new_message[:name] = name.to_s if name
         new_message[:id] = id.to_s if id
-        new_message[:upload_ids] = upload_ids if upload_ids
         new_message[:thinking] = thinking if thinking
         new_message[:thinking_signature] = thinking_signature if thinking_signature
         new_message[
@@ -115,10 +113,28 @@ def has_tools?
         tools.present?
       end
 
-      # TODO migrate to new API
       def encoded_uploads(message)
-        return [] if message[:upload_ids].blank?
-        UploadEncoder.encode(upload_ids: message[:upload_ids], max_pixels: max_pixels)
+        if message[:content].is_a?(Array)
+          upload_ids =
+            message[:content]
+              .map do |content|
+                content[:upload_id] if content.is_a?(Hash) && content.key?(:upload_id)
+              end
+              .compact
+          if !upload_ids.empty?
+            return UploadEncoder.encode(upload_ids: upload_ids, max_pixels: max_pixels)
+          end
+        end
+
+        []
+      end
+
+      def text_only(message)
+        if message[:content].is_a?(Array)
+          message[:content].map { |element| element if element.is_a?(String) }.compact.join
+        else
+          message[:content]
+        end
       end
 
       def encode_upload(upload_id)
@@ -165,7 +181,6 @@ def validate_message(message)
           content
           id
           name
-          upload_ids
           thinking
           thinking_signature
           redacted_thinking_signature
@@ -174,13 +189,6 @@ def validate_message(message)
           raise ArgumentError, "message contains invalid keys: #{invalid_keys}"
         end
 
-        if message[:type] == :upload_ids && !message[:upload_ids].is_a?(Array)
-          raise ArgumentError, "upload_ids must be an array of ids"
-        end
-
-        if message[:upload_ids].present? && message[:type] != :user
-          raise ArgumentError, "upload_ids are only supported for users"
-        end
         if message[:content].is_a?(Array)
           message[:content].each do |content|
             if !content.is_a?(String) && !(content.is_a?(Hash) && content.keys == [:upload_id])