blazer 2.4.2 → 2.4.6

data/app/controllers/blazer/queries_controller.rb

@@ -71,7 +71,7 @@ module Blazer
         @sql_errors << error if error
       end
 
-      @query.update!(status: "active") if @query.try(:status) == "archived"
+      @query.update!(status: "active") if @query.respond_to?(:status) && @query.status.in?(["archived", nil])
 
       Blazer.transform_statement.call(data_source, @statement) if Blazer.transform_statement
 
@@ -180,6 +180,7 @@ module Blazer
         @query = Blazer::Query.new
         @query.creator = blazer_user if @query.respond_to?(:creator)
       end
+      @query.status = "active" if @query.respond_to?(:status)
       unless @query.editable?(blazer_user)
         @query.errors.add(:base, "Sorry, permission denied")
       end

data/app/models/blazer/query.rb

@@ -8,7 +8,7 @@ module Blazer
 
     validates :statement, presence: true
 
-    scope :active, -> { column_names.include?("status") ? where(status: "active") : all }
+    scope :active, -> { column_names.include?("status") ? where(status: ["active", nil]) : all }
     scope :named, -> { where.not(name: "") }
 
     def to_param

data/lib/blazer/adapters/athena_adapter.rb

@@ -8,19 +8,25 @@ module Blazer
         rows = []
         error = nil
 
+        query_options = {
+          query_string: statement,
+          # use token so we fetch cached results after query is run
+          client_request_token: Digest::MD5.hexdigest([statement, data_source.id, settings["workgroup"]].compact.join("/")),
+          query_execution_context: {
+            database: database,
+          }
+        }
+
+        if settings["output_location"]
+          query_options[:result_configuration] = {output_location: settings["output_location"]}
+        end
+
+        if settings["workgroup"]
+          query_options[:work_group] = settings["workgroup"]
+        end
+
         begin
-          resp =
-            client.start_query_execution(
-              query_string: statement,
-              # use token so we fetch cached results after query is run
-              client_request_token: Digest::MD5.hexdigest([statement,data_source.id].join("/")),
-              query_execution_context: {
-                database: database,
-              },
-              result_configuration: {
-                output_location: settings["output_location"]
-              }
-            )
+          resp = client.start_query_execution(**query_options)
           query_execution_id = resp.query_execution_id
 
           timeout = data_source.timeout || 300
@@ -60,21 +66,21 @@ module Blazer
             column_types.each_with_index do |ct, i|
               # TODO more column_types
               case ct
-              when "timestamp"
+              when "timestamp", "timestamp with time zone"
                 rows.each do |row|
-                  row[i] = utc.parse(row[i])
+                  row[i] &&= utc.parse(row[i])
                 end
               when "date"
                 rows.each do |row|
-                  row[i] = Date.parse(row[i])
+                  row[i] &&= Date.parse(row[i])
                 end
               when "bigint"
                 rows.each do |row|
-                  row[i] = row[i].to_i
+                  row[i] &&= row[i].to_i
                 end
               when "double"
                 rows.each do |row|
-                  row[i] = row[i].to_f
+                  row[i] &&= row[i].to_f
                 end
               end
             end
@@ -118,11 +124,21 @@ module Blazer
       end
 
       def client
-        @client ||= Aws::Athena::Client.new
+        @client ||= Aws::Athena::Client.new(**client_options)
       end
 
       def glue
-        @glue ||= Aws::Glue::Client.new
+        @glue ||= Aws::Glue::Client.new(**client_options)
+      end
+
+      def client_options
+        @client_options ||= begin
+          if settings["access_key_id"] || settings["secret_access_key"]
+            {credentials: Aws::Credentials.new(settings["access_key_id"], settings["secret_access_key"])}
+          else
+            {}
+          end
+        end
       end
     end
   end

data/lib/blazer/adapters/bigquery_adapter.rb

@@ -13,7 +13,7 @@ module Blazer
           # code is for backward compatibility
           if !results.respond_to?(:complete?) || results.complete?
             columns = results.first.keys.map(&:to_s) if results.size > 0
-            rows = results.map(&:values)
+            rows = results.all.map(&:values)
           else
             error = Blazer::TIMEOUT_MESSAGE
           end

data/lib/blazer/data_source.rb

@@ -144,6 +144,7 @@ module Blazer
 
     def adapter_instance
       @adapter_instance ||= begin
+        # TODO add required settings to adapters
         unless settings["url"] || Rails.env.development? || ["bigquery", "athena", "snowflake", "salesforce"].include?(settings["adapter"])
           raise Blazer::Error, "Empty url for data source: #{id}"
         end
@@ -182,11 +183,12 @@ module Blazer
       Blazer::Result.new(self, columns, rows, error, nil, cache && !cache_data.nil?)
     end
 
+    # TODO check for adapter with same name, default to sql
     def detect_adapter
-      schema = settings["url"].to_s.split("://").first
-      case schema
+      scheme = settings["url"].to_s.split("://").first
+      case scheme
       when "mongodb", "presto", "cassandra", "ignite"
-        schema
+        scheme
       else
         "sql"
       end

data/lib/blazer/result.rb

@@ -174,7 +174,19 @@ module Blazer
     def anomaly?(series)
       series = series.reject { |v| v[0].nil? }.sort_by { |v| v[0] }
 
-      if Blazer.anomaly_checks == "trend"
+      case Blazer.anomaly_checks
+      when "prophet"
+        df = Rover::DataFrame.new(series[0..-2].map { |v| {"ds" => v[0], "y" => v[1]} })
+        m = Prophet.new(interval_width: 0.99)
+        m.logger.level = ::Logger::FATAL # no logging
+        m.fit(df)
+        future = Rover::DataFrame.new(series[-1..-1].map { |v| {"ds" => v[0]} })
+        forecast = m.predict(future).to_a[0]
+        lower = forecast["yhat_lower"]
+        upper = forecast["yhat_upper"]
+        value = series.last[1]
+        value < lower || value > upper
+      when "trend"
         anomalies = Trend.anomalies(Hash[series])
         anomalies.include?(series.last[0])
       else

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "2.4.2"
+  VERSION = "2.4.6"
 end

data/lib/generators/blazer/templates/config.yml.tt

@@ -63,11 +63,11 @@ check_schedules:
 
 # enable anomaly detection
 # note: with trend, time series are sent to https://trendapi.org
-# anomaly_checks: trend / r
+# anomaly_checks: prophet / trend / r
 
 # enable forecasting
 # note: with trend, time series are sent to https://trendapi.org
-# forecasting: trend / prophet
+# forecasting: prophet / trend
 
 # enable map
 # mapbox_access_token: <%%= ENV["MAPBOX_ACCESS_TOKEN"] %>

data/licenses/LICENSE-bootstrap.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2011-2016 Twitter, Inc.
+Copyright (c) 2011-2019 Twitter, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blazer
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.6
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Explore your data with SQL. Easily create charts and dashboards, and share