llm.rb 4.6.0 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c26db042940fc118505804bbec91d43dd39313b6625b4e3d7df51f43f01d58ae
-  data.tar.gz: 5780f3e3d0db3579772d4f7ba141052314d34b7fd0db06ba029e4b4fd6fd84dc
+  metadata.gz: 3d4facfaa664a93ec948639191915c027613ed7bd407f38acb79182d4ca10c31
+  data.tar.gz: 5974b17ea6f4c1317ee3eca9dd7ba9f6e342423cb954fdcf5a7474b53b660e88
 SHA512:
-  metadata.gz: 864ba517e81d8fb4d248d754c5a9fc4bdcbf162f9ac4fb7691a54c015006ed40035300fd19c2057f755678676534a568204b0e0bc29b8e058cf2334b8625465e
-  data.tar.gz: cd8b18c4e780a26c83201ea39f81077ad2535db966efcb5fe860f4af55808f96a8bd8a6bdd4c25f38a9012b3092eb2611bbfd31552969b00b15579af5e95354a
+  metadata.gz: e5b10736981b4bc2b2c0e06e45c6174ba78c869f7d4666da924e893d5582eb133ac6900d46cf0429cc4936d1f4090e58ba4b3f4cf862604e6f1bea3b86c95d2e
+  data.tar.gz: 7a1ea1a6c30999f595139381c788aa4876d569ac03dde0cbfa9b1f302c7b5c6c0a7bc2c394ce754041d2aa417587b2d05f90092161cc974aa5fae5d332469002

data/README.md

@@ -66,7 +66,7 @@ end
 llm = LLM.openai(key: ENV["KEY"])
 ses = LLM::Session.new(llm, schema: Report)
 res = ses.talk("Structure this report: 'Database latency spiked at 10:42 UTC, causing 5% request timeouts for 12 minutes.'")
-pp res.messages.first(&:assistant?).content!
+pp res.content!
 
 ##
 # {
@@ -198,14 +198,14 @@ and share a provider across multiple threads:
 #!/usr/bin/env ruby
 require "llm"
 
-llm = LLM.openai(key: ENV["KEY"], persistent: true)
+llm = LLM.openai(key: ENV["KEY"]).persist!
 schema = llm.schema.object(answer: llm.schema.integer.required)
 
 vals = 10.times.map do |x|
   Thread.new do
     ses = LLM::Session.new(llm, schema:)
     res = ses.talk "#{x} + 5 = ?"
-    res.messages.find(&:assistant?).content!
+    res.content!
   end
 end.map(&:value)
 
@@ -335,7 +335,7 @@ and the gem should be installed separately:
 #!/usr/bin/env ruby
 require "llm"
 
-llm  = LLM.openai(key: ENV["KEY"], persistent: true)
+llm  = LLM.openai(key: ENV["KEY"]).persist!
 res1 = llm.responses.create "message 1"
 res2 = llm.responses.create "message 2", previous_response_id: res1.response_id
 res3 = llm.responses.create "message 3", previous_response_id: res2.response_id
@@ -578,12 +578,13 @@ it has been uploaded. The file (a specialized instance of
 ```ruby
 #!/usr/bin/env ruby
 require "llm"
+require "pp"
 
 llm = LLM.openai(key: ENV["KEY"])
 ses = LLM::Session.new(llm)
 file = llm.files.create(file: "/tmp/llm-book.pdf")
 res = ses.talk ["Tell me about this file", file]
-res.messages.each { |m| puts "[#{m.role}] #{m.content}" }
+pp res.content
 ```
 
 ### Prompts
@@ -776,6 +777,7 @@ release:
 ```ruby
 #!/usr/bin/env ruby
 require "llm"
+require "pp"
 
 ##
 # List all models
@@ -789,7 +791,7 @@ end
 model = llm.models.all.find { |m| m.id == "gpt-3.5-turbo" }
 ses = LLM::Session.new(llm, model: model.id)
 res = ses.talk "Hello #{model.id} :)"
-res.messages.each { |m| puts "[#{m.role}] #{m.content}" }
+pp res.content
 ```
 
 ## Install

data/lib/llm/contract/completion.rb

@@ -43,6 +43,20 @@ module LLM::Contract
       raise NotImplementedError, "#{self.class} does not implement '#{__method__}'"
     end
 
+    ##
+    # @return [String]
+    #  Returns the LLM response
+    def content
+      messages.find(&:assistant?).content
+    end
+
+    ##
+    # @return [Hash]
+    #  Returns the LLM response after parsing it as JSON
+    def content!
+      LLM.json.load(content)
+    end
+
     ##
     # @return [LLM::Usage]
     #  Returns usage information

data/lib/llm/provider.rb

@@ -289,6 +289,20 @@ class LLM::Provider
     end
   end
 
+  ##
+  # This method configures a provider to use a persistent connection pool
+  # via the optional dependency [Net::HTTP::Persistent](https://github.com/drbrain/net-http-persistent)
+  # @example
+  #   llm = LLM.openai(key: ENV["KEY"]).persist!
+  #   # do something with 'llm'
+  # @return [LLM::Provider]
+  def persist!
+    client = persistent_client
+    lock do
+      tap { @client = client }
+    end
+  end
+
   private
 
   attr_reader :client, :base_uri, :host, :port, :timeout, :ssl

data/lib/llm/providers/anthropic/response_adapter/completion.rb

@@ -45,6 +45,18 @@ module LLM::Anthropic::ResponseAdapter
       body.model
     end
 
+    ##
+    # (see LLM::Contract::Completion#content)
+    def content
+      super
+    end
+
+    ##
+    # (see LLM::Contract::Completion#content!)
+    def content!
+      super
+    end
+
     private
 
     def adapt_choices

data/lib/llm/providers/gemini/response_adapter/completion.rb

@@ -45,6 +45,18 @@ module LLM::Gemini::ResponseAdapter
       body.modelVersion
     end
 
+    ##
+    # (see LLM::Contract::Completion#content)
+    def content
+      super
+    end
+
+    ##
+    # (see LLM::Contract::Completion#content!)
+    def content!
+      super
+    end
+
     private
 
     def adapt_choices

data/lib/llm/providers/ollama/response_adapter/completion.rb

@@ -45,6 +45,18 @@ module LLM::Ollama::ResponseAdapter
       body.model
     end
 
+    ##
+    # (see LLM::Contract::Completion#content)
+    def content
+      super
+    end
+
+    ##
+    # (see LLM::Contract::Completion#content!)
+    def content!
+      super
+    end
+
     private
 
     def adapt_choices

data/lib/llm/providers/openai/response_adapter/completion.rb

@@ -57,6 +57,18 @@ module LLM::OpenAI::ResponseAdapter
       body.model
     end
 
+    ##
+    # (see LLM::Contract::Completion#content)
+    def content
+      super
+    end
+
+    ##
+    # (see LLM::Contract::Completion#content!)
+    def content!
+      super
+    end
+
     private
 
     def adapt_tool_calls(tools)

data/lib/llm/tracer/telemetry.rb

@@ -48,6 +48,7 @@ module LLM
     def initialize(provider, options = {})
       super
       @exporter = options.delete(:exporter)
+      setup_langsmith!(options.delete(:langsmith))
       setup!
     end
 
@@ -132,7 +133,7 @@ module LLM
         "gen_ai.provider.name" => provider_name,
         "server.address" => provider_host,
         "server.port" => provider_port
-      }.compact
+      }.merge!(langsmith_attributes(span_kind: "tool")).compact
       span_name = ["execute_tool", name].compact.join(" ")
       span = create_span(span_name.empty? ? "gen_ai.tool" : span_name, attributes:)
       span.add_event("gen_ai.tool.start")
@@ -288,7 +289,7 @@ module LLM
         "gen_ai.provider.name" => provider_name,
         "server.address" => provider_host,
         "server.port" => provider_port
-      }.compact
+      }.merge!(langsmith_attributes(span_kind: "llm")).compact
       span_name = [operation, model].compact.join(" ")
       span = create_span(span_name.empty? ? "gen_ai.request" : span_name, attributes:)
       span.add_event("gen_ai.request.start")
@@ -301,7 +302,7 @@ module LLM
         "gen_ai.provider.name" => provider_name,
         "server.address" => provider_host,
         "server.port" => provider_port
-      }.compact
+      }.merge!(langsmith_attributes(span_kind: "retriever")).compact
       span = create_span(operation, attributes:)
       span.add_event("gen_ai.request.start")
       span
@@ -332,5 +333,53 @@ module LLM
       span.add_event("gen_ai.request.finish")
       span.tap(&:finish)
     end
+
+    def setup_langsmith!(options)
+      options ||= {}
+      @langsmith_metadata = options[:metadata] || {}
+      @langsmith_session_id = normalize_langsmith_session_id(options[:session_id], metadata: @langsmith_metadata)
+      @langsmith_tags = options[:tags] || []
+    end
+
+    def langsmith_attributes(span_kind:)
+      attributes = {}
+      unless @langsmith_session_id.to_s.empty?
+        attributes["langsmith.trace.session_id"] = @langsmith_session_id
+      end
+      @langsmith_metadata.each do |key, value|
+        next if value.nil?
+
+        attributes["langsmith.metadata.#{key}"] = serialize_langsmith_value(value)
+      end
+      unless @langsmith_tags.empty?
+        attributes["langsmith.span.tags"] = @langsmith_tags.map(&:to_s).join(",")
+      end
+      attributes["langsmith.span.kind"] = span_kind
+      attributes
+    end
+
+    def serialize_langsmith_value(value)
+      case value
+      when String, Numeric, TrueClass, FalseClass
+        value
+      else
+        LLM.json.dump(value)
+      end
+    end
+
+    def normalize_langsmith_session_id(session_id, metadata:)
+      raw = session_id&.to_s
+      return nil if raw.to_s.empty?
+      return raw if uuid?(raw)
+
+      # Keep arbitrary thread identifiers in metadata instead of forcing
+      # them into langsmith.trace.session_id, which expects a known UUID.
+      metadata[:session_id] ||= raw
+      nil
+    end
+
+    def uuid?(value)
+      value.match?(/\A[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}\z/i)
+    end
   end
 end

data/lib/llm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LLM
-  VERSION = "4.6.0"
+  VERSION = "4.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llm.rb
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.7.0
 platform: ruby
 authors:
 - Antar Azri