tinybird 4.6.0__tar.gz → 4.6.1__tar.gz

{tinybird-4.6.0 → tinybird-4.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.0
+Version: 4.6.1
 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.0 → tinybird-4.6.1}/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-4.6.0 → tinybird-4.6.1}/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.0'
-__revision__ = '1d9f802'
+__version__ = '4.6.1'
+__revision__ = '41da03f'

{tinybird-4.6.0 → tinybird-4.6.1}/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-4.6.0 → tinybird-4.6.1}/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-4.6.0 → tinybird-4.6.1}/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-4.6.0 → tinybird-4.6.1}/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.0 → tinybird-4.6.1}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 4.6.0
+Version: 4.6.1
 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.0 → tinybird-4.6.1}/tinybird.egg-info/requires.txt

@@ -18,7 +18,7 @@ requests<3,>=2.28.1
 shandy-sqlfmt==0.11.1
 shandy-sqlfmt[jinjafmt]==0.11.1
 toposort==1.10
-tornado~=6.0.0
+tornado~=6.5.5
 urllib3<2,>=1.26.14
 watchdog==6.0.0
 wheel