tinybird-cli 3.3.1.dev12__tar.gz → 3.3.1.dev14__tar.gz

{tinybird-cli-3.3.1.dev12 → tinybird-cli-3.3.1.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.3.1.dev12
+Version: 3.3.1.dev14
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,16 @@ Changelog
 
 ---------
 
+3.3.1.dev14
+************
+
+- `Added` Support `tb deploy` .datasource with `INDICES`
+
+3.3.1.dev13
+************
+
+- `Added` Support `tb push` .datasource with `INDICES`
+
 3.3.1.dev12
 ************
 
@@ -27,7 +37,7 @@ Changelog
 3.3.1.dev11
 ************
 
-- `Add` Check backfill on preview is required when `tb deploy` modified datasources. Disable check with `TB_CHECK_BACKFILL_REQUIRED=0`.
+- `Added` Check backfill on preview is required when `tb deploy` modified datasources. Disable check with `TB_CHECK_BACKFILL_REQUIRED=0`.
 
 3.3.1.dev10
 ************

{tinybird-cli-3.3.1.dev12 → tinybird-cli-3.3.1.dev14}/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.dev12'
-__revision__ = '059af77'
+__version__ = '3.3.1.dev14'
+__revision__ = '5fde94c'

{tinybird-cli-3.3.1.dev12 → tinybird-cli-3.3.1.dev14}/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.dev12 → tinybird-cli-3.3.1.dev14}/tinybird/datafile.py

@@ -65,7 +65,7 @@ from tinybird.tb_cli_modules.exceptions import CLIGitReleaseException, CLIPipeEx
 from .ch_utils.engine import ENABLED_ENGINES
 from .client import AuthException, CanNotBeDeletedException, DoesNotExistException, TinyB
 from .feedback_manager import FeedbackManager
-from .sql import parse_table_structure, schema_to_sql_columns
+from .sql import parse_indices_structure, parse_table_structure, schema_to_sql_columns
 from .sql_template import get_used_tables_in_template, render_sql_template
 from .tornado_template import UnClosedIfError
 
@@ -824,6 +824,17 @@ def parse(
         parser_state.current_node["schema"] = ",".join(schema_to_sql_columns(sh))
         parser_state.current_node["columns"] = sh
 
+    def indices(*args, **kwargs):
+        s = _unquote("".join(args))
+        if not s:
+            return
+        try:
+            indices = parse_indices_structure(s.splitlines())
+        except Exception as e:
+            raise ParseException(FeedbackManager.error_parsing_indices(line=kwargs["lineno"], error=e))
+
+        parser_state.current_node["indices"] = indices
+
     def assign_var(v: str) -> Callable[[VarArg(str), KwArg(Any)], None]:
         def _f(*args: str, **kwargs: Any):
             s = _unquote((" ".join(args)).strip())
@@ -970,6 +981,7 @@ def parse(
         "source": sources,
         "maintainer": assign("maintainer"),
         "schema": schema,
+        "indices": indices,
         "engine": set_engine,
         "partition_key": assign_var("partition_key"),
         "sorting_key": assign_var("sorting_key"),
@@ -1307,10 +1319,16 @@ async def process_file(
             return name
 
         description = node.get("description", "")
+        indices_list = node.get("indices", [])
+        indices = None
+        if indices_list:
+            indices = "\n".join([index.to_sql() for index in indices_list])
         params = {
             "name": append_version_to_name(name, version),
             "description": description,
             "schema": schema,
+            "indices": indices,
+            "indices_list": indices_list,
             "format": _format,
         }
 

{tinybird-cli-3.3.1.dev12 → tinybird-cli-3.3.1.dev14}/tinybird/feedback_manager.py

@@ -96,6 +96,9 @@ class FeedbackManager:
     error_pull = error_message("there was a problem while pulling: {error}")
     error_parsing_file = error_message("error parsing {filename}:{lineno} {error}")
     error_parsing_schema = error_message("error parsing schema (line {line}): {error}")
+    error_parsing_indices = error_message(
+        "error parsing indices (line {line}): {error}. Usage: `name expr TYPE type_full GRANULARITY granularity`. Separate multiple indices by a new line."
+    )
     error_sorting_key = error_message("SORTING_KEY should be set with {engine}")
     error_unknown_resource = error_message("Unknown resource '{resource}'")
     error_file_extension = error_message(

{tinybird-cli-3.3.1.dev12 → tinybird-cli-3.3.1.dev14}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.3.1.dev12
+Version: 3.3.1.dev14
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,16 @@ Changelog
 
 ---------
 
+3.3.1.dev14
+************
+
+- `Added` Support `tb deploy` .datasource with `INDICES`
+
+3.3.1.dev13
+************
+
+- `Added` Support `tb push` .datasource with `INDICES`
+
 3.3.1.dev12
 ************
 
@@ -27,7 +37,7 @@ Changelog
 3.3.1.dev11
 ************
 
-- `Add` Check backfill on preview is required when `tb deploy` modified datasources. Disable check with `TB_CHECK_BACKFILL_REQUIRED=0`.
+- `Added` Check backfill on preview is required when `tb deploy` modified datasources. Disable check with `TB_CHECK_BACKFILL_REQUIRED=0`.
 
 3.3.1.dev10
 ************