llm.rb 15.0.2 → 15.1.0

data/lib/llm/repl/node.rb

@@ -6,6 +6,30 @@ class LLM::Repl
   # of text and optional curses attributes.
   # @api private
   class Node
+    ##
+    # Returns the display width of the given text, counting wide
+    # characters such as emoji as two columns.
+    # @param [#to_s] text
+    # @return [Integer]
+    def self.width(text)
+      Unicode::DisplayWidth.of(text.to_s)
+    end
+
+    ##
+    # Slices the given text so the returned piece has a display width
+    # of at most `width` columns.
+    # @param [#to_s] text
+    # @param [Integer] width
+    # @return [String]
+    def self.slice(text, width)
+      out = +""
+      text.to_s.each_char do |char|
+        break if self.width(out + char) > width
+        out << char
+      end
+      out
+    end
+
     ##
     # @return [String]
     attr_reader :text
@@ -24,9 +48,10 @@ class LLM::Repl
     end
 
     ##
+    # Returns the display width of the text
     # @return [Integer]
     def size
-      @text.size
+      self.class.width(@text)
     end
     alias_method :length, :size
 

data/lib/llm/repl/stream.rb

@@ -17,6 +17,7 @@ class LLM::Repl
     # @return [LLM::Repl::Stream]
     def initialize(repl, queue)
       @repl = repl
+      @agent = @repl.agent
       @_queue = queue
       @buffer = +""
       @tools = {}
@@ -39,6 +40,14 @@ class LLM::Repl
       @_queue.push [:status, [" ", lambda, " • #{tool.name}(#{format_args(tool)})"]]
     end
 
+    ##
+    # @param [Exception] ex
+    # @param [Integer] attempt
+    # @return [void]
+    def on_retry(ex, attempt)
+      @_queue.push [:status, retry_error(ex, attempt)]
+    end
+
     ##
     # @param [LLM::Function] tool
     # @param [LLM::Function::Return] result
@@ -56,12 +65,30 @@ class LLM::Repl
 
     private
 
+    ##
+    # @return [LLM::Agent]
+    def agent
+      @agent
+    end
+
     ##
     # @return [LLM::Repl::Node]
     def lambda
       Node.new("λ", Curses::A_BOLD | Color.red)
     end
 
+    ##
+    # @return [LLM::Repl::Node]
+    def retry_error(ex, attempt)
+      err = case ex.class.to_s
+      when "LLM::RateLimitError", "LLM::InsufficientQuotaError" then "Rate limited"
+      when "Net::ReadTimeout", "Net::OpenTimeout" then "Timed out"
+      else "#{ex.class}"
+      end
+      [Node.new(" 🔁 "),
+       Node.new("#{err} • attempt #{attempt} of #{agent.retry_budget}", Color.red | Curses::A_BOLD)]
+    end
+
     ##
     # Formats tool arguments as compact key: value pairs
     # suitable for the status line.  Strings are quoted and
@@ -82,7 +109,7 @@ class LLM::Repl
       props  = props.sort_by { tool.params.properties[_1].index }
       props  = props.filter_map { args[_1] ? "#{_1}: #{format_value(args[_1])}" : nil }
       result = props.join(", ")
-      result.size > max ? "#{result[0...max - 1]}…" : result
+      Node.width(result) > max ? "#{Node.slice(result, max - 1)}…" : result
     end
 
     ##
@@ -92,7 +119,7 @@ class LLM::Repl
     def format_value(value, max: 18)
       case value
       when String
-        value.size > max ? "#{value[0...max]}…".inspect : value.inspect
+        Node.width(value) > max ? "#{Node.slice(value, max)}…".inspect : value.inspect
       when Array
         items = value.take(2).map { format_value(_1, max: 10) }
         items << "…" if value.size > 2
@@ -103,7 +130,7 @@ class LLM::Repl
         "nil"
       else
         str = value.inspect
-        str.size > max ? "#{str[0...max]}…" : str
+        Node.width(str) > max ? "#{Node.slice(str, max)}…" : str
       end
     end
   end

data/lib/llm/repl/window.rb

@@ -140,11 +140,11 @@ class LLM::Repl
           remaining = buffer.width - width
           break if remaining <= 0
           text, attrs = chunk.text.to_s, chunk.attrs
-          clipped = text[0, remaining]
+          clipped = Node.slice(text, remaining)
           Curses.attron(attrs) if attrs
           Curses.addstr(clipped)
           Curses.attroff(attrs) if attrs
-          width += clipped.length
+          width += Node.width(clipped)
         end
       end
       last_drawn = offset + rows.size
@@ -163,10 +163,10 @@ class LLM::Repl
       Curses.clrtoeol
       status.nodes.each { addnode(_1) }
       context = status.context_bar
-      Curses.setpos(y, [(columns - context.length) / 2, 0].max)
+      Curses.setpos(y, [(columns - Node.width(context)) / 2, 0].max)
       Curses.addstr(context)
       cost = status.cost.to_s
-      Curses.setpos(y, [columns - cost.length, 0].max)
+      Curses.setpos(y, [columns - Node.width(cost), 0].max)
       Curses.addstr(cost)
     end
 
@@ -178,9 +178,9 @@ class LLM::Repl
     def draw_meta(offset:)
       y = Curses.lines - offset
       fill_row(y) do
-        addnode(status.cwd, status.cwd.text[0, columns])
-        Curses.setpos(y, [columns - status.model.text.size, 0].max)
-        addnode(status.model, status.model.text[0, columns])
+        addnode(status.cwd, Node.slice(status.cwd.text, columns))
+        Curses.setpos(y, [columns - status.model.size, 0].max)
+        addnode(status.model, Node.slice(status.model.text, columns))
       end
     end
 

data/lib/llm/repl.rb

@@ -14,6 +14,7 @@ module LLM
   class Repl
     LLM.require "curses", "~> 1.6"
     LLM.require "kramdown", "~> 2.5"
+    LLM.require "unicode/display_width", "~> 3.2"
 
     require_relative "repl/color"
     require_relative "repl/window"

data/lib/llm/skill.rb

@@ -35,6 +35,11 @@ module LLM
     # @return [String]
     attr_reader :description
 
+    ##
+    # Returns the model the skill will use.
+    # @return [String, nil]
+    attr_reader :model
+
     ##
     # Returns the skill instructions.
     # @return [String]
@@ -90,7 +95,7 @@ module LLM
       stream = ctx.stream
       stream.on_skill_call(self)
       agent = self.agent(ctx)
-      res = agent.talk("Solve the user's query.")
+      res = agent.talk("Solve the user's query.", model: model || ctx.model)
       stream.on_skill_return(agent, self, res)
       {content: res.content}
     end
@@ -156,6 +161,7 @@ module LLM
       @frontmatter = LLM::Object.from(YAML.safe_load(match[1]) || {})
       @name = @frontmatter.name || @name
       @description = @frontmatter.description || @description
+      @model = @frontmatter.model || nil
       @instructions = match[2]
       @inherit_tools, @tools = parse_tools(@frontmatter.tools)
     end

data/lib/llm/stream.rb

@@ -185,12 +185,17 @@ module LLM
     end
 
     ##
-    # Called when a request is rate limited and will be retried.
-    # @param [LLM::RateLimitError] error
+    # Called when a request is retried because it was rate limited or
+    # timed out.
+    # @param [Exception] error
+    #  The error that caused the retry
+    # @param [Integer] attempt
+    #  The one-based retry attempt number
     # @return [nil]
-    def on_rate_limit(error)
+    def on_retry(error, attempt)
       nil
     end
+    alias_method :on_rate_limit, :on_retry
 
     ##
     # Called before a skill's subagent runs.

data/lib/llm/tools/git.rb

@@ -41,7 +41,7 @@ class LLM::Tool
         .spawn
     end
 
-    LLM.require "test-cmd.rb",  "~> 1.1"
-    Command = Test::Cmd
+    LLM.require "test-cmd.rb",  "~> 2.1"
+    Command = Test::Command
   end
 end

data/lib/llm/tools/mkdir.rb

@@ -29,7 +29,7 @@ class LLM::Tool
         .spawn
     end
 
-    LLM.require "test-cmd.rb", "~> 1.1"
-    Command = Test::Cmd
+    LLM.require "test-cmd.rb", "~> 2.1"
+    Command = Test::Command
   end
 end

data/lib/llm/tools/rg.rb

@@ -49,7 +49,7 @@ class LLM::Tool
         .spawn
     end
 
-    LLM.require "test-cmd.rb", "~> 1.1"
-    Command = Test::Cmd
+    LLM.require "test-cmd.rb", "~> 2.1"
+    Command = Test::Command
   end
 end

data/lib/llm/tools/ruby.rb

@@ -40,7 +40,7 @@ class LLM::Tool
     end
 
     require "rbconfig"
-    LLM.require "test-cmd.rb", "~> 1.1"
-    Command = Test::Cmd
+    LLM.require "test-cmd.rb", "~> 2.1"
+    Command = Test::Command
   end
 end

data/lib/llm/tools/shell.rb

@@ -49,7 +49,7 @@ class LLM::Tool
         .spawn
     end
 
-    LLM.require "test-cmd.rb", "~> 1.1"
-    Command = Test::Cmd
+    LLM.require "test-cmd.rb", "~> 2.1"
+    Command = Test::Command
   end
 end

data/lib/llm/tools/utils.rb

@@ -8,7 +8,7 @@ class LLM::Tool
     # Wait for a command to finish, or abort
     # with an error when it exceeds the
     # specified timeout.
-    # @param [Test::Cmd] command
+    # @param [Test::Command] command
     # @param [Integer] timeout
     # @return [void]
     def wait(command:, timeout:)

data/lib/llm/transport/curb.rb

@@ -28,12 +28,14 @@ class LLM::Transport
     # @param [String] host
     # @param [Integer] port
     # @param [Integer] timeout
+    # @param [Integer] connect_timeout
     # @param [Boolean] ssl
     # @return [LLM::Transport::Curb]
-    def initialize(host:, port:, timeout:, ssl:)
+    def initialize(host:, port:, timeout:, connect_timeout:, ssl:)
       @host = host
       @port = port
       @timeout = timeout
+      @connect_timeout = connect_timeout
       @ssl = ssl
       @base_uri = URI("#{ssl ? "https" : "http"}://#{host}:#{port}/")
       @monitor = Monitor.new
@@ -112,13 +114,13 @@ class LLM::Transport
 
     private
 
-    attr_reader :host, :port, :timeout, :ssl, :base_uri
+    attr_reader :host, :port, :timeout, :connect_timeout, :ssl, :base_uri
 
     def build_easy(request)
       LLM.require "curb" unless defined?(::Curl)
       easy = ::Curl::Easy.new(request_url(request))
       easy.timeout = timeout
-      easy.connect_timeout = timeout
+      easy.connect_timeout = connect_timeout
       request.headers.each { |k, v| easy.headers[k] = v }
       easy.follow_location = true
       easy.ssl_verify_peer = false if !ssl

data/lib/llm/transport/http.rb

@@ -20,12 +20,14 @@ class LLM::Transport
     # @param [String] host
     # @param [Integer] port
     # @param [Integer] timeout
+    # @param [Integer] connect_timeout
     # @param [Boolean] ssl
     # @return [LLM::Transport::HTTP]
-    def initialize(host:, port:, timeout:, ssl:)
+    def initialize(host:, port:, timeout:, connect_timeout:, ssl:)
       @host = host
       @port = port
       @timeout = timeout
+      @connect_timeout = connect_timeout
       @ssl = ssl
       @base_uri = URI("#{ssl ? "https" : "http"}://#{host}:#{port}/")
       @monitor = Monitor.new
@@ -93,10 +95,11 @@ class LLM::Transport
 
     private
 
-    attr_reader :host, :port, :timeout, :ssl, :base_uri
+    attr_reader :host, :port, :timeout, :connect_timeout, :ssl, :base_uri
 
     def client
       client = Net::HTTP.new(host, port)
+      client.open_timeout = connect_timeout
       client.read_timeout = timeout
       client.use_ssl = ssl
       client

data/lib/llm/transport/persistent_http.rb

@@ -32,12 +32,14 @@ class LLM::Transport
     # @param [String] host
     # @param [Integer] port
     # @param [Integer] timeout
+    # @param [Integer] connect_timeout
     # @param [Boolean] ssl
     # @return [LLM::Transport::PersistentHTTP]
-    def initialize(host:, port:, timeout:, ssl:)
+    def initialize(host:, port:, timeout:, connect_timeout:, ssl:)
       @host = host
       @port = port
       @timeout = timeout
+      @connect_timeout = connect_timeout
       @ssl = ssl
       @base_uri = URI("#{ssl ? "https" : "http"}://#{host}:#{port}/")
       @monitor = Monitor.new
@@ -100,7 +102,7 @@ class LLM::Transport
 
     private
 
-    attr_reader :host, :port, :timeout, :ssl, :base_uri
+    attr_reader :host, :port, :timeout, :connect_timeout, :ssl, :base_uri
 
     def client
       self.class.lock do
@@ -110,14 +112,14 @@ class LLM::Transport
           LLM.require "net/http/persistent" unless defined?(Net::HTTP::Persistent)
           client = Net::HTTP::Persistent.new(name: self.class.name)
           client.read_timeout = timeout
-          client.open_timeout = timeout
+          client.open_timeout = connect_timeout
           self.class.registry[client_id] = client
         end
       end
     end
 
     def client_id
-      "#{host}:#{port}:#{timeout}:#{ssl}"
+      "#{host}:#{port}:#{timeout}:#{connect_timeout}:#{ssl}"
     end
 
     def close_socket(http)

data/lib/llm/transport/utils.rb

@@ -24,18 +24,19 @@ class LLM::Transport
     # @param [String] host
     # @param [Integer] port
     # @param [Integer, nil] timeout
+    # @param [Integer] connect_timeout
     # @param [Boolean] ssl
     # @param [Boolean] persistent
     # @param [LLM::Transport, Class, Symbol, nil] transport
     # @return [LLM::Transport]
-    def resolve_transport(host:, port:, timeout:, ssl:, persistent:, transport:)
+    def resolve_transport(host:, port:, timeout:, connect_timeout: 5, ssl:, persistent:, transport:)
       if transport.nil?
-        default_transport(host:, port:, timeout:, ssl:, persistent:)
+        default_transport(host:, port:, timeout:, connect_timeout:, ssl:, persistent:)
       elsif Class === transport && transport <= LLM::Transport
-        transport.new(host:, port:, timeout:, ssl:)
+        transport.new(host:, port:, timeout:, connect_timeout:, ssl:)
       elsif Symbol === transport
         transport = LLM::Transport.public_send(transport)
-        transport.new(host:, port:, timeout:, ssl:)
+        transport.new(host:, port:, timeout:, connect_timeout:, ssl:)
       else
         transport
       end
@@ -49,12 +50,13 @@ class LLM::Transport
     # @param [String] host
     # @param [Integer] port
     # @param [Integer, nil] timeout
+    # @param [Integer] connect_timeout
     # @param [Boolean] ssl
     # @param [Boolean] persistent
     # @return [LLM::Transport]
-    def default_transport(host:, port:, timeout:, ssl:, persistent:)
+    def default_transport(host:, port:, timeout:, connect_timeout:, ssl:, persistent:)
       target = persistent ? LLM::Transport::PersistentHTTP : LLM::Transport::HTTP
-      target.new(host:, port:, timeout:, ssl:)
+      target.new(host:, port:, timeout:, connect_timeout:, ssl:)
     end
   end
 end

data/lib/llm/version.rb

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

data/lib/llm.rb

@@ -77,7 +77,9 @@ module LLM
   # @raise [LLM::LoadError]
   #  When the dependency cannot be loaded
   def self.require(name, version = nil)
-    names = {"xchan" => "xchan.rb", "net/http/persistent" => "net-http-persistent"}
+    names = { "xchan" => "xchan.rb",
+              "net/http/persistent" => "net-http-persistent",
+              "unicode/display_width" => "unicode-display_width" }
     gem(names[name] || name, version) if version
     super(name)
   rescue ::LoadError
@@ -260,6 +262,19 @@ module LLM
     end
   end
 
+  ##
+  # @param key (see LLM::OpenRouter#initialize)
+  # @param host (see LLM::OpenRouter#initialize)
+  # @return (see LLM::OpenRouter#initialize)
+  def openrouter(key: UNDEFINED, **)
+    lock(:require) { require_relative "llm/providers/openrouter" unless defined?(LLM::OpenRouter) }
+    if key == UNDEFINED
+      LLM::OpenRouter.new(key: key(name: __method__), **)
+    else
+      LLM::OpenRouter.new(key:, **)
+    end
+  end
+
   ##
   # @param key (see LLM::Alibaba#initialize)
   # @param host (see LLM::Alibaba#initialize)

data/llm.gemspec

@@ -53,7 +53,7 @@ DESCRIPTION
   spec.add_development_dependency "yard", "~> 0.9.37"
   spec.add_development_dependency "redcarpet", "~> 3.6"
   spec.add_development_dependency "webrick", "~> 1.8"
-  spec.add_development_dependency "test-cmd.rb", "~> 1.1.0"
+  spec.add_development_dependency "test-cmd.rb", "~> 2.1"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "standard", "~> 1.50"
@@ -71,4 +71,5 @@ DESCRIPTION
   spec.add_development_dependency "curb", "~> 1.3"
   spec.add_development_dependency "curses", "~> 1.6"
   spec.add_development_dependency "kramdown", "~> 2.5"
+  spec.add_development_dependency "unicode-display_width", "~> 3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llm.rb
 version: !ruby/object:Gem::Version
-  version: 15.0.2
+  version: 15.1.0
 platform: ruby
 authors:
 - Robert Gleeson
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -319,6 +319,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: unicode-display_width
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: |
   llm.rb is an advanced runtime for building agentic AI applications on CRuby.
   It has zero runtime dependencies by default, it supports concurrent and parallel
@@ -346,6 +360,7 @@ files:
 - data/mistral.json
 - data/moonshot.json
 - data/openai.json
+- data/openrouter.json
 - data/xai.json
 - data/zai.json
 - docs/deepdive.md
@@ -551,6 +566,7 @@ files:
 - lib/llm/providers/openai/schema.rb
 - lib/llm/providers/openai/stream_parser.rb
 - lib/llm/providers/openai/vector_stores.rb
+- lib/llm/providers/openrouter.rb
 - lib/llm/providers/xai.rb
 - lib/llm/providers/xai/images.rb
 - lib/llm/providers/zai.rb