fix: tests

default-anton · Dec 31, 2024 · ebebd9b · ebebd9b
1 parent 3ef46b3
commit ebebd9b
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 62 deletions.
diff --git a/lib/onellm/providers/openai_provider.rb b/lib/onellm/providers/openai_provider.rb
@@ -107,13 +107,13 @@ def validate_content(content)
     end
 
     def validate_content_array(content_array)
-      if content_array.none? { |part| part[:type] == 'text' }
-        raise ArgumentError, 'Content array must contain at least one text part'
-      end
-
       content_array.each do |part|
         validate_content_part(part)
       end
+
+      return unless content_array.none? { |part| part[:type] == 'text' }
+
+      raise ArgumentError, 'Content array must contain at least one text part'
     end
 
     def validate_content_part(part)

diff --git a/spec/providers/openai_provider_spec.rb b/spec/providers/openai_provider_spec.rb
@@ -34,64 +34,6 @@
       expect(chunks.first.choices.first.delta.content).to be_a(String)
     end
 
-    it 'raises error for empty messages' do
-      expect do
-        provider.complete(model: valid_model, messages: [])
-      end.to raise_error(ArgumentError, /Messages cannot be empty/)
-    end
-
-    it 'raises error for invalid message structure' do
-      expect do
-        provider.complete(model: valid_model, messages: [{ role: 'user' }])
-      end.to raise_error(ArgumentError, /Message must be a hash with :role and :content keys only/)
-    end
-
-    it 'raises error for invalid role' do
-      expect do
-        provider.complete(model: valid_model, messages: [{ role: 'invalid', content: 'test' }])
-      end.to raise_error(ArgumentError, /Invalid role: invalid. Valid roles are: system, user, assistant/)
-    end
-
-    it 'raises error for invalid content type' do
-      expect do
-        provider.complete(model: valid_model, messages: [{ role: 'user', content: 123 }])
-      end.to raise_error(ArgumentError, /Content must be a string or an array of content parts/)
-    end
-
-    it 'raises error for invalid content array' do
-      expect do
-        provider.complete(model: valid_model, messages: [{ role: 'user', content: [{ type: 'invalid' }] }])
-      end.to raise_error(ArgumentError, /Invalid content part. Each part must have :type \(text, image_url\)/)
-    end
-
-    it 'raises error for missing text part in content array' do
-      expect do
-        provider.complete(model: valid_model,
-                          messages: [{ role: 'user',
-                                       content: [{ type: 'image_url',
-                                                   image_url: { url: 'https://example.com/image.jpg' } }] }])
-      end.to raise_error(ArgumentError, /Content array must contain at least one text part/)
-    end
-
-    it 'raises error for invalid image URL' do
-      expect do
-        provider.complete(model: valid_model,
-                          messages: [{ role: 'user',
-                                       content: [{ type: 'text', text: 'test' },
-                                                 { type: 'image_url', image_url: { url: 'invalid' } }] }])
-      end.to raise_error(ArgumentError, %r{Image URL must be a valid HTTP/HTTPS URL or data URI})
-    end
-
-    it 'raises error for invalid API key' do
-      Onellm.configure do |config|
-        config.openai_api_key = 'invalid-key'
-      end
-
-      expect do
-        provider.complete(model: valid_model, messages: valid_messages)
-      end.to raise_error(Onellm::ConfigurationError, /Invalid OpenAI API key format/)
-    end
-
     it 'handles image content in messages' do
       image_url = 'https://raw.githubusercontent.com/default-anton/onellm/refs/heads/main/spec/data/Delta_Air_Lines_B767-332_N130DL%20Small.jpeg'
       messages = [
@@ -148,5 +90,65 @@
       expect(response.choices).to be_an(Array)
       expect(response.choices.first.message.content).to be_a(String)
     end
+
+    describe 'validation errors' do
+      it 'raises error for empty messages' do
+        expect do
+          provider.complete(model: valid_model, messages: [])
+        end.to raise_error(ArgumentError, /Messages cannot be empty/)
+      end
+
+      it 'raises error for invalid message structure' do
+        expect do
+          provider.complete(model: valid_model, messages: [{ role: 'user' }])
+        end.to raise_error(ArgumentError, /Message must be a hash with :role and :content keys only/)
+      end
+
+      it 'raises error for invalid role' do
+        expect do
+          provider.complete(model: valid_model, messages: [{ role: 'invalid', content: 'test' }])
+        end.to raise_error(ArgumentError, /Invalid role: invalid. Valid roles are: system, user, assistant/)
+      end
+
+      it 'raises error for invalid content type' do
+        expect do
+          provider.complete(model: valid_model, messages: [{ role: 'user', content: 123 }])
+        end.to raise_error(ArgumentError, /Content must be a string or an array of content parts/)
+      end
+
+      it 'raises error for invalid content array' do
+        expect do
+          provider.complete(model: valid_model, messages: [{ role: 'user', content: [{ type: 'invalid' }] }])
+        end.to raise_error(ArgumentError, /Invalid content part. Each part must have :type \(text, image_url\)/)
+      end
+
+      it 'raises error for missing text part in content array' do
+        expect do
+          provider.complete(model: valid_model,
+                            messages: [{ role: 'user',
+                                         content: [{ type: 'image_url',
+                                                     image_url: { url: 'https://example.com/image.jpg' } }] }])
+        end.to raise_error(ArgumentError, /Content array must contain at least one text part/)
+      end
+
+      it 'raises error for invalid image URL' do
+        expect do
+          provider.complete(model: valid_model,
+                            messages: [{ role: 'user',
+                                         content: [{ type: 'text', text: 'test' },
+                                                   { type: 'image_url', image_url: { url: 'invalid' } }] }])
+        end.to raise_error(ArgumentError, %r{Image URL must be a valid HTTP/HTTPS URL or data URI})
+      end
+
+      it 'raises error for invalid API key' do
+        Onellm.configure do |config|
+          allow(config).to receive(:openai_api_key).and_return('invalid-key')
+        end
+
+        expect do
+          provider.complete(model: valid_model, messages: valid_messages)
+        end.to raise_error(Onellm::ConfigurationError, /Invalid OpenAI API key format/)
+      end
+    end
   end
 end