ollama-client 0.2.1 → 0.2.3

data/examples/README.md

@@ -0,0 +1,92 @@
+# Examples
+
+This directory contains working examples demonstrating various features of the ollama-client gem.
+
+## Quick Start Examples
+
+### Basic Tool Calling
+- **[test_tool_calling.rb](test_tool_calling.rb)** - Simple tool calling demo with weather tool
+- **[tool_calling_pattern.rb](tool_calling_pattern.rb)** - Recommended patterns for tool calling
+- **[tool_calling_direct.rb](tool_calling_direct.rb)** - Direct tool calling without Executor
+
+### DhanHQ Market Data
+- **[test_dhanhq_tool_calling.rb](test_dhanhq_tool_calling.rb)** - DhanHQ tools with updated intraday & indicators
+- **[dhanhq_tools.rb](dhanhq_tools.rb)** - DhanHQ API wrapper tools
+- **[dhan_console.rb](dhan_console.rb)** - Interactive DhanHQ console with planning
+
+### Multi-Step Agents
+- **[multi_step_agent_e2e.rb](multi_step_agent_e2e.rb)** - End-to-end multi-step agent example
+- **[multi_step_agent_with_external_data.rb](multi_step_agent_with_external_data.rb)** - Agent with external data integration
+
+### Structured Data
+- **[structured_outputs_chat.rb](structured_outputs_chat.rb)** - Structured outputs with schemas
+- **[structured_tools.rb](structured_tools.rb)** - Structured tool definitions
+- **[tool_dto_example.rb](tool_dto_example.rb)** - Using DTOs for tool definitions
+
+### Advanced Features
+- **[advanced_multi_step_agent.rb](advanced_multi_step_agent.rb)** - Complex multi-step workflows
+- **[advanced_error_handling.rb](advanced_error_handling.rb)** - Error handling patterns
+- **[advanced_edge_cases.rb](advanced_edge_cases.rb)** - Edge case handling
+- **[advanced_complex_schemas.rb](advanced_complex_schemas.rb)** - Complex schema definitions
+- **[advanced_performance_testing.rb](advanced_performance_testing.rb)** - Performance testing
+
+### Interactive Consoles
+- **[chat_console.rb](chat_console.rb)** - Simple chat console with streaming
+- **[dhan_console.rb](dhan_console.rb)** - DhanHQ market data console with formatted tool results
+
+### Complete Workflows
+- **[complete_workflow.rb](complete_workflow.rb)** - Complete agent workflow example
+
+## DhanHQ Examples
+
+The `dhanhq/` subdirectory contains more specialized DhanHQ examples:
+- Technical analysis agents
+- Market scanners (intraday options, swing trading)
+- Pattern recognition and trend analysis
+- Multi-agent orchestration
+
+See [dhanhq/README.md](dhanhq/README.md) for details.
+
+## Running Examples
+
+Most examples are standalone and can be run directly:
+
+```bash
+# Basic tool calling
+ruby examples/test_tool_calling.rb
+
+# DhanHQ with intraday data
+ruby examples/test_dhanhq_tool_calling.rb
+
+# Interactive console
+ruby examples/chat_console.rb
+```
+
+### Requirements
+
+Some examples require additional setup:
+
+**DhanHQ Examples:**
+- Set `DHANHQ_CLIENT_ID` and `DHANHQ_ACCESS_TOKEN` environment variables
+- Or create `.env` file with credentials
+
+**Ollama:**
+- Ollama server running (default: `http://localhost:11434`)
+- Set `OLLAMA_BASE_URL` if using a different URL
+- Set `OLLAMA_MODEL` if not using default model
+
+## Learning Path
+
+1. **Start here:** `test_tool_calling.rb` - Learn basic tool calling
+2. **Structured data:** `structured_outputs_chat.rb` - Schema-based outputs
+3. **Multi-step:** `multi_step_agent_e2e.rb` - Complex agent workflows
+4. **Market data:** `test_dhanhq_tool_calling.rb` - Real-world API integration
+5. **Interactive:** `dhan_console.rb` - Full-featured console with planning
+
+## Contributing
+
+When adding new examples:
+- Include clear comments explaining what the example demonstrates
+- Add `#!/usr/bin/env ruby` shebang at the top
+- Use `frozen_string_literal: true`
+- Update this README with a description

data/examples/advanced_complex_schemas.rb

@@ -35,7 +35,8 @@ class FinancialAnalyzer
             "profit_margin" => {
               "type" => "number",
               "minimum" => 0,
-              "maximum" => 100
+              "maximum" => 100,
+              "description" => "Profit margin as percentage (0 to 100)"
             },
             "growth_rate" => {
               "type" => "number"
@@ -121,7 +122,8 @@ class CodeReviewer
         "overall_score" => {
           "type" => "integer",
           "minimum" => 0,
-          "maximum" => 100
+          "maximum" => 100,
+          "description" => "Overall quality score (0 to 100)"
         },
         "issues" => {
           "type" => "array",
@@ -262,7 +264,8 @@ class ResearchAnalyzer
         "reproducibility_score" => {
           "type" => "number",
           "minimum" => 0,
-          "maximum" => 1
+          "maximum" => 1,
+          "description" => "Reproducibility score (0.0 to 1.0, where 1.0 means fully reproducible)"
         }
       }
     }

data/examples/advanced_multi_step_agent.rb

@@ -46,7 +46,8 @@ class MultiStepAgent
         "confidence" => {
           "type" => "number",
           "minimum" => 0,
-          "maximum" => 1
+          "maximum" => 1,
+          "description" => "Confidence level (0.0 to 1.0, where 1.0 is 100% confident)"
         },
         "next_steps" => {
           "type" => "array",
@@ -123,7 +124,8 @@ class MultiStepAgent
         if recent_actions.length == 3 && recent_actions.uniq.length == 1
           puts "⚠️  Detected repetitive actions - forcing workflow progression"
           # Force next phase
-          if recent_actions.first == "collect"
+          case recent_actions.first
+          when "collect"
             puts "   → Moving to analysis phase"
             decision["action"]["type"] = "analyze"
             decision["action"]["parameters"] = { "target" => "collected_data" }
@@ -133,7 +135,7 @@ class MultiStepAgent
               action: "analyze",
               result: result
             }
-          elsif recent_actions.first == "analyze"
+          when "analyze"
             puts "   → Moving to validation phase"
             decision["action"]["type"] = "validate"
             decision["action"]["parameters"] = { "type" => "results" }
@@ -143,7 +145,7 @@ class MultiStepAgent
               action: "validate",
               result: result
             }
-          elsif recent_actions.first == "validate"
+          when "validate"
             puts "   → Completing workflow"
             decision["action"]["type"] = "complete"
             result = execute_action(decision)
@@ -269,9 +271,7 @@ class MultiStepAgent
     when "collect"
       data_key = params["data_type"] || params["key"] || "user_data"
       # Prevent collecting the same generic data repeatedly
-      if @state[:data_collected].key?(data_key) && data_key.match?(/^(missing|unknown|data)$/i) && !@state[:data_collected].key?("user_data")
-        data_key = "user_data"
-      end
+      data_key = "user_data" if should_collect_user_data?(data_key)
       puts "   📥 Collecting: #{data_key}"
       @state[:data_collected][data_key] = "collected_at_#{Time.now.to_i}"
       { status: "collected", key: data_key }
@@ -304,6 +304,12 @@ class MultiStepAgent
     end
   end
 
+  def should_collect_user_data?(data_key)
+    @state[:data_collected].key?(data_key) &&
+      data_key.match?(/^(missing|unknown|data)$/i) &&
+      !@state[:data_collected].key?("user_data")
+  end
+
   def display_summary
     puts "\n" + "=" * 60
     puts "Workflow Summary"

data/examples/chat_console.rb

@@ -0,0 +1,143 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative "../lib/ollama_client"
+require "tty-reader"
+require "tty-screen"
+require "tty-cursor"
+
+def build_config
+  config = Ollama::Config.new
+  config.base_url = ENV["OLLAMA_BASE_URL"] if ENV["OLLAMA_BASE_URL"]
+  config.model = ENV["OLLAMA_MODEL"] if ENV["OLLAMA_MODEL"]
+  config.temperature = ENV["OLLAMA_TEMPERATURE"].to_f if ENV["OLLAMA_TEMPERATURE"]
+  config
+end
+
+def exit_command?(text)
+  %w[/exit /quit exit quit].include?(text.downcase)
+end
+
+def add_system_message(messages)
+  system_prompt = ENV.fetch("OLLAMA_SYSTEM", nil)
+  return unless system_prompt && !system_prompt.strip.empty?
+
+  messages << { role: "system", content: system_prompt }
+end
+
+def print_banner(config)
+  puts "Ollama chat console"
+  puts "Model: #{config.model}"
+  puts "Base URL: #{config.base_url}"
+  puts "Type /exit to quit."
+  puts "Screen: #{TTY::Screen.width}x#{TTY::Screen.height}"
+  puts
+end
+
+HISTORY_PATH = ".ollama_chat_history"
+MAX_HISTORY = 200
+COLOR_RESET = "\e[0m"
+COLOR_USER = "\e[32m"
+COLOR_LLM = "\e[36m"
+USER_PROMPT = "#{COLOR_USER}you>#{COLOR_RESET} ".freeze
+LLM_PROMPT = "#{COLOR_LLM}llm>#{COLOR_RESET} ".freeze
+
+def build_reader
+  TTY::Reader.new
+end
+
+def read_input(reader)
+  reader.read_line(USER_PROMPT)
+end
+
+def load_history(reader, path)
+  history = load_history_list(path)
+  history.reverse_each { |line| reader.add_to_history(line) }
+end
+
+def load_history_list(path)
+  return [] unless File.exist?(path)
+
+  unique_history(normalize_history(File.readlines(path, chomp: true)))
+end
+
+def normalize_history(lines)
+  lines.map(&:strip).reject(&:empty?)
+end
+
+def unique_history(lines)
+  seen = {}
+  lines.each_with_object([]) do |line, unique|
+    next if seen[line]
+
+    unique << line
+    seen[line] = true
+  end
+end
+
+def update_history(path, text)
+  history = load_history_list(path)
+  history.delete(text)
+  history.unshift(text)
+  history = history.first(MAX_HISTORY)
+
+  File.write(path, history.join("\n") + (history.empty? ? "" : "\n"))
+end
+
+def chat_response(client, messages, config)
+  content = +""
+  prompt_printed = false
+
+  print "#{COLOR_LLM}...#{COLOR_RESET}"
+  $stdout.flush
+
+  client.chat_raw(
+    messages: messages,
+    allow_chat: true,
+    options: { temperature: config.temperature },
+    stream: true
+  ) do |chunk|
+    token = chunk.dig("message", "content").to_s
+    next if token.empty?
+
+    unless prompt_printed
+      print "\r#{LLM_PROMPT}"
+      prompt_printed = true
+    end
+
+    content << token
+    print token
+    $stdout.flush
+  end
+
+  puts
+  content
+end
+
+def run_console(client, config)
+  messages = []
+  add_system_message(messages)
+  print_banner(config)
+  reader = build_reader
+  load_history(reader, HISTORY_PATH)
+
+  loop do
+    input = read_input(reader)
+    break unless input
+
+    text = input.strip
+    next if text.empty?
+    break if exit_command?(text)
+
+    update_history(HISTORY_PATH, text)
+    messages << { role: "user", content: text }
+    content = chat_response(client, messages, config)
+    messages << { role: "assistant", content: content }
+  end
+rescue Interrupt
+  puts "\nExiting..."
+end
+
+config = build_config
+client = Ollama::Client.new(config: config)
+run_console(client, config)

data/examples/complete_workflow.rb

@@ -30,7 +30,7 @@ class TaskPlanner
           "type" => "number",
           "minimum" => 0,
           "maximum" => 1,
-          "description" => "Confidence in this decision"
+          "description" => "Confidence in this decision (0.0 to 1.0, where 1.0 is 100% confident)"
         },
         "next_step" => {
           "type" => "string",
@@ -49,8 +49,13 @@ class TaskPlanner
     puts "Context: #{context}\n\n"
 
     begin
+      prompt = "Given this context: #{context}\n\n" \
+               "Decide the next action to take.\n\n" \
+               "IMPORTANT: Use decimal values for confidence " \
+               "(e.g., 0.95 for 95% confident, 0.80 for 80% confident, 1.0 for 100% confident)."
+
       result = @client.generate(
-        prompt: "Given this context: #{context}\n\nDecide the next action to take.",
+        prompt: prompt,
         schema: @task_schema
       )
 
@@ -132,7 +137,8 @@ class DataAnalyzer
         "confidence" => {
           "type" => "number",
           "minimum" => 0,
-          "maximum" => 1
+          "maximum" => 1,
+          "description" => "Confidence level (0.0 to 1.0, where 1.0 is 100% confident)"
         },
         "key_points" => {
           "type" => "array",
@@ -157,8 +163,12 @@ class DataAnalyzer
     puts "Data: #{data}\n\n"
 
     begin
+      prompt = "Analyze this data and provide insights: #{data}\n\n" \
+               "IMPORTANT: Express confidence as a decimal between 0.0 and 1.0 " \
+               "(e.g., 0.85 for 85% confidence, not 85)."
+
       result = @client.generate(
-        prompt: "Analyze this data and provide insights: #{data}",
+        prompt: prompt,
         schema: @analysis_schema
       )