tinybird-cli 5.18.1.dev0__tar.gz → 5.18.1.dev2__tar.gz

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 5.18.1.dev0
+Version: 5.18.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.18.1.dev1
+***********
+
+- `Added` support for changes in `/v0/datasources/(.+)/delete`.
+
 5.18.0
 ***********
 

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.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.18.1.dev0'
-__revision__ = '18f745e'
+__version__ = '5.18.1.dev2'
+__revision__ = '046558d'

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.1.dev2}/tinybird/ch_utils/engine.py

@@ -456,7 +456,7 @@ ENABLED_ENGINES = [
         MERGETREE_OPTIONS,
     ),
     # AggregatingMergeTree()
-    engine_config("AggregatingMergeTree", options=REPLACINGMERGETREE_OPTIONS),
+    engine_config("AggregatingMergeTree", options=MERGETREE_OPTIONS),
     # CollapsingMergeTree(sign)
     engine_config(
         "CollapsingMergeTree",
@@ -631,9 +631,7 @@ def engine_full_from_dict(
 
     >>> schema = 'sign_column Int8'
     >>> engine_full_from_dict('AggregatingMergeTree', {}, schema=schema)
-    Traceback (most recent call last):
-    ...
-    ValueError: Missing required option 'sorting_key'
+    'AggregatingMergeTree() ORDER BY (tuple())'
 
     >>> columns=[]
     >>> columns.append({'name': 'key_column', 'type': 'Int8', 'codec': None, 'default_value': None, 'nullable': False, 'normalized_name': 'key_column'})
@@ -763,6 +761,16 @@ def engine_local_to_replicated(engine: str, database: str, name: str) -> str:
     return re.sub(r"(.*)MergeTree(\(([^\)]*)\))*(.*)", _replace, engine.strip())
 
 
+def ttl_from_engine(engine: str) -> Optional[str]:
+    ttl_array = engine.split(" TTL ")
+    if len(ttl_array) <= 1:
+        return None
+    settings_array = engine.split(" SETTINGS ")
+    settings = " SETTINGS " + settings_array[1] if len(settings_array) > 1 else None
+    ttl = ttl_array[1][: -(len(settings))] if settings else ttl_array[1]
+    return ttl
+
+
 def ttl_condition_from_engine_full(engine_full: Optional[str]) -> Optional[str]:
     """
     >>> ttl_condition_from_engine_full(None)
@@ -810,13 +818,9 @@ def ttl_condition_from_engine_full(engine_full: Optional[str]) -> Optional[str]:
         return None
 
     try:
-        ttl_array = engine_full.split(" TTL ")
-        if len(ttl_array) <= 1:
+        ttl = ttl_from_engine(engine_full)
+        if not ttl:
             return None
-        settings_array = engine_full.split(" SETTINGS ")
-        settings = " SETTINGS " + settings_array[1] if len(settings_array) > 1 else None
-        ttl = ttl_array[1][: -(len(settings))] if settings else ttl_array[1]
-
         groups = SIMPLE_TTL_DEFINITION.search(ttl)
         if not groups:
             return None

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.1.dev2}/tinybird/check_pypi.py

@@ -6,7 +6,7 @@ from tinybird.feedback_manager import FeedbackManager
 from tinybird.syncasync import sync_to_async
 from tinybird.tb_cli_modules.common import CLIException, getenv_bool
 
-PYPY_URL = "https://pypi.org/pypi/tinybird-cli/json"
+PYPY_URL = "https://pypi.org/pypi/tinybird/json"
 requests_get = sync_to_async(requests.get, thread_sensitive=False)
 
 

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.1.dev2}/tinybird/client.py

@@ -1,6 +1,7 @@
 import asyncio
 import json
 import logging
+import os
 import ssl
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Mapping, Optional, Set, Union
@@ -91,6 +92,8 @@ class TinyB:
         disable_ssl_checks: bool = False,
         send_telemetry: bool = False,
         semver: Optional[str] = None,
+        env: Optional[str] = "production",
+        staging: bool = False,
     ):
         ctx = ssl.create_default_context()
         ctx.check_hostname = False
@@ -102,8 +105,10 @@ class TinyB:
         self.disable_ssl_checks = disable_ssl_checks
         self.send_telemetry = send_telemetry
         self.semver = semver
+        self.env = env
+        self.staging = staging
 
-    async def _req(
+    async def _req_raw(
         self,
         endpoint: str,
         data=None,
@@ -112,7 +117,7 @@ class TinyB:
         retries: int = LIMIT_RETRIES,
         use_token: Optional[str] = None,
         **kwargs,
-    ):
+    ) -> Response:
         url = f"{self.host.strip('/')}/{endpoint.strip('/')}"
 
         token_to_use = use_token if use_token else self.token
@@ -122,6 +127,8 @@ class TinyB:
             url += ("&" if "?" in url else "?") + "cli_version=" + quote(self.version)
         if self.semver:
             url += ("&" if "?" in url else "?") + "__tb__semver=" + self.semver
+        if self.staging:
+            url += ("&" if "?" in url else "?") + "__tb__deployment=staging"
 
         verify_ssl = not self.disable_ssl_checks
         try:
@@ -155,10 +162,15 @@ class TinyB:
                     response = await sync_to_async(session.get, thread_sensitive=False)(
                         url, verify=verify_ssl, **kwargs
                     )
-
         except Exception as e:
             raise e
 
+        if self.send_telemetry:
+            try:
+                add_telemetry_event("api_request", endpoint=url, token=self.token, status_code=response.status_code)
+            except Exception as ex:
+                logging.exception(f"Can't send telemetry: {ex}")
+
         logging.debug("== server response ==")
         logging.debug(response.content)
         logging.debug("==      end        ==")
@@ -169,6 +181,21 @@ class TinyB:
             except Exception as ex:
                 logging.exception(f"Can't send telemetry: {ex}")
 
+        return response
+
+    async def _req(
+        self,
+        endpoint: str,
+        data=None,
+        files=None,
+        method: str = "GET",
+        retries: int = LIMIT_RETRIES,
+        use_token: Optional[str] = None,
+        **kwargs,
+    ):
+        token_to_use = use_token if use_token else self.token
+        response = await self._req_raw(endpoint, data, files, method, retries, use_token, **kwargs)
+
         if response.status_code == 403:
             error = parse_error_response(response)
             if not token_to_use:
@@ -188,7 +215,9 @@ class TinyB:
         if response.status_code == 599:
             raise TimeoutException("timeout")
         if "Content-Type" in response.headers and (
-            response.headers["Content-Type"] == "text/plain" or "text/csv" in response.headers["Content-Type"]
+            response.headers["Content-Type"] == "text/plain"
+            or "text/csv" in response.headers["Content-Type"]
+            or "ndjson" in response.headers["Content-Type"]
         ):
             return response.content.decode("utf-8")
         if response.status_code >= 400 and response.status_code not in [400, 403, 404, 409, 429]:
@@ -248,10 +277,10 @@ class TinyB:
             url = url + "?" + scopes_url
             return await self._req(url, method="PUT", data="")
 
-    async def datasources(self, branch: Optional[str] = None, used_by: bool = False):
-        params = {
-            "attrs": "used_by" if used_by else "",
-        }
+    async def datasources(self, branch: Optional[str] = None, used_by: bool = False) -> List[Dict[str, Any]]:
+        params = {}
+        if used_by:
+            params["attrs"] = "used_by"
         response = await self._req(f"/v0/datasources?{urlencode(params)}")
         ds = response["datasources"]
 
@@ -259,6 +288,25 @@ class TinyB:
             ds = [x for x in ds if x["name"].startswith(branch)]
         return ds
 
+    async def secrets(self) -> List[Dict[str, Any]]:
+        response = await self._req("/v0/variables")
+        return response["variables"]
+
+    async def get_secret(self, name: str) -> Optional[Dict[str, Any]]:
+        return await self._req(f"/v0/variables/{name}")
+
+    async def create_secret(self, name: str, value: str):
+        response = await self._req("/v0/variables", method="POST", data={"name": name, "value": value})
+        return response
+
+    async def update_secret(self, name: str, value: str):
+        response = await self._req(f"/v0/variables/{name}", method="PUT", data={"value": value})
+        return response
+
+    async def delete_secret(self, name: str):
+        response = await self._req(f"/v0/variables/{name}", method="DELETE")
+        return response
+
     async def get_connections(self, service: Optional[str] = None):
         params = {}
 
@@ -356,7 +404,7 @@ class TinyB:
         return res
 
     async def pipe_file(self, pipe: str):
-        return await self._req(f"/v0/pipes/{pipe}.pipe")
+        return await self._req(f"/v1/pipes/{pipe}.pipe")
 
     async def datasource_file(self, datasource: str):
         try:
@@ -498,6 +546,9 @@ class TinyB:
         payload = {"datasource_a": datasource_a, "datasource_b": datasource_b}
         return await self._req("/v0/datasources/exchange", method="POST", data=payload)
 
+    async def datasource_events(self, datasource_name: str, data: str):
+        return await self._req(f"/v0/events?name={datasource_name}", method="POST", data=data)
+
     async def analyze_pipe_node(
         self, pipe_name: str, node: Dict[str, Any], dry_run: str = "false", datasource_name: Optional[str] = None
     ):
@@ -532,7 +583,7 @@ class TinyB:
         )
         return response
 
-    async def pipes(self, branch=None, dependencies: bool = False, node_attrs=None, attrs=None):
+    async def pipes(self, branch=None, dependencies: bool = False, node_attrs=None, attrs=None) -> List[Dict[str, Any]]:
         params = {
             "dependencies": "true" if dependencies else "false",
             "attrs": attrs if attrs else "",
@@ -637,10 +688,12 @@ class TinyB:
     async def pipe_unlink_materialized(self, pipe_name: str, node_id: str):
         return await self._req(f"/v0/pipes/{pipe_name}/nodes/{node_id}/materialization", method="DELETE")
 
-    async def query(self, sql: str, pipeline: Optional[str] = None):
+    async def query(self, sql: str, pipeline: Optional[str] = None, playground: Optional[str] = None):
         params = {}
         if pipeline:
             params = {"pipeline": pipeline}
+        if playground:
+            params = {"playground": playground}
         params.update({"release_replacements": "true"})
 
         if len(sql) > TinyB.MAX_GET_LENGTH:
@@ -661,19 +714,27 @@ class TinyB:
     async def job_cancel(self, job_id: str):
         return await self._req(f"/v0/jobs/{job_id}/cancel", method="POST", data=b"")
 
-    async def user_workspaces(self):
-        return await self._req("/v0/user/workspaces/?with_environments=false")
+    async def user_workspaces(self, version: str = "v0"):
+        data = await self._req(f"/{version}/user/workspaces/?with_environments=false")
+        # TODO: this is repeated in local_common.py but I'm avoiding circular imports
+        local_port = int(os.getenv("TB_LOCAL_PORT", 80))
+        local_host = f"http://localhost:{local_port}"
+        if local_host != self.host:
+            return data
+
+        local_workspaces = [x for x in data["workspaces"] if not x["name"].startswith("Tinybird_Local_")]
+        return {**data, "workspaces": local_workspaces}
 
-    async def user_workspaces_and_branches(self):
-        return await self._req("/v0/user/workspaces/?with_environments=true")
+    async def user_workspaces_and_branches(self, version: str = "v0"):
+        return await self._req(f"/{version}/user/workspaces/?with_environments=true")
 
-    async def user_workspaces_with_organization(self):
+    async def user_workspaces_with_organization(self, version: str = "v0"):
         return await self._req(
-            "/v0/user/workspaces/?with_environments=false&with_organization=true&with_members_and_owner=false"
+            f"/{version}/user/workspaces/?with_environments=false&with_organization=true&with_members_and_owner=false"
         )
 
-    async def user_workspace_branches(self):
-        return await self._req("/v0/user/workspaces/?with_environments=true&only_environments=true")
+    async def user_workspace_branches(self, version: str = "v0"):
+        return await self._req(f"/{version}/user/workspaces/?with_environments=true&only_environments=true")
 
     async def branches(self):
         return await self._req("/v0/environments")
@@ -681,12 +742,18 @@ class TinyB:
     async def releases(self, workspace_id):
         return await self._req(f"/v0/workspaces/{workspace_id}/releases")
 
-    async def create_workspace(self, name: str, template: Optional[str], organization_id: Optional[str]):
-        url = f"/v0/workspaces?name={name}"
+    async def create_workspace(
+        self,
+        name: str,
+        template: Optional[str],
+        assign_to_organization_id: Optional[str] = None,
+        version: str = "v0",
+    ):
+        url = f"/{version}/workspaces?name={name}"
         if template:
             url += f"&starter_kit={template}"
-        if organization_id:
-            url += f"&assign_to_organization_id={organization_id}"
+        if assign_to_organization_id:
+            url += f"&assign_to_organization_id={assign_to_organization_id}"
         return await self._req(url, method="POST", data=b"")
 
     async def create_workspace_branch(
@@ -785,9 +852,9 @@ class TinyB:
             url = f"/v0/environments/{branch_id}/regression"
         return await self._req(url, method="POST", data=data, headers={"Content-Type": "application/json"})
 
-    async def delete_workspace(self, id: str, hard_delete_confirmation: Optional[str]):
+    async def delete_workspace(self, id: str, hard_delete_confirmation: Optional[str], version: str = "v0"):
         data = {"confirmation": hard_delete_confirmation}
-        return await self._req(f"/v0/workspaces/{id}", data, method="DELETE")
+        return await self._req(f"/{version}/workspaces/{id}", data, method="DELETE")
 
     async def delete_branch(self, id: str):
         return await self._req(f"/v0/environments/{id}", method="DELETE")
@@ -818,12 +885,53 @@ class TinyB:
         params = {"with_token": "true" if with_token else "false"}
         return await self._req(f"/v0/workspaces/{workspace_id}?{urlencode(params)}")
 
-    async def workspace_info(self):
-        return await self._req("/v0/workspace")
+    async def workspace_info(self, version: str = "v0") -> Dict[str, Any]:
+        return await self._req(f"/{version}/workspace")
 
     async def organization(self, organization_id: str):
         return await self._req(f"/v0/organizations/{organization_id}")
 
+    async def create_organization(
+        self,
+        name: str,
+    ):
+        url = f"/v0/organizations?name={name}"
+        return await self._req(url, method="POST", data=b"")
+
+    async def add_workspaces_to_organization(self, organization_id: str, workspace_ids: List[str]):
+        if not workspace_ids:
+            return
+        return await self._req(
+            f"/v0/organizations/{organization_id}/workspaces",
+            method="PUT",
+            data=json.dumps({"workspace_ids": ",".join(workspace_ids)}),
+        )
+
+    async def infra_create(self, organization_id: str, name: str, host: str) -> Dict[str, Any]:
+        params = {
+            "organization_id": organization_id,
+            "name": name,
+            "host": host,
+        }
+        return await self._req(f"/v1/infra?{urlencode(params)}", method="POST")
+
+    async def infra_update(self, infra_id: str, organization_id: str, name: str, host: str) -> Dict[str, Any]:
+        params = {
+            "organization_id": organization_id,
+        }
+        if name:
+            params["name"] = name
+        if host:
+            params["host"] = host
+        return await self._req(f"/v1/infra/{infra_id}?{urlencode(params)}", method="PUT")
+
+    async def infra_list(self, organization_id: str) -> List[Dict[str, Any]]:
+        data = await self._req(f"/v1/infra?organization_id={organization_id}")
+        return data.get("infras", [])
+
+    async def infra_delete(self, infra_id: str, organization_id: str) -> Dict[str, Any]:
+        return await self._req(f"/v1/infra/{infra_id}?organization_id={organization_id}", method="DELETE")
+
     async def wait_for_job(
         self,
         job_id: str,

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.1.dev2}/tinybird/config.py

@@ -70,14 +70,33 @@ LEGACY_HOSTS = {
 }
 
 
-async def get_config(host: str, token: Optional[str], semver: Optional[str] = None) -> Dict[str, Any]:
+CLOUD_HOSTS = {
+    "https://api.tinybird.co": "https://cloud.tinybird.co/gcp/europe-west3",
+    "https://api.us-east.tinybird.co": "https://cloud.tinybird.co/gcp/us-east4",
+    "https://api.us-east.aws.tinybird.co": "https://cloud.tinybird.co/aws/us-east-1",
+    "https://api.us-west-2.aws.tinybird.co": "https://cloud.tinybird.co/aws/us-west-2",
+    "https://api.eu-central-1.aws.tinybird.co": "https://cloud.tinybird.co/aws/eu-central-1",
+    "https://api.eu-west-1.aws.tinybird.co": "https://cloud.tinybird.co/aws/eu-west-1",
+    "https://api.europe-west2.gcp.tinybird.co": "https://cloud.tinybird.co/gcp/europe-west2",
+    "https://api.ap-east.aws.tinybird.co": "https://cloud.tinybird.co/aws/ap-east",
+    "https://ui.tinybird.co": "https://cloud.tinybird.co/gcp/europe-west3",
+    "https://ui.us-east.tinybird.co": "https://cloud.tinybird.co/gcp/us-east4",
+    "https://ui.us-east.aws.tinybird.co": "https://cloud.tinybird.co/aws/us-east-1",
+    "https://ui.us-west-2.aws.tinybird.co": "https://cloud.tinybird.co/aws/us-west-2",
+    "https://ui.eu-central-1.aws.tinybird.co": "https://cloud.tinybird.co/aws/eu-central-1",
+    "https://ui.europe-west2.gcp.tinybird.co": "https://cloud.tinybird.co/gcp/europe-west2",
+}
+
+
+async def get_config(
+    host: str, token: Optional[str], semver: Optional[str] = None, config_file: Optional[str] = None
+) -> Dict[str, Any]:
     if host:
         host = host.rstrip("/")
 
-    config_file = Path(getcwd()) / ".tinyb"
     config = {}
     try:
-        async with aiofiles.open(config_file) as file:
+        async with aiofiles.open(config_file or Path(getcwd()) / ".tinyb") as file:
             res = await file.read()
             config = json.loads(res)
     except OSError:
@@ -91,6 +110,7 @@ async def get_config(host: str, token: Optional[str], semver: Optional[str] = No
     config["semver"] = semver or config.get("semver", None)
     config["host"] = host or config.get("host", DEFAULT_API_HOST)
     config["workspaces"] = config.get("workspaces", [])
+    config["cwd"] = config.get("cwd", getcwd())
     return config
 
 
@@ -104,6 +124,14 @@ def get_display_host(ui_host: str):
     return LEGACY_HOSTS.get(ui_host, ui_host)
 
 
+def get_display_cloud_host(api_host: str) -> str:
+    is_local = "localhost" in api_host
+    if is_local:
+        port = api_host.split(":")[-1]
+        return f"http://cloud.tinybird.co/local/{port}"
+    return CLOUD_HOSTS.get(api_host, api_host)
+
+
 class FeatureFlags:
     @classmethod
     def ignore_sql_errors(cls) -> bool:  # Context: #1155

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.1.dev2}/tinybird/datafile.py

@@ -1174,6 +1174,8 @@ def parse(
             else:
                 doc.filtering_tags += filtering_tags
 
+    # WARNING! This code is duplicate for Tinybird Forward in tinybird/tb/modules/datafile/common.py
+    # If you make any changes here, it's very likely that you need to also change the other module. If in doubt, ask
     cmds = {
         "from": assign("from"),
         "source": sources,

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.1.dev2}/tinybird/datatypes.py

@@ -5,11 +5,14 @@ from decimal import Decimal
 from typing import Callable, Dict, List, Optional, Tuple
 
 datetime64_patterns = [
-    r"\d\d\d\d.\d\d.\d\d(T|\s)\d\d:\d\d:\d\d.\d\d\d",
-    r"\d\d.\d\d.\d\d\d\d.\d{1,2}:\d{1,2}:\d{1,2}.\d{1,3}",
+    re.compile(r"\d\d\d\d.\d\d.\d\d(T|\s)\d\d:\d\d:\d\d.\d\d\d"),
+    re.compile(r"\d\d.\d\d.\d\d\d\d.\d{1,2}:\d{1,2}:\d{1,2}.\d{1,3}"),
 ]
 
-datetime_patterns = [r"\d\d\d\d.\d\d.\d\d(T|\s)\d\d:\d\d:\d\d", r"\d\d.\d\d.\d\d\d\d.\d{1,2}:\d{1,2}:\d{1,2}"]
+datetime_patterns = [
+    re.compile(r"\d\d\d\d.\d\d.\d\d(T|\s)\d\d:\d\d:\d\d"),
+    re.compile(r"\d\d.\d\d.\d\d\d\d.\d{1,2}:\d{1,2}:\d{1,2}"),
+]
 
 int_8_max = 2**7
 int16_max = 2**15
@@ -23,13 +26,15 @@ uint32_max = 2**32
 uint64_max = 2**64
 uint128_max = 2**128
 uint256_max = 2**256
-intx_re = r"^[+-]?\d+$"
-uintx_re = r"^\d+$"
+intx_re = re.compile(r"^[+-]?\d+$")
+uintx_re = re.compile(r"^\d+$")
 float32_max = 2**23  # 23 bits is the fractional part of float 32 ieee754
 float64_max = 2**52  # 51 bits is the fractional part of float 64 ieee754
 
-datetime64_type_pattern = r"^DateTime64(\([1-9](, ?'.+')?\))?$"
-datetime_type_pattern = r"^DateTime(\(('.+')?)?\)?$"
+date_pattern = re.compile(r"\d\d\d\d-\d\d-\d\d$")
+
+datetime64_type_pattern = re.compile(r"^DateTime64(\([1-9](, ?'.+')?\))?$")
+datetime_type_pattern = re.compile(r"^DateTime(\(('.+')?)?\)?$")
 
 # List from https://github.com/tinybirdco/ClickHousePrivate/blob/153473d9c1c871974688a1d72dcff7a13fc2076c/src/DataTypes/Serializations/SerializationBool.cpp#L216
 bool_allowed_values = {
@@ -71,7 +76,7 @@ def is_type_datetime64(type_to_check: str) -> bool:
     >>> is_type_datetime64("datetime64")
     False
     """
-    return re.match(datetime64_type_pattern, type_to_check) is not None
+    return datetime64_type_pattern.match(type_to_check) is not None
 
 
 def is_type_datetime(type_to_check: str) -> bool:
@@ -87,7 +92,7 @@ def is_type_datetime(type_to_check: str) -> bool:
     >>> is_type_datetime("datetime")
     False
     """
-    return re.match(datetime_type_pattern, type_to_check) is not None
+    return datetime_type_pattern.match(type_to_check) is not None
 
 
 def string_test(x: str) -> bool:
@@ -95,63 +100,63 @@ def string_test(x: str) -> bool:
 
 
 def date_test(x: str) -> bool:
-    return re.match(r"\d\d\d\d-\d\d-\d\d$", x) is not None
+    return date_pattern.match(x) is not None
 
 
 def datetime64_test(x: str) -> bool:
-    return any([re.match(p, x) for p in datetime64_patterns])
+    return any([p.match(x) for p in datetime64_patterns])
 
 
 def datetime_test(x: str) -> bool:
-    return any([re.match(p, x) for p in datetime_patterns])
+    return any([p.match(x) for p in datetime_patterns])
 
 
 def int_8_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and -int_8_max <= int(x) < int_8_max
+    return intx_re.match(x) is not None and -int_8_max <= int(x) < int_8_max
 
 
 def int16_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and -int16_max <= int(x) < int16_max
+    return intx_re.match(x) is not None and -int16_max <= int(x) < int16_max
 
 
 def int32_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and -int32_max <= int(x) < int32_max
+    return intx_re.match(x) is not None and -int32_max <= int(x) < int32_max
 
 
 def int64_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and -int64_max <= int(x) < int64_max
+    return intx_re.match(x) is not None and -int64_max <= int(x) < int64_max
 
 
 def int128_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and -int128_max <= int(x) < int128_max
+    return intx_re.match(x) is not None and -int128_max <= int(x) < int128_max
 
 
 def int256_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and -int256_max <= int(x) < int256_max
+    return intx_re.match(x) is not None and -int256_max <= int(x) < int256_max
 
 
 def uint_8_test(x: str) -> bool:
-    return re.match(uintx_re, x) is not None and 0 <= int(x) < uint_8_max
+    return uintx_re.match(x) is not None and 0 <= int(x) < uint_8_max
 
 
 def uint16_test(x: str) -> bool:
-    return re.match(uintx_re, x) is not None and 0 <= int(x) < uint16_max
+    return uintx_re.match(x) is not None and 0 <= int(x) < uint16_max
 
 
 def uint32_test(x: str) -> bool:
-    return re.match(uintx_re, x) is not None and 0 <= int(x) < uint32_max
+    return uintx_re.match(x) is not None and 0 <= int(x) < uint32_max
 
 
 def uint64_test(x: str) -> bool:
-    return re.match(uintx_re, x) is not None and 0 <= int(x) < uint64_max
+    return uintx_re.match(x) is not None and 0 <= int(x) < uint64_max
 
 
 def uint128_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and 0 <= int(x) < uint128_max
+    return intx_re.match(x) is not None and 0 <= int(x) < uint128_max
 
 
 def uint256_test(x: str) -> bool:
-    return re.match(intx_re, x) is not None and 0 <= int(x) < uint256_max
+    return intx_re.match(x) is not None and 0 <= int(x) < uint256_max
 
 
 def float_test(x: str) -> bool:

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.1.dev2}/tinybird/feedback_manager.py

@@ -910,6 +910,9 @@ Ready? """
     success_delete_rows_datasource = success_message(
         "** Data Source '{datasource}' rows deleted matching condition \"{delete_condition}\""
     )
+    success_delete_rows_datasource_no_rows = success_message(
+        "** Data Source '{datasource}' no rows to delete matching condition \"{delete_condition}\""
+    )
     success_dry_run_delete_rows_datasource = success_message(
         "** [DRY RUN] Data Source '{datasource}' rows '{rows}' matching condition \"{delete_condition}\" to be deleted"
     )

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.1.dev2}/tinybird/sql.py

@@ -9,6 +9,24 @@ valid_chars_name: str = string.ascii_letters + string.digits + "._`*<>+-'"
 valid_chars_fn: str = valid_chars_name + "[](),=!?:/ \n\t\r"
 
 INDEX_WHITELIST = ["minmax", "set", "bloom_filter", "ngrambf_v1", "tokenbf_v1"]
+INDEX_SUPPORTED_TYPES = {
+    "bloom_filter": [
+        "Int*",
+        "UInt*",
+        "Float*",
+        "Enum",
+        "Date",
+        "DateTime",
+        "String",
+        "FixedString",
+        "Array",
+        "LowCardinality",
+        "Nullable",
+        "UUID",
+        "Map",
+    ],
+    "ngrambf_v1": ["String", "FixedString", "Map"],
+}
 
 
 @dataclass
@@ -39,12 +57,37 @@ class TableIndex:
     def clear_index_sql(self):
         return f"CLEAR INDEX IF EXISTS {self.name}"
 
-    def validate_allowed(self):
+    def _validate_index_type(self, table_structure: List[Dict[str, Any]]):
+        for col in table_structure:
+            if col["normalized_name"] != self.expr:
+                continue
+            col_type = col["type"]
+            index_supported_types: Optional[str] = next((t for t in INDEX_SUPPORTED_TYPES if t in self.type_full), None)
+
+            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+")
+                    if re.match(f"^{pattern}$", col_type):
+                        return
+                raise ValueError(
+                    f"Not allowed data type '{col_type}' for index '{self.type_full}' for column '{self.expr}' "
+                )
+
+    def validate_allowed(self, table_structure: Optional[List[Dict[str, Any]]] = None):
         """
         Validate at API level not to depend on CLI version
         """
         if not any(index in self.type_full for index in INDEX_WHITELIST):
             raise ValueError(f"Not allowed index '{self.type_full}'")
+        try:
+            if table_structure:
+                self._validate_index_type(table_structure)
+        except ValueError as e:
+            raise e
+        except Exception:
+            logging.exception(f"Error validating index '{self.type_full}' for column '{self.expr}'")
 
 
 @dataclass
@@ -174,7 +217,7 @@ def try_to_fix_nullable_in_simple_aggregating_function(t: str) -> Optional[str]:
     return result
 
 
-def schema_to_sql_columns(schema: List[Dict[str, Any]]) -> List[str]:
+def schema_to_sql_columns(schema: List[Dict[str, Any]], skip_jsonpaths: bool = False) -> List[str]:
     """return an array with each column in SQL
     >>> schema_to_sql_columns([{'name': 'temperature', 'type': 'Float32', 'codec': None, 'default_value': None, 'nullable': False, 'normalized_name': 'temperature'}, {'name': 'temperature_delta', 'type': 'Float32', 'codec': 'CODEC(Delta(4), LZ4))', 'default_value': 'MATERIALIZED temperature', 'nullable': False, 'normalized_name': 'temperature_delta'}])
     ['`temperature` Float32', '`temperature_delta` Float32 MATERIALIZED temperature CODEC(Delta(4), LZ4))']
@@ -198,7 +241,7 @@ def schema_to_sql_columns(schema: List[Dict[str, Any]]) -> List[str]:
         else:
             _type = x["type"]
         parts = [col_name(name, backquotes=True), _type]
-        if x.get("jsonpath", None):
+        if x.get("jsonpath", None) and not skip_jsonpaths:
             parts.append(f"`json:{x['jsonpath']}`")
         if "default_value" in x and x["default_value"] not in ("", None):
             parts.append(x["default_value"])

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.1.dev2}/tinybird/sql_template.py

@@ -2399,3 +2399,106 @@ def extract_variables_from_sql(sql: str, params: List[Dict[str, Any]]) -> Dict[s
         return {}
 
     return defaults
+
+
+def render_template_with_secrets(name: str, content: str, secrets: Optional[Dict[str, str]] = None) -> str:
+    """Renders a template with secrets, allowing for default values.
+
+    Args:
+        name: The name of the template
+        content: The template content
+        secrets: A dictionary mapping secret names to their values
+
+    Returns:
+        The rendered template
+
+    Examples:
+        >>> render_template_with_secrets(
+        ...     "my_kafka_connection",
+        ...     "KAFKA_BOOTSTRAP_SERVERS {{ tb_secret('PRODUCTION_KAFKA_SERVERS', 'localhost:9092') }}",
+        ...     secrets = {'PRODUCTION_KAFKA_SERVERS': 'server1:9092,server2:9092'}
+        ... )
+        'KAFKA_BOOTSTRAP_SERVERS server1:9092,server2:9092'
+
+        >>> render_template_with_secrets(
+        ...     "my_kafka_connection",
+        ...     "KAFKA_BOOTSTRAP_SERVERS {{ tb_secret('MISSING_SECRET', 'localhost:9092') }}",
+        ...     secrets = {}
+        ... )
+        'KAFKA_BOOTSTRAP_SERVERS localhost:9092'
+
+        >>> render_template_with_secrets(
+        ...     "my_kafka_connection",
+        ...     "KAFKA_BOOTSTRAP_SERVERS {{ tb_secret('MISSING_SECRET', '') }}",
+        ...     secrets = {}
+        ... )
+        'KAFKA_BOOTSTRAP_SERVERS ""'
+
+        >>> render_template_with_secrets(
+        ...     "my_kafka_connection",
+        ...     "KAFKA_BOOTSTRAP_SERVERS {{ tb_secret('MISSING_SECRET', 0) }}",
+        ...     secrets = {}
+        ... )
+        'KAFKA_BOOTSTRAP_SERVERS 0'
+
+        >>> render_template_with_secrets(
+        ...     "my_kafka_connection",
+        ...     "KAFKA_BOOTSTRAP_SERVERS {{ tb_secret('MISSING_SECRET') }}",
+        ...     secrets = {}
+        ... )
+        Traceback (most recent call last):
+        ...
+        tinybird.sql_template.SQLTemplateException: Template Syntax Error: Cannot access secret 'MISSING_SECRET'. Check the secret exists in the Workspace and the token has the required scope.
+    """
+    if not secrets:
+        secrets = {}
+
+    def tb_secret(secret_name: str, default: Optional[str] = None) -> str:
+        """Get a secret value with an optional default.
+
+        Args:
+            secret_name: The name of the secret to retrieve
+            default: The default value to use if the secret is not found
+
+        Returns:
+            The secret value or default
+
+        Raises:
+            SQLTemplateException: If the secret is not found and no default is provided
+        """
+        if secret_name in secrets:
+            value = secrets[secret_name]
+            if isinstance(value, str) and len(value) == 0:
+                return '""'
+            return value
+        elif default is not None:
+            if isinstance(default, str) and len(default) == 0:
+                return '""'
+            return default
+        else:
+            raise SQLTemplateException(
+                f"Cannot access secret '{secret_name}'. Check the secret exists in the Workspace and the token has the required scope."
+            )
+
+    # Create the template
+    t = Template(content, name=name, autoescape=None)
+
+    try:
+        # Create namespace with our tb_secret function
+        namespace = {"tb_secret": tb_secret}
+
+        # Generate the template without all the extra processing
+        # This directly uses the underlying _generate method of the Template class
+        result = t.generate(**namespace)
+
+        # Convert the result to string
+        if isinstance(result, bytes):
+            return result.decode("utf-8")
+
+        return str(result)
+    except SQLTemplateCustomError as e:
+        raise e
+    except SQLTemplateException as e:
+        raise e
+    except Exception as e:
+        raise SQLTemplateException(f"Error rendering template with secrets: {str(e)}")

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.1.dev2}/tinybird/tb_cli_modules/common.py

@@ -637,7 +637,7 @@ async def check_user_token(ctx: Context, token: str):
     if not is_authenticated.get("is_valid", False):
         raise CLIWorkspaceException(
             FeedbackManager.error_exception(
-                error='Invalid token. Please, be sure you are using the "user token" instead of the "admin your@email" token.'
+                error='Invalid token. Make sure you are using the "user token" instead of the "admin your@email" token.'
             )
         )
     if is_authenticated.get("is_valid") and not is_authenticated.get("is_user", False):

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.1.dev2}/tinybird/tb_cli_modules/datasource.py

@@ -466,6 +466,13 @@ async def datasource_delete_rows(ctx, datasource_name, sql_condition, yes, wait,
                     )
                 )
                 return
+            if res is None:  # 204,205
+                click.echo(
+                    FeedbackManager.success_delete_rows_datasource_no_rows(
+                        datasource=datasource_name, delete_condition=sql_condition
+                    )
+                )
+                return
             job_id = res["job_id"]
             job_url = res["job_url"]
             click.echo(FeedbackManager.info_datasource_delete_rows_job_url(url=job_url))

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.1.dev2}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 5.18.1.dev0
+Version: 5.18.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.18.1.dev1
+***********
+
+- `Added` support for changes in `/v0/datasources/(.+)/delete`.
+
 5.18.0
 ***********
 

{tinybird_cli-5.18.1.dev0 → tinybird_cli-5.18.1.dev2}/tinybird_cli.egg-info/top_level.txt

@@ -1,4 +1,5 @@
 tests
 tests_e2e
 tests_e2e_ingestion
+tests_tb
 tinybird