singlestoredb 1.4.1__py3-none-any.whl → 1.4.3__py3-none-any.whl

singlestoredb/__init__.py

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

singlestoredb/fusion/handler.py

@@ -28,8 +28,23 @@ CORE_GRAMMAR = r'''
     eq = ws* "=" ws*
     open_paren = ws* "(" ws*
     close_paren = ws* ")" ws*
+    open_repeats = ws* ~r"[\(\[\{]" ws*
+    close_repeats = ws* ~r"[\)\]\}]" ws*
     select = ~r"SELECT"i ws+ ~r".+" ws*
-'''
+
+    json = ws* json_object ws*
+    json_object = ~r"{\s*" json_members? ~r"\s*}"
+    json_members = json_mapping (~r"\s*,\s*" json_mapping)*
+    json_mapping = json_string ~r"\s*:\s*" json_value
+    json_array = ~r"\[\s*" json_items? ~r"\s*\]"
+    json_items = json_value (~r"\s*,\s*" json_value)*
+    json_value = json_object / json_array / json_string / json_true_val / json_false_val / json_null_val / json_number
+    json_true_val = "true"
+    json_false_val = "false"
+    json_null_val = "null"
+    json_string = ~r"\"[ !#-\[\]-\U0010ffff]*(?:\\(?:[\"\\/bfnrt]|u[0-9A-Fa-f]{4})[ !#-\[\]-\U0010ffff]*)*\""
+    json_number = ~r"-?(0|[1-9][0-9]*)(\.\d*)?([eE][-+]?\d+)?"
+'''  # noqa: E501
 
 BUILTINS = {
     '<order-by>': r'''
@@ -47,6 +62,7 @@ BUILTINS = {
     ''',
     '<integer>': '',
     '<number>': '',
+    '<json>': '',
 }
 
 BUILTIN_DEFAULTS = {  # type: ignore
@@ -54,9 +70,36 @@ BUILTIN_DEFAULTS = {  # type: ignore
     'like': None,
     'extended': False,
     'limit': None,
+    'json': {},
+}
+
+_json_unesc_re = re.compile(r'\\(["/\\bfnrt]|u[0-9A-Fa-f])')
+_json_unesc_map = {
+    '"': '"',
+    '/': '/',
+    '\\': '\\',
+    'b': '\b',
+    'f': '\f',
+    'n': '\n',
+    'r': '\r',
+    't': '\t',
 }
 
 
+def _json_unescape(m: Any) -> str:
+    c = m.group(1)
+    if c[0] == 'u':
+        return chr(int(c[1:], 16))
+    c2 = _json_unesc_map.get(c)
+    if not c2:
+        raise ValueError(f'invalid escape sequence: {m.group(0)}')
+    return c2
+
+
+def json_unescape(s: str) -> str:
+    return _json_unesc_re.sub(_json_unescape, s[1:-1])
+
+
 def get_keywords(grammar: str) -> Tuple[str, ...]:
     """Return all all-caps words from the beginning of the line."""
     m = re.match(r'^\s*((?:[A-Z0-9_]+)(\s+|$|;))+', grammar)
@@ -89,7 +132,7 @@ def process_alternates(m: Any) -> str:
 def process_repeats(m: Any) -> str:
     """Add repeated patterns."""
     sql = m.group(1).strip()
-    return f'open_paren? {sql} ws* ( comma {sql} ws* )* close_paren?'
+    return f'open_repeats? {sql} ws* ( comma {sql} ws* )* close_repeats?'
 
 
 def lower_and_regex(m: Any) -> str:
@@ -639,6 +682,14 @@ class SQLHandler(NodeVisitor):
         """Close parenthesis."""
         return
 
+    def visit_open_repeats(self, node: Node, visited_children: Iterable[Any]) -> Any:
+        """Open repeat grouping."""
+        return
+
+    def visit_close_repeats(self, node: Node, visited_children: Iterable[Any]) -> Any:
+        """Close repeat grouping."""
+        return
+
     def visit_init(self, node: Node, visited_children: Iterable[Any]) -> Any:
         """Entry point of the grammar."""
         _, out, *_ = visited_children
@@ -662,6 +713,57 @@ class SQLHandler(NodeVisitor):
             ascending.append(value[1].upper().startswith('A'))
         return {'order_by': {'by': by, 'ascending': ascending}}
 
+    def _delimited(self, node: Node, children: Iterable[Any]) -> Any:
+        children = list(children)
+        items = [children[0]]
+        items.extend(item for _, item in children[1])
+        return items
+
+    def _atomic(self, node: Node, children: Iterable[Any]) -> Any:
+        return list(children)[0]
+
+    # visitors
+    visit_json_value = _atomic
+    visit_json_members = visit_json_items = _delimited
+
+    def visit_json_object(self, node: Node, children: Iterable[Any]) -> Any:
+        _, members, _ = children
+        if isinstance(members, list):
+            members = members[0]
+        else:
+            members = []
+        members = [x for x in members if x != '']
+        return dict(members)
+
+    def visit_json_array(self, node: Node, children: Iterable[Any]) -> Any:
+        _, values, _ = children
+        if isinstance(values, list):
+            values = values[0]
+        else:
+            values = []
+        return values
+
+    def visit_json_mapping(self, node: Node, children: Iterable[Any]) -> Any:
+        key, _, value = children
+        return key, value
+
+    def visit_json_string(self, node: Node, children: Iterable[Any]) -> Any:
+        return json_unescape(node.text)
+
+    def visit_json_number(self, node: Node, children: Iterable[Any]) -> Any:
+        if '.' in node.text:
+            return float(node.text)
+        return int(node.text)
+
+    def visit_json_true_val(self, node: Node, children: Iterable[Any]) -> Any:
+        return True
+
+    def visit_json_false_val(self, node: Node, children: Iterable[Any]) -> Any:
+        return False
+
+    def visit_json_null_val(self, node: Node, children: Iterable[Any]) -> Any:
+        return None
+
     def generic_visit(self, node: Node, visited_children: Iterable[Any]) -> Any:
         """
         Handle all undefined rules.
@@ -675,6 +777,9 @@ class SQLHandler(NodeVisitor):
         rule can have repeated values, a list of values is returned.
 
         """
+        if node.expr_name.startswith('json'):
+            return visited_children or node.text
+
         # Call a grammar rule
         if node.expr_name in type(self).rule_info:
             n_keywords = type(self).rule_info[node.expr_name]['n_keywords']

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/notebook/_portal.py

@@ -182,7 +182,7 @@ class Portal(object):
         id = w.id
 
         self._call_javascript(
-            'changeWorkspace', [id],
+            'changeDeployment', [id],
             wait_on_condition=lambda: self.workspace_id == id,  # type: ignore
             timeout_message='timeout waiting for workspace update',
         )

{singlestoredb-1.4.1.dist-info → singlestoredb-1.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: singlestoredb
-Version: 1.4.1
+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.1.dist-info → singlestoredb-1.4.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-singlestoredb/__init__.py,sha256=P2EmifYW3g7dPP3gIrZyeec6uJpf9rZUbYwUeW_YGTE,1634
+singlestoredb/__init__.py,sha256=NTrIpxhbm7oMxrNbbjVKdK-4ShuyvUChQlP3z-kL9Ko,1634
 singlestoredb/auth.py,sha256=u8D9tpKzrqa4ssaHjyZnGDX1q8XBpGtuoOkTkSv7B28,7599
 singlestoredb/config.py,sha256=H4pQxqBEGGCmVHg40VEnAdqGXHun8ougZzj-Ed6ZLH4,11822
 singlestoredb/connection.py,sha256=WL_TSSHhhjLV0pnJOtaeMAf0o1DI-PJv9xnLFf_cM08,45173
@@ -22,7 +22,7 @@ singlestoredb/functions/ext/rowdat_1.py,sha256=JgKRsVSQYczFD6cmo2xLilbNPYpyLL2tP
 singlestoredb/functions/ext/utils.py,sha256=2-B8YU_Iekv8JcpI-ochs9TIeuyatLaLAH-AyYyUUIg,5311
 singlestoredb/fusion/__init__.py,sha256=Qo7SuqGw-l-vE8-EI2jhm6hXJkYfOLUKIws9c7LFNX0,356
 singlestoredb/fusion/graphql.py,sha256=ZA3HcDq5rER-dCEavwTqnF7KM0D2LCYIY7nLQk7lSso,5207
-singlestoredb/fusion/handler.py,sha256=hXvJoauKnixfU67IgobmuZF4WKchSzzhUwsPQf_FWT4,21581
+singlestoredb/fusion/handler.py,sha256=wuNq-nzzBngSha_kZ_Da7V7VzQzmhgXgUfh2V0HXLVI,24976
 singlestoredb/fusion/registry.py,sha256=jjdRTYZ3ylhy6gAoW5xBj0tkxGFBT-2yLQ0tztTgDIY,6112
 singlestoredb/fusion/result.py,sha256=Bd3KbRpqWqQcWp_Chd4bzBy8Kfc8nXLS_Pn_GGbPO6o,11772
 singlestoredb/fusion/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -37,7 +37,7 @@ singlestoredb/management/cluster.py,sha256=i23Smr1PBrDZ8NO_VPd_-bEYkyHvVe9CCRGUj
 singlestoredb/management/manager.py,sha256=sFP1vZGS8WpN8E0XLu1N7Mxtq6Sixalln44HlTQEyXI,8800
 singlestoredb/management/organization.py,sha256=Y0JFSxYF_UOjip53gcbBXWPCe_t92zo3d99jZNrhkx4,4995
 singlestoredb/management/region.py,sha256=HnLcWUh7r_aLECliplCDHak4a_F3B7LOSXEYMW66qD0,1611
-singlestoredb/management/utils.py,sha256=nTsGTDgl8lmjwcfl2nMS6feRn5P-jUjHlkVGzG5qrXM,10783
+singlestoredb/management/utils.py,sha256=t-O6NRb4Wad1qJJ1afxtFR1IX-0bezEqplKllnm8tto,11398
 singlestoredb/management/workspace.py,sha256=9oamNIaE5vLZNAlpl5SK-xu27qPqx2Ff3ZIdKckNfmc,61673
 singlestoredb/mysql/__init__.py,sha256=olUTAvkiERhDW41JXQMawkg-i0tvBEkoTkII1tt6lxU,4492
 singlestoredb/mysql/_auth.py,sha256=AugRitoUwgRIDFuJxuAH4MWIAmckY7Ji2pP6r_Ng9dY,8043
@@ -82,7 +82,7 @@ singlestoredb/mysql/tests/thirdparty/test_MySQLdb/test_MySQLdb_dbapi20.py,sha256
 singlestoredb/mysql/tests/thirdparty/test_MySQLdb/test_MySQLdb_nonstandard.py,sha256=pl0bvuZo_nzAlYOINxRiR-Zi9khz0W2Pc7vP-K3sQYQ,2819
 singlestoredb/notebook/__init__.py,sha256=v0j1E3MFAtaC8wTrR-F7XY0nytUvQ4XpYhVXddv2xA0,533
 singlestoredb/notebook/_objects.py,sha256=MkB1eowEq5SQXFHY00xAKAyyeLqHu_uaZiA20BCJPaE,8043
-singlestoredb/notebook/_portal.py,sha256=a0UeRwXQl-tBEfV_IOOL_UK2Zzrs-RgGswvjJiZk8Wc,8485
+singlestoredb/notebook/_portal.py,sha256=08_8hFFuD9Ybq3K8ruHOgMhDqzdhjj7o0Sq368zH714,8486
 singlestoredb/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 singlestoredb/tests/empty.sql,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 singlestoredb/tests/local_infile.csv,sha256=sBtqjvfkS9aoOVx8nMXYgYv4rDuT4OuYhqUhNRu0O68,42
@@ -114,9 +114,9 @@ singlestoredb/utils/events.py,sha256=9IB84T3pKQjs7aaoSSJCw7soNngnhoTDWIC52M51R9Y
 singlestoredb/utils/mogrify.py,sha256=-a56IF70U6CkfadeaZgfjRSVsAD3PuqRrzPpjZlgbwY,4050
 singlestoredb/utils/results.py,sha256=bJtaUaDiFq26IsPAKZ2FHGB7csMn94EAxLKrP4HaEEA,15277
 singlestoredb/utils/xdict.py,sha256=S9HKgrPrnu_6b7iOwa2KrW8CmU1Uqx0BWdEyogFzWbE,12896
-singlestoredb-1.4.1.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
-singlestoredb-1.4.1.dist-info/METADATA,sha256=e3LgU-lYTxOTjgFy24CcG69A9Vvq6Ke5YV0bV0oT2XA,5570
-singlestoredb-1.4.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-singlestoredb-1.4.1.dist-info/entry_points.txt,sha256=bSLaTWB5zGjpVYPAaI46MkkDup0su-eb3uAhCNYuRV0,48
-singlestoredb-1.4.1.dist-info/top_level.txt,sha256=eet8bVPNRqiGeY0PrO5ERH2UpamwlrKHEQCffz4dOh8,14
-singlestoredb-1.4.1.dist-info/RECORD,,
+singlestoredb-1.4.3.dist-info/LICENSE,sha256=Mlq78idURT-9G026aMYswwwnnrLcgzTLuXeAs5hjDLM,11341
+singlestoredb-1.4.3.dist-info/METADATA,sha256=sNKDftR6stTzMfX0NjKgcevlLjU9SQKhU6861nPiXQE,5570
+singlestoredb-1.4.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+singlestoredb-1.4.3.dist-info/entry_points.txt,sha256=bSLaTWB5zGjpVYPAaI46MkkDup0su-eb3uAhCNYuRV0,48
+singlestoredb-1.4.3.dist-info/top_level.txt,sha256=eet8bVPNRqiGeY0PrO5ERH2UpamwlrKHEQCffz4dOh8,14
+singlestoredb-1.4.3.dist-info/RECORD,,