tinybird-cli 6.1.1.dev0__tar.gz → 6.2.1.dev0__tar.gz

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 6.1.1.dev0
+Version: 6.2.1.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -43,6 +43,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+6.2.0
+***********
+
+- `Fixed` `tb push` with `SHARED_WITH` now uses the user token to fetch workspaces, avoiding failures caused by using the wrong token
+
 6.0.2
 ***********
 

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.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.1.1.dev0'
-__revision__ = 'cdfa249'
+__version__ = '6.2.1.dev0'
+__revision__ = '0284e51'

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/tinybird/ch_utils/engine.py

@@ -298,7 +298,7 @@ class EngineOption:
         self.required = required
         self.default_value = default_value
         self.is_valid = is_valid
-        self.tb_param = tb_param if tb_param else "_".join(["engine", name])
+        self.tb_param = tb_param or "_".join(["engine", name])
 
 
 class EngineParam:
@@ -314,7 +314,7 @@ class EngineParam:
         self.required = required
         self.default_value = default_value
         self.is_valid = is_valid
-        self.tb_param = tb_param if tb_param else self.build_engine_param_name(name)
+        self.tb_param = tb_param or self.build_engine_param_name(name)
 
     @staticmethod
     def build_engine_param_name(name: str):

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/tinybird/client.py

@@ -118,7 +118,7 @@ class TinyB:
     ) -> Response:
         url = f"{self.host.strip('/')}/{endpoint.strip('/')}"
 
-        token_to_use = use_token if use_token else self.token
+        token_to_use = use_token or self.token
         if token_to_use:
             url += ("&" if "?" in endpoint else "?") + "token=" + token_to_use
         if self.version:
@@ -191,7 +191,7 @@ class TinyB:
         use_token: Optional[str] = None,
         **kwargs,
     ):
-        token_to_use = use_token if use_token else self.token
+        token_to_use = use_token or self.token
         response = await self._req_raw(endpoint, data, files, method, retries, use_token, **kwargs)
 
         if response.status_code == 403:
@@ -565,8 +565,8 @@ class TinyB:
     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 "",
-            "node_attrs": node_attrs if node_attrs else "",
+            "attrs": attrs or "",
+            "node_attrs": node_attrs or "",
         }
         response = await self._req(f"/v0/pipes?{urlencode(params)}")
         pipes = response["pipes"]

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/tinybird/datafile_common.py

@@ -445,10 +445,12 @@ class CLIGitRelease:
         # not expected suffixes
         return list(
             filter(
-                lambda d: d.change_type in [c.value for c in self.ChangeType]
-                and d.a_path
-                and d.a_path not in self.NO_DATAFILES_PATHS
-                and Path(d.a_path).resolve().suffix in self.DATAFILES_SUFFIXES,
+                lambda d: (
+                    d.change_type in [c.value for c in self.ChangeType]
+                    and d.a_path
+                    and d.a_path not in self.NO_DATAFILES_PATHS
+                    and Path(d.a_path).resolve().suffix in self.DATAFILES_SUFFIXES
+                ),
                 self.diff(current_ws_commit),
             )
         )
@@ -533,9 +535,7 @@ class CLIGitRelease:
     async def update_release(
         self, tb_client: TinyB, current_ws: Dict[str, Any], commit: Optional[str] = None
     ) -> Dict[str, Any]:
-        release = await tb_client.workspace_commit_update(
-            current_ws["id"], commit if commit else self.head().commit.hexsha
-        )
+        release = await tb_client.workspace_commit_update(current_ws["id"], commit or self.head().commit.hexsha)
         return release
 
 
@@ -3145,24 +3145,23 @@ 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
 
     # 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:
-        # Force to get all the workspaces the user can access
         workspace = current_ws
-        workspaces = (await client.user_workspaces()).get("workspaces", [])
     else:
         workspace = await client.user_workspace_branches()
-        workspaces = workspace.get("workspaces", [])
 
     if workspace.get("is_branch", False):
         click.echo(FeedbackManager.info_skipping_sharing_datasources_branch(datasource=datasource["name"]))
         return
 
-    # We duplicate the client to use the user_token
-    user_client: TinyB = deepcopy(client)
-    user_client.token = user_token
+    # 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:
         for workspace_to_share in workspaces_to_share:
             w: Optional[Dict[str, Any]] = next((w for w in workspaces if w["name"] == workspace_to_share), None)
@@ -5029,7 +5028,7 @@ async def format_engine(
             file_parts.append(DATAFILE_NEW_LINE)
             for arg in sorted(node["engine"].get("args", [])):
                 elem = ", ".join([x.strip() for x in arg[1].split(",")])
-                file_parts.append(f"ENGINE_{arg[0].upper()} {elem if elem else empty}")
+                file_parts.append(f"ENGINE_{arg[0].upper()} {elem or empty}")
                 file_parts.append(DATAFILE_NEW_LINE)
             file_parts.append(DATAFILE_NEW_LINE)
         return file_parts

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/tinybird/sql.py

@@ -821,11 +821,11 @@ def _parse_table_structure(schema: str) -> List[Dict[str, Any]]:
         nullable = column["type"].lower().startswith("nullable")
         column["type"] = column["type"] if not nullable else column["type"][len("Nullable(") : -1]  # ')'
         column["nullable"] = nullable
-        column["codec"] = column["codec"] if column["codec"] else None
+        column["codec"] = column["codec"] or None
         column["name"] = column["name"]
         column["normalized_name"] = column["name"]
-        column["jsonpath"] = column["jsonpath"] if column["jsonpath"] else None
-        default_value = column["default_value"] if column["default_value"] else None
+        column["jsonpath"] = column["jsonpath"] or None
+        default_value = column["default_value"] or None
         if nullable and default_value and default_value.lower() == "default null":
             default_value = None
         column["default_value"] = default_value

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/tinybird/sql_template.py

@@ -199,7 +199,7 @@ class Comment:
 
 class Placeholder:
     def __init__(self, name=None, line=None):
-        self.name = name if name else "__no_value__"
+        self.name = name or "__no_value__"
         self.line = line or "unknown"
 
     def __str__(self):

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/tinybird/sql_toolset.py

@@ -539,7 +539,7 @@ def replace_tables(
                     if (
                         dependent_table[2]
                         and dependent_table[2] not in _enabled_table_functions
-                        and not (dependent_table[2] in ["cluster"] and replacement[0] == VALID_REMOTE)
+                        and not (dependent_table[2] == "cluster" and replacement[0] == VALID_REMOTE)
                     ):
                         raise InvalidFunction(table_function_name=dependent_table[2])
                     if dependent_table[0] or dependent_table[1]:

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/tinybird/tb_cli_modules/branch.py

@@ -1014,9 +1014,7 @@ async def datasource_copy_from_main(datasource_name: str, sql: str, sql_from_mai
 
     client = config.get_client()
 
-    response = await client.datasource_query_copy(
-        datasource_name, sql if sql else f"SELECT * FROM main.{datasource_name}"
-    )
+    response = await client.datasource_query_copy(datasource_name, sql or f"SELECT * FROM main.{datasource_name}")
     if "job" not in response:
         raise CLIBranchException(response)
     job_id = response["job"]["job_id"]

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/tinybird/tb_cli_modules/cicd.py

@@ -405,8 +405,8 @@ async def init_cicd(
 ):
     provider = ask_provider_interactively()
     if provider:
-        path = path if path else getcwd()
-        data_project_dir = data_project_dir if data_project_dir else "."
+        path = path or getcwd()
+        data_project_dir = data_project_dir or "."
         generator = CICDGeneratorBase.build_generator(provider)
         workspace_info = await client.workspace_info()
         token = await client.get_token_by_name("admin token")
@@ -426,7 +426,7 @@ async def init_cicd(
 
 
 async def check_cicd_exists(path: Optional[str] = None) -> Optional[Provider]:
-    path = path if path else getcwd()
+    path = path or getcwd()
     for provider in Provider:
         generator = CICDGeneratorBase.build_generator(provider.name)
         if generator.is_already_generated(path):

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/tinybird/tb_cli_modules/cli.py

@@ -229,7 +229,7 @@ async def init(
     config = CLIConfig.get_project_config()
     if config.get("token") is None:
         raise AuthNoTokenException
-    folder = folder if folder else getcwd()
+    folder = folder or getcwd()
 
     workspaces: List[Dict[str, Any]] = (await client.user_workspaces_and_branches()).get("workspaces", [])
     current_ws: Dict[str, Any] = next(
@@ -644,7 +644,7 @@ async def pull(ctx: Context, folder: str, auto: bool, match: Optional[str], forc
     """Retrieve latest versions for project files from Tinybird."""
 
     client = ctx.ensure_object(dict)["client"]
-    folder = folder if folder else getcwd()
+    folder = folder or getcwd()
 
     return await folder_pull(client, folder, auto, match, force, fmt=fmt)
 

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/tinybird/tb_cli_modules/common.py

@@ -1601,7 +1601,7 @@ async def wait_job(
             if "progress_percentage" in res:
                 progress_bar.update(int(round(res["progress_percentage"])) - progress_bar.pos)
             elif res["status"] != "working":
-                progress_bar.update(progress_bar.length if progress_bar.length else 0)
+                progress_bar.update(progress_bar.length or 0)
 
         try:
             # TODO: Simplify this as it's not needed to use two functions for

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/tinybird/tb_cli_modules/datasource.py

@@ -728,9 +728,7 @@ async def datasource_copy_from_main(
         click.echo(FeedbackManager.error_exception(error="Use --sql or --sql-from-main"))
         return
 
-    response = await client.datasource_query_copy(
-        datasource_name, sql if sql else f"SELECT * FROM main.{datasource_name}"
-    )
+    response = await client.datasource_query_copy(datasource_name, sql or f"SELECT * FROM main.{datasource_name}")
     if "job" not in response:
         raise Exception(response)
     job_id = response["job"]["job_id"]

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/tinybird/tb_cli_modules/tinyunit/tinyunit.py

@@ -226,7 +226,7 @@ async def run_test_file(tb_client: TinyB, file: str) -> List[TestResult]:
             pipe = test_case.pipe.name
             params = test_case.pipe.params
             try:
-                sql = test_case.sql if test_case.sql else None
+                sql = test_case.sql or None
                 test_response = await tb_client.pipe_data(pipe, format="json", params=params, sql=sql)
                 results.append(
                     TestResult(
@@ -263,7 +263,7 @@ def test_run_summary(results: List[TestSummaryResults], only_fail: bool = False,
             total_counts[test.status] = total_counts.get(test.status, 0) + 1
 
             # Skip the PASS tests if we only want the failed ones
-            if only_fail and test.status in [PASS]:
+            if only_fail and test.status == PASS:
                 continue
 
             summary.append(

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/tinybird/tornado_template.py

@@ -283,7 +283,7 @@ class Template:
         .. versionchanged:: 4.3
            Added ``whitespace`` parameter; deprecated ``compress_whitespace``.
         """
-        name = name if name else "<string>"
+        name = name or "<string>"
         self.name = escape.native_str(name)
 
         if compress_whitespace is not _UNSET:

{tinybird_cli-6.1.1.dev0 → tinybird_cli-6.2.1.dev0}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird_cli
-Version: 6.1.1.dev0
+Version: 6.2.1.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli
 Author: Tinybird
@@ -43,6 +43,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+6.2.0
+***********
+
+- `Fixed` `tb push` with `SHARED_WITH` now uses the user token to fetch workspaces, avoiding failures caused by using the wrong token
+
 6.0.2
 ***********