tinybird-cli 6.4.1.dev0__tar.gz → 6.5.1.dev0__tar.gz

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 6.4.1.dev0
+Version: 6.5.1.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -12,7 +12,7 @@ Requires-Dist: clickhouse-toolset==0.34.dev0
 Requires-Dist: click<8.2,>=8.1.8
 Requires-Dist: colorama==0.4.6
 Requires-Dist: cryptography~=41.0.0
-Requires-Dist: croniter==1.3.15
+Requires-Dist: croniter==6.2.2
 Requires-Dist: GitPython~=3.1.32
 Requires-Dist: humanfriendly~=8.2
 Requires-Dist: pydantic~=2.8.0
@@ -43,6 +43,17 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+6.5.0
+***********
+
+ - `Changed` `tb push` can now perform sharing and unsharing operations on Datasources with a DATASOURCES:CREATE token in workspaces in the same Organization
+
+6.4.1
+***********
+
+- `Improved` feedback messages when suggesting other cli commands.
+- `Fixed` `tb push` rejecting the `%` operator in column DEFAULT/MATERIALIZED expressions, causing failures after `tb pull` on schemas using modulo arithmetic.
+
 6.4.0
 ***********
 

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.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__ = '6.4.1.dev0'
-__revision__ = 'c8790f8'
+__version__ = '6.5.1.dev0'
+__revision__ = '676e19d'

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/client.py

@@ -340,10 +340,14 @@ class TinyB:
             for c in connectors
         ]
 
-    async def get_datasource(self, ds_name: str, used_by: bool = False) -> Dict[str, Any]:
+    async def get_datasource(
+        self, ds_name: str, used_by: bool = False, include_workspace_names: bool = False
+    ) -> Dict[str, Any]:
         params = {
             "attrs": "used_by" if used_by else "",
         }
+        if include_workspace_names:
+            params["include_workspace_names"] = "true"
         return await self._req(f"/v0/datasources/{ds_name}?{urlencode(params)}")
 
     async def alter_datasource(
@@ -489,12 +493,32 @@ class TinyB:
 
         return await self._req(f"/v0/dependencies?{urlencode(params)}", timeout=60)
 
-    async def datasource_share(self, datasource_id: str, current_workspace_id: str, destination_workspace_id: str):
-        params = {"origin_workspace_id": current_workspace_id, "destination_workspace_id": destination_workspace_id}
+    async def datasource_share(
+        self,
+        datasource_id: str,
+        current_workspace_id: str,
+        destination_workspace_id: Optional[str] = None,
+        destination_workspace_name: Optional[str] = None,
+    ) -> Dict[str, Any]:
+        params = {"origin_workspace_id": current_workspace_id}
+        if destination_workspace_id:
+            params["destination_workspace_id"] = destination_workspace_id
+        if destination_workspace_name:
+            params["destination_workspace_name"] = destination_workspace_name
         return await self._req(f"/v0/datasources/{datasource_id}/share", method="POST", data=params)
 
-    async def datasource_unshare(self, datasource_id: str, current_workspace_id: str, destination_workspace_id: str):
-        params = {"origin_workspace_id": current_workspace_id, "destination_workspace_id": destination_workspace_id}
+    async def datasource_unshare(
+        self,
+        datasource_id: str,
+        current_workspace_id: str,
+        destination_workspace_id: Optional[str] = None,
+        destination_workspace_name: Optional[str] = None,
+    ) -> Dict[str, Any]:
+        params = {"origin_workspace_id": current_workspace_id}
+        if destination_workspace_id:
+            params["destination_workspace_id"] = destination_workspace_id
+        if destination_workspace_name:
+            params["destination_workspace_name"] = destination_workspace_name
         return await self._req(f"/v0/datasources/{datasource_id}/share", method="DELETE", data=params)
 
     async def datasource_sync(self, datasource_id: str):
@@ -972,16 +996,28 @@ class TinyB:
         kafka_sasl_mechanism="PLAIN",
         kafka_security_protocol="SASL_SSL",
         kafka_ssl_ca_pem=None,
+        kafka_sasl_oauthbearer_method=None,
+        kafka_sasl_oauthbearer_aws_region=None,
+        kafka_sasl_oauthbearer_aws_role_arn=None,
+        kafka_sasl_oauthbearer_aws_external_id=None,
     ):
+        is_oauthbearer = kafka_sasl_mechanism == "OAUTHBEARER"
         params = {
             "service": "kafka",
             "kafka_security_protocol": kafka_security_protocol,
             "kafka_sasl_mechanism": kafka_sasl_mechanism,
             "kafka_bootstrap_servers": kafka_bootstrap_servers,
-            "kafka_sasl_plain_username": kafka_key,
-            "kafka_sasl_plain_password": kafka_secret,
             "name": kafka_connection_name,
         }
+        if is_oauthbearer:
+            params["kafka_sasl_oauthbearer_method"] = kafka_sasl_oauthbearer_method
+            params["kafka_sasl_oauthbearer_aws_region"] = kafka_sasl_oauthbearer_aws_region
+            params["kafka_sasl_oauthbearer_aws_role_arn"] = kafka_sasl_oauthbearer_aws_role_arn
+            if kafka_sasl_oauthbearer_aws_external_id:
+                params["kafka_sasl_oauthbearer_aws_external_id"] = kafka_sasl_oauthbearer_aws_external_id
+        else:
+            params["kafka_sasl_plain_username"] = kafka_key
+            params["kafka_sasl_plain_password"] = kafka_secret
 
         if kafka_schema_registry_url:
             params["kafka_schema_registry_url"] = kafka_schema_registry_url

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/config.py

@@ -37,7 +37,6 @@ LEGACY_HOSTS = {
     "https://api.wadus2.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus2",
     "https://api.wadus3.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus3",
     "https://api.wadus4.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus4",
-    "https://api.wadus5.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus5",
     "https://api.wadus1.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus1",
     "https://api.wadus2.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus2",
     "https://api.wadus3.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus3",
@@ -59,7 +58,6 @@ LEGACY_HOSTS = {
     "https://ui.wadus2.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus2",
     "https://ui.wadus3.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus3",
     "https://ui.wadus4.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus4",
-    "https://ui.wadus5.gcp.tinybird.co": "https://app.wadus.tinybird.co/gcp/wadus5",
     "https://ui.wadus1.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus1",
     "https://ui.wadus2.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus2",
     "https://ui.wadus3.aws.tinybird.co": "https://app.wadus.tinybird.co/aws/wadus3",

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/datafile_common.py

@@ -425,7 +425,7 @@ class CLIGitRelease:
 
     def is_dirty_to_release(self, use_include_dir: bool = True) -> bool:
         if use_include_dir:
-            return any([self.repo.is_dirty(path=p) for p in self.paths]) or self.has_untracked_files()
+            return any(self.repo.is_dirty(path=p) for p in self.paths) or self.has_untracked_files()
         else:
             return self.repo.is_dirty(path=self.path) or self.has_untracked_files()
 
@@ -594,7 +594,9 @@ class Deployment:
     ):
         if self.is_git_release:
             if not self.current_release:
-                raise CLIGitReleaseException(FeedbackManager.error_init_release(workspace=self.current_ws["name"]))
+                raise CLIGitReleaseException(
+                    FeedbackManager.error_init_release(workspace=self.current_ws["name"], cli="tb")
+                )
             self.cli_git_release = CLIGitRelease()
             if not use_main:
                 self.cli_git_release.validate_local_for_release(self.current_release, check_outdated=check_outdated)
@@ -613,7 +615,7 @@ class Deployment:
             # error until we support it https://gitlab.com/tinybird/analytics/-/issues/9655
             for d in diffs:
                 if self.cli_git_release.ChangeType(d.change_type) == self.cli_git_release.ChangeType.RENAMED:
-                    raise CLIGitReleaseException(FeedbackManager.error_unsupported_diff())
+                    raise CLIGitReleaseException(FeedbackManager.error_unsupported_diff(cli="tb"))
             if not diffs:
                 click.echo(FeedbackManager.info_git_release_no_diffs())
             changed = self.cli_git_release.get_changes_from_diffs(diffs, filenames)
@@ -701,10 +703,10 @@ class Deployment:
                     release = await self.cli_git_release.update_release(self.tb_client, self.current_ws, commit)
                     click.echo(FeedbackManager.success_git_release(release_commit=release["commit"]))
                 else:
-                    click.echo(FeedbackManager.warning_no_release())
+                    click.echo(FeedbackManager.warning_no_release(cli="tb"))
             except Exception as e:
                 if self.only_changes:
-                    click.echo(FeedbackManager.warning_no_release())
+                    click.echo(FeedbackManager.warning_no_release(cli="tb"))
                 else:
                     raise e
 
@@ -1233,6 +1235,10 @@ def parse(
         "kafka_key_avro_deserialization": assign_var("kafka_key_avro_deserialization"),
         "kafka_ssl_ca_pem": assign_var("kafka_ssl_ca_pem"),
         "kafka_sasl_mechanism": assign_var("kafka_sasl_mechanism"),
+        "kafka_sasl_oauthbearer_method": assign_var("kafka_sasl_oauthbearer_method"),
+        "kafka_sasl_oauthbearer_aws_region": assign_var("kafka_sasl_oauthbearer_aws_region"),
+        "kafka_sasl_oauthbearer_aws_role_arn": assign_var("kafka_sasl_oauthbearer_aws_role_arn"),
+        "kafka_sasl_oauthbearer_aws_external_id": assign_var("kafka_sasl_oauthbearer_aws_external_id"),
         "import_service": assign_var("import_service"),
         "import_connection_name": assign_var("import_connection_name"),
         "import_schedule": assign_var("import_schedule"),
@@ -1366,6 +1372,7 @@ async def process_file(
 
         if not skip_connectors:
             try:
+                is_oauthbearer = params.get("kafka_sasl_mechanism") == "OAUTHBEARER"
                 connector_params = {
                     "kafka_bootstrap_servers": params.get("kafka_bootstrap_servers", None),
                     "kafka_key": params.get("kafka_key", None),
@@ -1375,6 +1382,12 @@ async def process_file(
                     "kafka_schema_registry_url": params.get("kafka_schema_registry_url", None),
                     "kafka_ssl_ca_pem": get_ca_pem_content(params.get("kafka_ssl_ca_pem", None), filename),
                     "kafka_sasl_mechanism": params.get("kafka_sasl_mechanism", None),
+                    "kafka_sasl_oauthbearer_method": params.get("kafka_sasl_oauthbearer_method", None),
+                    "kafka_sasl_oauthbearer_aws_region": params.get("kafka_sasl_oauthbearer_aws_region", None),
+                    "kafka_sasl_oauthbearer_aws_role_arn": params.get("kafka_sasl_oauthbearer_aws_role_arn", None),
+                    "kafka_sasl_oauthbearer_aws_external_id": params.get(
+                        "kafka_sasl_oauthbearer_aws_external_id", None
+                    ),
                 }
 
                 connector = await tb_client.get_connection(**connector_params)
@@ -1382,11 +1395,19 @@ async def process_file(
                     click.echo(
                         FeedbackManager.info_creating_kafka_connection(connection_name=params["kafka_connection_name"])
                     )
-                    required_params = [
-                        connector_params["kafka_bootstrap_servers"],
-                        connector_params["kafka_key"],
-                        connector_params["kafka_secret"],
-                    ]
+                    if is_oauthbearer:
+                        required_params = [
+                            connector_params["kafka_bootstrap_servers"],
+                            connector_params["kafka_sasl_oauthbearer_method"],
+                            connector_params["kafka_sasl_oauthbearer_aws_region"],
+                            connector_params["kafka_sasl_oauthbearer_aws_role_arn"],
+                        ]
+                    else:
+                        required_params = [
+                            connector_params["kafka_bootstrap_servers"],
+                            connector_params["kafka_key"],
+                            connector_params["kafka_secret"],
+                        ]
 
                     if not all(required_params):
                         raise click.ClickException(FeedbackManager.error_unknown_kafka_connection(datasource=name))
@@ -1547,10 +1568,7 @@ async def process_file(
                     period: int = DEFAULT_CRON_PERIOD
 
                     if current_ws:
-                        workspaces = (await tb_client.user_workspaces()).get("workspaces", [])
-                        workspace_rate_limits: Dict[str, Dict[str, int]] = next(
-                            (w.get("rate_limits", {}) for w in workspaces if w["id"] == current_ws["id"]), {}
-                        )
+                        workspace_rate_limits: Dict[str, Dict[str, int]] = current_ws.get("rate_limits", {})
                         period = workspace_rate_limits.get("api_datasources_create_append_replace", {}).get(
                             "period", DEFAULT_CRON_PERIOD
                         )
@@ -1630,7 +1648,7 @@ async def process_file(
         deps = []
         nodes: List[Dict[str, Any]] = []
 
-        is_copy = any([node for node in doc.nodes if node.get("type", "standard").lower() == PipeNodeTypes.COPY])
+        is_copy = any(node for node in doc.nodes if node.get("type", "standard").lower() == PipeNodeTypes.COPY)
         for node in doc.nodes:
             sql = node["sql"]
             node_type = node.get("type", "standard").lower()
@@ -2910,7 +2928,7 @@ async def new_pipe(
     current_pipe = r.json() if r.status_code == 200 else None
     pipe_exists = current_pipe is not None
 
-    is_materialized = any([node.get("params", {}).get("type", None) == "materialized" for node in p["nodes"]])
+    is_materialized = any(node.get("params", {}).get("type", None) == "materialized" for node in p["nodes"])
     copy_node = next((node for node in p["nodes"] if node.get("params", {}).get("type", None) == "copy"), None)
     sink_node = next((node for node in p["nodes"] if node.get("params", {}).get("type", None) == "sink"), None)
     stream_node = next((node for node in p["nodes"] if node.get("params", {}).get("type", None) == "stream"), None)
@@ -3137,7 +3155,7 @@ async def new_pipe(
 async def share_and_unshare_datasource(
     client: TinyB,
     datasource: Dict[str, Any],
-    user_token: str,
+    user_token: Optional[str],
     workspaces_current_shared_with: List[str],
     workspaces_to_share: List[str],
     current_ws: Optional[Dict[str, Any]],
@@ -3145,21 +3163,58 @@ async def share_and_unshare_datasource(
     datasource_name = datasource.get("name", "")
     datasource_id = datasource.get("id", "")
     workspaces: List[Dict[str, Any]]
-    # We duplicate the client to use the user_token in workspace discovery and sharing operations.
-    user_client: TinyB = deepcopy(client)
-    user_client.token = user_token
+    user_client: TinyB = deepcopy(client) if user_token else client
+    if user_token:
+        # We duplicate the client to use the user_token in workspace discovery and sharing operations.
+        user_client.token = user_token
 
     # In case we are pushing to a branch, we don't share the datasource
     # FIXME: Have only once way to get the current workspace
     if current_ws:
         workspace = current_ws
-    else:
+    elif user_token:
         workspace = await client.user_workspace_branches()
+    else:
+        workspace = await client.workspace_info()
 
     if workspace.get("is_branch", False):
         click.echo(FeedbackManager.info_skipping_sharing_datasources_branch(datasource=datasource["name"]))
         return
 
+    if not user_token:
+        workspaces_current_shared_with = [
+            shared_workspace["name"] for shared_workspace in datasource.get("shared_with_workspaces", [])
+        ]
+        workspace_names_need_to_share = [
+            workspace_name
+            for workspace_name in workspaces_to_share
+            if workspace_name not in workspaces_current_shared_with
+        ]
+        workspace_names_need_to_unshare = [
+            workspace_name
+            for workspace_name in workspaces_current_shared_with
+            if workspace_name not in workspaces_to_share
+        ]
+
+        for workspace_name in workspace_names_need_to_share:
+            await user_client.datasource_share(
+                datasource_id=datasource_id,
+                current_workspace_id=workspace.get("id", ""),
+                destination_workspace_name=workspace_name,
+            )
+            click.echo(FeedbackManager.success_datasource_shared(datasource=datasource_name, workspace=workspace_name))
+
+        for workspace_name in workspace_names_need_to_unshare:
+            await user_client.datasource_unshare(
+                datasource_id=datasource_id,
+                current_workspace_id=workspace.get("id", ""),
+                destination_workspace_name=workspace_name,
+            )
+            click.echo(
+                FeedbackManager.success_datasource_unshared(datasource=datasource_name, workspace=workspace_name)
+            )
+        return
+
     # Use the user token for workspace discovery, as workspace/admin tokens may not list all targets.
     workspaces = (await user_client.user_workspaces()).get("workspaces", [])
     if not workspaces_current_shared_with:
@@ -3243,8 +3298,12 @@ async def new_ds(
                     scopes.append(sc)
                 await client.alter_tokens(token_name, scopes)
 
+    can_manage_shared_with = bool(user_token or (current_ws and current_ws.get("can_manage_datasources")))
+
     try:
-        existing_ds = await client.get_datasource(ds_name)
+        existing_ds = await client.get_datasource(
+            ds_name, include_workspace_names=can_manage_shared_with and not user_token
+        )
         datasource_exists = True
     except DoesNotExistException:
         datasource_exists = False
@@ -3302,7 +3361,7 @@ async def new_ds(
                 await manage_tokens()
 
             if ds.get("shared_with"):
-                if not user_token:
+                if not can_manage_shared_with:
                     click.echo(FeedbackManager.info_skipping_shared_with_entry())
                 else:
                     await share_and_unshare_datasource(
@@ -3322,7 +3381,7 @@ async def new_ds(
         raise click.ClickException(FeedbackManager.error_datasource_already_exists(datasource=ds_name))
 
     if ds.get("shared_with", []) or existing_ds.get("shared_with", []):
-        if not user_token:
+        if not can_manage_shared_with:
             click.echo(FeedbackManager.info_skipping_shared_with_entry())
         else:
             await share_and_unshare_datasource(
@@ -3359,7 +3418,7 @@ async def new_ds(
             existing = existing_ds.get("indexes", [])
             new.sort(key=lambda x: x["name"])
             existing.sort(key=lambda x: x["name"])
-            if len(existing) != len(new) or any([(d, d2) for d, d2 in zip(new, existing) if d != d2]):
+            if len(existing) != len(new) or any((d, d2) for d, d2 in zip(new, existing) if d != d2):
                 new_indices = ds.get("params", {}).get("indexes") or "0"
         if (
             new_description
@@ -3383,7 +3442,7 @@ async def new_ds(
 
     if alter_response:
         if git_release and not skip_confirmation:
-            click.echo(FeedbackManager.info_custom_deployment())
+            click.echo(FeedbackManager.info_custom_deployment(cli="tb"))
             click.echo("***************************************")
             click.echo("***************************************")
         click.echo(FeedbackManager.info_datasource_doesnt_match(datasource=ds_name))
@@ -3559,7 +3618,7 @@ async def new_token(token: Dict[str, Any], client: TinyB, force: bool = False):
 
     if force:
         ADMIN_SCOPES = ["ADMIN", "ADMIN_USER"]
-        if any([scope["type"] in ADMIN_SCOPES for scope in existing_token["scopes"]]):
+        if any(scope["type"] in ADMIN_SCOPES for scope in existing_token["scopes"]):
             raise click.ClickException(FeedbackManager.error_token_cannot_be_overriden(token=token["name"]))
 
         await client.token_update(token)
@@ -4002,7 +4061,7 @@ async def build_graph(
             if (
                 fork_downstream
                 and r.get("resource", "") == "pipes"
-                and any(["engine" in x.get("params", {}) for x in r.get("nodes", [])])
+                and any("engine" in x.get("params", {}) for x in r.get("nodes", []))
             ):
                 raise click.ClickException(FeedbackManager.error_forkdownstream_pipes_with_engine(pipe=fn))
 
@@ -4034,13 +4093,10 @@ async def build_graph(
 
             # In case the datasource is to be shared and we have mapping, let's replace the name
             if "shared_with" in r and workspace_map:
-                mapped_workspaces: List[str] = []
-                for shared_with in r["shared_with"]:
-                    mapped_workspaces.append(
-                        workspace_map.get(shared_with)
-                        if workspace_map.get(shared_with, None) is not None
-                        else shared_with  # type: ignore
-                    )
+                mapped_workspaces: List[str] = [
+                    workspace_map.get(shared_with) if workspace_map.get(shared_with, None) is not None else shared_with  # type: ignore
+                    for shared_with in r["shared_with"]
+                ]
                 r["shared_with"] = mapped_workspaces
 
             dep_map[fn] = set(dep_list)
@@ -4241,10 +4297,13 @@ async def folder_push(
     hide_folders: bool = False,
     on_demand_compute: bool = False,
 ):
-    workspaces: List[Dict[str, Any]] = (await tb_client.user_workspaces_and_branches()).get("workspaces", [])
-    current_ws: Dict[str, Any] = next(
-        (workspace for workspace in workspaces if config and workspace.get("id", ".") == config.get("id", "..")), {}
-    )
+    if tb_client.semver:
+        workspaces: List[Dict[str, Any]] = (await tb_client.user_workspaces_and_branches()).get("workspaces", [])
+        current_ws: Dict[str, Any] = next(
+            (workspace for workspace in workspaces if config and workspace.get("id", ".") == config.get("id", "..")), {}
+        )
+    else:
+        current_ws = await tb_client.workspace_info()
     is_branch = current_ws.get("is_branch", False)
     has_semver: bool = release_created or False
 
@@ -4270,13 +4329,13 @@ async def folder_push(
     existing_resources: List[str] = [x["name"] for x in datasources] + [x["name"] for x in pipes]
     # replace workspace mapping names
     for old_ws, new_ws in workspace_map.items():
-        existing_resources = [re.sub(f"^{old_ws}\.", f"{new_ws}.", x) for x in existing_resources]
+        existing_resources = [re.sub(f"^{old_ws}\\.", f"{new_ws}.", x) for x in existing_resources]
 
     remote_resource_names = [get_remote_resource_name_without_version(x) for x in existing_resources]
 
     # replace workspace mapping names
     for old_ws, new_ws in workspace_map.items():
-        remote_resource_names = [re.sub(f"^{old_ws}\.", f"{new_ws}.", x) for x in remote_resource_names]
+        remote_resource_names = [re.sub(f"^{old_ws}\\.", f"{new_ws}.", x) for x in remote_resource_names]
 
     if not filenames:
         filenames = get_project_filenames(folder)
@@ -5555,7 +5614,7 @@ def is_materialized(resource: Optional[Dict[str, Any]]) -> bool:
         return False
 
     is_materialized = any(
-        [node.get("params", {}).get("type", None) == "materialized" for node in resource.get("nodes", []) or []]
+        node.get("params", {}).get("type", None) == "materialized" for node in resource.get("nodes", []) or []
     )
     return is_materialized
 
@@ -5634,7 +5693,7 @@ async def create_release(
 def has_internal_datafiles(folder: str) -> bool:
     folder = folder or "."
     filenames = get_project_filenames(folder)
-    return any([f for f in filenames if "spans" in str(f) and "vendor" not in str(f)])
+    return any(f for f in filenames if "spans" in str(f) and "vendor" not in str(f))
 
 
 def is_file_a_datasource(filename: str) -> bool:

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/datatypes.py

@@ -117,11 +117,11 @@ def date_test(x: str) -> bool:
 
 
 def datetime64_test(x: str) -> bool:
-    return any([p.match(x) for p in datetime64_patterns])
+    return any(p.match(x) for p in datetime64_patterns)
 
 
 def datetime_test(x: str) -> bool:
-    return any([p.match(x) for p in datetime_patterns])
+    return any(p.match(x) for p in datetime_patterns)
 
 
 def int_8_test(x: str) -> bool:

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/git_settings.py

@@ -71,7 +71,7 @@ VERSION=0.0.0
 # TB_SKIP_REGRESSION=0
 
 # Use `OBFUSCATE_REGEX_PATTERN` and `OBFUSCATE_PATTERN_SEPARATOR` environment variables to define a regex pattern and a separator (in case of a single string with multiple regex) to obfuscate secrets in the CLI output.
-# OBFUSCATE_REGEX_PATTERN="https://(www\.)?[^/]+||^Follow these instructions =>"
+# OBFUSCATE_REGEX_PATTERN="https://(www\\.)?[^/]+||^Follow these instructions =>"
 # OBFUSCATE_PATTERN_SEPARATOR=||
 ##########
 """

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/sql.py

@@ -6,7 +6,7 @@ from dataclasses import dataclass
 from typing import Any, Dict, Iterable, List, Optional
 
 valid_chars_name: str = string.ascii_letters + string.digits + "._`*<>+-'"
-valid_chars_fn: str = valid_chars_name + "[](),=!?:/ \n\t\r"
+valid_chars_fn: str = valid_chars_name + "[](),=!?:/% \n\t\r"
 # Use sets for O(1) membership checks in hot loops
 _VALID_CHARS_NAME_SET = set(valid_chars_name)
 _VALID_CHARS_FN_SET = set(valid_chars_fn)
@@ -233,10 +233,21 @@ def try_to_fix_nullable_in_simple_aggregating_function(t: str) -> Optional[str]:
     if match := _RE_TRY_FIX_NULLABLE_SAF.search(t):
         fn = match.group(1)
         inner_type = match.group(2)
-        result = f"SimpleAggregateFunction({fn}, Nullable({inner_type}))"
+        if "Nullable(" not in inner_type:
+            result = f"SimpleAggregateFunction({fn}, Nullable({inner_type}))"
     return result
 
 
+def wrap_nullable(col: dict[str, Any]):
+    if col["nullable"]:
+        if (col_type := try_to_fix_nullable_in_simple_aggregating_function(col["type"])) is None:
+            # Skip wrapping if Nullable already present, e.g. LowCardinality(Nullable(String))
+            col_type = col["type"] if "Nullable(" in col["type"] else "Nullable(%s)" % col["type"]
+    else:
+        col_type = col["type"]
+    return col_type
+
+
 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'}])
@@ -255,12 +266,7 @@ def schema_to_sql_columns(schema: List[Dict[str, Any]], skip_jsonpaths: bool = F
     columns: List[str] = []
     for x in schema:
         name = x["normalized_name"] if "normalized_name" in x else x["name"]
-        if x["nullable"]:
-            if (_type := try_to_fix_nullable_in_simple_aggregating_function(x["type"])) is None:
-                # Skip wrapping if Nullable already present, e.g. LowCardinality(Nullable(String))
-                _type = x["type"] if "Nullable(" in x["type"] else "Nullable(%s)" % x["type"]
-        else:
-            _type = x["type"]
+        _type = wrap_nullable(x)
         parts = [col_name(name, backquotes=True), _type]
         if x.get("jsonpath", None) and not skip_jsonpaths:
             parts.append(f"`json:{x['jsonpath']}`")

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/sql_template.py

@@ -20,6 +20,8 @@ from tinybird.context import (
 from .datatypes import testers
 from .tornado_template import VALID_CUSTOM_FUNCTION_NAMES, SecurityException, Template
 
+VALID_ACTIVATE_FEATURES = frozenset(["analyzer", "parallel_replicas", "optimize_aggregation_in_order"])
+
 TB_SECRET_IN_TEST_MODE = "tb_secret_dont_raise"
 TB_SECRET_PREFIX = "tb_secret_"
 CH_PARAM_PREFIX = "param_"
@@ -1463,10 +1465,9 @@ def generate(self, **kwargs) -> Tuple[str, TemplateExecutionResults]:
         return Expression(f"-- cache_ttl {ttl_expression}\n")
 
     def set_activate(feature):
-        valid_features = ("analyzer", "parallel_replicas")
-        if feature not in valid_features:
+        if feature not in VALID_ACTIVATE_FEATURES:
             raise SQLTemplateException(f"'{feature}' is not a valid 'activate' argument")
-        template_execution_results["activate"] = feature
+        template_execution_results.setdefault("activate", set()).add(feature)
         return Expression(f"-- activate {feature}\n")
 
     def set_disable_feature(feature):
@@ -2143,7 +2144,7 @@ def get_var_data(content, node_id=None):
     return [dict(name=k, **v) for k, v in vars.items()]
 
 
-def get_var_names_and_types(t, node_id=None):
+def get_var_names_and_types(t: Template, node_id: Optional[str] = None) -> List[Dict[str, Any]]:
     """
     >>> get_var_names_and_types(Template("SELECT * FROM filter_value WHERE description = {{Float32(with_value, 0.0)}}"))
     [{'name': 'with_value', 'type': 'Float32', 'default': 0.0}]
@@ -2825,7 +2826,7 @@ def render_sql_template(
             return Comment("error launched")
 
         v: dict = {x["name"]: Placeholder(x["name"], x["line"]) for x in template_variables}
-        is_tb_secret = any([s for s in template_variables if s["name"] == "tb_secret" or s["name"] == "tb_var"])
+        is_tb_secret = any(s for s in template_variables if s["name"] == "tb_secret" or s["name"] == "tb_var")
 
         if variables:
             v.update(variables)

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/sql_toolset.py

@@ -22,7 +22,7 @@ VALID_REMOTE = "VALID_REMOTE"
 
 class InvalidFunction(ValueError):
     def __init__(self, msg: str = "", table_function_name: str = ""):
-        if any([fn for fn in COPY_ENABLED_TABLE_FUNCTIONS if fn in msg]):
+        if any(fn for fn in COPY_ENABLED_TABLE_FUNCTIONS if fn in msg):
             msg = msg.replace("is restricted", "is restricted to Copy Pipes")
 
         if table_function_name:
@@ -75,19 +75,6 @@ def explain_plan(sql: str) -> str:
     return chquery.explain_ast(sql)
 
 
-@dataclass(frozen=True)
-class ColumnInfo:
-    name: str
-    type: str
-    nullable: bool
-    default_specifier: str = ""
-    default_expression: str | None = None
-    codec: str | None = None
-    comment: str | None = None
-    ttl: str | None = None
-    is_primary_key: bool = False
-
-
 @dataclass
 class MaterializedViewTarget:
     database: Optional[str]
@@ -118,11 +105,6 @@ def parse_materialized_view_target(create_table_query: str) -> Optional[Material
     )
 
 
-def get_columns_from_create_query(sql_schema: str) -> list[ColumnInfo]:
-    columns = chquery.get_columns_from_create_query(sql_schema)
-    return [ColumnInfo(**col) for col in columns]
-
-
 def has_join(sql: str) -> bool:
     return any(line.rstrip().startswith("TableJoin") for line in explain_plan(sql).split())
 

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/tb_cli_modules/auth.py

@@ -234,7 +234,7 @@ async def auth_use(region_name_or_host_or_id: str) -> None:
     config.set_host(host)
 
     if not await try_authenticate(config, regions):
-        msg = FeedbackManager.error_wrong_config_file(config_file=config._path)
+        msg = FeedbackManager.error_wrong_config_file(config_file=config._path, cli="tb")
         raise CLIAuthException(msg)
 
     config.persist_to_file()

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/tb_cli_modules/branch.py

@@ -58,11 +58,10 @@ async def release_ls() -> None:
 async def print_releases(config: CLIConfig):
     response = await config.get_client().releases(config["id"])
 
-    table: List[Tuple[str, str, str, str, str]] = []
-    for release in response["releases"]:
-        table.append(
-            (release["created_at"], release["semver"], release["status"], release["commit"], release["rollback"])
-        )
+    table: List[Tuple[str, str, str, str, str]] = [
+        (release["created_at"], release["semver"], release["status"], release["commit"], release["rollback"])
+        for release in response["releases"]
+    ]
 
     columns = ["created_at", "semver", "status", "commit", "rollback release"]
     click.echo(FeedbackManager.info_releases())
@@ -79,7 +78,7 @@ async def print_releases(config: CLIConfig):
 )
 @coro
 async def release_generate(semver: str) -> None:
-    click.echo(FeedbackManager.warning_deprecated_releases())
+    click.echo(FeedbackManager.warning_deprecated_releases(cli="tb"))
     if os.path.exists(".tinyenv"):
         async with aiofiles.open(".tinyenv", "r") as env_file:
             lines = await env_file.readlines()
@@ -147,7 +146,7 @@ set -euxo pipefail
 )
 @coro
 async def release_create(semver: str, commit: Optional[str]) -> None:
-    click.echo(FeedbackManager.warning_deprecated_releases())
+    click.echo(FeedbackManager.warning_deprecated_releases(cli="tb"))
     config = CLIConfig.get_project_config()
     _ = await try_update_config_with_remote(config, only_if_needed=True)
 
@@ -165,7 +164,7 @@ async def release_promote(semver: str) -> None:
     """
     The oldest rollback Release will be automatically removed if no usage, otherwise export TB_FORCE_REMOVE_OLDEST_ROLLBACK="1" to force deletion
     """
-    click.echo(FeedbackManager.warning_deprecated_releases())
+    click.echo(FeedbackManager.warning_deprecated_releases(cli="tb"))
     config = CLIConfig.get_project_config()
     _ = await try_update_config_with_remote(config, only_if_needed=True)
 
@@ -191,7 +190,7 @@ async def release_promote(semver: str) -> None:
 )
 @coro
 async def release_preview(semver: str) -> None:
-    click.echo(FeedbackManager.warning_deprecated_releases())
+    click.echo(FeedbackManager.warning_deprecated_releases(cli="tb"))
     config = CLIConfig.get_project_config()
     _ = await try_update_config_with_remote(config, only_if_needed=True)
 
@@ -208,7 +207,7 @@ async def release_preview(semver: str) -> None:
 @click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
 @coro
 async def release_rollback(yes: bool) -> None:
-    click.echo(FeedbackManager.warning_deprecated_releases())
+    click.echo(FeedbackManager.warning_deprecated_releases(cli="tb"))
     config = CLIConfig.get_project_config()
     _ = await try_update_config_with_remote(config, only_if_needed=False)
 
@@ -252,7 +251,7 @@ async def release_rollback(yes: bool) -> None:
 )
 @coro
 async def release_rm(semver: str, oldest_rollback: bool, force: bool, yes: bool, dry_run: bool) -> None:
-    click.echo(FeedbackManager.warning_deprecated_releases())
+    click.echo(FeedbackManager.warning_deprecated_releases(cli="tb"))
     if (not semver and not oldest_rollback) or (semver and oldest_rollback):
         raise CLIException(FeedbackManager.error_release_rm_param())
 
@@ -278,7 +277,6 @@ async def release_rm(semver: str, oldest_rollback: bool, force: bool, yes: bool,
 @cli.group()
 def branch() -> None:
     """Branch commands. Branches are an experimental feature only available in beta. Running branch commands without activation will return an error"""
-    pass
 
 
 @branch.command(name="ls")
@@ -427,7 +425,7 @@ async def delete_branch(branch_name_or_id: str, yes: bool) -> None:
         raise CLIBranchException(FeedbackManager.error_exception(error=str(e)))
 
     if not workspace_to_delete:
-        raise CLIBranchException(FeedbackManager.error_branch(branch=branch_name_or_id))
+        raise CLIBranchException(FeedbackManager.error_branch(branch=branch_name_or_id, cli="tb"))
 
     if yes or click.confirm(FeedbackManager.warning_confirm_delete_branch(branch=workspace_to_delete["name"])):
         need_to_switch_to_main = workspace_to_delete.get("main") and config["id"] == workspace_to_delete["id"]
@@ -450,7 +448,7 @@ async def delete_branch(branch_name_or_id: str, yes: bool) -> None:
                 if workspace_main:
                     await switch_to_workspace_by_user_workspace_data(config, workspace_main)
                 else:
-                    raise CLIException(FeedbackManager.error_switching_to_main())
+                    raise CLIException(FeedbackManager.error_switching_to_main(cli="tb"))
 
 
 @branch.command(

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/tb_cli_modules/cli.py

@@ -127,7 +127,7 @@ async def cli(
             click.echo(FeedbackManager.warning_development_cli())
 
         if "x.y.z" not in CURRENT_VERSION and latest_version != CURRENT_VERSION:
-            click.echo(FeedbackManager.warning_update_version(latest_version=latest_version))
+            click.echo(FeedbackManager.warning_update_version(latest_version=latest_version, cli="tb"))
             click.echo(FeedbackManager.warning_current_version(current_version=CURRENT_VERSION))
 
     if debug:
@@ -237,7 +237,7 @@ async def init(
     )
 
     if current_ws.get("is_branch"):
-        raise CLIException(FeedbackManager.error_not_allowed_in_branch())
+        raise CLIException(FeedbackManager.error_not_allowed_in_branch(cli="tb"))
 
     await folder_init(client, folder, generate_datasources, generate_releases=True, force=force)
 
@@ -255,7 +255,7 @@ async def init(
 
     if sync_git:
         if not cli_git_release.is_main_branch() and not override_commit:
-            raise CLIGitReleaseException(FeedbackManager.error_no_git_main_branch())
+            raise CLIGitReleaseException(FeedbackManager.error_no_git_main_branch(cli="tb"))
 
         if not cli_git_release.is_dottinyb_ignored():
             raise CLIGitReleaseException(
@@ -316,7 +316,7 @@ async def init(
 
         else:
             click.echo(FeedbackManager.info_no_git_release_yet(workspace=current_ws["name"]))
-            click.echo(FeedbackManager.info_diff_resources_for_git_init())
+            click.echo(FeedbackManager.info_diff_resources_for_git_init(cli="tb"))
             changed = await diff_command(
                 [], True, client, with_print=False, verbose=False, clean_up=True, progress_bar=True
             )
@@ -342,7 +342,7 @@ async def init(
             if cli_git_release.is_dirty_to_init():
                 raise CLIGitReleaseException(
                     FeedbackManager.error_commit_changes_to_init_release(
-                        path=cli_git_release.path, git_output=cli_git_release.status()
+                        path=cli_git_release.path, git_output=cli_git_release.status(), cli="tb"
                     )
                 )
             try:
@@ -732,19 +732,19 @@ async def diff(
         for workspace in response["workspaces"]:
             if config["id"] == workspace["id"]:
                 if not workspace.get("is_branch"):
-                    raise CLIException(FeedbackManager.error_not_a_branch())
+                    raise CLIException(FeedbackManager.error_not_a_branch(cli="tb"))
 
                 origin = workspace["main"]
                 workspace = await get_current_main_workspace(config)
 
                 if not workspace:
-                    raise CLIException(FeedbackManager.error_workspace(workspace=origin))
+                    raise CLIException(FeedbackManager.error_workspace(workspace=origin, cli="tb"))
 
                 ws_client = _get_tb_client(workspace["token"], config["host"])
                 break
 
         if not ws_client:
-            raise CLIException(FeedbackManager.error_workspace(workspace=origin))
+            raise CLIException(FeedbackManager.error_workspace(workspace=origin, cli="tb"))
         changed = await diff_command(
             list(filename) if filename else None, fmt, ws_client, no_color, with_print=not only_resources_changed
         )
@@ -867,9 +867,7 @@ async def sql(
         if format_ == "json":
             click.echo(json.dumps(res, indent=8))
         else:
-            dd = []
-            for d in res["data"]:
-                dd.append(d.values())
+            dd = [d.values() for d in res["data"]]
             echo_safe_humanfriendly_tables_format_smart_table(dd, column_names=res["data"][0].keys())
     else:
         click.echo(FeedbackManager.info_no_rows())
@@ -1347,7 +1345,7 @@ async def deploy(
             current_semver = release.get("semver")
 
         if not current_semver:
-            click.echo(FeedbackManager.error_init_release(workspace=current_ws.get("name")))
+            click.echo(FeedbackManager.error_init_release(workspace=current_ws.get("name"), cli="tb"))
             sys.exit(1)
 
         release_created = False
@@ -1358,7 +1356,7 @@ async def deploy(
         if not semver:
             semver = current_semver
         else:
-            click.echo(FeedbackManager.warning_deprecated_releases())
+            click.echo(FeedbackManager.warning_deprecated_releases(cli="tb"))
 
         if semver and current_semver:
             new_version = version.parse(semver.split("-snapshot")[0])

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/tb_cli_modules/common.py

@@ -234,7 +234,7 @@ variable to '1' or 'true'."""
         try:
             self.main(*args, **kwargs)
         except AuthNoTokenException:
-            error_msg = FeedbackManager.error_notoken()
+            error_msg = FeedbackManager.error_notoken(cli="tb")
             error_event = "auth_error"
             exit_code = 1
         except AuthException as ex:
@@ -315,7 +315,6 @@ async def folder_init(
         except FileExistsError:
             if not force:
                 click.echo(FeedbackManager.info_path_already_exists(path=x))
-            pass
 
     if generate_datasources:
         for format in SUPPORTED_FORMATS:
@@ -690,7 +689,7 @@ async def create_workspace_branch(
     try:
         workspace = await get_current_workspace(config)
         if not workspace:
-            raise CLIWorkspaceException(FeedbackManager.error_workspace())
+            raise CLIWorkspaceException(FeedbackManager.error_workspace(cli="tb"))
 
         if not branch_name:
             click.echo(FeedbackManager.info_workspace_branch_create_greeting())
@@ -748,10 +747,12 @@ async def create_workspace_branch(
 async def print_data_branch_summary(client, job_id, response=None):
     response = await client.job(job_id) if job_id else response or {"partitions": []}
     columns = ["Data Source", "Partition", "Status", "Error"]
-    table = []
+    table: list[list] = []
     for partition in response["partitions"]:
-        for p in partition["partitions"]:
-            table.append([partition["datasource"]["name"], p["partition"], p["status"], p.get("error", "")])
+        table.extend(
+            [partition["datasource"]["name"], p["partition"], p["status"], p.get("error", "")]
+            for p in partition["partitions"]
+        )
     echo_safe_humanfriendly_tables_format_smart_table(table, column_names=columns)
 
 
@@ -1195,7 +1196,7 @@ def validate_string_connector_param(param, s):
 
 async def validate_connection_name(client, connection_name, service):
     if await client.get_connector(connection_name, service) is not None:
-        raise CLIConnectionException(FeedbackManager.error_connection_already_exists(name=connection_name))
+        raise CLIConnectionException(FeedbackManager.error_connection_already_exists(name=connection_name, cli="tb"))
 
 
 def _get_setting_value(connection, setting, sensitive_settings):
@@ -1223,9 +1224,9 @@ async def switch_workspace(config: CLIConfig, workspace_name_or_id: str, only_en
 
         if not workspace:
             if only_environments:
-                raise CLIException(FeedbackManager.error_branch(branch=workspace_name_or_id))
+                raise CLIException(FeedbackManager.error_branch(branch=workspace_name_or_id, cli="tb"))
             else:
-                raise CLIException(FeedbackManager.error_workspace(workspace=workspace_name_or_id))
+                raise CLIException(FeedbackManager.error_workspace(workspace=workspace_name_or_id, cli="tb"))
 
         config.set_token(workspace["token"])
         config.set_token_for_host(workspace["token"], config.get_host())
@@ -1391,17 +1392,17 @@ async def get_host_from_region(
         try:
             host = regions[index - 1]["api_host"]
         except Exception:
-            raise CLIException(FeedbackManager.error_getting_region_by_index())
+            raise CLIException(FeedbackManager.error_getting_region_by_index(cli="tb"))
     except ValueError:
         region_name = region_name_or_host_or_id.lower()
         try:
             region = get_region_from_host(region_name, regions)
             host = region["api_host"] if region else None
         except Exception:
-            raise CLIException(FeedbackManager.error_getting_region_by_name_or_url())
+            raise CLIException(FeedbackManager.error_getting_region_by_name_or_url(cli="tb"))
 
     if not host:
-        raise CLIException(FeedbackManager.error_getting_region_by_name_or_url())
+        raise CLIException(FeedbackManager.error_getting_region_by_name_or_url(cli="tb"))
 
     return regions, host
 
@@ -1562,7 +1563,7 @@ async def try_authenticate(
                 break
 
     if not authenticated:
-        raise CLIAuthException(FeedbackManager.error_invalid_token())
+        raise CLIAuthException(FeedbackManager.error_invalid_token(cli="tb"))
 
     config.persist_to_file()
 
@@ -1899,14 +1900,14 @@ async def validate_aws_iamrole_connection_name(
 ) -> str:
     if connection_name and no_validate is False:
         if await client.get_connector(connection_name) is not None:
-            raise CLIConnectionException(FeedbackManager.info_connection_already_exists(name=connection_name))
+            raise CLIConnectionException(FeedbackManager.info_connection_already_exists(name=connection_name, cli="tb"))
     else:
         while not connection_name:
             connection_name = click.prompt("Enter the name for this connection", default=None, show_default=False)
             assert isinstance(connection_name, str)
 
             if no_validate is False and await client.get_connector(connection_name) is not None:
-                click.echo(FeedbackManager.info_connection_already_exists(name=connection_name))
+                click.echo(FeedbackManager.info_connection_already_exists(name=connection_name, cli="tb"))
                 connection_name = None
     assert isinstance(connection_name, str)
     return connection_name

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/tb_cli_modules/datasource.py

@@ -556,10 +556,10 @@ async def datasource_share(ctx: Context, datasource_name: str, workspace_name_or
     current_workspace = next((workspace for workspace in workspaces if workspace["id"] == config["id"]), None)
 
     if not destination_workspace:
-        raise CLIDatasourceException(FeedbackManager.error_workspace(workspace=workspace_name_or_id))
+        raise CLIDatasourceException(FeedbackManager.error_workspace(workspace=workspace_name_or_id, cli="tb"))
 
     if not current_workspace:
-        raise CLIDatasourceException(FeedbackManager.error_not_authenticated())
+        raise CLIDatasourceException(FeedbackManager.error_not_authenticated(cli="tb"))
 
     if not user_token:
         user_token = ask_for_user_token("share a Data Source", ui_host)
@@ -626,10 +626,10 @@ async def datasource_unshare(ctx: Context, datasource_name: str, workspace_name_
     current_workspace = next((workspace for workspace in workspaces if workspace["id"] == config["id"]), None)
 
     if not destination_workspace:
-        raise CLIDatasourceException(FeedbackManager.error_workspace(workspace=workspace_name_or_id))
+        raise CLIDatasourceException(FeedbackManager.error_workspace(workspace=workspace_name_or_id, cli="tb"))
 
     if not current_workspace:
-        raise CLIDatasourceException(FeedbackManager.error_not_authenticated())
+        raise CLIDatasourceException(FeedbackManager.error_not_authenticated(cli="tb"))
 
     if not user_token:
         user_token = ask_for_user_token("unshare a Data Source", ui_host)

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/tb_cli_modules/job.py

@@ -36,9 +36,7 @@ async def jobs_ls(ctx: Context, status: str) -> None:
     jobs = await client.jobs(status=status)
     columns = ["id", "kind", "status", "created at", "updated at", "job url"]
     click.echo(FeedbackManager.info_jobs())
-    table = []
-    for j in jobs:
-        table.append([j[c.replace(" ", "_")] for c in columns])
+    table = [[j[c.replace(" ", "_")] for c in columns] for j in jobs]
     echo_safe_humanfriendly_tables_format_smart_table(table, column_names=columns)
     click.echo("\n")
 

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/tb_cli_modules/tag.py

@@ -28,11 +28,10 @@ async def tag_ls(ctx: Context, tag_name: Optional[str]) -> None:
         the_tag = [tag for tag in response["tags"] if tag["name"] == tag_name]
 
         columns = ["name", "id", "type"]
-        table = []
+        table: list[list] = []
 
         if len(the_tag) > 0:
-            for resource in the_tag[0]["resources"]:
-                table.append([resource["name"], resource["id"], resource["type"]])
+            table.extend([resource["name"], resource["id"], resource["type"]] for resource in the_tag[0]["resources"])
 
         click.echo(FeedbackManager.info_tag_resources(tag_name=tag_name))
         echo_safe_humanfriendly_tables_format_smart_table(table, column_names=columns)

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird/tb_cli_modules/workspace.py

@@ -55,19 +55,18 @@ async def workspace_ls(ctx: Context) -> None:
         raise CLIWorkspaceException(FeedbackManager.error_unable_to_identify_main_workspace())
 
     columns = ["name", "id", "role", "plan", "current"]
-    table = []
     click.echo(FeedbackManager.info_workspaces())
 
-    for workspace in response["workspaces"]:
-        table.append(
-            [
-                workspace["name"],
-                workspace["id"],
-                workspace["role"],
-                _get_workspace_plan_name(workspace["plan"]),
-                current_main_workspace["id"] == workspace["id"],
-            ]
-        )
+    table = [
+        [
+            workspace["name"],
+            workspace["id"],
+            workspace["role"],
+            _get_workspace_plan_name(workspace["plan"]),
+            current_main_workspace["id"] == workspace["id"],
+        ]
+        for workspace in response["workspaces"]
+    ]
 
     echo_safe_humanfriendly_tables_format_smart_table(table, column_names=columns)
 
@@ -114,7 +113,7 @@ async def clear_workspace(ctx: Context, yes: bool, dry_run: bool) -> None:
     for workspace in response["workspaces"]:
         if config["id"] == workspace["id"]:
             if workspace.get("is_branch"):
-                raise CLIWorkspaceException(FeedbackManager.error_not_allowed_in_branch())
+                raise CLIWorkspaceException(FeedbackManager.error_not_allowed_in_branch(cli="tb"))
                 return
             else:
                 click.echo(FeedbackManager.info_current_workspace())
@@ -297,7 +296,7 @@ async def delete_workspace(
     )
 
     if not workspace_to_delete:
-        raise CLIWorkspaceException(FeedbackManager.error_workspace(workspace=workspace_name_or_id))
+        raise CLIWorkspaceException(FeedbackManager.error_workspace(workspace=workspace_name_or_id, cli="tb"))
 
     if yes or click.confirm(
         FeedbackManager.warning_confirm_delete_workspace(workspace_name=workspace_to_delete.get("name"))

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 6.4.1.dev0
+Version: 6.5.1.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -12,7 +12,7 @@ Requires-Dist: clickhouse-toolset==0.34.dev0
 Requires-Dist: click<8.2,>=8.1.8
 Requires-Dist: colorama==0.4.6
 Requires-Dist: cryptography~=41.0.0
-Requires-Dist: croniter==1.3.15
+Requires-Dist: croniter==6.2.2
 Requires-Dist: GitPython~=3.1.32
 Requires-Dist: humanfriendly~=8.2
 Requires-Dist: pydantic~=2.8.0
@@ -43,6 +43,17 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+6.5.0
+***********
+
+ - `Changed` `tb push` can now perform sharing and unsharing operations on Datasources with a DATASOURCES:CREATE token in workspaces in the same Organization
+
+6.4.1
+***********
+
+- `Improved` feedback messages when suggesting other cli commands.
+- `Fixed` `tb push` rejecting the `%` operator in column DEFAULT/MATERIALIZED expressions, causing failures after `tb pull` on schemas using modulo arithmetic.
+
 6.4.0
 ***********
 

{tinybird_cli-6.4.1.dev0 → tinybird_cli-6.5.1.dev0}/tinybird_cli.egg-info/requires.txt

@@ -3,7 +3,7 @@ clickhouse-toolset==0.34.dev0
 click<8.2,>=8.1.8
 colorama==0.4.6
 cryptography~=41.0.0
-croniter==1.3.15
+croniter==6.2.2
 GitPython~=3.1.32
 humanfriendly~=8.2
 pydantic~=2.8.0