lammy 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dddd7ebf694f48f5d75ff062990bdec4f4e2c1188af7f958fe12a6856928c103
-  data.tar.gz: ea361dc698c42d8c8c37318e0e98300d7fb416e31de53d2b4f3ab05882bf480d
+  metadata.gz: 656f2074be0687f9996946697d7bc3ea5286b384749113521012bb061f88f914
+  data.tar.gz: de4f1f7c8ec35448807230777ee4a5e75a3eacb7d66c88978296d5f30bf38efd
 SHA512:
-  metadata.gz: c925d41bfa4a2b66867e43e081187f76f0143775d1e2ac0044b6a243fc3aadcaec13499b9678cbc891b076ae50c9b8612999d183c987b77ae99838658f4f222d
-  data.tar.gz: dcfb1071b3eb78ad66e1151b2d04d4b58581d576ff211f48d2126d9d52af991abbb387bb5cdc36c925efca9ca990a8be1bf1d19767ac5b4dd5aa9d904c997077
+  metadata.gz: 1dc35a49b4139d03baf530930d6157023a8b6e4eed36fdf26ad9c042a4e8c8d87ee812330aef2c047e9f6f45d4240a6c5c74abd1fc223ca011a6cc32fe1fdfff
+  data.tar.gz: 9066b3c808e63abc01822ec355bcf49dd19aa5632c5b68640ddba5d33fd951c05f12da14ea600049d9bdbe66f3a8ad803f3e6194ea6a114080887ee4178a2a4d

data/lib/lammy/chat.rb

@@ -17,18 +17,12 @@ module L
       define_method(method_name) do |*args, &block|
         # Initialize context
         @system_message = nil
-        @prefilled_message = nil
 
         # `context` sets the system message and is available within the instance
         define_singleton_method(:context) do |message|
           @system_message = message
         end
 
-        # `prefill` sets the prefilled message and is available within the instance
-        define_singleton_method(:prefill) do |message|
-          @prefilled_message = message
-        end
-
         # Call the original method to get the user message
         user_message = original_method.bind(self).call(*args, &block)
 
@@ -41,7 +35,7 @@ module L
                    raise "Unsupported model: #{settings[:model]}"
                  end
 
-        client.chat(user_message, @system_message, @prefilled_message)
+        client.chat(user_message, @system_message)
       end
     end
   end

data/lib/lammy/openai.rb

@@ -22,14 +22,15 @@ module L
     end
 
     # Generate a response with support for structured output
-    def chat(user_message, system_message = nil, _ = nil)
+    def chat(user_message, system_message = nil)
       schema = schema(settings)
+      messages = messages(user_message, system_message)
+
       response = client.chat(
         parameters: {
-          model: settings[:model], response_format: schema, messages: [
-            system_message ? { role: :system, content: system_message } : nil,
-            { role: :user, content: user_message }
-          ].compact
+          model: settings[:model],
+          response_format: schema,
+          messages: messages
         }.compact
       ).dig('choices', 0, 'message', 'content')
 
@@ -66,6 +67,15 @@ module L
       }
     end
 
+    def messages(user_message, system_message)
+      return user_message if user_message.is_a?(Array)
+
+      [
+        system_message ? L.system(system_message) : nil,
+        L.user(user_message)
+      ].compact
+    end
+
     def array?(schema)
       schema.is_a?(Hash) && schema.dig('json_schema', 'schema', 'properties', 'items', 'type') == 'array'
     end

data/lib/lammy/schema.rb

@@ -1,11 +1,23 @@
 # frozen_string_literal: true
 
 module L
-  # Structured Outputs is a feature that ensures the model will always generate responses
-  # that adhere to your supplied JSON Schema, so you don't need to worry about the model
-  # omitting a required key, or hallucinating an invalid enum value. This is a set of
-  # helper methods to help you define your JSON Schema easily.
   module Schema
+    def system(content)
+      { role: :system, content: content }
+    end
+
+    def user(content)
+      { role: :user, content: content }
+    end
+
+    def assistant(content)
+      { role: :assistant, content: content }
+    end
+
+    # Structured Outputs is a feature that ensures the model will always generate responses
+    # that adhere to your supplied JSON Schema, so you don't need to worry about the model
+    # omitting a required key, or hallucinating an invalid enum value. This is a set of
+    # helper methods to help you define your JSON Schema easily.
     def to_a(object)
       {
         'type' => 'object',

metadata

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