ollama-client 0.2.1 → 0.2.3

data/lib/ollama/tool/function.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+require_relative "../dto"
+
+module Ollama
+  # Tool class is defined in tool.rb
+  # This file adds Function class to Tool
+  class Tool
+    # Represents a function definition for tool usage in Ollama API
+    #
+    # Provides structured, type-safe function definitions for agent tools.
+    # Use this when you need explicit control over tool schemas beyond
+    # auto-inference from Ruby callable signatures.
+    #
+    # Example:
+    #   function = Ollama::Tool::Function.new(
+    #     name: 'get_current_weather',
+    #     description: 'Get the current weather for a location',
+    #     parameters: parameters_spec
+    #   )
+    #
+    #   # Deserialize from hash
+    #   function = Ollama::Tool::Function.from_hash({ name: '...', description: '...' })
+    class Function
+      include DTO
+
+      attr_reader :name, :description, :parameters
+
+      def initialize(name:, description:, parameters: nil)
+        @name = name.to_s
+        @description = description.to_s
+        @parameters = parameters || Function::Parameters.new(
+          type: "object",
+          properties: {},
+          required: []
+        )
+      end
+
+      # Create instance from hash
+      #
+      # @param hash [Hash] Hash with name, description, and optional parameters
+      # @return [Function] New Function instance
+      def self.from_hash(hash)
+        normalized = hash.transform_keys(&:to_sym)
+        params_hash = normalized[:parameters] || normalized["parameters"]
+
+        parameters = if params_hash.is_a?(Hash)
+                       Function::Parameters.from_hash(params_hash)
+                     elsif params_hash
+                       params_hash
+                     end
+
+        new(
+          name: normalized[:name] || normalized["name"],
+          description: normalized[:description] || normalized["description"],
+          parameters: parameters
+        )
+      end
+
+      def to_h
+        hash = {
+          name: @name,
+          description: @description
+        }
+        hash[:parameters] = @parameters.to_h if @parameters
+        hash
+      end
+
+      # Override as_json to use explicit attributes instead of tracked ones
+      def as_json(*_ignored)
+        to_h
+      end
+    end
+
+    # Load Parameters class after Function is defined
+    require_relative "function/parameters"
+  end
+end

data/lib/ollama/tool.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require_relative "dto"
+require_relative "tool/function"
+
+module Ollama
+  # Tool definition for function calling in agents
+  #
+  # Provides a structured, type-safe way to define tools for agent executors.
+  # This is an optional alternative to passing raw callables - use when you
+  # need explicit control over tool schemas.
+  #
+  # Example:
+  #   tool = Ollama::Tool.new(
+  #     type: 'function',
+  #     function: Ollama::Tool::Function.new(
+  #       name: 'get_weather',
+  #       description: 'Get current weather',
+  #       parameters: parameters_spec
+  #     )
+  #   )
+  #
+  #   # Deserialize from hash
+  #   tool = Ollama::Tool.from_hash({ type: 'function', function: {...} })
+  class Tool
+    include DTO
+
+    attr_reader :type, :function
+
+    def initialize(type:, function:)
+      @type = type.to_s
+      @function = function
+    end
+
+    # Create instance from hash
+    #
+    # @param hash [Hash] Hash with type and function keys
+    # @return [Tool] New Tool instance
+    def self.from_hash(hash)
+      normalized = hash.transform_keys(&:to_sym)
+      function_hash = normalized[:function] || normalized["function"]
+      function = function_hash.is_a?(Hash) ? Function.from_hash(function_hash) : function_hash
+
+      new(type: normalized[:type] || normalized["type"], function: function)
+    end
+
+    def to_h
+      {
+        type: @type,
+        function: @function.to_h
+      }
+    end
+
+    # Override as_json to use explicit attributes instead of tracked ones
+    # (since we're using to_h for our specific structure)
+    def as_json(*_ignored)
+      to_h
+    end
+  end
+end

data/lib/ollama/version.rb

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

data/lib/ollama_client.rb

@@ -3,6 +3,9 @@
 require_relative "ollama/config"
 require_relative "ollama/errors"
 require_relative "ollama/schema_validator"
+require_relative "ollama/options"
+require_relative "ollama/response"
+require_relative "ollama/tool"
 require_relative "ollama/client"
 require_relative "ollama/streaming_observer"
 require_relative "ollama/agent/messages"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ollama-client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Shubham Taywade
@@ -45,6 +45,7 @@ description: A production-ready, agent-first Ruby client for the Ollama API with
 email:
 - shubhamtaywade82@gmail.com
 executables:
+- dhan_console
 - ollama-client
 extensions: []
 extra_rdoc_files: []
@@ -53,16 +54,26 @@ files:
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - LICENSE.txt
-- PRODUCTION_FIXES.md
 - README.md
 - Rakefile
-- TESTING.md
+- docs/CLOUD.md
+- docs/CONSOLE_IMPROVEMENTS.md
+- docs/FEATURES_ADDED.md
+- docs/HANDLERS_ANALYSIS.md
+- docs/PRODUCTION_FIXES.md
+- docs/README.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
 - examples/advanced_multi_step_agent.rb
 - examples/advanced_performance_testing.rb
+- examples/chat_console.rb
 - examples/complete_workflow.rb
+- examples/dhan_console.rb
 - examples/dhanhq/README.md
 - examples/dhanhq/agents/base_agent.rb
 - examples/dhanhq/agents/data_agent.rb
@@ -83,6 +94,8 @@ files:
 - examples/dhanhq/services/trading_service.rb
 - examples/dhanhq/technical_analysis_agentic_runner.rb
 - examples/dhanhq/technical_analysis_runner.rb
+- examples/dhanhq/test_tool_calling.rb
+- examples/dhanhq/test_tool_calling_verbose.rb
 - examples/dhanhq/utils/instrument_helper.rb
 - examples/dhanhq/utils/parameter_cleaner.rb
 - examples/dhanhq/utils/parameter_normalizer.rb
@@ -90,18 +103,33 @@ 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
+- exe/dhan_console
 - exe/ollama-client
 - lib/ollama/agent/executor.rb
 - lib/ollama/agent/messages.rb
 - lib/ollama/agent/planner.rb
 - lib/ollama/client.rb
 - lib/ollama/config.rb
+- lib/ollama/dto.rb
+- lib/ollama/embeddings.rb
 - lib/ollama/errors.rb
+- lib/ollama/options.rb
+- lib/ollama/response.rb
 - lib/ollama/schema_validator.rb
 - lib/ollama/schemas/base.json
 - lib/ollama/streaming_observer.rb
+- lib/ollama/tool.rb
+- lib/ollama/tool/function.rb
+- lib/ollama/tool/function/parameters.rb
+- lib/ollama/tool/function/parameters/property.rb
 - lib/ollama/version.rb
 - lib/ollama_client.rb
 - sig/ollama/client.rbs