tinybird-cli 5.20.1.dev1__tar.gz → 5.20.1.dev2__tar.gz

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 5.20.1.dev1
+Version: 5.20.1.dev2
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -61,6 +61,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.20.1.dev2
+***********
+
+- `Fixed` Templating when using `id` parameter and the value was not provided.
+
 5.20.1.dev1
 ***********
 

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '5.20.1.dev1'
-__revision__ = '6ec3b53'
+__version__ = '5.20.1.dev2'
+__revision__ = 'afe97eb'

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird/ch_utils/constants.py

@@ -242,3 +242,17 @@ FORBIDDEN_SQL_KEYWORDS = {
 
 CH_SETTINGS_JOIN_ALGORITHM_HASH = "hash"  # uses 'hash' by default, https://clickhouse.com/docs/en/operations/settings/settings/#settings-join_algorithm
 CH_SETTINGS_JOIN_ALGORITHM_AUTO = "auto,hash"
+
+VALID_QUERY_FORMATS = (
+    "JSON",
+    "CSV",
+    "CSVWithNames",
+    "TSV",
+    "TSVWithNames",
+    "PrettyCompact",
+    "JSONEachRow",
+    "Parquet",
+    "JSONStrings",
+    "Prometheus",
+    "Native",
+)

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird/client.py

@@ -552,7 +552,7 @@ class TinyB:
     async def analyze_pipe_node(
         self, pipe_name: str, node: Dict[str, Any], dry_run: str = "false", datasource_name: Optional[str] = None
     ):
-        params = {**{"include_datafile": "true", "dry_run": dry_run}, **node.get("params", node)}
+        params = {"include_datafile": "true", "dry_run": dry_run, **node.get("params", node)}
         if "mode" in params:
             params.pop("mode")
         node_name = node["params"]["name"] if node.get("params", None) else node["name"]

tinybird_cli-5.20.1.dev1/tinybird/datafile.py → tinybird_cli-5.20.1.dev2/tinybird/datafile_common.py

@@ -395,7 +395,7 @@ class CLIGitRelease:
 
     def is_head_outdated(self, current_ws_commit: str) -> bool:
         try:
-            return self.repo.is_ancestor(current_ws_commit, self.head_commit())
+            return self.repo.is_ancestor(current_ws_commit, self.head().commit)  # type: ignore
         except GitCommandError:
             raise CLIGitReleaseException(
                 FeedbackManager.error_in_git_ancestor_commits(
@@ -405,7 +405,9 @@ class CLIGitRelease:
 
     def has_untracked_files(self) -> bool:
         current_pwd = os.getcwd()
-        working_dir = f"{self.repo.working_dir}/" if os.getcwd() != self.repo.working_dir else self.repo.working_dir
+        working_dir = (
+            f"{self.repo.working_dir}/" if os.getcwd() != self.repo.working_dir else str(self.repo.working_dir)
+        )
         project_path = current_pwd[current_pwd.startswith(working_dir) and len(working_dir) :]
         for untracked_file in self.repo.untracked_files:
             for path in PROJECT_PATHS:
@@ -426,7 +428,7 @@ class CLIGitRelease:
         return self.head().commit.hexsha != current_ws_commit
 
     def diff(self, current_ws_commit: str) -> List[Diff]:
-        return self.repo.commit(current_ws_commit).diff(self.head(), paths=self.paths)
+        return self.repo.commit(current_ws_commit).diff(self.head().commit, paths=self.paths)
 
     def diff_datafiles(self, current_ws_commit: str) -> List[Diff]:
         # ignore diffs if:

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird/sql.py

@@ -67,8 +67,18 @@ class TableIndex:
             if index_supported_types:
                 for supported_type in INDEX_SUPPORTED_TYPES.get(index_supported_types, []):
                     # Convert supported type to regex pattern
-                    # Replace * with \d+ to match any number
                     pattern = supported_type.replace("*", r"\d+")
+
+                    # Special handling for complex types that can have parameters
+                    if supported_type == "Array":
+                        pattern = r"Array\(.*\)"
+                    elif supported_type == "Map":
+                        pattern = r"Map\(.*\)"
+                    elif supported_type == "LowCardinality":
+                        pattern = r"LowCardinality\(.*\)"
+                    elif supported_type == "Nullable":
+                        pattern = r"Nullable\(.*\)"
+
                     if re.match(f"^{pattern}$", col_type):
                         return
                 raise ValueError(

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird/sql_template.py

@@ -435,8 +435,10 @@ def sql_unescape(x, what=""):
     "'testing%'"
     >>> sql_unescape('testing%', '$')
     "'testing\\\\%'"
+    >>> sql_unescape('testing"')
+    '\\'testing"\\''
     """
-    return Expression("'" + sqlescape(x).replace(f"\\{what}", what) + "'")
+    return Expression("'" + sqlescape_for_string_expression(x).replace(f"\\{what}", what) + "'")
 
 
 def split_to_array(x, default="", separator: str = ","):
@@ -1386,6 +1388,7 @@ _namespace = {
     "close": None,
     "print": None,
     "input": None,
+    "id": None,
 }
 
 
@@ -2018,6 +2021,7 @@ def render_sql_template(
     test_mode: bool = False,
     name: Optional[str] = None,
     local_variables: Optional[dict] = None,
+    secrets_in_test_mode: Optional[bool] = True,
 ) -> Tuple[str, TemplateExecutionResults, list]:
     """
     >>> render_sql_template("select * from table where f = {{Float32(foo)}}", { 'foo': -1 })
@@ -2300,7 +2304,7 @@ def render_sql_template(
         if secrets:
             v.update({"tb_secrets": secrets})
 
-        if is_tb_secret:
+        if is_tb_secret and secrets_in_test_mode:
             v.update({TB_SECRET_IN_TEST_MODE: None})
 
         v.update(type_fns_check)

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird/sql_toolset.py

@@ -227,25 +227,56 @@ def sql_get_used_tables(
 
 
 class ReplacementsDict(dict):
+    def __init__(self, *args, enabled_table_functions=None, **kwargs):
+        self.enabled_table_functions = enabled_table_functions
+        super().__init__(*args, **kwargs)
+
     def __getitem__(self, key):
         v = super().__getitem__(key)
         if isinstance(v, tuple):
             k, r = v
             if callable(r):
-                r = r()
+                r = update_callable_signature(r)(self.enabled_table_functions)
                 super().__setitem__(key, (k, r))
             return k, r
         if callable(v):
-            v = v()
+            v = update_callable_signature(v)(self.enabled_table_functions)
             super().__setitem__(key, v)
         return v
 
 
-def tables_or_sql(replacement: dict, table_functions=False) -> set:
+def update_callable_signature(func):
+    """
+    Utility function to provide backward compatibility for callable functions
+    that don't accept the enabled_table_functions parameter.
+    """
+    if callable(func):
+
+        def wrapper(enabled_table_functions=None):
+            # Check if the function accepts the enabled_table_functions parameter
+            import inspect
+
+            sig = inspect.signature(func)
+            if len(sig.parameters) == 0:
+                # Old-style callable with no parameters
+                return func()
+            else:
+                # New-style callable that accepts enabled_table_functions
+                return func(enabled_table_functions)
+
+        return wrapper
+    return func
+
+
+def tables_or_sql(replacement: dict, table_functions=False, function_allow_list=None) -> set:
     try:
         return set(
             sql_get_used_tables(
-                replacement[1], default_database=replacement[0], raising=True, table_functions=table_functions
+                replacement[1],
+                default_database=replacement[0],
+                raising=True,
+                table_functions=table_functions,
+                function_allow_list=frozenset(function_allow_list),
             )
         )
     except Exception as e:
@@ -342,6 +373,7 @@ def replace_tables(
         _enabled_table_functions = ENABLED_TABLE_FUNCTIONS
     else:
         _enabled_table_functions = ENABLED_TABLE_FUNCTIONS.union(set(function_allow_list))
+    _replacements.enabled_table_functions = frozenset(_enabled_table_functions)
     while _tables:
         table = _tables.pop()
         if len(table) == 3:
@@ -355,7 +387,9 @@ def replace_tables(
         seen_tables.add(table)
         if table in _replacements:
             replacement = _replacements[table]
-            dependent_tables = tables_or_sql(replacement, table_functions=check_functions)
+            dependent_tables = tables_or_sql(
+                replacement, table_functions=check_functions, function_allow_list=_enabled_table_functions
+            )
             deps[table] |= {(d[0], d[1]) for d in dependent_tables}
             for dependent_table in list(dependent_tables):
                 if len(dependent_table) == 3:

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird/tb_cli_modules/auth.py

@@ -74,9 +74,8 @@ async def auth(ctx: click.Context, token: str, host: str, region: str, connector
     # do a clean auth
     if not token and not ctx.parent.params.get("token") and not env_token:
         config.set_token(None)
-    else:
-        if env_token and not token:
-            click.echo(FeedbackManager.info_reading_from_env(value="token", envvar="TB_TOKEN"))
+    elif env_token and not token:
+        click.echo(FeedbackManager.info_reading_from_env(value="token", envvar="TB_TOKEN"))
 
     regions: Optional[List[Region]] = None
     try_all_regions = True

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird/tb_cli_modules/branch.py

@@ -11,7 +11,7 @@ import aiofiles
 import click
 import yaml
 
-from tinybird.datafile import create_release, wait_job
+from tinybird.datafile_common import create_release, wait_job
 from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb_cli_modules.cli import cli
 from tinybird.tb_cli_modules.common import (
@@ -597,9 +597,8 @@ async def regression_tests(
                 await print_branch_regression_tests_summary(client, job_id, config["host"])
         except Exception as e:
             raise CLIBranchException(FeedbackManager.error_exception(error=str(e)))
-    else:
-        if not ctx.invoked_subcommand:
-            await _run_regression(type="coverage", wait=wait, run_in_main=main)
+    elif not ctx.invoked_subcommand:
+        await _run_regression(type="coverage", wait=wait, run_in_main=main)
 
 
 async def _run_regression(

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird/tb_cli_modules/cli.py

@@ -28,7 +28,7 @@ from tinybird.client import (
     TinyB,
 )
 from tinybird.config import CURRENT_VERSION, SUPPORTED_CONNECTORS, VERSION, FeatureFlags, get_config
-from tinybird.datafile import (
+from tinybird.datafile_common import (
     AlreadyExistsException,
     CLIGitRelease,
     CLIGitReleaseException,
@@ -431,10 +431,9 @@ async def init(
                 error = True
             else:
                 click.echo(FeedbackManager.info_cicd_already_exists(provider=cicd_provider.name))
-        else:
-            if cicd:
-                data_project_dir = os.path.relpath(folder, cli_git_release.working_dir())
-                await init_cicd(client, path=cli_git_release.working_dir(), data_project_dir=data_project_dir)
+        elif cicd:
+            data_project_dir = os.path.relpath(folder, cli_git_release.working_dir())
+            await init_cicd(client, path=cli_git_release.working_dir(), data_project_dir=data_project_dir)
 
     if final_response:
         if error:
@@ -1463,12 +1462,11 @@ async def deploy(
                             )
                         else:
                             click.echo(FeedbackManager.info_minor_patch_release_with_autopromote(version=new_version))
-                else:
-                    if show_feedback:
-                        if dry_run:
-                            click.echo(FeedbackManager.info_dry_minor_patch_release_no_autopromote(version=new_version))
-                        else:
-                            click.echo(FeedbackManager.info_minor_patch_release_no_autopromote(version=new_version))
+                elif show_feedback:
+                    if dry_run:
+                        click.echo(FeedbackManager.info_dry_minor_patch_release_no_autopromote(version=new_version))
+                    else:
+                        click.echo(FeedbackManager.info_minor_patch_release_no_autopromote(version=new_version))
                 new_release = True
 
         if new_release:

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird/tb_cli_modules/datasource.py

@@ -20,7 +20,7 @@ from tinybird.tb_cli_modules.config import CLIConfig
 if TYPE_CHECKING:
     from tinybird.connectors import Connector
 
-from tinybird.datafile import get_name_version, wait_job
+from tinybird.datafile_common import get_name_version, wait_job
 from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb_cli_modules.branch import warn_if_in_live
 from tinybird.tb_cli_modules.cli import cli

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird/tb_cli_modules/fmt.py

@@ -7,7 +7,7 @@ import aiofiles
 import click
 from click import Context
 
-from tinybird.datafile import color_diff, format_datasource, format_pipe, is_file_a_datasource, peek
+from tinybird.datafile_common import color_diff, format_datasource, format_pipe, is_file_a_datasource, peek
 from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb_cli_modules.cli import cli
 from tinybird.tb_cli_modules.common import coro
@@ -29,10 +29,11 @@ from tinybird.tb_cli_modules.common import coro
     default=False,
     help="Formats local file, prints the diff and exits 1 if different, 0 if equal",
 )
+@click.option("--no-color", is_flag=True, default=False, help="Don't colorize diff")
 @click.pass_context
 @coro
 async def fmt(
-    ctx: Context, filenames: List[str], line_length: int, dry_run: bool, yes: bool, diff: bool
+    ctx: Context, filenames: List[str], line_length: int, dry_run: bool, yes: bool, diff: bool, no_color: bool
 ) -> Optional[str]:
     """
     Formats a .datasource, .pipe or .incl file
@@ -66,7 +67,8 @@ async def fmt(
             diff_result = difflib.unified_diff(
                 lines_file, lines_fmt, fromfile=f"{Path(filename).name} local", tofile="fmt datafile"
             )
-            diff_result = color_diff(diff_result)
+            if not no_color:
+                diff_result = color_diff(diff_result)
             not_empty, diff_lines = peek(diff_result)
             if not_empty:
                 sys.stdout.writelines(diff_lines)

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird/tb_cli_modules/pipe.py

@@ -16,7 +16,7 @@ from click import Context
 import tinybird.context as context
 from tinybird.client import AuthNoTokenException, DoesNotExistException, TinyB
 from tinybird.config import DEFAULT_API_HOST, FeatureFlags
-from tinybird.datafile import PipeNodeTypes, PipeTypes, folder_push, get_name_version, process_file, wait_job
+from tinybird.datafile_common import PipeNodeTypes, PipeTypes, folder_push, get_name_version, process_file, wait_job
 from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb_cli_modules.branch import warn_if_in_live
 from tinybird.tb_cli_modules.cli import cli

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird/tb_cli_modules/workspace.py

@@ -10,7 +10,7 @@ from click import Context
 
 from tinybird.client import CanNotBeDeletedException, DoesNotExistException, TinyB
 from tinybird.config import get_display_host
-from tinybird.datafile import PipeTypes
+from tinybird.datafile_common import PipeTypes
 from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb_cli_modules.cli import cli
 from tinybird.tb_cli_modules.common import (
@@ -234,20 +234,19 @@ async def create_workspace(
         if not organization:
             raise CLIWorkspaceException(FeedbackManager.error_organization_not_found(organization_id=organization_id))
         organization_name = organization.get("name")
+    elif len(organizations) == 0:
+        click.echo(FeedbackManager.warning_none_organization(ui_host=ui_host))
+    elif len(organizations) == 1:
+        organization_id = organizations[0].get("id")
+        organization_name = organizations[0].get("name")
     else:
-        if len(organizations) == 0:
-            click.echo(FeedbackManager.warning_none_organization(ui_host=ui_host))
-        elif len(organizations) == 1:
-            organization_id = organizations[0].get("id")
-            organization_name = organizations[0].get("name")
+        sorted_organizations = sort_organizations_by_user(organizations, user_email=config.get_user_email())
+        current_organization = await ask_for_organization_interactively(sorted_organizations)
+        if current_organization:
+            organization_id = current_organization.get("id")
+            organization_name = current_organization.get("name")
         else:
-            sorted_organizations = sort_organizations_by_user(organizations, user_email=config.get_user_email())
-            current_organization = await ask_for_organization_interactively(sorted_organizations)
-            if current_organization:
-                organization_id = current_organization.get("id")
-                organization_name = current_organization.get("name")
-            else:
-                return
+            return
 
     # If we have at least workspace_name, we start the non interactive
     # process, creating an empty workspace

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 5.20.1.dev1
+Version: 5.20.1.dev2
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -61,6 +61,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.20.1.dev2
+***********
+
+- `Fixed` Templating when using `id` parameter and the value was not provided.
+
 5.20.1.dev1
 ***********
 

{tinybird_cli-5.20.1.dev1 → tinybird_cli-5.20.1.dev2}/tinybird_cli.egg-info/SOURCES.txt

@@ -4,7 +4,7 @@ tinybird/client.py
 tinybird/config.py
 tinybird/connectors.py
 tinybird/context.py
-tinybird/datafile.py
+tinybird/datafile_common.py
 tinybird/datatypes.py
 tinybird/feedback_manager.py
 tinybird/git_settings.py