lammy 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 656f2074be0687f9996946697d7bc3ea5286b384749113521012bb061f88f914
-  data.tar.gz: de4f1f7c8ec35448807230777ee4a5e75a3eacb7d66c88978296d5f30bf38efd
+  metadata.gz: ec35c0b162ca174c4baaa39d040632e10ce1e18a8b79e281161ff79f99a0758b
+  data.tar.gz: 88542e30eddbd8e1d26e2fbef989e7e2467f0503abc1544410f9f6f9490f6083
 SHA512:
-  metadata.gz: 1dc35a49b4139d03baf530930d6157023a8b6e4eed36fdf26ad9c042a4e8c8d87ee812330aef2c047e9f6f45d4240a6c5c74abd1fc223ca011a6cc32fe1fdfff
-  data.tar.gz: 9066b3c808e63abc01822ec355bcf49dd19aa5632c5b68640ddba5d33fd951c05f12da14ea600049d9bdbe66f3a8ad803f3e6194ea6a114080887ee4178a2a4d
+  metadata.gz: 9f2230a56f061fb8595ad27a6539c42807e0507fbd86542866f79a9a40f8c98cd345d45a3d3611ebc7c738b5e0919b55f5567b27c60db83c393b64be25edcbde
+  data.tar.gz: d2c855118e9cfb30287ba8902c1dd74aed6bcd5161ba59b8752eeb755b75735ec1a634166b2493f718c5a6572d496f796e370c3232ec0e05dc01a0f30772441c

data/lib/lammy/chat.rb

@@ -23,6 +23,10 @@ module L
           @system_message = message
         end
 
+        define_singleton_method(:stream) do |proc|
+          @stream = proc
+        end
+
         # Call the original method to get the user message
         user_message = original_method.bind(self).call(*args, &block)
 
@@ -35,7 +39,7 @@ module L
                    raise "Unsupported model: #{settings[:model]}"
                  end
 
-        client.chat(user_message, @system_message)
+        client.chat(user_message, @system_message, @stream)
       end
     end
   end

data/lib/lammy/openai.rb

@@ -2,6 +2,7 @@
 
 require 'openai'
 require 'hashie'
+require 'base64'
 
 module L
   # Use the OpenAI API's Ruby library
@@ -22,18 +23,22 @@ module L
     end
 
     # Generate a response with support for structured output
-    def chat(user_message, system_message = nil)
+    def chat(user_message, system_message = nil, stream = nil)
       schema = schema(settings)
       messages = messages(user_message, system_message)
 
-      response = client.chat(
+      request = client.chat(
         parameters: {
           model: settings[:model],
           response_format: schema,
-          messages: messages
+          messages: messages,
+          stream: stream ? ->(chunk) { stream.call(stream_content(chunk)) } : nil
         }.compact
-      ).dig('choices', 0, 'message', 'content')
+      )
+
+      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
@@ -72,14 +77,34 @@ 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
 
+    def stream_content(chunk)
+      chunk.dig('choices', 0, 'delta', 'content')
+    end
+
     def client
       return settings[:client] if settings[:client]
 

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.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Kamil Nicieja
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-05 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: anthropic
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.2
 description: An LLM library for Ruby
 email: kamil@nicieja.co
 executables: []