ollama-client 0.2.2 → 0.2.4

data/lib/ollama/client.rb

@@ -46,11 +46,7 @@ module Ollama
     # rubocop:disable Metrics/ParameterLists
     def chat(messages:, model: nil, format: nil, tools: nil, options: {}, strict: false, allow_chat: false,
              return_meta: false)
-      unless allow_chat || strict
-        raise Error,
-              "chat() is intentionally gated because it is easy to misuse inside agents. " \
-              "Prefer generate(). If you really want chat(), pass allow_chat: true (or strict: true)."
-      end
+      ensure_chat_allowed!(allow_chat: allow_chat, strict: strict, method_name: "chat")
 
       attempts = 0
       @current_schema = format # Store for validation
@@ -63,73 +59,22 @@ module Ollama
         raw = call_chat_api(model: model, messages: messages, format: format, tools: normalized_tools, options: options)
         attempt_latency_ms = elapsed_ms(attempt_started_at)
 
-        emit_response_hook(
-          raw,
-          {
-            endpoint: "/api/chat",
-            model: model || @config.model,
-            attempt: attempts,
-            attempt_latency_ms: attempt_latency_ms
-          }
-        )
-
-        # When tools are used, response might have only tool_calls and no content
-        # In that case, return empty string (caller should use chat_raw() for tool_calls)
-        if raw.nil? || raw.empty?
-          return "" unless return_meta
-
-          return {
-            "data" => "",
-            "meta" => {
-              "endpoint" => "/api/chat",
-              "model" => model || @config.model,
-              "attempts" => attempts,
-              "latency_ms" => elapsed_ms(started_at),
-              "note" => "Empty content (likely tool_calls only - use chat_raw() to access tool_calls)"
-            }
-          }
-        end
+        emit_response_hook(raw, chat_response_meta(model: model, attempt: attempts,
+                                                   attempt_latency_ms: attempt_latency_ms))
 
-        # When tools are used, response might have only tool_calls and no content
-        # In that case, return empty string (caller should use chat_raw() for tool_calls)
-        if raw.nil? || raw.empty?
-          return "" unless return_meta
-
-          return {
-            "data" => "",
-            "meta" => {
-              "endpoint" => "/api/chat",
-              "model" => model || @config.model,
-              "attempts" => attempts,
-              "latency_ms" => elapsed_ms(started_at),
-              "note" => "Empty content (likely tool_calls only - use chat_raw() to access tool_calls)"
-            }
-          }
-        end
+        empty_response = empty_chat_response(raw: raw,
+                                             return_meta: return_meta,
+                                             model: model,
+                                             attempts: attempts,
+                                             started_at: started_at)
+        return empty_response unless empty_response.nil?
 
         parsed = parse_json_response(raw)
-
-        # CRITICAL: If format is provided, free-text output is forbidden
-        if format
-          if parsed.nil? || parsed.empty?
-            raise SchemaViolationError,
-                  "Empty or nil response when format schema is required"
-          end
-
-          SchemaValidator.validate!(parsed, format)
-        end
+        validate_chat_format!(parsed: parsed, format: format)
 
         return parsed unless return_meta
 
-        {
-          "data" => parsed,
-          "meta" => {
-            "endpoint" => "/api/chat",
-            "model" => model || @config.model,
-            "attempts" => attempts,
-            "latency_ms" => elapsed_ms(started_at)
-          }
-        }
+        chat_response_with_meta(data: parsed, model: model, attempts: attempts, started_at: started_at)
       rescue NotFoundError => e
         enhanced_error = enhance_not_found_error(e)
         raise enhanced_error
@@ -165,11 +110,7 @@ module Ollama
     # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/ParameterLists
     def chat_raw(messages:, model: nil, format: nil, tools: nil, options: {}, strict: false, allow_chat: false,
                  return_meta: false, stream: false, &on_chunk)
-      unless allow_chat || strict
-        raise Error,
-              "chat_raw() is intentionally gated because it is easy to misuse inside agents. " \
-              "Prefer generate(). If you really want chat_raw(), pass allow_chat: true (or strict: true)."
-      end
+      ensure_chat_allowed!(allow_chat: allow_chat, strict: strict, method_name: "chat_raw")
 
       attempts = 0
       @current_schema = format # Store for validation
@@ -265,7 +206,7 @@ module Ollama
     end
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/ParameterLists
 
-    def generate(prompt:, schema:, strict: false, return_meta: false)
+    def generate(prompt:, schema:, model: nil, strict: false, return_meta: false)
       attempts = 0
       @current_schema = schema # Store for prompt enhancement
       started_at = monotonic_time
@@ -273,14 +214,14 @@ module Ollama
       begin
         attempts += 1
         attempt_started_at = monotonic_time
-        raw = call_api(prompt)
+        raw = call_api(prompt, model: model)
         attempt_latency_ms = elapsed_ms(attempt_started_at)
 
         emit_response_hook(
           raw,
           {
             endpoint: "/api/generate",
-            model: @config.model,
+            model: model || @config.model,
             attempt: attempts,
             attempt_latency_ms: attempt_latency_ms
           }
@@ -298,7 +239,7 @@ module Ollama
           "data" => parsed,
           "meta" => {
             "endpoint" => "/api/generate",
-            "model" => @config.model,
+            "model" => model || @config.model,
             "attempts" => attempts,
             "latency_ms" => elapsed_ms(started_at)
           }
@@ -326,8 +267,8 @@ module Ollama
     end
     # rubocop:enable Metrics/MethodLength
 
-    def generate_strict!(prompt:, schema:, return_meta: false)
-      generate(prompt: prompt, schema: schema, strict: true, return_meta: return_meta)
+    def generate_strict!(prompt:, schema:, model: nil, return_meta: false)
+      generate(prompt: prompt, schema: schema, model: model, strict: true, return_meta: return_meta)
     end
 
     # Lightweight server health check.
@@ -407,6 +348,14 @@ module Ollama
 
     private
 
+    def ensure_chat_allowed!(allow_chat:, strict:, method_name:)
+      return if allow_chat || strict
+
+      raise Error,
+            "#{method_name}() is intentionally gated because it is easy to misuse inside agents. " \
+            "Prefer generate(). If you really want #{method_name}(), pass allow_chat: true (or strict: true)."
+    end
+
     # Normalize tools to array of hashes for API
     # Supports: Tool object, Array of Tool objects, Array of hashes, or nil
     def normalize_tools(tools)
@@ -424,6 +373,50 @@ module Ollama
       tools
     end
 
+    def chat_response_meta(model:, attempt:, attempt_latency_ms:)
+      {
+        endpoint: "/api/chat",
+        model: model || @config.model,
+        attempt: attempt,
+        attempt_latency_ms: attempt_latency_ms
+      }
+    end
+
+    def empty_chat_response(raw:, return_meta:, model:, attempts:, started_at:)
+      return nil unless raw.nil? || raw.empty?
+      return "" unless return_meta
+
+      {
+        "data" => "",
+        "meta" => {
+          "endpoint" => "/api/chat",
+          "model" => model || @config.model,
+          "attempts" => attempts,
+          "latency_ms" => elapsed_ms(started_at),
+          "note" => "Empty content (likely tool_calls only - use chat_raw() to access tool_calls)"
+        }
+      }
+    end
+
+    def validate_chat_format!(parsed:, format:)
+      return unless format
+      raise SchemaViolationError, "Empty or nil response when format schema is required" if parsed.nil? || parsed.empty?
+
+      SchemaValidator.validate!(parsed, format)
+    end
+
+    def chat_response_with_meta(data:, model:, attempts:, started_at:)
+      {
+        "data" => data,
+        "meta" => {
+          "endpoint" => "/api/chat",
+          "model" => model || @config.model,
+          "attempts" => attempts,
+          "latency_ms" => elapsed_ms(started_at)
+        }
+      }
+    end
+
     def handle_http_error(res, requested_model: nil)
       status_code = res.code.to_i
       requested_model ||= @config.model
@@ -646,13 +639,13 @@ module Ollama
       raise Error, "Connection failed: #{e.message}"
     end
 
-    def call_api(prompt)
+    def call_api(prompt, model: nil)
       req = Net::HTTP::Post.new(@uri)
       req["Content-Type"] = "application/json"
 
       # Build request body
       body = {
-        model: @config.model,
+        model: model || @config.model,
         prompt: prompt,
         stream: false,
         temperature: @config.temperature,
@@ -676,7 +669,7 @@ module Ollama
         open_timeout: @config.timeout
       ) { |http| http.request(req) }
 
-      handle_http_error(res) unless res.is_a?(Net::HTTPSuccess)
+      handle_http_error(res, requested_model: model || @config.model) unless res.is_a?(Net::HTTPSuccess)
 
       body = JSON.parse(res.body)
       body["response"]

data/lib/ollama/dto.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "json"
+require "set"
 
 module Ollama
   # A module that provides a foundation for data transfer objects (DTOs) within
@@ -21,22 +22,21 @@ module Ollama
   #   end
   module DTO
     def self.included(base)
-      unless defined?(Set)
-      end
       base.extend(ClassMethods)
-      base.class_variable_set(:@@attributes, Set.new)
+      base.instance_variable_set(:@attributes, Set.new)
     end
 
+    # Class-level helpers for DTO attribute tracking.
     module ClassMethods
       # The attributes accessor reads and writes the attributes instance variable.
       #
       # @return [Set] the set of attributes stored in the instance variable
       def attributes
-        class_variable_get(:@@attributes)
+        @attributes ||= Set.new
       end
 
       def attributes=(value)
-        class_variable_set(:@@attributes, value)
+        @attributes = value
       end
 
       # The from_hash method creates a new instance of the class by converting a
@@ -180,8 +180,8 @@ module Ollama
     #
     # @param args [Array] pass-through args
     # @return [String] a JSON string representation of the object
-    def to_json(*)
-      as_json.to_json(*)
+    def to_json(*args)
+      as_json.to_json(*args)
     end
   end
 end

data/lib/ollama/options.rb

@@ -10,15 +10,17 @@ module Ollama
   #   options = Ollama::Options.new(temperature: 0.7, top_p: 0.95)
   #   client.generate(prompt: "...", schema: {...}, options: options.to_h)
   class Options
-    attr_accessor :temperature, :top_p, :top_k, :num_ctx, :repeat_penalty, :seed
-
-    def initialize(temperature: nil, top_p: nil, top_k: nil, num_ctx: nil, repeat_penalty: nil, seed: nil)
-      self.temperature = temperature if temperature
-      self.top_p = top_p if top_p
-      self.top_k = top_k if top_k
-      self.num_ctx = num_ctx if num_ctx
-      self.repeat_penalty = repeat_penalty if repeat_penalty
-      self.seed = seed if seed
+    VALID_KEYS = %i[temperature top_p top_k num_ctx repeat_penalty seed].freeze
+
+    attr_reader :temperature, :top_p, :top_k, :num_ctx, :repeat_penalty, :seed
+
+    def initialize(**options)
+      unknown_keys = options.keys - VALID_KEYS
+      raise ArgumentError, "Unknown options: #{unknown_keys.join(", ")}" if unknown_keys.any?
+
+      VALID_KEYS.each do |key|
+        assign_option(key, options[key])
+      end
     end
 
     def temperature=(value)
@@ -65,6 +67,12 @@ module Ollama
 
     private
 
+    def assign_option(name, value)
+      return if value.nil?
+
+      public_send("#{name}=", value)
+    end
+
     def validate_numeric_range(value, min, max, name)
       return if value.nil?
 

data/lib/ollama/response.rb

@@ -28,12 +28,10 @@ module Ollama
     end
 
     # Delegate other methods to underlying hash
-    def method_missing(method, *, &)
-      if @data.respond_to?(method)
-        @data.public_send(method, *, &)
-      else
-        super
-      end
+    def method_missing(method, ...)
+      return super unless @data.respond_to?(method)
+
+      @data.public_send(method, ...)
     end
 
     def respond_to_missing?(method, include_private = false)

data/lib/ollama/tool/function/parameters.rb

@@ -6,6 +6,7 @@ module Ollama
   # Tool and Function classes are defined in tool.rb and tool/function.rb
   # This file adds Parameters class to Function
   class Tool
+    # Function metadata and schema for tool calls.
     class Function
       # Parameters specification for a tool function
       #

data/lib/ollama/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ollama
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ollama-client
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Shubham Taywade
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bigdecimal
@@ -53,13 +54,24 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
-- FEATURES_ADDED.md
-- HANDLERS_ANALYSIS.md
 - LICENSE.txt
-- PRODUCTION_FIXES.md
 - README.md
 - Rakefile
-- TESTING.md
+- docs/CLOUD.md
+- docs/CONSOLE_IMPROVEMENTS.md
+- docs/FEATURES_ADDED.md
+- docs/GEM_RELEASE_GUIDE.md
+- docs/GET_RUBYGEMS_SECRET.md
+- docs/HANDLERS_ANALYSIS.md
+- docs/PRODUCTION_FIXES.md
+- docs/QUICK_OTP_SETUP.md
+- docs/QUICK_RELEASE.md
+- docs/README.md
+- docs/RUBYGEMS_OTP_SETUP.md
+- docs/SCHEMA_FIXES.md
+- docs/TESTING.md
+- docs/TEST_UPDATES.md
+- examples/README.md
 - examples/advanced_complex_schemas.rb
 - examples/advanced_edge_cases.rb
 - examples/advanced_error_handling.rb
@@ -97,8 +109,11 @@ files:
 - examples/dhanhq/utils/trading_parameter_normalizer.rb
 - examples/dhanhq_agent.rb
 - examples/dhanhq_tools.rb
+- examples/multi_step_agent_with_external_data.rb
 - examples/structured_outputs_chat.rb
 - examples/structured_tools.rb
+- examples/test_dhanhq_tool_calling.rb
+- examples/test_tool_calling.rb
 - examples/tool_calling_direct.rb
 - examples/tool_calling_pattern.rb
 - examples/tool_dto_example.rb
@@ -124,8 +139,6 @@ files:
 - lib/ollama/version.rb
 - lib/ollama_client.rb
 - sig/ollama/client.rbs
-- test_dhanhq_tool_calling.rb
-- test_tool_calling.rb
 homepage: https://github.com/shubhamtaywade82/ollama-client
 licenses:
 - MIT
@@ -134,6 +147,7 @@ metadata:
   source_code_uri: https://github.com/shubhamtaywade82/ollama-client
   changelog_uri: https://github.com/shubhamtaywade82/ollama-client/blob/main/CHANGELOG.md
   rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -148,7 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: An agent-first Ruby client for Ollama (planner/executor + safe tool loops)
 test_files: []