tinybird-cli 3.6.1.dev5__tar.gz → 3.6.1.dev7__tar.gz

{tinybird-cli-3.6.1.dev5 → tinybird-cli-3.6.1.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.6.1.dev5
+Version: 3.6.1.dev7
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -19,6 +19,16 @@ Changelog
 
 ---------
 
+3.6.1.dev7
+************
+
+- `Fixed` `tb deploy` supports deployment when a `.incl` file is removed
+
+3.6.1.dev6
+************
+
+- `Fixed` Some issues when using `--fmt: off` with `CASE` in the sql
+
 3.6.1.dev5
 ************
 

{tinybird-cli-3.6.1.dev5 → tinybird-cli-3.6.1.dev7}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '3.6.1.dev5'
-__revision__ = '321fe96'
+__version__ = '3.6.1.dev7'
+__revision__ = 'c015232'

{tinybird-cli-3.6.1.dev5 → tinybird-cli-3.6.1.dev7}/tinybird/ch_utils/engine.py

@@ -32,7 +32,20 @@ class TableDetails:
     >>> ed.to_datafile()
     ''
 
+    >>> ed = TableDetails({ "engine_full": "MergeTree() PARTITION BY toYear(timestamp) ORDER BY (timestamp, cityHash64(location)) SAMPLE BY cityHash64(location) SETTINGS index_granularity = 32, index_granularity_bytes = 2048", "engine": "MergeTree", "partition_key": "toYear(timestamp)", "sorting_key": "timestamp, cityHash64(location)", "primary_key": "timestamp, cityHash64(location)", "sampling_key": "cityHash64(location)", "settings": "index_granularity = 32, index_granularity_bytes = 2048", "ttl": None })
+    >>> ed.diff_ttl("toDate(timestamp) + toIntervalDay(1)")
+    True
     >>> ed = TableDetails({ "engine_full": "MergeTree() PARTITION BY toYear(timestamp) ORDER BY (timestamp, cityHash64(location)) SAMPLE BY cityHash64(location) SETTINGS index_granularity = 32, index_granularity_bytes = 2048 TTL toDate(timestamp) + INTERVAL 1 DAY", "engine": "MergeTree", "partition_key": "toYear(timestamp)", "sorting_key": "timestamp, cityHash64(location)", "primary_key": "timestamp, cityHash64(location)", "sampling_key": "cityHash64(location)", "settings": "index_granularity = 32, index_granularity_bytes = 2048", "ttl": "toDate(timestamp) + INTERVAL 1 DAY" })
+    >>> ed.diff_ttl("toDate(timestamp) + toIntervalDay(1)")
+    False
+    >>> ed.diff_ttl("toDate(timestamp) + toIntervalDay(2)")
+    True
+    >>> ed.diff_ttl("toDate(timestamp) + INTERVAL DAY 2")
+    True
+    >>> ed.diff_ttl("toDate(timestamp) + INTERVAL 1 DAY")
+    False
+    >>> ed.diff_ttl("")
+    True
     >>> ed.engine_full
     'MergeTree() PARTITION BY toYear(timestamp) ORDER BY (timestamp, cityHash64(location)) SAMPLE BY cityHash64(location) SETTINGS index_granularity = 32, index_granularity_bytes = 2048 TTL toDate(timestamp) + INTERVAL 1 DAY'
     >>> ed.engine
@@ -132,6 +145,16 @@ class TableDetails:
             return is_aggregating or is_replacing or is_collapsing
         return False
 
+    def diff_ttl(self, new_ttl: str) -> bool:
+        try:
+            from tinybird.sql_toolset import format_sql
+
+            current_ttl = format_sql(f"select {self.ttl}")[7:]
+            new_ttl = format_sql(f"select {new_ttl}")[7:]
+            return current_ttl != new_ttl
+        except Exception:
+            return self.ttl != new_ttl
+
     @property
     def partition_key(self) -> Optional[str]:
         return self.details.get("partition_key", None)

{tinybird-cli-3.6.1.dev5 → tinybird-cli-3.6.1.dev7}/tinybird/datafile.py

@@ -237,6 +237,10 @@ class ParseException(Exception):
         super().__init__(err)
 
 
+class IncludeFileNotFoundException(Exception):
+    pass
+
+
 class ValidationException(Exception):
     def __init__(self, err: str, lineno: int = -1) -> None:
         self.lineno: int = lineno
@@ -411,16 +415,21 @@ class CLIGitRelease:
         parsed_resources: Dict[str, Datafile] = {}
 
         def _is_include(include_path, resource_path):
-            if filename.endswith(".pipe"):
-                parsed_func = parse_pipe
-            else:
-                parsed_func = parse_datasource
-            parsed_resource = parsed_resources.get(resource_path, parsed_func(resource_path))
-            parsed_resources[filename] = parsed_resource
-            for include in parsed_resource.includes.keys():
-                if Path(include_path).resolve().name in include.strip('"').strip("'"):
-                    return True
-            return False
+            try:
+                if filename.endswith(".pipe"):
+                    parsed_func = parse_pipe
+                else:
+                    parsed_func = parse_datasource
+                parsed_resource = parsed_resources.get(resource_path, parsed_func(resource_path))
+                parsed_resources[filename] = parsed_resource
+                for include in parsed_resource.includes.keys():
+                    if Path(include_path).resolve().name in include.strip('"').strip("'"):
+                        return True
+                return False
+            except IncludeFileNotFoundException as e:
+                raise click.ClickException(
+                    FeedbackManager.error_deleted_include(include_file=str(e), filename=filename)
+                )
 
         for diff in diffs:
             changes_in_includes = False
@@ -663,7 +672,9 @@ class Deployment:
                 for dep in node["dependencies"]:
                     if dep in [pipe["name"] for pipe in remote_pipes]:
                         pipes_deps.setdefault(dep, []).append(pipe["name"])
-        deleted_resources: Dict[str, str] = {Path(resource).resolve().stem: resource for resource in deleted}
+        deleted_resources: Dict[str, str] = {
+            Path(resource).resolve().stem: resource for resource in deleted if ".incl" not in resource
+        }
 
         for group in toposort(pipes_deps):
             # for each level keep materialized for the end
@@ -976,19 +987,22 @@ def parse(
         # be sure to replace the include line
         p = Path(basepath)
 
-        with open(p / f) as file:
-            try:
-                ll = list(StringIO(file.read(), newline=None))
-                node_line = [line for line in ll if "NODE" in line]
-                if node_line and doc.includes[args_with_attrs]:
-                    doc.includes[node_line[0].split("NODE")[-1].split("\n")[0].strip()] = ""
-            except Exception:
-                pass
-            finally:
-                file.seek(0)
-            lines[lineno : lineno + 1] = [""] + list(
-                StringIO(Template(file.read()).safe_substitute(attrs), newline=None)
-            )
+        try:
+            with open(p / f) as file:
+                try:
+                    ll = list(StringIO(file.read(), newline=None))
+                    node_line = [line for line in ll if "NODE" in line]
+                    if node_line and doc.includes[args_with_attrs]:
+                        doc.includes[node_line[0].split("NODE")[-1].split("\n")[0].strip()] = ""
+                except Exception:
+                    pass
+                finally:
+                    file.seek(0)
+                lines[lineno : lineno + 1] = [""] + list(
+                    StringIO(Template(file.read()).safe_substitute(attrs), newline=None)
+                )
+        except FileNotFoundError:
+            raise IncludeFileNotFoundException(f)
 
     def version(*args: str, **kwargs: Any) -> None:
         if len(args) < 1:
@@ -1152,6 +1166,8 @@ def parse(
             raise click.ClickException(FeedbackManager.error_missing_datasource_name())
         else:
             raise ValidationException(f"Validation error, found {line} in line {str(lineno)}: {str(e)}", lineno=lineno)
+    except IncludeFileNotFoundException as e:
+        raise e
     except Exception as e:
         traceback.print_tb(e.__traceback__)
         raise ParseException(f"Unexpected error: {e}", lineno=lineno)
@@ -3628,6 +3644,8 @@ async def build_graph(
             )
         except click.ClickException as e:
             raise e
+        except IncludeFileNotFoundException as e:
+            raise click.ClickException(FeedbackManager.error_deleted_include(include_file=str(e), filename=filename))
         except Exception as e:
             raise click.ClickException(str(e))
 

{tinybird-cli-3.6.1.dev5 → tinybird-cli-3.6.1.dev7}/tinybird/feedback_manager.py

@@ -206,6 +206,9 @@ class FeedbackManager:
     error_connection_create = error_message("Connection {connection_name} could not be created: {error}")
     error_connection_integration_not_available = error_message("Connection could not be created: {error}")
     error_workspace = error_message("Workspace {workspace} not found. use 'tb workspace ls' to list your workspaces")
+    error_deleted_include = error_message(
+        "Related include file {include_file} was deleted and it's used in {filename}. Delete or remove dependency from {filename}."
+    )
     error_branch = error_message(
         "Branch {branch} not found. use 'tb branch ls' to list your Branches, make sure you are authenticated using the right workspace token"
     )

{tinybird-cli-3.6.1.dev5 → tinybird-cli-3.6.1.dev7}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 3.6.1.dev5
+Version: 3.6.1.dev7
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -19,6 +19,16 @@ Changelog
 
 ---------
 
+3.6.1.dev7
+************
+
+- `Fixed` `tb deploy` supports deployment when a `.incl` file is removed
+
+3.6.1.dev6
+************
+
+- `Fixed` Some issues when using `--fmt: off` with `CASE` in the sql
+
 3.6.1.dev5
 ************