lammy 0.1.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b017f8a1db36acfcb44ade375afb444be57a91950d2b8fdb9b4540c7a19d2a0
-  data.tar.gz: 98702338c1b30893351da07ffb3cd25c3b91ab0411536a67a782ffcd52dea16b
+  metadata.gz: 9225fc482f95ed862d6e12bc4541731c8854127900e0bfe369075ef1092fae8e
+  data.tar.gz: 720ce8849858edb0832c34b0b10ef736c6353b12daa1e5cecf68c137de94a91d
 SHA512:
-  metadata.gz: 21363a7704447fbfec6b7d6a38ab199d907b35a7512f0ede712ee26ac3f641ee159ad4f3379a91d303d7dcea029c8923bfde7ce66d50fbad738800053165c8dc
-  data.tar.gz: a26916678096f4660d0abbb540655bd9b6d570c57bddfb01799b3595a5d1cf74ec8da51f8d15f837c33708fd3af48fd2212ce7218ffef05a1bceb46d2a833674
+  metadata.gz: 83be8412698ad307dba650aaa54e230cf9b47ee9e140e9dac1d26c2927f28b43649ac9b2e6196154a09b8b608a04b8fb72e7c0792e2a6bd799a2ff1edd339494
+  data.tar.gz: 9add86016f31a13416848ff64a7b9eeea03808b9220b239b029049c1ffc04796a9253f71dfac623928b8eddacbd8ffa182a243fd1a7c50c5a5ade6bdc8a68b50

data/lib/lammy/chat.rb

@@ -28,8 +28,8 @@ module L
 
         case settings[:model]
         when *OpenAI::MODELS
-          client = OpenAI.new
-          client.chat(settings, user_message, @system_message)
+          client = OpenAI.new(settings)
+          client.chat(user_message, @system_message)
         else
           raise "Unsupported model: #{settings[:model]}"
         end

data/lib/lammy/embeddings.rb

@@ -15,13 +15,13 @@ module L
 
       # Redefine the method
       define_method(method_name) do |*args, &block|
-        # Initialize chunking settings
-        @chunk_by_size = nil
+        # # Initialize chunking settings
+        # @chunk_by_size = nil
 
-        # Make `chunk_by_size` method available within the instance
-        define_singleton_method(:chunk_by_size) do |size|
-          @chunk_by_size = size
-        end
+        # # Make `chunk_by_size` method available within the instance
+        # define_singleton_method(:chunk_by_size) do |size|
+        #   @chunk_by_size = size
+        # end
 
         # Call the original method to get the input
         input = original_method.bind(self).call(*args, &block)
@@ -37,8 +37,8 @@ module L
 
         case settings[:model]
         when *OpenAI::EMBEDDINGS
-          client = OpenAI.new
-          client.embeddings(settings, input)
+          client = OpenAI.new(settings)
+          client.embeddings(input)
         else
           raise "Unsupported model: #{settings[:model]}"
         end

data/lib/lammy/openai.rb

@@ -15,25 +15,32 @@ module L
       text-embedding-3-small text-embedding-3-large text-embedding-ada-002
     ].freeze
 
+    attr_reader :settings
+
+    def initialize(settings)
+      @settings = settings
+    end
+
     # Generate a response with support for structured output
-    def chat(settings, user_message, system_message = nil)
+    def chat(user_message, system_message = nil)
+      schema = schema(settings)
       response = client.chat(
         parameters: {
-          model: settings[:model], response_format: schema(settings), messages: [
+          model: settings[:model], response_format: schema, messages: [
             system_message ? { role: :system, content: system_message } : nil,
             { role: :user, content: user_message }
           ].compact
         }.compact
-      )
+      ).dig('choices', 0, 'message', 'content')
 
-      content = response.dig('choices', 0, 'message', 'content')
-      settings[:schema] ? ::Hashie::Mash.new(JSON.parse(content)) : 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
     # numbers. The distance between two vectors measures their relatedness. Small distances suggest high relatedness
     # and large distances suggest low relatedness.
-    def embeddings(settings, chunks)
+    def embeddings(chunks)
       responses = chunks.map do |chunk|
         response = client.embeddings(
           parameters: { model: settings[:model], dimensions: settings[:dimensions], input: chunk }
@@ -51,15 +58,21 @@ module L
       return unless settings[:schema]
 
       {
-        type: :json_schema,
-        json_schema: {
-          name: :schema,
-          schema: settings[:schema]
+        'type' => 'json_schema',
+        'json_schema' => {
+          'name' => 'schema',
+          'schema' => settings[:schema]
         }
       }
     end
 
+    def array?(schema)
+      schema.is_a?(Hash) && schema.dig('json_schema', 'schema', 'properties', 'items', 'type') == 'array'
+    end
+
     def client
+      return settings[:client] if settings[:client]
+
       @client ||= ::OpenAI::Client.new(
         access_token: ENV.fetch('OPENAI_ACCESS_TOKEN')
       )

data/lib/lammy/schema.rb

@@ -22,7 +22,7 @@ module L
     def to_h(object)
       {
         'type' => 'object',
-        "properties": object.inject({}) { |h, (k, v)| h.merge(k => { 'type' => v }) },
+        "properties": object.inject({}) { |h, (k, v)| h.merge(k.to_s => { 'type' => v.to_s }) },
         "required": object.keys,
         "additionalProperties": false
       }

data/lib/lammy.rb

@@ -5,43 +5,6 @@ require 'lammy/openai'
 require 'lammy/schema'
 require 'lammy/chat'
 
-# Example:
-#
-# ```ruby
-# class User < ApplicationRecord
-#   include L
-#
-#   llm(model: 'gpt-4o')
-#   def welcome
-#     context "You are a helpful assistant that writes in lower case."
-#     "Say hello to #{name.reverse} with a poem."
-#   end
-#
-#   v(model: 'text-embedding-3-large')
-#   def embeddings
-#     chunk_by_size 256
-#     welcome
-#   end
-# end
-#
-# user = User.new(name: 'John Doe')
-# user.welcome
-#
-# # => "hello eoD nhoJ, let's make a cheer,\n
-# # with a whimsical poem to bring you near.\n
-# # though your name's in reverse, it’s clear and bright,\n
-# # let's dance in verse on this delightful night.\n\n
-# #
-# # to a friend unique, in every single way,\n
-# # we flip the letters but the bond will stay.\n
-# # the sun may set and rise again,\n
-# # with you, the fun will never wane.\n\n
-# #
-# # through twists and turns, in backwards flow,\n
-# # we celebrate you in this poetic show.\n
-# # eoD nhoJ, here's a cheer to you,\n
-# # in every form, our friendship's true!"
-# ```
 module L
   extend Schema
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lammy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Kamil Nicieja
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie