tinybird 4.6.1.dev0__py3-none-any.whl → 4.6.2.dev0__py3-none-any.whl

tinybird/sql_template.py

@@ -7,7 +7,7 @@ from collections import deque
 from datetime import datetime
 from functools import lru_cache
 from json import loads
-from typing import Any, Callable, Dict, List, Optional, Tuple, Union
+from typing import Any, Callable, Dict, List, Optional, Tuple, Union, cast
 
 from tornado import escape
 from tornado.util import ObjectDict, exec_in, unicode_type
@@ -1499,7 +1499,7 @@ def generate(self, **kwargs) -> Tuple[str, TemplateExecutionResults]:
     )
 
     exec_in(self.compiled, namespace)
-    execute = namespace["_tt_execute"]
+    execute = cast(Callable[[], bytes], namespace["_tt_execute"])
     # Clear the traceback module's cache of source data now that
     # we've generated a new template (mainly for this module's
     # unittests, where different tests reuse the same name).

tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '4.6.1.dev0'
-__revision__ = '1d9f802'
+__version__ = '4.6.2.dev0'
+__revision__ = '41da03f'

tinybird/tb/modules/common.py

@@ -105,7 +105,9 @@ def echo_safe_humanfriendly_tables_format_smart_table(data: Iterable[Any], colum
     try:
         click.echo(humanfriendly.tables.format_smart_table(data, column_names=column_names))
     except ValueError as exc:
-        if str(exc) == "max() arg is an empty sequence":
+        # Python 3.11 wording: "max() arg is an empty sequence"
+        # Python 3.12 wording: "max() iterable argument is empty"
+        if str(exc) in ("max() arg is an empty sequence", "max() iterable argument is empty"):
             click.echo("------------")
             click.echo("Empty")
             click.echo("------------")
@@ -122,7 +124,9 @@ def echo_safe_humanfriendly_tables_format_pretty_table(data: Iterable[Any], colu
     try:
         click.echo(humanfriendly.tables.format_pretty_table(data, column_names=column_names))
     except ValueError as exc:
-        if str(exc) == "max() arg is an empty sequence":
+        # Python 3.11 wording: "max() arg is an empty sequence"
+        # Python 3.12 wording: "max() iterable argument is empty"
+        if str(exc) in ("max() arg is an empty sequence", "max() iterable argument is empty"):
             click.echo("------------")
             click.echo("Empty")
             click.echo("------------")
@@ -139,7 +143,9 @@ def echo_safe_format_table(data: Iterable[Any], columns) -> None:
     try:
         click.echo(format_table(data, columns))
     except ValueError as exc:
-        if str(exc) == "max() arg is an empty sequence":
+        # Python 3.11 wording: "max() arg is an empty sequence"
+        # Python 3.12 wording: "max() iterable argument is empty"
+        if str(exc) in ("max() arg is an empty sequence", "max() iterable argument is empty"):
             click.echo("------------")
             click.echo("Empty")
             click.echo("------------")

tinybird/tb/modules/datafile/pull.py

@@ -8,6 +8,8 @@ from tinybird.tb.modules.datafile.format_datasource import format_datasource
 from tinybird.tb.modules.datafile.format_pipe import format_pipe
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
+PULL_EXISTING_FILE_MAX_DEPTH = 5
+
 
 def folder_pull(
     client: TinyB,
@@ -18,7 +20,7 @@ def folder_pull(
     progress_bar: bool = False,
     fmt: bool = False,
 ) -> list[str]:
-    def get_file_folder(extension: str, resource_type: Optional[str]):
+    def get_file_folder(extension: str, resource_type: Optional[str]) -> Optional[str]:
         if extension == "datasource":
             return "datasources"
         if extension == "connection":
@@ -35,6 +37,24 @@ def folder_pull(
             return "pipes"
         return None
 
+    def find_existing_resource_file(dest_folder: Path, name: str) -> Optional[Path]:
+        if not dest_folder.exists():
+            return None
+
+        candidates = []
+        for candidate in dest_folder.rglob(name):
+            if not candidate.is_file():
+                continue
+
+            relative_parent = candidate.parent.relative_to(dest_folder)
+            if len(relative_parent.parts) <= PULL_EXISTING_FILE_MAX_DEPTH:
+                candidates.append(candidate)
+
+        if not candidates:
+            return None
+
+        return sorted(candidates, key=lambda path: (len(path.parent.relative_to(dest_folder).parts), str(path)))[0]
+
     def write_files(
         resources: list[dict[str, Any]],
         extension: str,
@@ -62,14 +82,17 @@ def folder_pull(
                 file_folder = get_file_folder(extension, k.get("type"))
                 f = Path(dest_folder) / file_folder if file_folder is not None else Path(dest_folder)
 
-                if not f.exists():
-                    f.mkdir(parents=True)
-
-                f = f / name
+                existing_file = find_existing_resource_file(Path(dest_folder), name)
+                if existing_file is not None:
+                    f = existing_file
+                else:
+                    if not f.exists():
+                        f.mkdir(parents=True)
+                    f = f / name
 
                 if verbose:
                     click.echo(FeedbackManager.info_writing_resource(resource=f))
-                if not f.exists() or force:
+                if not f.exists() or force or existing_file is not None:
                     with open(f, "w") as fd:
                         if resource_to_write:
                             fd.write(resource_to_write)

tinybird/tb/modules/query_output.py

@@ -26,7 +26,9 @@ def print_table_formatted(res: dict, name: str):
         click.echo(FeedbackManager.success(message=stats_message))
         click.echo(FeedbackManager.gray(message=rows_message))
     except ValueError as exc:
-        if str(exc) == "max() arg is an empty sequence":
+        # Python 3.11 wording: "max() arg is an empty sequence"
+        # Python 3.12 wording: "max() iterable argument is empty"
+        if str(exc) in ("max() arg is an empty sequence", "max() iterable argument is empty"):
             click.echo("------------")
         else:
             raise

tinybird/tb_cli_modules/common.py

@@ -112,7 +112,9 @@ def echo_safe_humanfriendly_tables_format_smart_table(data: Iterable[Any], colum
     try:
         click.echo(humanfriendly.tables.format_smart_table(data, column_names=column_names))
     except ValueError as exc:
-        if str(exc) == "max() arg is an empty sequence":
+        # Python 3.11 wording: "max() arg is an empty sequence"
+        # Python 3.12 wording: "max() iterable argument is empty"
+        if str(exc) in ("max() arg is an empty sequence", "max() iterable argument is empty"):
             click.echo("------------")
             click.echo("Empty")
             click.echo("------------")

{tinybird-4.6.1.dev0.dist-info → tinybird-4.6.2.dev0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.1.dev0
+Version: 4.6.2.dev0
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -27,7 +27,7 @@ Requires-Dist: requests<3,>=2.28.1
 Requires-Dist: shandy-sqlfmt==0.11.1
 Requires-Dist: shandy-sqlfmt[jinjafmt]==0.11.1
 Requires-Dist: toposort==1.10
-Requires-Dist: tornado~=6.0.0
+Requires-Dist: tornado~=6.5.5
 Requires-Dist: urllib3<2,>=1.26.14
 Requires-Dist: watchdog==6.0.0
 Requires-Dist: wheel
@@ -52,6 +52,11 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+4.6.1
+*******
+
+- `Changed` `tb pull` to overwrite existing local files when pulling from a Tinybird workspace.
+
 4.6.0
 *******
 

{tinybird-4.6.1.dev0.dist-info → tinybird-4.6.2.dev0.dist-info}/RECORD

@@ -5,7 +5,7 @@ tinybird/git_settings.py,sha256=mqWgeboOlOFsSo97qyv595UCR2R1QCAqT4GTawBNPBg,3935
 tinybird/prompts.py,sha256=F8ic_mGId50MDJmg5ec8i5BDavxz9SWtocLXqgO0IRY,45689
 tinybird/service_datasources.py,sha256=tt_8G6yJcr2ZbsaR99ulExe79pNS8h9dzdGm45vf16c,58710
 tinybird/sql.py,sha256=qdqxsq1WPiGTk-SmZWaxvZb936ISdo1ChZhnC_uXeUE,49351
-tinybird/sql_template.py,sha256=_J-QmHos4Sx9YS6tVsEyE68qrcFbj13VwCA1zB3Sz8Q,128634
+tinybird/sql_template.py,sha256=nSzUdaQe18Da_8qlgLW7tsZl1pOa2kDaBa8TdrF6pJ4,128667
 tinybird/sql_template_fmt.py,sha256=Ma4qcs-2r8ZXQC4GUmrCqYz34DsnGF8k5lE2Jwnr314,10638
 tinybird/sql_toolset.py,sha256=xWY-EtixaZKUPuNY4WBz2fDwwNnmbgtdLsmI2wy67UA,27220
 tinybird/syncasync.py,sha256=rIPmCvygWSFqfnlVqhZH4N9gVVTvD6DEPsfoxGizYrI,27776
@@ -17,7 +17,7 @@ tinybird/datafile/exceptions.py,sha256=8rw2umdZjtby85QbuRKFO5ETz_eRHwUY5l7eHsy1w
 tinybird/datafile/parse_connection.py,sha256=GxmGp_XnWbDZPDbh_PBxitlIMqZRYfDwxMBw-JQBp1g,1890
 tinybird/datafile/parse_datasource.py,sha256=yd58HrUF4yNJXLn6OsvKGpZJpvrcjLGAeJG1lgBe_zk,1891
 tinybird/datafile/parse_pipe.py,sha256=-9bbgVuiWRyDYydrLVflDBt8GstZotMy6dklsrc6MUY,3859
-tinybird/tb/__cli__.py,sha256=QXbgUCqET_aryHwR2WxQwXVxJResA_P30lxlABqLiEA,245
+tinybird/tb/__cli__.py,sha256=ghH8YiRtCEUACEVbZgch3RDH11g2M0Pxuf6s4Y3opmI,245
 tinybird/tb/check_pypi.py,sha256=Gp0HkHHDFMSDL6nxKlOY51z7z1Uv-2LRexNTZSHHGmM,552
 tinybird/tb/cli.py,sha256=IjiGfNIpxSxi1odK1kMj9s8lEhx3sAUgGA263XdmyR0,1119
 tinybird/tb/client.py,sha256=SEp4-XoRDXMEBj2_C1jfJKtZOkbiwNIYERPQN6uoolI,55646
@@ -27,7 +27,7 @@ tinybird/tb/modules/build.py,sha256=bGFoFppR_UbGUMDWFGDzfJ4nT3CGFwzCzl2o4OpwR2o,
 tinybird/tb/modules/build_common.py,sha256=o04aeaoyGTnwhR0cEXAgQzc7SJya97YECoEihsi4SyU,24979
 tinybird/tb/modules/cicd.py,sha256=IO4qqsoLRXcubALb7vx_QnRpg3zIIxfaVO9bGomlESY,8267
 tinybird/tb/modules/cli.py,sha256=n_B9EapB1eYOWOfRHN1Jefip6LcmYrkLDIz5GoGCJhA,41889
-tinybird/tb/modules/common.py,sha256=tiBjysOj5RW0aZRC2wIADoK6H-72yKx31UNc5MlwivM,94782
+tinybird/tb/modules/common.py,sha256=5oyFPfrM4ct9-U3AmhtAKXTPUWw5eDoX55jxF3TK5H0,95286
 tinybird/tb/modules/config.py,sha256=Z47lMZxFeX68b62bTzgj9379zn-9eT4cPbrcMJ_xTGQ,11431
 tinybird/tb/modules/connection.py,sha256=HwHn0YgwqcKEYCLr2OqDzJzAUFd65Wv8MZiSUw_TLII,18452
 tinybird/tb/modules/connection_dynamodb.py,sha256=j1Z0tXrlTZJU1LJ0rEzv3ezo0pS4PJJKfVjUTGrH3nk,9473
@@ -63,7 +63,7 @@ tinybird/tb/modules/preview.py,sha256=712lVUgFE2a1qCmBGVrU_JyiaRyo5-S0dypcBxmKln
 tinybird/tb/modules/project.py,sha256=sb-561KV6RQiYrq4nHSULFNMOodq8Ywxwp6Dfogs0KY,9171
 tinybird/tb/modules/project_commands.py,sha256=t7h5JJWNA5eGth_Nrj0fak5B9eyVPGeDluF-41OBkhw,1877
 tinybird/tb/modules/py_project.py,sha256=DE3N-GPhcvVulELMINZQmw0zG6xZ1YeVkyJt1vn2E4I,7799
-tinybird/tb/modules/query_output.py,sha256=vdsjAsWt2YPfZ9hGEokCknYCnwuzMsnSVTDoLr47bBs,1346
+tinybird/tb/modules/query_output.py,sha256=8Akg5_jzc6icM_-MvJXmP9Nn5v2s3xx6r1bMO4ap98c,1514
 tinybird/tb/modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb/modules/secret.py,sha256=iwwBDmlWSTm-9WKjg9G4gejJQHnOelBlB7XTg9zUr3g,3942
 tinybird/tb/modules/secret_common.py,sha256=8mEXOdNFrTuVWu7rgZ5-C8v-rB1EAdZQUHIyBIgwISI,1578
@@ -89,17 +89,17 @@ tinybird/tb/modules/datafile/format_datasource.py,sha256=rqA0Mr_3x5vaXe5vXWs7Fe2
 tinybird/tb/modules/datafile/format_pipe.py,sha256=9UuUsl5DjV4tJIRr6Whuv-AtIM9Gx7R3396AbKjHaJ4,7724
 tinybird/tb/modules/datafile/pipe_checker.py,sha256=dxsCQoA6ruxg1fvF6sMLFowpjaqws8lUQcM7XyhgZPE,24609
 tinybird/tb/modules/datafile/playground.py,sha256=TB4ebscUaNPqYzn0zBWqFBtK6TyzhcenHeTf62ac-2E,55269
-tinybird/tb/modules/datafile/pull.py,sha256=vzJ8_rixPRyuv3x_Ah8v5iHr1cM2LUGrSX54Opg4lGI,5073
+tinybird/tb/modules/datafile/pull.py,sha256=WbFCv0rp-ThcCcfH6gqs9Be-NawJfEEkY-aU78O93hk,6004
 tinybird/tb/modules/tinyunit/tinyunit.py,sha256=GHdp_6uDcCO2C-Z5bXu4OJQGXMm9Y_yjrcLVYdWy65o,11238
 tinybird/tb/modules/tinyunit/tinyunit_lib.py,sha256=NHoXcCHPDcKWYLzgP3NViho3Ey-6RV-ynPDzySPrTPE,1817
 tinybird/tb_cli_modules/cicd.py,sha256=i2Mw8AbmEVNBcEPYdio7liy3PGqh1ezVFZ0OmJ9ww5o,13809
-tinybird/tb_cli_modules/common.py,sha256=WS8on_s8sGSq27YQdmMsfQ45MP9wyoJaRN_Cfrr6lUk,77275
+tinybird/tb_cli_modules/common.py,sha256=_J0ovBGdMqdrYCMdkw4ub74pMLuMdkm1yAsu_OAFMwQ,77443
 tinybird/tb_cli_modules/config.py,sha256=0kFDmsDcjKon32rgFGMHHKSbv4j5dOrXtVOlyuAyEkk,11510
 tinybird/tb_cli_modules/exceptions.py,sha256=pmucP4kTF4irIt7dXiG-FcnI-o3mvDusPmch1L8RCWk,3367
 tinybird/tb_cli_modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb_cli_modules/telemetry.py,sha256=W098H6jmS4kpE7hN3tadaREBTf7oMocel-lkKWN0pU8,10466
-tinybird-4.6.1.dev0.dist-info/METADATA,sha256=yPtpFgNPvMixR2tfsd8kVlW17P2y1BA_k2HRSJ8_E-U,12572
-tinybird-4.6.1.dev0.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-tinybird-4.6.1.dev0.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-4.6.1.dev0.dist-info/top_level.txt,sha256=ZIQJTPCzMqnfDzM_hEGZrJqDSEcKnIK_49T86DGWpyQ,78
-tinybird-4.6.1.dev0.dist-info/RECORD,,
+tinybird-4.6.2.dev0.dist-info/METADATA,sha256=NUakUIjMH63SvEAurFVKJ1PsHBKbV9WbO-9KdACgETk,12684
+tinybird-4.6.2.dev0.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+tinybird-4.6.2.dev0.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-4.6.2.dev0.dist-info/top_level.txt,sha256=ZIQJTPCzMqnfDzM_hEGZrJqDSEcKnIK_49T86DGWpyQ,78
+tinybird-4.6.2.dev0.dist-info/RECORD,,