egauge-python 0.9.4__tar.gz → 0.9.6__tar.gz

{egauge_python-0.9.4/egauge_python.egg-info → egauge-python-0.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: egauge-python
-Version: 0.9.4
+Version: 0.9.6
 Summary: .
 Home-page: https://bitbucket.org/egauge/python/
 Author: David Mosberger-Tang
@@ -15,16 +15,9 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: crcmod
-Requires-Dist: deprecated
-Requires-Dist: intelhex
-Requires-Dist: requests>=2.4.2
 Provides-Extra: examples
-Requires-Dist: matplotlib; extra == "examples"
-Requires-Dist: readchar; extra == "examples"
 Provides-Extra: pyside
-Requires-Dist: PySide6; extra == "pyside"
+License-File: LICENSE
 
 # eGauge open source Python code
 

{egauge_python-0.9.4 → egauge-python-0.9.6}/egauge/ctid/ctid.py

@@ -490,7 +490,7 @@ class Table:
                 f"delay={self.delay:g}μs"
             )
         elif self.sensor_type == SENSOR_TYPE_TEMP_LINEAR:
-            ret += f"scale={self.scale:g}°C/V " f"offset={self.offset:g}°C"
+            ret += f"scale={self.scale:g}°C/V offset={self.offset:g}°C"
         elif self.sensor_type == SENSOR_TYPE_TEMP_NTC:
             ret += (
                 f"A={self.ntc_a:g} "

{egauge_python-0.9.4 → egauge-python-0.9.6}/egauge/ctid/encoder.py

@@ -238,7 +238,7 @@ def main():
         "--bias-voltage",
         type=float,
         default=0,
-        help="Output voltage when no current " "is flowing through the CD.",
+        help="Output voltage when no current is flowing through the CD.",
     )
     #
     # Linear Parameters:

{egauge_python-0.9.4 → egauge-python-0.9.6}/egauge/pyside/terminal.py

@@ -215,7 +215,7 @@ def test():
             self.plainTextEdit.setFocusPolicy(QtCore.Qt.FocusPolicy.NoFocus)
             self.plainTextEdit.setAcceptDrops(False)
             self.plainTextEdit.setStyleSheet(
-                "background-color: black;\n" "color: white;\n"
+                "background-color: black;\ncolor: white;\n"
             )
             self.plainTextEdit.setLineWidth(1)
             self.plainTextEdit.setUndoRedoEnabled(False)

{egauge_python-0.9.4 → egauge-python-0.9.6}/egauge/webapi/auth.py

@@ -1,6 +1,6 @@
 #
-# Copyright (c) 2020-2022, 2024 eGauge Systems LLC
-#       1644 Conestoga St, Suite 2
+# Copyright (c) 2020-2022, 2024-2025 eGauge Systems LLC
+#       4805 Sterling Dr, Suite 1
 #       Boulder, CO 80301
 #       voice: 720-545-9767
 #       email: davidm@egauge.net
@@ -34,6 +34,7 @@ token-based authentication (TokenAuth).
 """
 
 import hashlib
+import logging
 import os
 import secrets
 import types
@@ -49,6 +50,10 @@ from . import json_api
 # The name of the optional environment variable storing a token:
 ENV_EGAUGE_API_TOKEN = "EGAUGE_API_TOKEN"
 
+MAX_RETRIES = 10
+
+log = logging.getLogger(__name__)
+
 
 def _decorate_public_metaclass(decorator):
     """Return a metaclass which will decorate all public methods of a
@@ -109,7 +114,7 @@ class JWTAuth(AuthBase):
     def __call__(self, r):
         if self.bearer_token:
             self.add_auth_header(r)
-        r.register_hook("response", self.handle_401)
+        r.register_hook("response", self.handle_response)
         return r
 
     def __eq__(self, other):
@@ -133,12 +138,12 @@ class JWTAuth(AuthBase):
 
     def handle_401(self, r, **kwargs):
         """Called when server responds with 401 Unauthorized."""
-        if r.status_code != 401:
-            return r
+        log.debug("handle_401: auth request received for %s", r.request.url)
 
         try:
             auth_request = r.json()
         except ValueError:
+            log.debug("handle_401: auth request is not valid JSON")
             return r
 
         realm = auth_request["rlm"]
@@ -166,10 +171,19 @@ class JWTAuth(AuthBase):
         auth_reply = json_api.post(login_uri, data, timeout=60, verify=verify)
 
         if not isinstance(auth_reply, dict):
+            log.debug("handle_401: auth reply is not a dict")
             return r
 
         token = auth_reply.get("jwt")
+        if auth_reply.get("error"):
+            log.debug(
+                "handle_401: auth reply error: %s", auth_reply.get("error")
+            )
+            return r
         if not isinstance(token, str):
+            log.debug(
+                "handle_401: token in auth reply is not a string: %s", token
+            )
             return r
 
         self.bearer_token = token
@@ -181,6 +195,17 @@ class JWTAuth(AuthBase):
         _r.request = prep
         return _r
 
+    def handle_response(self, r, **kwargs):
+        """Called when a server response is received."""
+        if r.status_code == 401:
+            for i in range(MAX_RETRIES):
+                r = self.handle_401(r, **kwargs)
+                if r.status_code != 401:
+                    break
+                log.debug("handle_response: auth attempt %d failed", i + 1)
+        log.debug("handle_response: returning status %d", r.status_code)
+        return r
+
 
 class TokenAuth(AuthBase):
     """Implements the eGauge web services' token-based authentication
@@ -227,7 +252,7 @@ class TokenAuth(AuthBase):
 
     def __call__(self, r):
         self.add_auth_header(r)
-        r.register_hook("response", self.handle_401)
+        r.register_hook("response", self.handle_response)
         return r
 
     def __eq__(self, other):
@@ -251,9 +276,6 @@ class TokenAuth(AuthBase):
 
     def handle_401(self, r, **kwargs):
         """Called when server responds with 401 Unauthorized."""
-        if r.status_code != 401:
-            return r
-
         usr = self.username
         pwd = self.password
 
@@ -272,10 +294,11 @@ class TokenAuth(AuthBase):
             self.token_service_url, json=creds, timeout=60, verify=verify
         ).json()
 
-        if auth_reply is None:
+        if not isinstance(auth_reply, dict):
             return r
 
-        if "token" not in auth_reply:
+        token = auth_reply.get("token")
+        if not isinstance(token, str) or not token:
             return r
 
         self.token = auth_reply["token"]
@@ -293,6 +316,15 @@ class TokenAuth(AuthBase):
         _r.request = prep
         return _r
 
+    def handle_response(self, r, **kwargs):
+        """Called when a server response is received."""
+        if r.status_code == 401:
+            for _ in range(MAX_RETRIES):
+                r = self.handle_401(r, **kwargs)
+                if r.status_code != 401:
+                    break
+        return r
+
     def _save_token(self):
         if self.token_file is None or self.token is None:
             return

{egauge_python-0.9.4 → egauge-python-0.9.6}/egauge/webapi/device/register_type.py

@@ -8,13 +8,8 @@
 
 from enum import Enum
 
-from .physical_units import (
-    AlternateUnit,
-    PhysicalUnitConversion,
-    PhysicalUnits,
-    PrimaryUnit,
-)
-
+from .physical_units import AlternateUnit, PhysicalUnits, \
+    PhysicalUnitConversion, PrimaryUnit
 
 class UnitSystem(Enum):
     METRIC = 0
@@ -675,24 +670,24 @@ def _create_units():
 
     p38 = PrimaryUnit("var·s")
     pus.add(p38)
-    au = AlternateUnit("vahr", p38, c3)
-    pus.add(au)
-    pus.add_scaled(au, "yvahr", 1e+24, "yocto")
-    pus.add_scaled(au, "zvahr", 1e+21, "zepto")
-    pus.add_scaled(au, "avahr", 1e+18, "atto")
-    pus.add_scaled(au, "fvahr", 1000000000000000, "femto")
-    pus.add_scaled(au, "pvahr", 1000000000000, "pico")
-    pus.add_scaled(au, "nvahr", 1000000000, "nano")
-    pus.add_scaled(au, "μvahr", 1000000, "micro")
-    pus.add_scaled(au, "mvahr", 1000, "milli")
-    pus.add_scaled(au, "kvahr", 1 / 1000, "kilo")
-    pus.add_scaled(au, "Mvahr", 1 / 1000000, "mega")
-    pus.add_scaled(au, "Gvahr", 1 / 1000000000, "giga")
-    pus.add_scaled(au, "Tvahr", 1 / 1000000000000, "tera")
-    pus.add_scaled(au, "Pvahr", 1 / 1000000000000000, "peta")
-    pus.add_scaled(au, "Evahr", 1 / 1e+18, "exa")
-    pus.add_scaled(au, "Zvahr", 1 / 1e+21, "zetta")
-    pus.add_scaled(au, "Yvahr", 1 / 1e+24, "yotta")
+    au = AlternateUnit("varh", p38, c3)
+    pus.add(au)
+    pus.add_scaled(au, "yvarh", 1e+24, "yocto")
+    pus.add_scaled(au, "zvarh", 1e+21, "zepto")
+    pus.add_scaled(au, "avarh", 1e+18, "atto")
+    pus.add_scaled(au, "fvarh", 1000000000000000, "femto")
+    pus.add_scaled(au, "pvarh", 1000000000000, "pico")
+    pus.add_scaled(au, "nvarh", 1000000000, "nano")
+    pus.add_scaled(au, "μvarh", 1000000, "micro")
+    pus.add_scaled(au, "mvarh", 1000, "milli")
+    pus.add_scaled(au, "kvarh", 1 / 1000, "kilo")
+    pus.add_scaled(au, "Mvarh", 1 / 1000000, "mega")
+    pus.add_scaled(au, "Gvarh", 1 / 1000000000, "giga")
+    pus.add_scaled(au, "Tvarh", 1 / 1000000000000, "tera")
+    pus.add_scaled(au, "Pvarh", 1 / 1000000000000000, "peta")
+    pus.add_scaled(au, "Evarh", 1 / 1e+18, "exa")
+    pus.add_scaled(au, "Zvarh", 1 / 1e+21, "zetta")
+    pus.add_scaled(au, "Yvarh", 1 / 1e+24, "yotta")
 
     c7 = PhysicalUnitConversion(False,
         lambda x, t=None: (9/5)*x + 32,
@@ -758,10 +753,10 @@ class Units:
 
     # Preferred units for METRIC and IMPERIAL systems:
     preferred = [
-        ['kW', 'kWh', 'kVA', 'kVAh', 'kvar', 'kvahr', 'kg', 'kg/s',
+        ['kW', 'kWh', 'kVA', 'kVAh', 'kvar', 'kvarh', 'kg', 'kg/s',
          'kWh/m²', 'km/h', 'hPa', 'Ah', 'Vh', 'L/m', 'L', '°C',
          '°C·d'],
-        ['kW', 'kWh', 'kVA', 'kVAh', 'kvar', 'kvahr', 'lbs', 'lbs/s',
+        ['kW', 'kWh', 'kVA', 'kVAh', 'kvar', 'kvarh', 'lbs', 'lbs/s',
          'kWh/m²', 'mph', 'inHg', 'Ah', 'Vh', 'ft', '°F', '°F·d',
          'lbs·s', 'inHg·s', 'ft·s', 'gpm', 'gal']
     ]
@@ -804,7 +799,7 @@ class Units:
                              cumul_scale=1 / 3600000, cumul_unit='kWh/m²',
                              name='Irradiance'),
         'PQ': UnitTableEntry(fix_scale=1, rate_unit='var',
-                             cumul_scale=1 / 3600000, cumul_unit='kvahr',
+                             cumul_scale=1 / 3600000, cumul_unit='kvarh',
                              name='Reactive Power'),
         '$': UnitTableEntry(fix_scale=536870912, rate_unit='${currency}/s',
                             cumul_scale=1 / 536870912, cumul_unit='${currency}',

{egauge_python-0.9.4 → egauge-python-0.9.6}/egauge/webapi/device/virtual_register.py

@@ -193,7 +193,7 @@ class VirtualRegister(Generic[RegId]):
         """
 
         def error(reason: str) -> NoReturn:
-            raise VirtRegError(f"{reason} (rest: '{formula[state.idx:]}')")
+            raise VirtRegError(f"{reason} (rest: '{formula[state.idx :]}')")
 
         def whitespace():
             while state.idx < len(formula) and formula[state.idx] in [

{egauge_python-0.9.4 → egauge-python-0.9.6/egauge_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: egauge-python
-Version: 0.9.4
+Version: 0.9.6
 Summary: .
 Home-page: https://bitbucket.org/egauge/python/
 Author: David Mosberger-Tang
@@ -15,16 +15,9 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: crcmod
-Requires-Dist: deprecated
-Requires-Dist: intelhex
-Requires-Dist: requests>=2.4.2
 Provides-Extra: examples
-Requires-Dist: matplotlib; extra == "examples"
-Requires-Dist: readchar; extra == "examples"
 Provides-Extra: pyside
-Requires-Dist: PySide6; extra == "pyside"
+License-File: LICENSE
 
 # eGauge open source Python code
 

{egauge_python-0.9.4 → egauge-python-0.9.6}/egauge_python.egg-info/top_level.txt

@@ -1,3 +1,2 @@
-build
 dist
 egauge

{egauge_python-0.9.4 → egauge-python-0.9.6}/setup.py

@@ -10,7 +10,7 @@ os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
 setuptools.setup(
     name="egauge-python",
-    version="0.9.4",
+    version="0.9.6",
     packages=setuptools.find_namespace_packages(include="egauge.*"),
     install_requires=[
         "crcmod",