saal 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90aa53b1093427163af28bee630532e79ccefea47de44463641c3e387f038640
-  data.tar.gz: 41fca314cb32d91ca10bfb1982cf7e60a6b584c3c521b8ddcd148b18f465fd86
+  metadata.gz: '097e00e7d501d49e8b411d07a6a7eff6afe0adf220c3e1757304428c4cc059f1'
+  data.tar.gz: 398f11226d5a182aa92417448afd7b3adf0e6a3d1ab120b8f903eb952e6c131b
 SHA512:
-  metadata.gz: ff26de3ff3cca4750a365b9672a82165d449f7c11fb3bd57d7f3f27758636a521d766ae99dc84b50cd30e940453eb30826ad485e44f9e50d723bb5625cd07915
-  data.tar.gz: f93e18eacc3a2eb6555c95b9ea91f74506a39af91c6083ab6dbb3acc1ef2d83387db9ed59a573afcb7bbd1354cfdf7af51ec11122d9f48f287baf273c235debf
+  metadata.gz: ce014accc32521fb1fad84ed552fe92d6ed3798aef83b30769b03244703d80c205d5463c5ebf9b5ad0fff418663d3293add9291d7344b51db4201a634ee0308e
+  data.tar.gz: 3aaeb5d0825733dd3e87d4eb9fb9900f6f7cb5a78c9be3a8168ba7b7afef7ce379d51d8e4a267c59f1fcce86e33075c6a55eb18cfcba65932d138d718f534dd0

data/bin/saal_envoy_read

@@ -31,6 +31,14 @@ def fdisp_dec(val)
   end
 end
 
+def fdispd(val)
+  if val
+    Time.at(val.to_i).strftime("%Y-%m-%d %k:%M:%S")
+  else
+    "n/a"
+  end
+end
+
 def l(vals, name)
   sensor = vals[name]
   if sensor
@@ -137,7 +145,7 @@ inverters = envoy.create_sensors
 puts " Found #{envoy.inverters.size} inverters"
 envoy.inverters.each do |serial|
   puts " INVERTER: #{serial} \
-date:#{l(inverters,"inverters_#{serial}_last_report_date")} \
+date:#{fdispd(l(inverters,"inverters_#{serial}_last_report_date"))} \
 lastWatts:#{l(inverters,"inverters_#{serial}_w_now")} \
 maxWatts:#{l(inverters,"inverters_#{serial}_w_max")} \
 "

data/lib/dbstore.rb

@@ -35,6 +35,32 @@ module SAAL
       db_range("AVG", sensor, from, to)
     end
 
+    def weighted_average(sensor, from, to)
+      total_time = 0
+      total_value = 0.0
+      previous_value = nil
+      start_time = nil
+      initialized = false
+      db_query "SELECT date,value FROM sensor_reads
+                       WHERE sensor = '#{db_quote(sensor.to_s)}'
+                         AND date >= #{from.to_s}
+                         AND date <= #{to.to_s}" do |r|
+        r.each do |row|
+          date = row["date"].to_i
+          value = row["value"].to_f
+          if start_time
+            elapsed = date - start_time
+            total_value += elapsed * previous_value
+            total_time += elapsed
+            initialized = true
+          end
+          start_time = date
+          previous_value = value
+        end
+      end
+      initialized ? total_value / total_time : nil
+    end
+
     def minimum(sensor, from, to)     
       db_range("MIN", sensor, from, to)
     end

data/lib/denkovi.rb

@@ -30,7 +30,7 @@ module SAAL
 
     class OutletGroup
       DEFAULT_TIMEOUT = 2
-      DEFAULT_CACHE_TIMEOUT = 60
+      DEFAULT_CACHE_TIMEOUT = 5
       DEFAULT_OUTLETS = {}
       DEFAULT_DESCRIPTIONS = {}
 

data/lib/dinrelay.rb

@@ -29,7 +29,7 @@ module SAAL
 
     class OutletGroup
       DEFAULT_TIMEOUT = 2
-      DEFAULT_CACHE_TIMEOUT = 60
+      DEFAULT_CACHE_TIMEOUT = 5
 
       attr_accessor :host, :port, :user, :pass, :timeout, :cache_timeout
 

data/lib/envoy.rb

@@ -15,8 +15,9 @@ module SAAL
 
     class PowerEnergy
       DEFAULT_HOST = "envoy.local"
+      DEFAULT_TOKEN = ""
       DEFAULT_TIMEOUT = 2
-      DEFAULT_CACHE_TIMEOUT = 50
+      DEFAULT_CACHE_TIMEOUT = 5
       DEFAULT_SOURCES = [
         "production_inverters",
         "production_phase1", "production_phase2", "production_phase3", "production_total",
@@ -30,6 +31,7 @@ module SAAL
 
       def initialize(defs, opts={})
         @host = defs[:host] || defs['host'] || DEFAULT_HOST
+        @token = defs[:token] || defs['token'] || DEFAULT_TOKEN
         @timeout = opts[:timeout] || opts['timeout'] || DEFAULT_TIMEOUT
         @cache_timeout = opts[:cache_timeout] || opts['cache_timeout'] || DEFAULT_CACHE_TIMEOUT
         @cache = nil
@@ -85,7 +87,7 @@ module SAAL
       end
 
       def read_all
-        response = SAAL::do_http_get(@host, 80, "/production.json?details=1", nil, nil, @timeout)
+        response = SAAL::do_https_get_token(@host, "/production.json?details=1", @token, @timeout)
         return nil if !response
 
         values = JSON.parse(response.body)
@@ -139,14 +141,16 @@ module SAAL
 
     class ACQuality
       DEFAULT_HOST = "envoy.local"
+      DEFAULT_TOKEN = ""
       DEFAULT_TIMEOUT = 2
-      DEFAULT_CACHE_TIMEOUT = 50
+      DEFAULT_CACHE_TIMEOUT = 5
       DEFAULT_SOURCES = ["total","phase1","phase2","phase3",]
       DEFAULT_TYPES = ["frequency","voltage"]
       DEFAULT_PREFIX = "ac"
 
       def initialize(defs, opts={})
         @host = defs[:host] || defs['host'] || DEFAULT_HOST
+        @token = defs[:token] || defs['token'] || DEFAULT_TOKEN
         @timeout = opts[:timeout] || opts['timeout'] || DEFAULT_TIMEOUT
         @cache_timeout = opts[:cache_timeout] || opts['cache_timeout'] || DEFAULT_CACHE_TIMEOUT
         @cache = nil
@@ -184,7 +188,7 @@ module SAAL
       end
 
       def read_all
-        response = SAAL::do_http_get(@host, 80, "/ivp/meters/readings", nil, nil, @timeout)
+        response = SAAL::do_https_get_token(@host, "/ivp/meters/readings", @token, @timeout)
         return nil if !response
 
         values = JSON.parse(response.body)
@@ -213,19 +217,18 @@ module SAAL
     end
 
     class Inverters
+      DEFAULT_HOST = "envoy.local"
+      DEFAULT_TOKEN = nil
       DEFAULT_TIMEOUT = 2
       DEFAULT_CACHE_TIMEOUT = 50
       DEFAULT_SOURCES = []
       DEFAULT_TYPES = ["w_now"] # "last_report_date", "w_max"
-      DEFAULT_USER = nil
-      DEFAULT_PASSWORD = nil
       DEFAULT_PREFIX = "inverters"
       attr_reader :inverters
 
       def initialize(defs, opts={})
         @host = defs[:host] || defs['host'] || DEFAULT_HOST
-        @user = defs[:user] || defs['user'] || DEFAULT_USER
-        @password = defs[:password] || defs['password'] || DEFAULT_PASSWORD
+        @token = defs[:token] || defs['token'] || DEFAULT_TOKEN
         @timeout = opts[:timeout] || opts['timeout'] || DEFAULT_TIMEOUT
         @cache_timeout = opts[:cache_timeout] || opts['cache_timeout'] || DEFAULT_CACHE_TIMEOUT
         @cache = nil
@@ -264,7 +267,7 @@ module SAAL
 
       private
       def read_all
-        response = SAAL::do_http_get_digest(@host, 80, "/api/v1/production/inverters", @user, @password, @timeout)
+        response = SAAL::do_https_get_token(@host, "/api/v1/production/inverters", @token, @timeout)
         return nil if !response
 
         values = JSON.parse(response.body)

data/lib/http.rb

@@ -1,6 +1,6 @@
 require 'uri'
 require 'net/http'
-require 'net/http/digest_auth'
+require 'openssl'
 
 def SAAL::do_http_get(host, port, path, user, pass, timeout)
   begin
@@ -22,26 +22,21 @@ def SAAL::do_http_get(host, port, path, user, pass, timeout)
   end
 end
 
-def SAAL::do_http_get_digest(host, port, path, user, pass, timeout)
+def SAAL::do_https_get_token(host, path, token, timeout)
   begin
-    uri = URI.parse "http://#{host}:#{port}/#{path}"
-    digest_auth = Net::HTTP::DigestAuth.new
-    uri.user = user
-    uri.password = pass
-    http = Net::HTTP.new(host,port)
+    http = Net::HTTP.new(host,443)
     # Timeout faster when the other side doesn't respond
     http.open_timeout = timeout
     http.read_timeout = timeout
+    http.use_ssl = true
+    http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     req = Net::HTTP::Get.new(path)
+    req['Accept'] = "application/json"
+    req['Authorization'] = "Bearer #{token}"
     response = http.request(req)
-    if response.code == "401" && user && pass
-      auth = digest_auth.auth_header uri, response['www-authenticate'], 'GET'
-      req.add_field 'Authorization', auth
-      response = http.request(req)
-    end
     if response.code != "200"
-      #$stderr.puts "ERROR: Code #{response.code}"
-      #$stderr.puts response.body
+      $stderr.puts "ERROR: Code #{response.code}"
+      $stderr.puts response.body
       return nil
     end
     return response

data/lib/saal.rb

@@ -10,7 +10,7 @@ module SAAL
     DBCONF = CONFDIR+"database.yml"
     CHARTSCONF = CONFDIR+"charts.yml"
 
-    VERSION = '0.3.3'
+    VERSION = '0.3.5'
 end
 
 require File.dirname(__FILE__)+'/dbstore.rb'

data/lib/sensor.rb

@@ -72,6 +72,11 @@ module SAAL
       apply_offset @dbstore.average(@name, from, to)
     end
 
+    def weighted_average(from, to)
+      return @mock_opts[:weighted_average] if @mock_opts[:weighted_average]
+      apply_offset @dbstore.weighted_average(@name, from, to)
+    end
+
     def minimum(from, to)
       return @mock_opts[:minimum] if @mock_opts[:minimum]
       apply_offset @dbstore.minimum(@name, from, to)

data/saal.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
 
   s.name              = 'saal'
-  s.version           = '0.3.3'
-  s.date              = '2020-12-28'
+  s.version           = '0.3.5'
+  s.date              = '2024-02-08'
 
   s.summary     = "Thin abstraction layer for interfacing and recording sensors (currently onewire) and actuators (currently dinrelay)"
   s.description = <<EOF

data/test/dbstore_test.rb

@@ -42,6 +42,21 @@ class TestFileStore < Test::Unit::TestCase
     assert_nil @dbstore.average(:test_sensor, 50, 60)
   end
 
+  def test_weighted_average
+    db_setup
+    test_values = [[10, 7.323],[12, 5.432],[23, -2.125], [44, 0.123]]
+    test_average = ((12-10)*7.323+(23-12)*5.432+(44-23)*(-2.125)) / (44-10)
+    test_values.each do |values|
+      @dbstore.write(:test_sensor, *values)
+    end
+
+    assert_instance_of Float, @dbstore.average(:test_sensor, 10, 44)
+    assert_in_delta test_average, @dbstore.weighted_average(:test_sensor, 10, 44), 0.001
+
+    # when there are no points it's nil
+    assert_nil @dbstore.weighted_average(:test_sensor, 50, 60)
+  end
+
   def test_min_max
     db_setup
     test_values = [[10, 7.323],[12, 5.432],[23, -2.125], [44, 0.123]]

data/test/sensor_test.rb

@@ -31,6 +31,9 @@ class MockDBStore
   def average(sensor, from, to)
     @value
   end
+  def weighted_average(sensor, from, to)
+    @value
+  end
   def minimum(sensor, from, to)
     @value
   end
@@ -112,6 +115,7 @@ class TestSensor < Test::Unit::TestCase
     assert_equal corrected, sensor.minimum(0,100)
     assert_equal corrected, sensor.maximum(0,100)
     assert_equal corrected, sensor.average(0,100)
+    assert_equal corrected, sensor.weighted_average(0,100)
   end
 
   def test_linear_correction
@@ -125,6 +129,7 @@ class TestSensor < Test::Unit::TestCase
     assert_equal corrected, sensor.minimum(0,100)
     assert_equal corrected, sensor.maximum(0,100)
     assert_equal corrected, sensor.average(0,100)
+    assert_equal corrected, sensor.weighted_average(0,100)
   end
 
   def test_sensor_type
@@ -145,9 +150,10 @@ class TestSensor < Test::Unit::TestCase
     assert_equal 2.0, @mockable.read
     @mockable.write(3.0)
     assert_equal 3.0, @mockable.read
-    @mockable.mock_set(:minimum => 1.0, :average => 2.0, :maximum => 3.0, :last_value => 5.0)
+    @mockable.mock_set(:minimum => 1.0, :average => 2.0, :weighted_average => 2.5, :maximum => 3.0, :last_value => 5.0)
     assert_equal 1.0, @mockable.minimum(0,100)
     assert_equal 2.0, @mockable.average(0,100)
+    assert_equal 2.5, @mockable.weighted_average(0,100)
     assert_equal 3.0, @mockable.maximum(0,100)
     assert_equal 5.0, @mockable.last_value
     assert_equal 3.0, @mockable.read

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saal
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 platform: ruby
 authors:
 - Pedro Côrte-Real
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ownet
@@ -71,16 +71,16 @@ description: "A daemon and libraries to create an abstraction layer that interfa
   current and historical values, and allowing changes of state.\n"
 email: pedro@pedrocr.net
 executables:
-- dinrelaystatus
 - dinrelayset
-- saal_import_mysql
-- saal_dump_database
-- saal_readall
-- saal_denkovi_relays
+- dinrelaystatus
 - saal_chart
 - saal_daemon
+- saal_denkovi_relays
+- saal_dump_database
 - saal_envoy_generate_config
 - saal_envoy_read
+- saal_import_mysql
+- saal_readall
 extensions: []
 extra_rdoc_files:
 - README.rdoc
@@ -140,7 +140,7 @@ homepage: https://github.com/pedrocr/saal
 licenses:
 - LGPL-2.1
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "-S"
 - "-w 2"
@@ -159,8 +159,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.3.5
+signing_key: 
 specification_version: 2
 summary: Thin abstraction layer for interfacing and recording sensors (currently onewire)
   and actuators (currently dinrelay)