lammy 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bab0a835c9ce12e44b4c5f0d4252eb3040e0d5cb3336aeefe24856f59a74a2a9
-  data.tar.gz: a627a3d18b19a86785a1c70d95304b5bc8ab820766faf15f7893a79d563aeb44
+  metadata.gz: 656f2074be0687f9996946697d7bc3ea5286b384749113521012bb061f88f914
+  data.tar.gz: de4f1f7c8ec35448807230777ee4a5e75a3eacb7d66c88978296d5f30bf38efd
 SHA512:
-  metadata.gz: 0cd66977d719fb4bf752b96c9d5fcaeb1d776fda9d3f929366b4ac41a9913f2e16de6cb1454f0116214f1a7b404b815506f3e0375ac781f5ef2304aa01e54b6c
-  data.tar.gz: 8c39fea57e23ce2c39a926b039c01e132482237a5c9e6af4fd1bd9de20b884845f05930be747a202f5a3982fe22bbf2f3e308f9f605d934c9897b57b095c72c0
+  metadata.gz: 1dc35a49b4139d03baf530930d6157023a8b6e4eed36fdf26ad9c042a4e8c8d87ee812330aef2c047e9f6f45d4240a6c5c74abd1fc223ca011a6cc32fe1fdfff
+  data.tar.gz: 9066b3c808e63abc01822ec355bcf49dd19aa5632c5b68640ddba5d33fd951c05f12da14ea600049d9bdbe66f3a8ad803f3e6194ea6a114080887ee4178a2a4d

data/lib/lammy/chat.rb

@@ -18,7 +18,7 @@ module L
         # Initialize context
         @system_message = nil
 
-        # Make `context` method available within the instance
+        # `context` sets the system message and is available within the instance
         define_singleton_method(:context) do |message|
           @system_message = message
         end

data/lib/lammy/openai.rb

@@ -24,12 +24,13 @@ module L
     # Generate a response with support for structured output
     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.4.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