lammy 0.8.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d44c524678b02c6e7bb07135102e42750ff70786f2941d7768f2d1598b7a8f98
-  data.tar.gz: 8d94092fc72aecf3d1b2bad51f864785a99761448ea423f68bc82437fe8ed270
+  metadata.gz: d2e0b41537900b2d85dbdc0615b3fdbaa4d2c299c7bb725d96537aa80a92779e
+  data.tar.gz: f23d7da872f98736f60a25008f3e819e757ca0ffcc4745f83ba029d97141a410
 SHA512:
-  metadata.gz: 0ef97bb570e1879206760211b0d7f2c76382281f73b6f3d2bd38801cf94348e22837dc79465d9b55c352ae7f917e3bdb4e33db5eb8057237f20ed206f25a9dc7
-  data.tar.gz: 6db191e6da9b0b7f762d65e194fee4484b86965ebb74d6e6e67957cdd06d9a90d6162df86d8727bdf67754f3b1d3fedce1ff186956fe7fc35c8ef98245a7ae42
+  metadata.gz: fb5968d47e3f60ccd0235146fd46c65b777dccc0860c310bedfcd4e5415412fee1bd6b1f73c9e52849eb27b21b5ac2bfc72b0fc00790199adcafbdec3451361c
+  data.tar.gz: 33c1932bc38493bac9b71414057554cd46672270dc135dc33a51477ddadd3292eb8bed2ac57b33708b730c8eaec816ab051fa7c8fc7c99cc029b6465037ebd9f

data/lib/lammy/chat.rb

@@ -23,16 +23,20 @@ module Lammy
         # Call the original method to get the user message
         user_message = original_method.bind(self).call(*args, &block)
 
-        client = case settings[:model]
-                 when *OpenAI::MODELS
-                   OpenAI.new(settings)
-                 when *Claude::MODELS
-                   Claude.new(settings)
-                 else
-                   raise "Unsupported model: #{settings[:model]}"
-                 end
+        model = settings[:model] || Lammy.configuration.model
+        client = if OpenAI::MODELS.any? { |regex| model =~ regex }
+                  OpenAI.new(settings)
+                elsif Claude::MODELS.any? { |regex| model =~ regex }
+                  Claude.new(settings)
+                else
+                  raise "Unsupported model: #{model}"
+                end
 
-        client.chat(user_message, @system_message, @stream)
+        if !settings[:async] || @_with_sync_lammy
+          client.chat(user_message, @system_message, @stream)
+        else
+          ::Lammy::Job.perform_async(klass.name, self.id, method_name, *args)
+        end
       end
     end
   end

data/lib/lammy/claude.rb

@@ -6,11 +6,12 @@ require 'hashie'
 module Lammy
   # Use the Claude API's Ruby library
   class Claude
-    MODELS = %w[
-      claude-3-5-sonnet-latest claude-3-5-haiku-latest claude-3-opus-latest
-      claude-3-5-sonnet-20240620 claude-3-5-haiku-20241022
-      claude-3-opus-20240229 claude-3-sonnet-20240229 claude-3-haiku-20240307
-      claude-2.1 claude-2.0 claude-instant-1.2
+    MODELS = [
+      /\Aclaude-3-7-(?:sonnet|haiku|opus)(?:-\d{8}|-latest)?\z/,
+      /\Aclaude-3-5-(?:sonnet|haiku|opus)(?:-\d{8}|-latest)?\z/,
+      /\Aclaude-3-(?:sonnet|haiku|opus)(?:-\d{8}|-latest)?\z/,
+      /\Aclaude-2(?:\.\d)?\z/,
+      /\Aclaude-instant-(?:\d\.\d)?\z/
     ].freeze
 
     attr_reader :settings
@@ -24,7 +25,7 @@ module Lammy
       response = client.messages(
         parameters: {
           system: system_message,
-          model: settings[:model],
+          model: settings[:model] || Lammy.configuration.model,
           max_tokens: settings[:max_tokens] || 4096,
           stream: stream ? ->(chunk) { stream.call(stream_content(chunk)) } : nil,
           messages: user_message.is_a?(Array) ? user_message : [vision(L.user(user_message))]
@@ -57,6 +58,7 @@ module Lammy
 
     def client
       return settings[:client] if settings[:client]
+      return Lammy.configuration.client if Lammy.configuration.client
 
       @client ||= ::Anthropic::Client.new(
         access_token: ENV.fetch('ANTHROPIC_API_KEY')

data/lib/lammy/openai.rb

@@ -7,20 +7,15 @@ require 'base64'
 module Lammy
   # Use the OpenAI API's Ruby library
   class OpenAI
-    MODELS = %w[
-      gpt-4o gpt-4o-2024-08-06 gpt-4o-2024-05-13 gpt-4o chatgpt-4o-latest
-
-      gpt-4o-mini gpt-4o-mini-2024-07-18
-
-      o1-preview o1-preview-2024-09-12
-
-      o1-mini o1-mini-2024-09-12
-
-      gpt-3.5-turbo
-
-      gpt-4-turbo gpt-4-turbo-2024-04-09 gpt-4 gpt-4-32k gpt-4-0125-preview gpt-4-1106-preview gpt-4-vision-preview
-      gpt-3.5-turbo-0125 gpt-3.5-turbo-instruct gpt-3.5-turbo-1106 gpt-3.5-turbo-0613 gpt-3.5-turbo-16k-0613
-      gpt-3.5-turbo-0301 davinci-002 babbage-002
+    MODELS = [
+      /^gpt-4o(?:-\d{4}-\d{2}-\d{2})?$/, /^chatgpt-4o-latest$/,
+      /^gpt-4o-mini(?:-\d{4}-\d{2}-\d{2})?$/,
+      /^o1(?:-preview(?:-\d{4}-\d{2}-\d{2})?)?$/,
+      /^o1-mini(?:-\d{4}-\d{2}-\d{2})?$/,
+      /^gpt-3\.5-turbo$/,
+      /^gpt-4(?:-turbo(?:-\d{4}-\d{2}-\d{2})?|-32k|-\d{4}-preview|-vision-preview)?$/,
+      /^gpt-3\.5-turbo-(?:\d{4}|\d{2}k-\d{4}|-instruct)$/,
+      /^(?:davinci|babbage)-002$/
     ].freeze
 
     EMBEDDINGS = %w[
@@ -40,7 +35,7 @@ module Lammy
 
       request = client.chat(
         parameters: {
-          model: settings[:model],
+          model: settings[:model] || Lammy.configuration.model,
           response_format: schema,
           messages: messages,
           stream: stream ? ->(chunk) { stream.call(stream_content(chunk)) } : nil
@@ -118,6 +113,7 @@ module Lammy
 
     def client
       return settings[:client] if settings[:client]
+      return Lammy.configuration.client if Lammy.configuration.client
 
       @client ||= ::OpenAI::Client.new(
         access_token: ENV.fetch('OPENAI_ACCESS_TOKEN')

data/lib/lammy.rb

@@ -1,5 +1,24 @@
 # frozen_string_literal: true
 
+module Lammy
+  class Configuration
+    attr_accessor :model, :client
+
+    def initialize
+      @model = nil
+      @client = nil
+    end
+  end
+
+  def self.configuration
+    @configuration ||= Configuration.new
+  end
+
+  def self.configure
+    yield(configuration)
+  end
+end
+
 require 'lammy/embeddings'
 require 'lammy/claude'
 require 'lammy/openai'
@@ -13,6 +32,12 @@ module L
     base.extend ClassMethods
   end
 
+  def _lammy_perform_now(&block)
+    @_with_sync_lammy = true
+    block.call
+    @_with_sync_lammy = false
+  end
+
   # Wrap generative methods with handlers
   module ClassMethods
     def llm(**kwargs)

metadata

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