tinybird-cli 3.3.1.dev13__tar.gz → 3.3.1.dev15__tar.gz

{tinybird-cli-3.3.1.dev13 → tinybird-cli-3.3.1.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.3.1.dev13
+Version: 3.3.1.dev15
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,16 @@ Changelog
 
 ---------
 
+3.3.1.dev15
+************
+
+- `Remove` part of the code supporting python 3.6 as we stopped giving support 18 month ago
+
+3.3.1.dev14
+************
+
+- `Added` Support `tb deploy` .datasource with `INDICES`
+
 3.3.1.dev13
 ************
 

{tinybird-cli-3.3.1.dev13 → tinybird-cli-3.3.1.dev15}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://docs.tinybird.co/cli.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '3.3.1.dev13'
-__revision__ = 'ab05577'
+__version__ = '3.3.1.dev15'
+__revision__ = 'daed555'

{tinybird-cli-3.3.1.dev13 → tinybird-cli-3.3.1.dev15}/tinybird/ch_utils/engine.py

@@ -1,9 +1,10 @@
 import logging
 import re
 from collections import defaultdict
+from dataclasses import asdict
 from typing import Any, Callable, Dict, Iterable, List, Optional
 
-from ..sql import col_name, engine_replicated_to_local, parse_table_structure
+from ..sql import TableIndex, col_name, engine_replicated_to_local, parse_indices_structure, parse_table_structure
 
 DEFAULT_EMPTY_PARAMETERS = ["ttl", "partition_key", "sorting_key"]
 DEFAULT_JOIN_EMPTY_PARAMETERS = ["join_strictness", "join_type", "key_columns"]
@@ -204,6 +205,10 @@ class TableDetails:
             "row_count": self.details.get("total_rows", None),
         }
 
+    @property
+    def indices(self) -> List[TableIndex]:
+        return _parse_indices(str(self.details.get("create_table_query", "")))
+
     def to_json(self, exclude: Optional[List[str]] = None, include_empty_details: bool = False):
         # name, database are not exported since they are not part of the engine
         d: Dict[str, Any] = {
@@ -234,6 +239,8 @@ class TableDetails:
             d["version"] = self.version
         if self.ttl:
             d["ttl"] = self.ttl.strip()
+        if self.indices:
+            d["indices"] = [asdict(index) for index in self.indices]
 
         if self.engine_full:
             engine_params = engine_params_from_engine_full(self.engine_full)
@@ -253,7 +260,9 @@ class TableDetails:
         return d
 
     def to_datafile(self, include_empty_details: bool = False) -> str:
-        d: Dict[str, Any] = self.to_json(exclude=["engine", "engine_full"], include_empty_details=include_empty_details)
+        d: Dict[str, Any] = self.to_json(
+            exclude=["engine", "engine_full", "indices"], include_empty_details=include_empty_details
+        )
         engine: str = self.engine
 
         datafile: str = ""
@@ -774,3 +783,21 @@ def ttl_condition_from_engine_full(engine_full: Optional[str]) -> Optional[str]:
     except Exception as e:
         logging.error(str(e))
         return None
+
+
+def _parse_indices(create_table_query_expr: str) -> List[TableIndex]:
+    if create_table_query_expr == "":
+        return []
+    try:
+        from tinybird.sql_toolset import format_sql
+
+        indices = [
+            line.strip()
+            for line in format_sql(create_table_query_expr).splitlines()
+            if line.strip().startswith("INDEX")
+        ]
+    except ModuleNotFoundError:
+        # this is not needed from CLI
+        return []
+
+    return parse_indices_structure(indices)

{tinybird-cli-3.3.1.dev13 → tinybird-cli-3.3.1.dev15}/tinybird/tb_cli_modules/common.py

@@ -17,7 +17,6 @@ from enum import Enum
 from functools import wraps
 from os import chmod, environ, getcwd, getenv
 from pathlib import Path
-from sys import version_info
 from typing import TYPE_CHECKING, Any, Callable, Dict, Iterable, List, Optional, Set, Tuple, Union
 from urllib.parse import urljoin, urlparse
 
@@ -100,11 +99,7 @@ def create_connector(connector: str, options: Dict[str, Any]):
 def coro(f):
     @wraps(f)
     def wrapper(*args, **kwargs):
-        if version_info[1] >= 7:  # FIXME drop python 3.6 support
-            return asyncio.run(f(*args, **kwargs))
-        else:
-            loop = asyncio.get_event_loop()
-            return loop.run_until_complete(f(*args, **kwargs))
+        return asyncio.run(f(*args, **kwargs))
 
     return wrapper
 

{tinybird-cli-3.3.1.dev13 → tinybird-cli-3.3.1.dev15}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.3.1.dev13
+Version: 3.3.1.dev15
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,16 @@ Changelog
 
 ---------
 
+3.3.1.dev15
+************
+
+- `Remove` part of the code supporting python 3.6 as we stopped giving support 18 month ago
+
+3.3.1.dev14
+************
+
+- `Added` Support `tb deploy` .datasource with `INDICES`
+
 3.3.1.dev13
 ************