tinybird-cli 5.13.3.dev0__tar.gz → 5.13.4.dev0__tar.gz

{tinybird_cli-5.13.3.dev0 → tinybird_cli-5.13.4.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird_cli
-Version: 5.13.3.dev0
+Version: 5.13.4.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -18,9 +18,20 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.13.3
+***********
+
+- `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.
 

{tinybird_cli-5.13.3.dev0 → tinybird_cli-5.13.4.dev0}/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.13.3.dev0'
-__revision__ = 'd9e1309'
+__version__ = '5.13.4.dev0'
+__revision__ = '3595fd7'

{tinybird_cli-5.13.3.dev0 → tinybird_cli-5.13.4.dev0}/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.3.dev0 → tinybird_cli-5.13.4.dev0}/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.3.dev0 → tinybird_cli-5.13.4.dev0}/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.3.dev0 → tinybird_cli-5.13.4.dev0}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.13.3.dev0
+Version: 5.13.4.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -18,9 +18,20 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.13.3
+***********
+
+- `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.