tinybird-cli 5.13.2.dev1__tar.gz → 5.13.3__tar.gz

{tinybird-cli-5.13.2.dev1/tinybird_cli.egg-info → tinybird_cli-5.13.3}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
-Name: tinybird-cli
-Version: 5.13.2.dev1
+Name: tinybird_cli
+Version: 5.13.3
 Summary: Tinybird Command Line Tool
-Home-page: https://www.tinybird.co/docs/cli/introduction.html
+Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
 Author-email: support@tinybird.co
 Requires-Python: >=3.9, <3.13
@@ -18,11 +18,22 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
-5.13.2.dev1
+5.13.3
 ***********
 
-- Added `eu-west-1` region to the list of available regions.
+- `Fixed` updating the cron schedule of a BigQuery data source when having a query but no external_data_source setting.
+- `Fixed` handle Kafka connector with multiple brokers properly.
 
+5.13.2
+***********
+
+- `Fixed` Correctly handle Kafka connector with multiple brokers
+
+5.13.1.dev2
+***********
+
+- `Added` comply with [PEP 625](https://peps.python.org/pep-0625/)
+- `Added` `eu-west-1` region to the list of available regions.
 
 5.13.1
 ***********

tinybird_cli-5.13.3/tinybird/__cli__.py

@@ -0,0 +1,8 @@
+
+__name__ = 'tinybird_cli'
+__description__ = 'Tinybird Command Line Tool'
+__url__ = 'https://www.tinybird.co/docs/cli'
+__author__ = 'Tinybird'
+__author_email__ = 'support@tinybird.co'
+__version__ = '5.13.3'
+__revision__ = '3595fd7'

{tinybird-cli-5.13.2.dev1 → tinybird_cli-5.13.3}/tinybird/context.py

@@ -21,3 +21,4 @@ wait_parameter: ContextVar[bool] = ContextVar("wait_parameter")
 api_host: ContextVar[str] = ContextVar("api_host")
 ff_split_to_array_escape: ContextVar[bool] = ContextVar("ff_split_to_array_escape")
 ff_preprocess_parameters_circuit_breaker: ContextVar[bool] = ContextVar("ff_preprocess_parameters_circuit_breaker")
+ff_column_json_backticks_circuit_breaker: ContextVar[bool] = ContextVar("ff_column_json_backticks_circuit_breaker")

{tinybird-cli-5.13.2.dev1 → tinybird_cli-5.13.3}/tinybird/datafile.py

@@ -3434,14 +3434,33 @@ async def new_ds(
     DATASOURCE_VALID_SERVICES_TO_UPDATE = ["bigquery", "snowflake"]
     if datasource_exists and service and service in [*DATASOURCE_VALID_SERVICES_TO_UPDATE, *PREVIEW_CONNECTOR_SERVICES]:
         connector_required_params = {
-            "bigquery": ["service", "cron", "external_data_source"],
+            "bigquery": ["service", "cron"],
             "snowflake": ["connector", "service", "cron", "external_data_source"],
             "s3": ["connector", "service", "cron", "bucket_uri"],
             "s3_iamrole": ["connector", "service", "cron", "bucket_uri"],
             "gcs": ["connector", "service", "cron", "bucket_uri"],
         }.get(service, [])
 
+        connector_at_least_one_required_param = {
+            "bigquery": ["external_data_source", "query"],
+        }.get(service, [])
+
+        if connector_at_least_one_required_param and not any(
+            key in ds_params for key in connector_at_least_one_required_param
+        ):
+            params = [
+                (ImportReplacements.get_datafile_param_for_linker_param(service, param) or param).upper()
+                for param in connector_at_least_one_required_param
+            ]
+            click.echo(FeedbackManager.error_updating_connector_missing_at_least_one_param(param=" or ".join(params)))
+            return
+
         if not all(key in ds_params for key in connector_required_params):
+            params = [
+                (ImportReplacements.get_datafile_param_for_linker_param(service, param) or param).upper()
+                for param in connector_required_params
+            ]
+            click.echo(FeedbackManager.error_updating_connector_missing_params(param=", ".join(params)))
             return
 
         connector = ds_params.get("connector", None)
@@ -5589,3 +5608,38 @@ def is_file_a_datasource(filename: str) -> bool:
                 return True
 
     return False
+
+
+def update_connector_params(service: str, ds_params: Dict[str, Any], connector_required_params: List[str]) -> None:
+    """
+    Update connector parameters for a given service, ensuring required parameters exist.
+
+    :param service: The name of the service (e.g., 'bigquery').
+    :param ds_params: The data source parameters to be checked.
+    :param connector_required_params: The list of required parameters for the connector.
+    :return: None
+    """
+
+    connector_at_least_one_required_param: List[str] = {
+        "bigquery": ["external_data_source", "query"],
+    }.get(service, [])
+
+    # Handle the "at least one param" requirement
+    if connector_at_least_one_required_param and not any(
+        key in ds_params for key in connector_at_least_one_required_param
+    ):
+        params = [
+            (ImportReplacements.get_datafile_param_for_linker_param(service, param) or param).upper()
+            for param in connector_at_least_one_required_param
+        ]
+        click.echo(FeedbackManager.error_updating_connector_missing_at_least_one_param(param=" or ".join(params)))
+        return
+
+    # Handle the mandatory params requirement
+    if not all(key in ds_params for key in connector_required_params):
+        params = [
+            (ImportReplacements.get_datafile_param_for_linker_param(service, param) or param).upper()
+            for param in connector_required_params
+        ]
+        click.echo(FeedbackManager.error_updating_connector_missing_params(param=", ".join(params)))
+        return

{tinybird-cli-5.13.2.dev1 → tinybird_cli-5.13.3}/tinybird/feedback_manager.py

@@ -130,6 +130,12 @@ class FeedbackManager:
     error_remove_no_endpoint = error_message("Pipe does not have any endpoint")
     error_updating_pipe = error_message("Failed updating pipe {error}")
     error_updating_connector_not_supported = error_message("Changing {param} is not currently supported")
+    error_updating_connector_missing_at_least_one_param = error_message(
+        "Connection settings not updated. Connection info should have at least one of {param} settings"
+    )
+    error_updating_connector_missing_params = error_message(
+        "Connection settings not updated. Connection info should have {param} settings"
+    )
     error_removing_node = error_message("Failed removing node from pipe {pipe}: {error}")
     error_pushing_pipe = error_message("Failed pushing pipe {pipe}: {error}")
     error_creating_endpoint = error_message("Failed creating endpoint in node {node} on pipe {pipe}: {error}")

{tinybird-cli-5.13.2.dev1 → tinybird_cli-5.13.3}/tinybird/sql_template.py

@@ -12,7 +12,11 @@ from typing import Any, Dict, List, Optional, Tuple, Union
 from tornado import escape
 from tornado.util import ObjectDict, exec_in, unicode_type
 
-from tinybird.context import ff_preprocess_parameters_circuit_breaker, ff_split_to_array_escape
+from tinybird.context import (
+    ff_column_json_backticks_circuit_breaker,
+    ff_preprocess_parameters_circuit_breaker,
+    ff_split_to_array_escape,
+)
 
 from .datatypes import testers
 from .tornado_template import VALID_CUSTOM_FUNCTION_NAMES, SecurityException, Template
@@ -271,6 +275,8 @@ def columns(x, default=None, fn=None):
 
 
 def column(x, default=None):
+    bypass_colunn_json_backticks = ff_column_json_backticks_circuit_breaker.get(False)
+
     if x is None or isinstance(x, Placeholder):
         if default is None:
             raise SQLTemplateException(
@@ -278,7 +284,18 @@ def column(x, default=None):
                 documentation="/cli/advanced-templates.html#column",
             )
         x = default
-    return Symbol("`" + sqlescape(x) + "`")
+
+    quote = "`"
+    if bypass_colunn_json_backticks:
+        return Symbol(quote + sqlescape(x) + quote)
+
+    try:
+        slices = x.split(".")
+        escaped_slices = [quote + sqlescape(s) + quote for s in slices]
+        escaped = ".".join(escaped_slices)
+        return Symbol(escaped)
+    except Exception:  # in case there's a problem with .split
+        return Symbol(quote + sqlescape(x) + quote)
 
 
 def symbol(x, quote="`"):
@@ -2109,6 +2126,8 @@ def render_sql_template(
     ('SELECT `foo`', {}, [])
     >>> render_sql_template("SELECT {{column(agg)}}", {'agg': '"foo"'})
     ('SELECT `foo`', {}, [])
+    >>> render_sql_template("SELECT {{column(agg)}}", {'agg': 'json.a'})
+    ('SELECT `json`.`a`', {}, [])
     >>> render_sql_template('{% if not defined(test) %}error("This is an error"){% end %}', {})
     ('error("This is an error")', {}, [])
     >>> render_sql_template('{% if not defined(test) %}custom_error({error: "This is an error"}){% end %}', {})

{tinybird-cli-5.13.2.dev1 → tinybird_cli-5.13.3}/tinybird/tb_cli_modules/common.py

@@ -1252,26 +1252,28 @@ def is_url_valid(url):
         return False
 
 
-def validate_kafka_bootstrap_servers(host_and_port):
-    if not isinstance(host_and_port, str):
+def validate_kafka_bootstrap_servers(bootstrap_servers):
+    if not isinstance(bootstrap_servers, str):
         raise CLIException(FeedbackManager.error_kafka_bootstrap_server())
-    parts = host_and_port.split(":")
-    if len(parts) > 2:
-        raise CLIException(FeedbackManager.error_kafka_bootstrap_server())
-    host = parts[0]
-    port_str = parts[1] if len(parts) == 2 else "9092"
-    try:
-        port = int(port_str)
-    except Exception:
-        raise CLIException(FeedbackManager.error_kafka_bootstrap_server())
-    with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as sock:
+
+    for host_and_port in bootstrap_servers.split(","):
+        parts = host_and_port.split(":")
+        if len(parts) > 2:
+            raise CLIException(FeedbackManager.error_kafka_bootstrap_server())
+        host = parts[0]
+        port_str = parts[1] if len(parts) == 2 else "9092"
         try:
-            sock.settimeout(3)
-            sock.connect((host, port))
-        except socket.timeout:
-            raise CLIException(FeedbackManager.error_kafka_bootstrap_server_conn_timeout())
+            port = int(port_str)
         except Exception:
-            raise CLIException(FeedbackManager.error_kafka_bootstrap_server_conn())
+            raise CLIException(FeedbackManager.error_kafka_bootstrap_server())
+        with closing(socket.socket(socket.AF_INET, socket.SOCK_STREAM)) as sock:
+            try:
+                sock.settimeout(3)
+                sock.connect((host, port))
+            except socket.timeout:
+                raise CLIException(FeedbackManager.error_kafka_bootstrap_server_conn_timeout())
+            except Exception:
+                raise CLIException(FeedbackManager.error_kafka_bootstrap_server_conn())
 
 
 def validate_kafka_key(s):

{tinybird-cli-5.13.2.dev1 → tinybird_cli-5.13.3/tinybird_cli.egg-info}/PKG-INFO

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.13.2.dev1
+Version: 5.13.3
 Summary: Tinybird Command Line Tool
-Home-page: https://www.tinybird.co/docs/cli/introduction.html
+Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
 Author-email: support@tinybird.co
 Requires-Python: >=3.9, <3.13
@@ -18,11 +18,22 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
-5.13.2.dev1
+5.13.3
 ***********
 
-- Added `eu-west-1` region to the list of available regions.
+- `Fixed` updating the cron schedule of a BigQuery data source when having a query but no external_data_source setting.
+- `Fixed` handle Kafka connector with multiple brokers properly.
 
+5.13.2
+***********
+
+- `Fixed` Correctly handle Kafka connector with multiple brokers
+
+5.13.1.dev2
+***********
+
+- `Added` comply with [PEP 625](https://peps.python.org/pep-0625/)
+- `Added` `eu-west-1` region to the list of available regions.
 
 5.13.1
 ***********

tinybird-cli-5.13.2.dev1/tinybird/__cli__.py

@@ -1,8 +0,0 @@
-
-__name__ = 'tinybird-cli'
-__description__ = 'Tinybird Command Line Tool'
-__url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
-__author__ = 'Tinybird'
-__author_email__ = 'support@tinybird.co'
-__version__ = '5.13.2.dev1'
-__revision__ = '26dd72d'