yf_as_dataframe 0.3.1 → 0.4.1

data/lib/yf_as_dataframe/price_history.rb

@@ -1,10 +1,10 @@
 require 'polars'
 require 'polars-df'
+require 'logger'
 
 class YfAsDataframe
   module PriceHistory
     extend ActiveSupport::Concern
-    include ActionView::Helpers::NumberHelper
 
     PRICE_COLNAMES = ['Open', 'High', 'Low', 'Close', 'Adj Close']
     BASE_URL = 'https://query2.finance.yahoo.com'
@@ -35,10 +35,10 @@ class YfAsDataframe
     def history(period: "1mo", interval: "1d", start: nil, fin: nil, prepost: false,
                 actions: true, auto_adjust: true, back_adjust: false, repair: false, keepna: false,
                 rounding: false, raise_errors: false, returns: false)
-      logger = Rails.logger # Yfin.get_yf_logger
+      logger = Logger.new(STDOUT) # Replace Rails.logger with standard Ruby logger
       start_user = start
       # Rails.logger.info { "#{__FILE__}:#{__LINE__} here" }
-      end_user = fin || DateTime.now
+      end_user = fin || Time.now
 
       # Rails.logger.info { "#{__FILE__}:#{__LINE__} here" }
       params = _preprocess_params(start, fin, interval, period, prepost, raise_errors)
@@ -572,7 +572,7 @@ class YfAsDataframe
           if raise_errors
             raise Exception.new("#{@ticker}: #{err_msg}")
           else
-            Rails.logger.error("#{@ticker}: #{err_msg}")
+            Logger.new(STDOUT).error("#{@ticker}: #{err_msg}")
           end
           return YfAsDataframe::Utils.empty_df
         end
@@ -585,7 +585,7 @@ class YfAsDataframe
           if interval == "1m"
             start = (fin - 1.week).to_i
           else
-            max_start_datetime = (DateTime.now - (99.years)).to_i
+            max_start_datetime = (Time.now - (99.years)).to_i
             start = max_start_datetime.to_i
           end
         else
@@ -598,7 +598,7 @@ class YfAsDataframe
       else
         period = period.downcase
         # params = { "range" => period }
-        fin = DateTime.now.to_i
+        fin = Time.now.to_i
         # Rails.logger.info { "#{__FILE__}:#{__LINE__} here fin= #{fin}, period = #{period}" } 
         start = (fin - YfAsDataframe::Utils.interval_to_timedelta(period)).to_i
         params = { "period1" => start, "period2" => fin }
@@ -617,31 +617,40 @@ class YfAsDataframe
     def _get_data(ticker, params, fin, raise_errors)
       url = "https://query2.finance.yahoo.com/v8/finance/chart/#{CGI.escape ticker}"
       # url = "https://query1.finance.yahoo.com/v7/finance/download/#{ticker}" ... Deprecated
-      # Rails.logger.info { "#{__FILE__}:#{__LINE__} url = #{url}" }
+      logger = Logger.new(STDOUT)
+      logger.info { "#{__FILE__}:#{__LINE__} url = #{url}" }
       data = nil
       # get_fn = @data.method(:get)
 
       if fin
         end_dt = DateTime.strptime(fin.to_s, '%s') #.new_offset(0)
-        dt_now = DateTime.now #.new_offset(0)
+        dt_now = Time.now #.new_offset(0)
         data_delay = Rational(30, 24 * 60)
 
         # get_fn = @data.method(:cache_get) if end_dt + data_delay <= dt_now
       end
 
       begin
-        # Rails.logger.info { "#{__FILE__}:#{__LINE__} url = #{url}, params = #{params.inspect}" }
+        logger.info { "#{__FILE__}:#{__LINE__} url = #{url}, params = #{params.inspect}" }
         data = get(url, nil, params).parsed_response
-        # Rails.logger.info { "#{__FILE__}:#{__LINE__} data = #{data.inspect}" }
+        logger.info { "#{__FILE__}:#{__LINE__} data = #{data.inspect}" }
+
+        # Validate response before processing
+        unless validate_yahoo_response(data)
+          raise RuntimeError.new("Invalid response from Yahoo Finance: #{data.inspect}")
+        end
 
         raise RuntimeError.new(
           "*** YAHOO! FINANCE IS CURRENTLY DOWN! ***\n" +
           "Our engineers are working quickly to resolve the issue. Thank you for your patience."
-        ) if data.text.include?("Will be right back") || data.nil?
+        ) if (data.is_a?(String) && data.include?("Will be right back")) || data.nil?
 
-        data = HashWithIndifferentAccess.new(data)
-        # Rails.logger.info { "#{__FILE__}:#{__LINE__} data = #{data.inspect}" }
-      rescue Exception
+        # Use standard Ruby Hash
+        data = data.is_a?(Hash) ? data : JSON.parse(data.to_s) rescue data
+        logger.info { "#{__FILE__}:#{__LINE__} data = #{data.inspect}" }
+      rescue Exception => e
+        logger.error { "#{__FILE__}:#{__LINE__} Exception caught: #{e.message}" }
+        logger.error { "#{__FILE__}:#{__LINE__} Exception backtrace: #{e.backtrace.first(5).join("\n")}" }
         raise if raise_errors
       end
 
@@ -710,7 +719,7 @@ class YfAsDataframe
         # startDt = quotes.index[0].floor('D')
         startDt = quotes['Timestamps'].to_a.map(&:to_date).min
         # Rails.logger.info { "#{__FILE__}:#{__LINE__} startDt = #{startDt.inspect}" }
-        endDt = fin.present? ? fin.to_date : Time.at(DateTime.now.tomorrow).to_i
+        endDt = !fin.nil? && !(fin.respond_to?(:empty?) && fin.empty?) ? fin.to_date : (Time.now + 86400).to_date
 
         # Rails.logger.info { "#{__FILE__}:#{__LINE__} @history[events][dividends] = #{@history['events']["dividends"].inspect}" }
         # divi = {}
@@ -722,32 +731,32 @@ class YfAsDataframe
         # Rails.logger.info { "#{__FILE__}:#{__LINE__} ts = #{ts.inspect}" }
         @history['events']["dividends"].select{|k,v| 
           Time.at(k.to_i).utc.to_date >= startDt && Time.at(k.to_i).utc.to_date <= endDt }.each{|k,v| 
-            d[ts.index(Time.at(k.to_i).utc)] = v['amount'].to_f} unless @history.try(:[],'events').try(:[],"dividends").nil?
+            d[ts.index(Time.at(k.to_i).utc)] = v['amount'].to_f} unless @history.dig('events', 'dividends').nil?
         df['Dividends'] = Polars::Series.new(d)
         # Rails.logger.info { "#{__FILE__}:#{__LINE__} df = #{df.inspect}" }
 
         # caga = {}
         # @history['events']["capital gains"].select{|k,v| 
         #   Time.at(k.to_i).utc.to_date >= startDt  && Time.at(k.to_i).utc.to_date <= endDt }.each{|k,v| 
-        #     caga['date'] = v['amount']} unless @history.try(:[],'events').try(:[],"capital gains").nil?
+        #     caga['date'] = v['amount']} unless @history.dig('events', 'capital gains').nil?
         # capital_gains = capital_gains.loc[startDt:] if capital_gains.shape.first > 0
         # Rails.logger.info { "#{__FILE__}:#{__LINE__} caga = #{caga.inspect}" }
         d = [0.0] * df.length
         @history['events']["capital gains"].select{|k,v| 
           Time.at(k.to_i).utc.to_date >= startDt  && Time.at(k.to_i).utc.to_date <= endDt }.each{|k,v| 
-            d[ts.index(Time.at(k.to_i).utc)] = v['amount'].to_f} unless @history.try(:[],'events').try(:[],"capital gains").nil?
+            d[ts.index(Time.at(k.to_i).utc)] = v['amount'].to_f} unless @history.dig('events', 'capital gains').nil?
         df['Capital Gains'] = Polars::Series.new(d)
 
         # splits = splits.loc[startDt:] if splits.shape[0] > 0
         # stspl = {}
         # @history['events']['stock splits'].select{|k,v| 
         #   Time.at(k.to_i).utc.to_date >= startDt  && Time.at(k.to_i).utc.to_date <= endDt }.each{|k,v| 
-        #     stspl['date'] = v['numerator'].to_f/v['denominator'].to_f} unless @history.try(:[],'events').try(:[],"stock splits").nil?
+        #     stspl['date'] = v['numerator'].to_f/v['denominator'].to_f} unless @history.dig('events', 'capital gains').nil?
         # Rails.logger.info { "#{__FILE__}:#{__LINE__} stspl = #{stspl.inspect}" }
         d = [0.0] * df.length
         @history['events']["capital gains"].select{|k,v| 
           Time.at(k.to_i).utc.to_date >= startDt  && Time.at(k.to_i).utc.to_date <= endDt }.each{|k,v| 
-            d[ts.index(Time.at(k.to_i).utc)] = v['numerator'].to_f/v['denominator'].to_f} unless @history.try(:[],'events').try(:[],"capital gains").nil?
+            d[ts.index(Time.at(k.to_i).utc)] = v['numerator'].to_f/v['denominator'].to_f} unless @history.dig('events', 'capital gains').nil?
         df['Stock Splits'] = Polars::Series.new(d)
       end
 
@@ -2019,7 +2028,7 @@ class YfAsDataframe
     end
 
     def _exchange_open_now
-      t = DateTime.now
+      t = Time.now
       _get_exchange_metadata
 
       # if self._today_open is nil and self._today_close.nil?
@@ -2041,5 +2050,26 @@ class YfAsDataframe
       # print("_exchange_open_now returning", r)
       # return r
     end
+
+    private
+
+    def validate_yahoo_response(response)
+      return false if response.nil?
+      return false if response.is_a?(String) && response.include?("Too Many Requests")
+      return false if response.is_a?(String) && response.include?("Will be right back")
+      return false if response.is_a?(String) && response.include?("<html>")
+      return false if response.is_a?(String) && response.strip.empty?
+      
+      # If it's a Hash, validate it has the expected structure
+      if response.is_a?(Hash)
+        return false unless response.key?("chart")
+        return false unless response["chart"].is_a?(Hash)
+        return false unless response["chart"].key?("result")
+        return false unless response["chart"]["result"].is_a?(Array)
+        return false if response["chart"]["result"].empty?
+      end
+      
+      true
+    end
   end
 end

data/lib/yf_as_dataframe/price_technical.rb

@@ -3,7 +3,6 @@ require 'tulirb'
 class YfAsDataframe
   module PriceTechnical
     extend ActiveSupport::Concern
-    include ActionView::Helpers::NumberHelper
 
 
     def ad(df)

data/lib/yf_as_dataframe/quote.rb

@@ -1,4 +1,5 @@
 require 'httparty'
+require 'logger'
 
 class YfAsDataframe
   module Quote
@@ -129,7 +130,7 @@ class YfAsDataframe
         result = get_raw_json(QUOTE_SUMMARY_URL + "/#{symbol}", user_agent_headers=user_agent_headers, params=params_dict)
         # Rails.logger.info { "#{__FILE__}:#{__LINE__} result = #{result.inspect}" }
       rescue Exception => e
-        Rails.logger.error("ERROR: #{e.message}")
+        Logger.new(STDOUT).error("ERROR: #{e.message}")
         return nil
       end
       return result
@@ -192,10 +193,10 @@ class YfAsDataframe
         keys.each { |k| url += "&type=" + k }
 
         # Request 6 months of data
-        start = (DateTime.now.utc.midnight - 6.months).to_i #datetime.timedelta(days=365 // 2)
+        start = (Time.now.utc.midnight - 6.months).to_i #datetime.timedelta(days=365 // 2)
         # start = int(start.timestamp())
 
-        ending = DateTime.now.utc.tomorrow.midnight.to_i
+        ending = Time.now.utc.tomorrow.midnight.to_i
         # ending = int(ending.timestamp())
         url += "&period1=#{start}&period2=#{ending}"
 

data/lib/yf_as_dataframe/ticker.rb

@@ -1,3 +1,6 @@
+require 'tzinfo'
+require 'logger'
+
 class YfAsDataframe
   class Ticker
     ROOT_URL = 'https://finance.yahoo.com'.freeze
@@ -44,28 +47,28 @@ class YfAsDataframe
     def symbol; @ticker; end
 
     def shares_full(start: nil, fin: nil)
-      logger = Rails.logger
+      logger = Logger.new(STDOUT)
 
       # Rails.logger.info { "#{__FILE__}:#{__LINE__} start = #{start.inspect}, fin = #{fin.inspect}" } 
 
       if start
         start_ts = YfAsDataframe::Utils.parse_user_dt(start, tz)
         # Rails.logger.info { "#{__FILE__}:#{__LINE__} start_ts = #{start_ts}" }
-        start = Time.at(start_ts).in_time_zone(tz)
+        start = Time.at(start_ts)
         # Rails.logger.info { "#{__FILE__}:#{__LINE__} start = #{start.inspect}, fin = #{fin.inspect}" } 
       end
       if fin
         end_ts = YfAsDataframe::Utils.parse_user_dt(fin, tz)
         # Rails.logger.info { "#{__FILE__}:#{__LINE__} end_ts = #{end_ts}" }
-        fin = Time.at(end_ts).in_time_zone(tz)
+        fin = Time.at(end_ts)
         # Rails.logger.info { "#{__FILE__}:#{__LINE__} start = #{start.inspect}, fin = #{fin.inspect}" } 
       end
 
       # Rails.logger.info { "#{__FILE__}:#{__LINE__} start = #{start.inspect}, fin = #{fin.inspect}" } 
 
-      dt_now = DateTime.now.in_time_zone(tz)
+      dt_now = Time.now
       fin ||= dt_now
-      start ||= (fin - 548.days).midnight
+      start ||= Time.new(fin.year, fin.month, fin.day) - 548*24*60*60
 
       if start >= fin
         logger.error("Start date (#{start}) must be before end (#{fin})")
@@ -73,7 +76,7 @@ class YfAsDataframe
       end
 
       ts_url_base = "https://query2.finance.yahoo.com/ws/fundamentals-timeseries/v1/finance/timeseries/#{@ticker}?symbol=#{@ticker}"
-      shares_url = "#{ts_url_base}&period1=#{start.to_i}&period2=#{fin.tomorrow.midnight.to_i}"
+      shares_url = "#{ts_url_base}&period1=#{Time.new(start.year, start.month, start.day).to_i}&period2=#{Time.new((fin + 86400).year, (fin + 86400).month, (fin + 86400).day).to_i}"
 
       begin
         json_data = get(shares_url).parsed_response
@@ -92,7 +95,7 @@ class YfAsDataframe
 
       return nil if !shares_data[0].key?("shares_out")
 
-      timestamps = shares_data[0]["timestamp"].map{|t| Time.at(t).to_datetime }
+      timestamps = shares_data[0]["timestamp"].map{|t| Time.at(t) }
 
       df = Polars::DataFrame.new(
         {
@@ -107,7 +110,7 @@ class YfAsDataframe
     def shares
       return @shares unless @shares.nil?
 
-      full_shares = shares_full(start: DateTime.now.utc.to_date-548.days, fin: DateTime.now.utc.to_date)
+      full_shares = shares_full(start: Time.now.utc.to_date-548.days, fin: Time.now.utc.to_date)
       # Rails.logger.info { "#{__FILE__}:#{__LINE__} full_shares = #{full_shares.inspect}" }
 
       # if shares.nil?
@@ -150,7 +153,7 @@ class YfAsDataframe
       # """
       return @earnings_dates[limit] if @earnings_dates && @earnings_dates[limit]
 
-      logger = Rails.logger
+      logger = Logger.new(STDOUT)
 
       page_size = [limit, 100].min  # YF caps at 100, don't go higher
       page_offset = 0

data/lib/yf_as_dataframe/utils.rb

@@ -247,13 +247,17 @@ class YfAsDataframe
 
     def self.parse_user_dt(dt, exchange_tz)
       if dt.is_a?(Integer)
-        Time.at(dt)
+        return Time.at(dt)
       elsif dt.is_a?(String)
-        dt = DateTime.strptime(dt.to_s, '%Y-%m-%d') 
+        dt = DateTime.strptime(dt.to_s, '%Y-%m-%d')
       elsif dt.is_a?(Date)
-        dt = dt.to_datetime 
-      elsif dt.is_a?(DateTime) && dt.zone.nil?
-        dt = dt.in_time_zone(exchange_tz)
+        dt = dt.to_datetime
+      end
+      # If it's a DateTime, convert to Time
+      if dt.is_a?(DateTime)
+        # If zone is nil, try to set it, else just convert
+        dt = dt.in_time_zone(exchange_tz) if dt.zone.nil? && dt.respond_to?(:in_time_zone)
+        dt = dt.to_time
       end
       dt.to_i
     end
@@ -261,37 +265,80 @@ class YfAsDataframe
     def self.interval_to_timedelta(interval)
       case interval
       when '1mo'
-        1.month
+        # Calculate 1 month from now to get accurate days
+        now = Time.now
+        next_month = Time.new(now.year, now.month + 1, now.day)
+        # Handle year rollover
+        next_month = Time.new(now.year + 1, 1, now.day) if next_month.month == 1
+        (next_month - now).to_i
       when '2mo'
-        2.months
+        # Calculate 2 months from now
+        now = Time.now
+        next_month = Time.new(now.year, now.month + 2, now.day)
+        # Handle year rollover
+        next_month = Time.new(now.year + 1, next_month.month, now.day) if next_month.month <= 2
+        (next_month - now).to_i
       when '3mo'
-        3.months
+        # Calculate 3 months from now
+        now = Time.now
+        next_month = Time.new(now.year, now.month + 3, now.day)
+        # Handle year rollover
+        next_month = Time.new(now.year + 1, next_month.month, now.day) if next_month.month <= 3
+        (next_month - now).to_i
       when '6mo'
-        6.months
+        # Calculate 6 months from now
+        now = Time.now
+        next_month = Time.new(now.year, now.month + 6, now.day)
+        # Handle year rollover
+        next_month = Time.new(now.year + 1, next_month.month, now.day) if next_month.month <= 6
+        (next_month - now).to_i
       when '9mo'
-        9.months
+        # Calculate 9 months from now
+        now = Time.now
+        next_month = Time.new(now.year, now.month + 9, now.day)
+        # Handle year rollover
+        next_month = Time.new(now.year + 1, next_month.month, now.day) if next_month.month <= 9
+        (next_month - now).to_i
       when '12mo'
-        1.year
+        # Calculate 12 months (1 year) from now
+        now = Time.now
+        next_year = Time.new(now.year + 1, now.month, now.day)
+        (next_year - now).to_i
       when '1y'
-        1.year
+        # Calculate 1 year from now
+        now = Time.now
+        next_year = Time.new(now.year + 1, now.month, now.day)
+        (next_year - now).to_i
       when '2y'
-        2.year
+        # Calculate 2 years from now
+        now = Time.now
+        next_year = Time.new(now.year + 2, now.month, now.day)
+        (next_year - now).to_i
       when '3y'
-        3.year
+        # Calculate 3 years from now
+        now = Time.now
+        next_year = Time.new(now.year + 3, now.month, now.day)
+        (next_year - now).to_i
       when '4y'
-        4.year
+        # Calculate 4 years from now
+        now = Time.now
+        next_year = Time.new(now.year + 4, now.month, now.day)
+        (next_year - now).to_i
       when '5y'
-        5.year
+        # Calculate 5 years from now
+        now = Time.now
+        next_year = Time.new(now.year + 5, now.month, now.day)
+        (next_year - now).to_i
       when '1wk'
-        1.week
+        7.days
       when '2wk'
-        2.week
+        14.days
       when '3wk'
-        3.week
+        21.days
       when '4wk'
-        4.week
+        28.days
       else
-        Rails.logger.warn { "#{__FILE__}:#{__LINE__} #{interval} not a recognized interval" }
+        # Logger.new(STDOUT).warn { "#{__FILE__}:#{__LINE__} #{interval} not a recognized interval" }
         interval
       end
     end

data/lib/yf_as_dataframe/version.rb

@@ -1,3 +1,3 @@
 class YfAsDataframe
-  VERSION = "0.3.1"
+  VERSION = "0.4.1"
 end