singlestoredb 1.4.2__tar.gz → 1.4.3__tar.gz

{singlestoredb-1.4.2/singlestoredb.egg-info → singlestoredb-1.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: singlestoredb
-Version: 1.4.2
+Version: 1.4.3
 Summary: Interface to the SingleStoreDB database and workspace management APIs
 Home-page: https://github.com/singlestore-labs/singlestoredb-python
 Author: SingleStore

{singlestoredb-1.4.2 → singlestoredb-1.4.3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = singlestoredb
-version = 1.4.2
+version = 1.4.3
 description = Interface to the SingleStoreDB database and workspace management APIs
 long_description = file: README.md
 long_description_content_type = text/markdown

{singlestoredb-1.4.2 → singlestoredb-1.4.3}/singlestoredb/__init__.py

@@ -13,7 +13,7 @@ Examples
 
 """
 
-__version__ = '1.4.2'
+__version__ = '1.4.3'
 
 from typing import Any
 

{singlestoredb-1.4.2 → singlestoredb-1.4.3}/singlestoredb/management/utils.py

@@ -123,14 +123,14 @@ class NamedList(List[T]):
 def _setup_authentication_info_handler() -> Callable[..., Dict[str, Any]]:
     """Setup authentication info event handler."""
 
-    authentication_info: List[Tuple[str, Any]] = []
+    authentication_info: Dict[str, Any] = {}
 
     def handle_authentication_info(msg: Dict[str, Any]) -> None:
         """Handle authentication info events."""
         nonlocal authentication_info
         if msg.get('name', '') != 'singlestore.portal.authentication_updated':
             return
-        authentication_info = list(msg.get('data', {}).items())
+        authentication_info = dict(msg.get('data', {}))
 
     events.subscribe(handle_authentication_info)
 
@@ -145,11 +145,27 @@ def _setup_authentication_info_handler() -> Callable[..., Dict[str, Any]]:
             out['user'] = data['user']
         if 'password' in data:
             out['password'] = data['password']
-        authentication_info = list(out.items())
+        authentication_info = out
 
     events.subscribe(handle_authentication_info)
 
+    def retrieve_current_authentication_info() -> List[Tuple[str, Any]]:
+        """Retrieve JWT if not expired."""
+        nonlocal authentication_info
+        password = authentication_info.get('password')
+        if password:
+            expires = datetime.datetime.fromtimestamp(
+                jwt.decode(
+                    password,
+                    options={'verify_signature': False},
+                )['exp'],
+            )
+            if datetime.datetime.now() > expires:
+                authentication_info = {}
+        return list(authentication_info.items())
+
     def get_env() -> List[Tuple[str, Any]]:
+        """Retrieve JWT from environment."""
         conn = {}
         url = os.environ.get('SINGLESTOREDB_URL') or get_option('host')
         if url:
@@ -170,7 +186,7 @@ def _setup_authentication_info_handler() -> Callable[..., Dict[str, Any]]:
         return dict(
             itertools.chain(
                 (get_env() if include_env else []),
-                authentication_info,
+                retrieve_current_authentication_info(),
             ),
         )
 

{singlestoredb-1.4.2 → singlestoredb-1.4.3/singlestoredb.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: singlestoredb
-Version: 1.4.2
+Version: 1.4.3
 Summary: Interface to the SingleStoreDB database and workspace management APIs
 Home-page: https://github.com/singlestore-labs/singlestoredb-python
 Author: SingleStore