DhanHQ 3.0.1 → 3.1.0

data/skills/dhanhq-ruby/scripts/resolve_security.rb

@@ -0,0 +1,168 @@
+# frozen_string_literal: true
+# rubocop:disable Style/FormatStringToken
+# rubocop:disable Performance/CollectionLiteralInLoop
+
+$LOAD_PATH.unshift(File.expand_path("../../lib", __dir__))
+require "dhan_hq"
+require_relative "dhan_helpers"
+
+def load_security_master(_segment = "compact")
+  puts "Loading security master segments..."
+  # Unlike Python, Ruby SDK by_segment is segment-specific.
+  # We will resolve dynamically when searching.
+end
+
+def search_equity(query, limit = 10)
+  query_upper = query.to_s.upcase.strip
+
+  results = []
+  %w[NSE_EQ BSE_EQ].each do |segment|
+    instruments = begin
+      DhanHQ::Models::Instrument.by_segment(segment)
+    rescue StandardError
+      []
+    end
+    instruments.each do |inst|
+      next unless inst.instrument == DhanHQ::Constants::InstrumentType::EQUITY
+
+      symbol_name = inst.symbol_name.to_s.upcase
+      underlying = inst.underlying_symbol.to_s.upcase
+      display_name = inst.display_name.to_s.upcase
+
+      if symbol_name == query_upper || display_name == query_upper
+        results << inst
+      elsif symbol_name.include?(query_upper) || display_name.include?(query_upper) || underlying.include?(query_upper)
+        results << inst
+      end
+
+      break if results.size >= limit
+    end
+    break if results.size >= limit
+  end
+  begin
+    results.head(limit)
+  rescue StandardError
+    results.first(limit)
+  end
+end
+
+def search_derivative(underlying, strike: nil, option_type: nil, expiry: nil, limit: 20)
+  # Look in NSE_FNO and BSE_FNO
+  results = []
+  %w[NSE_FNO BSE_FNO].each do |segment|
+    instruments = begin
+      DhanHQ::Models::Instrument.by_segment(segment)
+    rescue StandardError
+      []
+    end
+    matched = instruments.select do |inst|
+      symbol_match = inst.underlying_symbol&.upcase == underlying.upcase ||
+                     inst.symbol_name&.upcase&.start_with?(underlying.upcase)
+
+      match = symbol_match
+
+      if option_type == "FUT"
+        match &&= inst.instrument&.upcase&.include?("FUT")
+      elsif %w[CE PE].include?(option_type)
+        match &&= inst.option_type&.upcase == option_type
+      end
+
+      match &&= inst.strike_price&.to_f == strike.to_f if strike
+
+      match &&= inst.expiry_date == expiry if expiry
+
+      match
+    end
+
+    results.concat(matched)
+  end
+
+  results.sort_by { |inst| [inst.expiry_date.to_s, inst.symbol_name.to_s] }.first(limit)
+end
+
+def parse_query(query)
+  parts = query.upcase.split
+
+  return { type: :equity, name: query } if parts.size <= 2 && parts.none? { |p| %w[CE PE FUT FUTURE].include?(p) }
+
+  underlying = parts[0]
+  strike = nil
+  option_type = nil
+  expiry = nil
+
+  parts[1..].each do |part|
+    if %w[CE PE].include?(part)
+      option_type = part
+    elsif %w[FUT FUTURE].include?(part)
+      option_type = "FUT"
+    elsif part.include?("-") && part.length == 10
+      expiry = part
+    else
+      begin
+        strike = Float(part)
+      rescue ArgumentError
+        underlying += " #{part}"
+      end
+    end
+  end
+
+  {
+    type: :fno,
+    underlying: underlying,
+    strike: strike,
+    option_type: option_type,
+    expiry: expiry
+  }
+end
+
+def main
+  if ARGV.empty?
+    puts "Usage: ruby scripts/resolve_security.rb <query>"
+    puts "Examples: \"RELIANCE\", \"HDFC Bank\", \"NIFTY 24000 CE 2025-03-27\""
+    exit 1
+  end
+
+  query = ARGV.join(" ")
+  parsed = parse_query(query)
+
+  # Ensure configuration is initialized (can be dummy if just reading files)
+  begin
+    DhanHQ.configure_with_env
+  rescue StandardError
+    nil
+  end
+
+  results = if parsed[:type] == :equity
+              search_equity(parsed[:name])
+            else
+              search_derivative(
+                parsed[:underlying],
+                strike: parsed[:strike],
+                option_type: parsed[:option_type],
+                expiry: parsed[:expiry]
+              )
+            end
+
+  if results.empty?
+    puts "No instruments found for: #{query}"
+    return
+  end
+
+  puts "\nResults for: #{query}\n\n"
+  printf("%-15s | %-18s | %-12s | %-12s | %-6s | %-10s\n", "Security ID", "Trading Symbol", "Exchange Seg", "Instrument", "Lot", "Expiry")
+  puts "-" * 85
+  results.each do |row|
+    printf(
+      "%-15s | %-18s | %-12s | %-12s | %-6d | %-10s\n",
+      row.security_id.to_s,
+      row.symbol_name.to_s,
+      row.exchange_segment.to_s,
+      row.instrument.to_s,
+      row.lot_size.to_i,
+      row.expiry_date.to_s
+    )
+  end
+  puts
+end
+
+main if __FILE__ == $PROGRAM_NAME

data/skills/dhanhq-ruby/scripts/trade_logger.rb

@@ -0,0 +1,131 @@
+# frozen_string_literal: true
+# rubocop:disable Style/FormatStringToken
+# rubocop:disable Naming/AccessorMethodName
+
+require "json"
+require "fileutils"
+require "date"
+
+def _get_log_path
+  plugin_data = ENV.fetch("CLAUDE_PLUGIN_DATA", nil)
+  if plugin_data && !plugin_data.empty?
+    FileUtils.mkdir_p(plugin_data)
+    File.join(plugin_data, "trades.jsonl")
+  else
+    default_dir = File.expand_path("../data", __dir__)
+    FileUtils.mkdir_p(default_dir)
+    File.join(default_dir, "trades.jsonl")
+  end
+end
+
+def log_order(order_params, response, notes = "")
+  log_path = _get_log_path
+  FileUtils.mkdir_p(File.dirname(log_path))
+
+  status = response[:status] || response["status"]
+  data = response[:data] || response["data"]
+  order_id = data.is_a?(Hash) ? (data[:orderId] || data["orderId"]) : nil
+
+  record = {
+    "timestamp" => Time.now.strftime("%Y-%m-%dT%H:%M:%S%:z"),
+    "order_params" => order_params,
+    "response" => response,
+    "order_id" => order_id,
+    "status" => status,
+    "notes" => notes
+  }
+
+  File.open(log_path, "a") do |f|
+    f.write("#{JSON.dump(record)}\n")
+  end
+
+  record
+end
+
+def _read_all_records
+  log_path = _get_log_path
+  return [] unless File.exist?(log_path)
+
+  records = []
+  File.foreach(log_path) do |line|
+    line_trimmed = line.strip
+    next if line_trimmed.empty?
+
+    records << JSON.parse(line_trimmed)
+  rescue JSON::ParserError
+    # skip invalid lines
+  end
+  records
+end
+
+def get_today_orders
+  today_str = begin
+    Date.today.isoformat
+  rescue StandardError
+    Date.today.strftime("%Y-%m-%d")
+  end
+  _read_all_records.select { |r| r["timestamp"].start_with?(today_str) }
+end
+
+def get_trade_history(days = 7)
+  cutoff_time = Time.now - (days * 24 * 60 * 60)
+  cutoff_str = cutoff_time.strftime("%Y-%m-%dT%H:%M:%S%:z")
+
+  records = _read_all_records.select { |r| r["timestamp"] >= cutoff_str }
+  records.sort_by { |r| r["timestamp"] }.reverse
+end
+
+def get_trade_summary(days = 7)
+  records = get_trade_history(days)
+  summary = {
+    "period_days" => days,
+    "total_orders" => records.size,
+    "successful" => records.count { |r| r["status"] == "success" },
+    "failed" => records.count { |r| r["status"] != "success" },
+    "buy_count" => 0,
+    "sell_count" => 0,
+    "instruments_traded" => []
+  }
+
+  instruments = []
+  records.each do |r|
+    params = r["order_params"] || {}
+    txn = params["transaction_type"] || params[:transaction_type] || ""
+    if txn.to_s.upcase == DhanHQ::Constants::TransactionType::BUY
+      summary["buy_count"] += 1
+    elsif txn.to_s.upcase == DhanHQ::Constants::TransactionType::SELL
+      summary["sell_count"] += 1
+    end
+
+    sid = params["security_id"] || params[:security_id] || params["trading_symbol"] || params[:trading_symbol]
+    instruments << sid.to_s if sid
+  end
+
+  summary["instruments_traded"] = instruments.uniq
+  summary
+end
+
+def print_today_orders
+  orders = get_today_orders
+  if orders.empty?
+    puts "No orders placed today."
+    return
+  end
+
+  puts "--- Today's Orders (#{orders.size} total) ---"
+  orders.each do |r|
+    params = r["order_params"] || {}
+    status = r["status"] || "unknown"
+    oid = r["order_id"] || "N/A"
+    txn = params["transaction_type"] || params[:transaction_type] || "?"
+    sym = params["trading_symbol"] || params[:trading_symbol] || params["security_id"] || params[:security_id] || "?"
+    qty = params["quantity"] || params[:quantity] || "?"
+    price = params["price"] || params[:price] || "MKT"
+
+    time_part = r["timestamp"].split("T")[1] ? r["timestamp"].split("T")[1][0...8] : "00:00:00"
+
+    printf("  [%s] %-8s | %-4s %dx %s @ %s | ID: %s\n", time_part, status.to_s.upcase, txn.to_s.upcase, qty, sym, price, oid)
+  end
+end
+
+print_today_orders if __FILE__ == $PROGRAM_NAME

data/skills/dhanhq-ruby/scripts/validate_order.rb

@@ -0,0 +1,169 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+# rubocop:disable Metrics/AbcSize
+# rubocop:disable Metrics/CyclomaticComplexity
+# rubocop:disable Metrics/PerceivedComplexity
+# rubocop:disable Metrics/ParameterLists
+# rubocop:disable Style/FormatString
+
+require "date"
+
+LOT_SIZES = {
+  "NIFTY" => 75,
+  "BANKNIFTY" => 15,
+  "FINNIFTY" => 25,
+  "MIDCPNIFTY" => 50,
+  "SENSEX" => 10
+}.freeze
+
+FREEZE_QTY = {
+  "NIFTY" => 1800,
+  "BANKNIFTY" => 900,
+  "FINNIFTY" => 1000,
+  "MIDCPNIFTY" => 2800,
+  "SENSEX" => 500
+}.freeze
+
+VALID_EXCHANGE_SEGMENTS = %w[
+  NSE_EQ BSE_EQ NSE_FNO BSE_FNO MCX_COMM NSE_CURRENCY BSE_CURRENCY
+].freeze
+
+EQUITY_SEGMENTS = %w[NSE_EQ BSE_EQ].freeze
+DERIVATIVE_SEGMENTS = %w[NSE_FNO BSE_FNO MCX_COMM NSE_CURRENCY BSE_CURRENCY].freeze
+
+EQUITY_PRODUCT_TYPES = %w[CNC INTRADAY MARGIN MTF].freeze
+DERIVATIVE_PRODUCT_TYPES = %w[INTRADAY MARGIN].freeze
+
+VALID_ORDER_TYPES = %w[LIMIT MARKET STOP_LOSS STOP_LOSS_MARKET].freeze
+VALID_TRANSACTION_TYPES = %w[BUY SELL].freeze
+VALID_VALIDITY = %w[DAY IOC].freeze
+
+NOTIONAL_WARNING_THRESHOLD = 50_000
+
+def _infer_lot_size(trading_symbol)
+  return nil if trading_symbol.nil? || trading_symbol.to_s.empty?
+
+  symbol_upper = trading_symbol.to_s.upcase
+  LOT_SIZES.each do |name, lot_size|
+    return lot_size if symbol_upper.include?(name)
+  end
+  nil
+end
+
+def _infer_freeze_qty(trading_symbol)
+  return nil if trading_symbol.nil? || trading_symbol.to_s.empty?
+
+  symbol_upper = trading_symbol.to_s.upcase
+  FREEZE_QTY.each do |name, freeze_qty|
+    return freeze_qty if symbol_upper.include?(name)
+  end
+  nil
+end
+
+def validate_order(
+  security_id: nil,
+  exchange_segment: nil,
+  transaction_type: nil,
+  quantity: nil,
+  order_type: nil,
+  product_type: nil,
+  price: 0.0,
+  trigger_price: 0.0,
+  validity: DhanHQ::Constants::Validity::DAY,
+  after_market_order: false,
+  trading_symbol: nil,
+  lot_size: nil
+)
+  errors = []
+  warnings = []
+
+  exchange_segment = exchange_segment&.to_s&.upcase
+  transaction_type = transaction_type&.to_s&.upcase
+  order_type = order_type&.to_s&.upcase
+  product_type = product_type&.to_s&.upcase
+  validity = validity&.to_s&.upcase
+
+  errors << "security_id is required" if security_id.nil? || security_id.to_s.empty?
+  errors << "exchange_segment is required" if exchange_segment.nil? || exchange_segment.to_s.empty?
+  errors << "transaction_type is required" if transaction_type.nil? || transaction_type.to_s.empty?
+  errors << "quantity must be a positive integer" if quantity.nil? || quantity.to_i <= 0
+  errors << "order_type is required" if order_type.nil? || order_type.to_s.empty?
+  errors << "product_type is required" if product_type.nil? || product_type.to_s.empty?
+
+  errors << "Invalid exchange_segment: #{exchange_segment}" if exchange_segment && !VALID_EXCHANGE_SEGMENTS.include?(exchange_segment)
+  errors << "Invalid transaction_type: #{transaction_type}" if transaction_type && !VALID_TRANSACTION_TYPES.include?(transaction_type)
+  errors << "Invalid order_type: #{order_type}" if order_type && !VALID_ORDER_TYPES.include?(order_type)
+  errors << "Invalid validity: #{validity}" if validity && !VALID_VALIDITY.include?(validity)
+
+  errors << "price is required for #{order_type} orders" if %w[LIMIT STOP_LOSS].include?(order_type) && price.to_f <= 0
+  errors << "trigger_price is required for #{order_type} orders" if %w[STOP_LOSS STOP_LOSS_MARKET].include?(order_type) && trigger_price.to_f <= 0
+
+  if exchange_segment && EQUITY_SEGMENTS.include?(exchange_segment) && product_type && !EQUITY_PRODUCT_TYPES.include?(product_type)
+    errors << "Invalid product_type '#{product_type}' for equity segment '#{exchange_segment}'. Valid values: #{EQUITY_PRODUCT_TYPES.sort}"
+  end
+
+  if exchange_segment && DERIVATIVE_SEGMENTS.include?(exchange_segment) && product_type && !DERIVATIVE_PRODUCT_TYPES.include?(product_type)
+    errors << "Invalid product_type '#{product_type}' for derivative segment '#{exchange_segment}'. Valid values: #{DERIVATIVE_PRODUCT_TYPES.sort}"
+  end
+
+  warnings << "Dhan's current order docs say API market orders are converted to limit orders with MPP." if order_type == DhanHQ::Constants::OrderType::MARKET
+
+  effective_lot_size = lot_size || _infer_lot_size(trading_symbol)
+  if exchange_segment && DERIVATIVE_SEGMENTS.include?(exchange_segment) && quantity
+    if effective_lot_size && quantity.to_i % effective_lot_size != 0
+      errors << "Derivative quantity must be a multiple of lot size #{effective_lot_size}. Got #{quantity}."
+    elsif effective_lot_size.nil?
+      warnings << "Could not resolve a lot size from the provided data. Confirm lot size from the security master before placing."
+    end
+
+    freeze_qty = _infer_freeze_qty(trading_symbol)
+    if freeze_qty && quantity.to_i > freeze_qty
+      warnings << "Quantity #{quantity} exceeds fallback freeze quantity #{freeze_qty}. Consider place_slice_order() after verifying the latest exchange freeze limits."
+    end
+  end
+
+  if price.to_f.positive? && quantity
+    notional = price.to_f * quantity.to_i
+    warnings << "High notional value: Rs. #{"%.2f" % notional} exceeds the Rs. 50,000 warning threshold." if notional > NOTIONAL_WARNING_THRESHOLD
+  end
+
+  unless after_market_order
+    now = Time.now
+    if now.saturday? || now.sunday?
+      warnings << "Market is closed on weekends. Use AMO only if that is intentional."
+    elsif now.hour < 9 || (now.hour == 9 && now.min < 15)
+      warnings << "Regular market is not yet open."
+    elsif now.hour > 15 || (now.hour == 15 && now.min > 30)
+      warnings << "Regular market is closed. Use AMO only if that is intentional."
+    end
+  end
+
+  {
+    "valid" => errors.empty?,
+    "errors" => errors,
+    "warnings" => warnings
+  }
+end
+
+def print_validation(result)
+  if result["valid"]
+    puts "Order validation: PASS"
+  else
+    puts "Order validation: FAIL"
+    result["errors"].each { |error| puts "  ERROR: #{error}" }
+  end
+  result["warnings"].each { |warning| puts "  WARNING: #{warning}" }
+end
+
+if __FILE__ == $PROGRAM_NAME
+  sample = validate_order(
+    security_id: "2885",
+    exchange_segment: DhanHQ::Constants::ExchangeSegment::NSE_EQ,
+    transaction_type: DhanHQ::Constants::TransactionType::BUY,
+    quantity: 10,
+    order_type: DhanHQ::Constants::OrderType::LIMIT,
+    product_type: DhanHQ::Constants::ProductType::CNC,
+    price: 2450
+  )
+  print_validation(sample)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: DhanHQ
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Shubham Taywade
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-07-08 00:00:00.000000000 Z
+date: 2026-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -172,6 +172,7 @@ email:
 - shubhamtaywade82@gmail.com
 executables:
 - DhanHQ
+- dhanhq-mcp
 extensions: []
 extra_rdoc_files: []
 files:
@@ -216,6 +217,7 @@ files:
 - docs/WEBSOCKET_PROTOCOL.md
 - docs/architecture-overview.svg
 - exe/DhanHQ
+- exe/dhanhq-mcp
 - lib/DhanHQ.rb
 - lib/DhanHQ/agent.rb
 - lib/DhanHQ/agent/order_preview.rb
@@ -339,19 +341,28 @@ files:
 - lib/DhanHQ/resources/twap_orders.rb
 - lib/DhanHQ/risk.rb
 - lib/DhanHQ/risk/checks/asm_gsm.rb
+- lib/DhanHQ/risk/checks/concentration.rb
 - lib/DhanHQ/risk/checks/market_hours.rb
+- lib/DhanHQ/risk/checks/max_loss.rb
 - lib/DhanHQ/risk/checks/options.rb
 - lib/DhanHQ/risk/checks/order_type.rb
+- lib/DhanHQ/risk/checks/position_limits.rb
 - lib/DhanHQ/risk/checks/product_support.rb
 - lib/DhanHQ/risk/checks/quantity.rb
 - lib/DhanHQ/risk/checks/trading_permission.rb
 - lib/DhanHQ/risk/pipeline.rb
 - lib/DhanHQ/skills.rb
 - lib/DhanHQ/skills/base.rb
+- lib/DhanHQ/skills/builtin/bear_call_spread.rb
+- lib/DhanHQ/skills/builtin/bull_put_spread.rb
 - lib/DhanHQ/skills/builtin/buy_atm_call.rb
+- lib/DhanHQ/skills/builtin/covered_call.rb
 - lib/DhanHQ/skills/builtin/iron_condor.rb
+- lib/DhanHQ/skills/builtin/market_data_summarizer.rb
+- lib/DhanHQ/skills/builtin/protective_put.rb
 - lib/DhanHQ/skills/builtin/square_off_all.rb
 - lib/DhanHQ/skills/builtin/square_off_position.rb
+- lib/DhanHQ/skills/builtin/straddle.rb
 - lib/DhanHQ/skills/builtin/strangle.rb
 - lib/DhanHQ/skills/registry.rb
 - lib/DhanHQ/skills/workflow.rb
@@ -406,8 +417,33 @@ files:
 - lib/ta/technical_analysis.rb
 - sig/DhanHQ.rbs
 - skills/dhanhq-ruby/SKILL.md
-- skills/dhanhq-ruby/references/market_data.md
+- skills/dhanhq-ruby/examples/fetch_option_chain.rb
+- skills/dhanhq-ruby/examples/gtt_forever_order.rb
+- skills/dhanhq-ruby/examples/historical_data_analysis.rb
+- skills/dhanhq-ruby/examples/iron_condor.rb
+- skills/dhanhq-ruby/examples/live_feed_setup.rb
+- skills/dhanhq-ruby/examples/margin_check.rb
+- skills/dhanhq-ruby/examples/order_management.rb
+- skills/dhanhq-ruby/examples/place_equity_order.rb
+- skills/dhanhq-ruby/examples/place_fno_order.rb
+- skills/dhanhq-ruby/examples/portfolio_summary.rb
+- skills/dhanhq-ruby/examples/super_order_with_sl.rb
+- skills/dhanhq-ruby/references/backtesting-with-dhan.md
+- skills/dhanhq-ruby/references/common-workflows.md
+- skills/dhanhq-ruby/references/error-codes.md
+- skills/dhanhq-ruby/references/funds.md
+- skills/dhanhq-ruby/references/instruments.md
+- skills/dhanhq-ruby/references/live-feed.md
+- skills/dhanhq-ruby/references/market-data.md
+- skills/dhanhq-ruby/references/option-chain.md
+- skills/dhanhq-ruby/references/options-analysis-patterns.md
 - skills/dhanhq-ruby/references/orders.md
+- skills/dhanhq-ruby/references/portfolio.md
+- skills/dhanhq-ruby/references/scanx-data.md
+- skills/dhanhq-ruby/scripts/dhan_helpers.rb
+- skills/dhanhq-ruby/scripts/resolve_security.rb
+- skills/dhanhq-ruby/scripts/trade_logger.rb
+- skills/dhanhq-ruby/scripts/validate_order.rb
 - watchlist.csv
 homepage: https://github.com/shubhamtaywade82/dhanhq-client
 licenses:

data/skills/dhanhq-ruby/references/market_data.md

@@ -1,3 +0,0 @@
-# Market data with agents
-
-Use `DhanHQ::Models::Instrument.search` to resolve a query to Dhan security IDs, then call `DhanHQ::Models::MarketFeed.ltp`, `.ohlc`, or `.quote` with an exchange-segment keyed payload.