lammy 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 160025e8046546a063a9a75deb7e1f29186973f9b7fe2096018734c6d9e1a523
-  data.tar.gz: 0402c839e540115883c2b3bc99b065ab2b7f590824aa05aa9b50ac42e288fd76
+  metadata.gz: ec35c0b162ca174c4baaa39d040632e10ce1e18a8b79e281161ff79f99a0758b
+  data.tar.gz: 88542e30eddbd8e1d26e2fbef989e7e2467f0503abc1544410f9f6f9490f6083
 SHA512:
-  metadata.gz: 3db10fe3e0615d2a0c8a739e6a9baf5c406aa3ed8d7dc18f9521a470ffcd51a2544a9365f51614ff2f0f70d34719b485de3bbd18a82cacde05b529314808b93e
-  data.tar.gz: 65ab65d92be1cca2f88382ab3c347c83c2182493dc4bf358379c35fb16d06d13053ed57d3b266dd2674e337c5db07090cc937e5ffa05ed4d113225d8cabf0a06
+  metadata.gz: 9f2230a56f061fb8595ad27a6539c42807e0507fbd86542866f79a9a40f8c98cd345d45a3d3611ebc7c738b5e0919b55f5567b27c60db83c393b64be25edcbde
+  data.tar.gz: d2c855118e9cfb30287ba8902c1dd74aed6bcd5161ba59b8752eeb755b75735ec1a634166b2493f718c5a6572d496f796e370c3232ec0e05dc01a0f30772441c

data/lib/lammy/openai.rb

@@ -2,6 +2,7 @@
 
 require 'openai'
 require 'hashie'
+require 'base64'
 
 module L
   # Use the OpenAI API's Ruby library
@@ -35,13 +36,11 @@ module L
         }.compact
       )
 
-      if stream.nil?
-        response = request.dig('choices', 0, 'message', 'content')
-        content = schema ? ::Hashie::Mash.new(JSON.parse(response)) : response
-        array?(schema) ? content.items : content
-      else
-        stream
-      end
+      return stream if stream
+
+      response = request.dig('choices', 0, 'message', 'content')
+      content = schema ? ::Hashie::Mash.new(JSON.parse(response)) : response
+      array?(schema) ? content.items : content
     end
 
     # OpenAI’s text embeddings measure the relatedness of text strings. An embedding is a vector of floating point
@@ -78,10 +77,26 @@ module L
 
       [
         system_message ? L.system(system_message) : nil,
-        L.user(user_message)
+        vision(L.user(user_message))
       ].compact
     end
 
+    def vision(message)
+      image = message[:_image]
+      base = message.except(:_image)
+
+      return base unless image
+
+      messages = [
+        { 'type' => 'text', 'text' => message[:content] },
+        {
+          'type' => 'image_url', 'image_url' => { 'url' => "data:image/jpeg;base64,#{Base64.encode64(image)}" }
+        }
+      ]
+
+      base.merge(content: messages)
+    end
+
     def array?(schema)
       schema.is_a?(Hash) && schema.dig('json_schema', 'schema', 'properties', 'items', 'type') == 'array'
     end

data/lib/lammy/schema.rb

@@ -2,15 +2,25 @@
 
 module L
   module Schema
+    def self.formatted?(content)
+      content.is_a?(Hash) && content.key?(:role) && content.key?(:content)
+    end
+
     def system(content)
+      return content if L::Schema.formatted?(content)
+
       { role: :system, content: content }
     end
 
-    def user(content)
-      { role: :user, content: content }
+    def user(content, image: nil)
+      return content if L::Schema.formatted?(content)
+
+      { role: :user, content: content, _image: image }
     end
 
     def assistant(content)
+      return content if L::Schema.formatted?(content)
+
       { role: :assistant, content: content }
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lammy
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Kamil Nicieja
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-06 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anthropic