ollama-client 0.2.2 → 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",

data/examples/chat_console.rb

@@ -39,8 +39,8 @@ MAX_HISTORY = 200
 COLOR_RESET = "\e[0m"
 COLOR_USER = "\e[32m"
 COLOR_LLM = "\e[36m"
-USER_PROMPT = "#{COLOR_USER}you>#{COLOR_RESET} "
-LLM_PROMPT = "#{COLOR_LLM}llm>#{COLOR_RESET} "
+USER_PROMPT = "#{COLOR_USER}you>#{COLOR_RESET} ".freeze
+LLM_PROMPT = "#{COLOR_LLM}llm>#{COLOR_RESET} ".freeze
 
 def build_reader
   TTY::Reader.new
@@ -86,7 +86,10 @@ end
 
 def chat_response(client, messages, config)
   content = +""
-  print LLM_PROMPT
+  prompt_printed = false
+
+  print "#{COLOR_LLM}...#{COLOR_RESET}"
+  $stdout.flush
 
   client.chat_raw(
     messages: messages,
@@ -97,8 +100,14 @@ def chat_response(client, messages, config)
     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

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
       )
 

data/examples/dhan_console.rb

@@ -42,8 +42,8 @@ MAX_HISTORY = 200
 COLOR_RESET = "\e[0m"
 COLOR_USER = "\e[32m"
 COLOR_LLM = "\e[36m"
-USER_PROMPT = "#{COLOR_USER}you>#{COLOR_RESET} "
-LLM_PROMPT = "#{COLOR_LLM}llm>#{COLOR_RESET} "
+USER_PROMPT = "#{COLOR_USER}you>#{COLOR_RESET} ".freeze
+LLM_PROMPT = "#{COLOR_LLM}llm>#{COLOR_RESET} ".freeze
 
 def build_reader
   TTY::Reader.new
@@ -497,7 +497,7 @@ def build_tools
     "get_historical_data" => lambda do |exchange_segment:, from_date:, to_date:, symbol: nil, security_id: nil,
                                         interval: nil, expiry_code: nil, calculate_indicators: false|
       # Convert security_id to integer if provided (LLM may pass it as string)
-      normalized_security_id = security_id ? security_id.to_i : nil
+      normalized_security_id = security_id&.to_i
       DhanHQDataTools.get_historical_data(**compact_kwargs(exchange_segment: exchange_segment,
                                                            symbol: symbol,
                                                            security_id: normalized_security_id,
@@ -509,14 +509,14 @@ def build_tools
     end,
     "get_expiry_list" => lambda do |exchange_segment:, symbol: nil, security_id: nil|
       # Convert security_id to integer if provided (LLM may pass it as string)
-      normalized_security_id = security_id ? security_id.to_i : nil
+      normalized_security_id = security_id&.to_i
       DhanHQDataTools.get_expiry_list(**compact_kwargs(exchange_segment: exchange_segment,
                                                        symbol: symbol,
                                                        security_id: normalized_security_id))
     end,
     "get_option_chain" => lambda do |exchange_segment:, symbol: nil, security_id: nil, expiry: nil, strikes_count: 5|
       # Convert security_id to integer if provided (LLM may pass it as string)
-      normalized_security_id = security_id ? security_id.to_i : nil
+      normalized_security_id = security_id&.to_i
       # Default to 5 strikes (2 ITM, ATM, 2 OTM) - good balance for analysis
       normalized_strikes_count = strikes_count.to_i
       normalized_strikes_count = 5 if normalized_strikes_count < 1 # Minimum 1 (ATM)
@@ -555,16 +555,18 @@ def tool_messages(messages)
 end
 
 def print_tool_results(messages)
-  puts "Tool Results:"
   tool_messages(messages).each do |message|
     print_tool_message(message)
   end
+  puts # blank line after tool results
 end
 
 def print_tool_message(message)
   tool_name = message[:name] || "unknown_tool"
-  puts "- #{tool_name}"
-  puts format_tool_content(message[:content])
+  content = parse_tool_content(message[:content])
+
+  puts "\n#{COLOR_LLM}🔧 Tool Called:#{COLOR_RESET} #{tool_name}"
+  print_formatted_result(tool_name, content)
 end
 
 def format_tool_content(content)
@@ -582,6 +584,99 @@ rescue JSON::ParserError
   content
 end
 
+def print_formatted_result(tool_name, content)
+  return puts content if content.is_a?(String)
+
+  result = content["result"] || content
+
+  case tool_name
+  when "get_live_ltp"
+    print_ltp_result(result)
+  when "get_market_quote"
+    print_quote_result(result)
+  when "get_historical_data"
+    print_historical_result(result, content)
+  when "get_option_chain"
+    print_option_chain_result(result)
+  when "get_expiry_list"
+    print_expiry_list_result(result)
+  when "find_instrument"
+    print_instrument_result(result)
+  else
+    puts "   #{COLOR_LLM}→#{COLOR_RESET} #{JSON.pretty_generate(content)}"
+  end
+end
+
+def print_ltp_result(result)
+  symbol = result["symbol"] || "Unknown"
+  ltp = result["ltp"] || result.dig("ltp_data", "last_price")
+  exchange = result["exchange_segment"]
+
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} #{symbol} (#{exchange})"
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} Last Price: ₹#{ltp}"
+end
+
+def print_quote_result(result)
+  symbol = result["symbol"] || "Unknown"
+  quote = result["quote"] || {}
+  ohlc = quote["ohlc"] || {}
+
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} #{symbol}"
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} LTP: ₹#{quote['last_price']}"
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} OHLC: O:#{ohlc['open']} H:#{ohlc['high']} L:#{ohlc['low']} C:#{ohlc['close']}"
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} Volume: #{quote['volume']}" if quote["volume"]&.positive?
+end
+
+def print_historical_result(result, content)
+  if result.is_a?(Hash) && result.key?("indicators")
+    print_indicator_result(result)
+  elsif result.is_a?(Hash)
+    data_points = result["data"]&.size || 0
+    interval = content.dig("params", "interval")
+    puts "   #{COLOR_LLM}→#{COLOR_RESET} Historical data: #{data_points} records"
+    puts "   #{COLOR_LLM}→#{COLOR_RESET} Interval: #{interval}" if interval
+  elsif result.is_a?(Array)
+    puts "   #{COLOR_LLM}→#{COLOR_RESET} #{result.size} data points"
+  end
+end
+
+def print_indicator_result(result)
+  indicators = result["indicators"]
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} Technical Indicators:"
+  puts "   #{COLOR_LLM}→#{COLOR_RESET}   Current Price: ₹#{indicators['current_price']}"
+  puts "   #{COLOR_LLM}→#{COLOR_RESET}   RSI(14): #{indicators['rsi']&.round(2)}"
+  puts "   #{COLOR_LLM}→#{COLOR_RESET}   MACD: #{indicators.dig('macd', 'macd')&.round(2)}"
+  puts "   #{COLOR_LLM}→#{COLOR_RESET}   SMA(20): ₹#{indicators['sma_20']&.round(2)}"
+  puts "   #{COLOR_LLM}→#{COLOR_RESET}   SMA(50): ₹#{indicators['sma_50']&.round(2)}"
+end
+
+def print_option_chain_result(result)
+  oc = result.dig("data", "oc") || {}
+  last_price = result.dig("data", "last_price")
+  strikes = oc.keys.size
+
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} Spot: ₹#{last_price}"
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} Strikes: #{strikes}"
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} (Filtered: ATM/OTM/ITM with both CE & PE)"
+end
+
+def print_expiry_list_result(result)
+  expiries = result["expiries"] || []
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} Available expiries: #{expiries.size}"
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} Next expiry: #{expiries.first}" if expiries.any?
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} Expiries: #{expiries[0..4].join(', ')}#{'...' if expiries.size > 5}"
+end
+
+def print_instrument_result(result)
+  symbol = result["symbol"]
+  security_id = result["security_id"]
+  exchange = result["exchange_segment"]
+
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} Found: #{symbol}"
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} Security ID: #{security_id}"
+  puts "   #{COLOR_LLM}→#{COLOR_RESET} Exchange: #{exchange}"
+end
+
 def show_llm_summary?
   ENV["SHOW_LLM_SUMMARY"] == "true"
 end

data/examples/dhanhq/agents/technical_analysis_agent.rb

@@ -236,7 +236,12 @@ module DhanHQ
             "stop_loss" => { "type" => "number" },
             "target_price" => { "type" => "number" },
             "risk_reward_ratio" => { "type" => "number" },
-            "confidence" => { "type" => "number", "minimum" => 0, "maximum" => 1 },
+            "confidence" => {
+              "type" => "number",
+              "minimum" => 0,
+              "maximum" => 1,
+              "description" => "Confidence (0.0 to 1.0)"
+            },
             "reasoning" => { "type" => "string" },
             "timeframe" => { "type" => "string" }
           }

data/examples/dhanhq/schemas/agent_schemas.rb

@@ -21,7 +21,7 @@ module DhanHQ
             "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)"
           },
           "parameters" => {
             "type" => "object",
@@ -47,7 +47,7 @@ module DhanHQ
             "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)"
           },
           "parameters" => {
             "type" => "object",

data/examples/dhanhq_agent.rb

@@ -76,7 +76,7 @@ class DataAgent
           "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)"
         },
         "parameters" => {
           "type" => "object",
@@ -304,7 +304,7 @@ class TradingAgent
           "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)"
         },
         "parameters" => {
           "type" => "object",
@@ -662,16 +662,26 @@ if __FILE__ == $PROGRAM_NAME
     puts "  ⚠️  RELIANCE data error: #{e.message}"
   end
 
-  # NOTE: Positions and holdings are not part of the 6 Data APIs
+  # NOTE: Positions and holdings are not part of the 6 Data APIs, but available via DhanHQ gem
   begin
-    positions_result = { action: "check_positions", result: { positions: [], count: 0 },
-                         note: "Positions API not available in Data Tools" }
-    if positions_result[:result]
-      market_data[:positions] = positions_result[:result][:positions] || []
-      puts "  ✅ Positions: #{positions_result[:result][:count] || 0} active"
-    else
-      puts "  ✅ Positions: 0 active (Positions API not in Data Tools)"
-      market_data[:positions] = []
+    positions_list = DhanHQ::Models::Position.all
+    positions_data = positions_list.map do |pos|
+      {
+        trading_symbol: pos.trading_symbol,
+        quantity: pos.net_qty,
+        average_price: pos.buy_avg,
+        exchange_segment: pos.exchange_segment,
+        security_id: pos.security_id,
+        pnl: pos.realized_profit
+      }
+    end
+    market_data[:positions] = positions_data
+    puts "  ✅ Positions: #{positions_data.length} active"
+
+    if positions_data.any?
+      positions_data.each do |pos|
+        puts "     - #{pos[:trading_symbol]}: Qty #{pos[:quantity]} @ ₹#{pos[:average_price]}"
+      end
     end
   rescue StandardError => e
     puts "  ⚠️  Positions error: #{e.message}"
@@ -852,8 +862,8 @@ if __FILE__ == $PROGRAM_NAME
   begin
     # NOTE: Options symbols may need different format
     # Try with NIFTY which typically has options
-    # First, get the list of available expiries
-    expiry_list_result = DhanHQDataTools.get_option_chain(
+    # First, get the list of available expiries using get_expiry_list
+    expiry_list_result = DhanHQDataTools.get_expiry_list(
       symbol: "NIFTY", # NIFTY typically has options, RELIANCE might not
       exchange_segment: "IDX_I"
     )