tinybird-cli 1.2.1.dev1__tar.gz → 1.2.1.dev2__tar.gz

{tinybird-cli-1.2.1.dev1 → tinybird-cli-1.2.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 1.2.1.dev1
+Version: 1.2.1.dev2
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,11 @@ Changelog
 
 ---------
 
+1.2.1.dev2
+************
+
+- `Changed` Internal change
+
 1.2.1.dev1
 ************
 

{tinybird-cli-1.2.1.dev1 → tinybird-cli-1.2.1.dev2}/tinybird/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://docs.tinybird.co/cli.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '1.2.1.dev1'
-__revision__ = '4f74b13'
+__version__ = '1.2.1.dev2'
+__revision__ = '06bf61e'

{tinybird-cli-1.2.1.dev1 → tinybird-cli-1.2.1.dev2}/tinybird/client.py

@@ -588,6 +588,7 @@ class TinyB(object):
         params = {}
         if pipeline:
             params = {"pipeline": pipeline}
+        params.update({"release_replacements": "true"})
 
         if len(sql) > TinyB.MAX_GET_LENGTH:
             return await self._req(f"/v0/sql?{urlencode(params)}", data=sql, method="POST")

{tinybird-cli-1.2.1.dev1 → tinybird-cli-1.2.1.dev2}/tinybird/datafile.py

@@ -23,7 +23,7 @@ from operator import itemgetter
 import shlex
 import sys
 import re
-from typing import Any, Callable, Dict, Generator, Iterable, List, Optional, Tuple, Union, cast, Set
+from typing import Any, Callable, Dict, Generator, Iterable, List, Optional, Tuple, Union, cast
 from enum import Enum
 from mypy_extensions import VarArg, KwArg
 import difflib
@@ -2297,6 +2297,7 @@ async def new_pipe(
     tests_check_requests_from_branch: bool = False,
     config: Any = None,
     fork_downstream: Optional[bool] = False,
+    fork: Optional[bool] = False,
 ):  # noqa: C901
     # TODO use tb_client instead of calling the urls directly.
     host = tb_client.host
@@ -2382,7 +2383,7 @@ async def new_pipe(
     if populate_subset:
         params["populate_subset"] = populate_subset
     params["unlink_on_populate_error"] = "true" if unlink_on_populate_error else "false"
-    params["branch_mode"] = "fork" if fork_downstream else "None"
+    params["branch_mode"] = "fork" if fork_downstream or fork else "None"
 
     body = {"name": p["name"], "description": p.get("description", "")}
 
@@ -2610,6 +2611,7 @@ async def new_ds(
     skip_confirmation: bool = False,
     current_ws=None,
     fork_downstream: Optional[bool] = False,
+    fork: Optional[bool] = False,
     git_release: Optional[bool] = False,
 ):
     ds_name = ds["params"]["name"]
@@ -2641,9 +2643,9 @@ async def new_ds(
     except DoesNotExistException:
         datasource_exists = False
 
-    if not datasource_exists or fork_downstream:
+    if not datasource_exists or fork_downstream or fork:
         params = ds["params"]
-        params["branch_mode"] = "fork" if fork_downstream else "None"
+        params["branch_mode"] = "fork" if fork_downstream or fork else "None"
 
         try:
             if (
@@ -2719,7 +2721,7 @@ async def new_ds(
             ds["params"]["schema"].replace(" ", "") != existing_ds["schema"]["sql_schema"].replace(" ", "")
         ):
             new_schema = ds["params"]["schema"]
-        if new_description or new_schema or new_ttl and not fork_downstream:
+        if new_description or new_schema or new_ttl and (not fork_downstream or not fork):
             alter_response = await client.alter_datasource(
                 ds_name, new_schema=new_schema, description=new_description, ttl=new_ttl, dry_run=True
             )
@@ -2899,6 +2901,7 @@ async def exec_file(
     tests_check_requests_from_branch: bool = False,
     current_ws: Optional[Dict[str, Any]] = None,
     fork_downstream: Optional[bool] = False,
+    fork: Optional[bool] = False,
     git_release: Optional[bool] = False,
 ):
     if debug:
@@ -2929,6 +2932,7 @@ async def exec_file(
             override_datasource=override_datasource,
             tests_check_requests_from_branch=tests_check_requests_from_branch,
             fork_downstream=fork_downstream,
+            fork=fork,
         )
     elif r["resource"] == "datasources":
         await new_ds(
@@ -2939,6 +2943,7 @@ async def exec_file(
             skip_confirmation=skip_confirmation,
             current_ws=current_ws,
             fork_downstream=fork_downstream,
+            fork=fork,
             git_release=git_release,
         )
     elif r["resource"] == "tokens":
@@ -3280,38 +3285,48 @@ async def build_graph(
 
         return downstream_dependency_graph
 
-    def update_dep_map_recursively(dep_map, downstream_dep_map, all_resources, to_run, key, external_visitor):
+    def update_dep_map_recursively(
+        dep_map, downstream_dep_map, all_resources, to_run, dep_map_keys, key=None, visited=None
+    ):
         """
         Given a downstream_dep_map obtained from create_downstream_dependency_graph this function updates each node recursively to complete the downstream dependency graph for each node
         """
+        if not visited:
+            visited = list()
+        if not key and len(dep_map_keys) == 0:
+            return
+        if not key:
+            key = dep_map_keys.pop()
         if key not in dep_map:
             dep_map[key] = set()
-        elif key in external_visitor:
-            return
         else:
-            external_visitor.add(key)
+            visited.append(key)
+            return
 
         for dep in downstream_dep_map.get(key, {}):
             if dep not in downstream_dep_map:
                 continue
             to_run[dep] = all_resources.get(dep)
-            update_dep_map_recursively(dep_map, downstream_dep_map, all_resources, to_run, dep, external_visitor)
+            update_dep_map_recursively(
+                dep_map, downstream_dep_map, all_resources, to_run, dep_map_keys, key=dep, visited=visited
+            )
             dep_map[key].update(downstream_dep_map[dep])
             dep_map[key].update({dep})
             try:
                 dep_map[key].remove(key)
             except KeyError:
-                return
+                pass
 
         to_run[key] = all_resources.get(key)
+        update_dep_map_recursively(
+            dep_map, downstream_dep_map, all_resources, to_run, dep_map_keys, key=None, visited=visited
+        )
 
     new_dep_map = dep_map
     if all_dep_map and fork_downstream:
         downstream_dep_map = create_downstream_dependency_graph(all_dep_map, all_resources)
         new_dep_map = {}
-        external_visitor: Set[str] = set()
-        for key in list(dep_map.keys()):
-            update_dep_map_recursively(new_dep_map, downstream_dep_map, all_resources, to_run, key, external_visitor)
+        update_dep_map_recursively(new_dep_map, downstream_dep_map, all_resources, to_run, list(set(dep_map.keys())))
 
     return to_run, new_dep_map
 
@@ -3396,6 +3411,7 @@ async def folder_push(
     config: Optional[Dict[str, Any]] = None,
     user_token: Optional[str] = None,
     fork_downstream: Optional[bool] = False,
+    fork: Optional[bool] = False,
     is_internal: Optional[bool] = False,
 ):  # noqa: C901
     workspaces: List[Dict[str, Any]] = (await tb_client.user_workspaces_and_branches()).get("workspaces", [])
@@ -3535,6 +3551,7 @@ async def folder_push(
         latest_datasource_versions: Dict[str, Any],
         dry_run: bool,
         fork_downstream: Optional[bool] = False,
+        fork: Optional[bool] = False,
     ):
         if name in to_run:
             if not dry_run:
@@ -3583,6 +3600,7 @@ async def folder_push(
                             tests_check_requests_from_branch,
                             current_ws,
                             fork_downstream,
+                            fork,
                             git_release,
                         )
                         if not run_tests:
@@ -3632,6 +3650,7 @@ async def folder_push(
     async def push_files(dry_run: bool = False):
         endpoints_dep_map = dict()
         pipes_dep_map = dict()
+        mat_dep_map = dict()
         processed = set()
 
         groups = [group for group in toposort(dep_map)]
@@ -3643,24 +3662,44 @@ async def folder_push(
                     continue
                 # FIXME: name in dep_map?? that's wrong it should be there
                 if fork_downstream and not is_datasource(to_run.get(name)) and name in dep_map:
-                    pipes_dep_map[name] = dep_map[name]
-                    continue
-                await push(name, to_run, resource_versions, latest_datasource_versions, dry_run, fork_downstream)
+                    if is_materialized(to_run.get(name)):
+                        mat_dep_map[name] = dep_map[name]
+                        continue
+                    else:
+                        pipes_dep_map[name] = dep_map[name]
+                        continue
+                await push(name, to_run, resource_versions, latest_datasource_versions, dry_run, fork_downstream, fork)
                 processed.add(name)
 
+        # push endpoints with no dependencies or dependencies with other endpoints
+        groups = [group for group in toposort(endpoints_dep_map)]
+        for group in groups:
+            for name in group:
+                if name not in processed and not is_materialized(to_run[name]):
+                    await push(
+                        name, to_run, resource_versions, latest_datasource_versions, dry_run, fork_downstream, fork
+                    )
+                    processed.add(name)
+
+        # materialized pipes at the end
         if fork_downstream:
-            for group in toposort(pipes_dep_map):
+            groups = [group for group in toposort(pipes_dep_map)]
+            for group in groups:
                 for name in group:
-                    if name not in processed:
+                    if name not in processed and not is_materialized(to_run[name]):
                         await push(
                             name, to_run, resource_versions, latest_datasource_versions, dry_run, fork_downstream
                         )
+                        processed.add(name)
 
-        # push endpoints with no dependencies or dependencies with other endpoints
-        for group in toposort(endpoints_dep_map):
-            for name in group:
-                if name not in processed:
-                    await push(name, to_run, resource_versions, latest_datasource_versions, dry_run, fork_downstream)
+            groups = [group for group in toposort(mat_dep_map)]
+            for group in groups:
+                for name in group:
+                    if name not in processed:
+                        await push(
+                            name, to_run, resource_versions, latest_datasource_versions, dry_run, fork_downstream
+                        )
+                        processed.add(name)
 
     if deployment.is_git_release:
         deployment.deploying_dry_run()
@@ -4365,6 +4404,15 @@ def is_endpoint(resource: Dict[str, Any]) -> bool:
     return False
 
 
+def is_materialized(resource: Dict[str, Any]) -> bool:
+    if not resource:
+        return False
+    is_materialized = any(
+        [node.get("params", {}).get("type", None) == "materialized" for node in resource.get("nodes", []) or []]
+    )
+    return is_materialized
+
+
 def is_endpoint_with_no_dependencies(resource: Dict[str, Any], dep_map: Dict[str, Any], to_run: Dict[str, Any]) -> bool:
     if not resource or resource.get("resource") == "datasources":
         return False
@@ -4388,7 +4436,7 @@ def is_endpoint_with_no_dependencies(resource: Dict[str, Any], dep_map: Dict[str
     deps = dep_map.get(resource["resource_name"], None)
     for dep in deps:
         r = to_run.get(dep, None)
-        if is_endpoint(r):
+        if is_endpoint(r) or is_materialized(r):
             return False
 
     return True

{tinybird-cli-1.2.1.dev1 → tinybird-cli-1.2.1.dev2}/tinybird/sql_template.py

@@ -423,7 +423,14 @@ def day_diff(d0, d1, default=None):
         )
 
 
-def date_diff_in_days(d0, d1, date_format: str = "%Y-%m-%d", default=None):
+def date_diff_in_days(
+    d0: Union[Placeholder, str],
+    d1: Union[Placeholder, str],
+    date_format: str = "%Y-%m-%d",
+    default=None,
+    backup_date_format=None,
+    none_if_error=False,
+):
     """
     >>> date_diff_in_days('2019-01-01', '2019-01-01')
     0
@@ -441,13 +448,27 @@ def date_diff_in_days(d0, d1, date_format: str = "%Y-%m-%d", default=None):
     0
     >>> date_diff_in_days(Placeholder(), '')
     0
+    >>> date_diff_in_days('2019-01-01', '2019/01/01', backup_date_format='%Y/%m/%d')
+    0
+    >>> date_diff_in_days('2019-01-01', '2019/01/04', backup_date_format='%Y/%m/%d')
+    3
+    >>> date_diff_in_days('2019/01/04', '2019-01-01', backup_date_format='%Y/%m/%d')
+    3
+    >>> date_diff_in_days('2019-02-01T20:00:00z', '2019-02-15', '%Y-%m-%dT%H:%M:%Sz', backup_date_format='%Y-%m-%d')
+    13
+    >>> date_diff_in_days('2019-02-01 20:00:00', '2019-02-15', '%Y-%m-%dT%H:%M:%Sz', backup_date_format='%Y-%m-%d', none_if_error=True) is None
+    True
+    >>> date_diff_in_days('2019-01-01', '2019-00-02', none_if_error=True) is None
+    True
+    >>> date_diff_in_days('2019-01-01 00:00:00', '2019-01-02 00:00:00', none_if_error=True) is None
+    True
     """
     if isinstance(d0, Placeholder) or isinstance(d1, Placeholder):
         if default:
             return default
         return 0
     try:
-        return __date_diff(d0, d1, date_format, "days")
+        return __date_diff(d0, d1, date_format, backup_date_format, "days", none_if_error)
     except Exception:
         raise SQLTemplateException(
             "invalid date format in function `date_diff_in_days`, it must be ISO format date YYYY-MM-DD, e.g. 2018-09-26",
@@ -456,7 +477,12 @@ def date_diff_in_days(d0, d1, date_format: str = "%Y-%m-%d", default=None):
 
 
 def date_diff_in_hours(
-    d0: Union[Placeholder, str], d1: Union[Placeholder, str], date_format: str = "%Y-%m-%d %H:%M:%S", default=None
+    d0: Union[Placeholder, str],
+    d1: Union[Placeholder, str],
+    date_format: str = "%Y-%m-%d %H:%M:%S",
+    default=None,
+    backup_date_format=None,
+    none_if_error=False,
 ):
     """
     >>> date_diff_in_hours('2022-12-19T18:42:23.521Z', '2022-12-19T18:42:23.521Z', date_format='%Y-%m-%dT%H:%M:%S.%fz')
@@ -471,13 +497,33 @@ def date_diff_in_hours(
     0
     >>> date_diff_in_hours(Placeholder(), '')
     0
+    >>> date_diff_in_hours('2022-12-19T03:22:12.102Z', '2022-12-19', date_format='%Y-%m-%dT%H:%M:%S.%fz', backup_date_format='%Y-%m-%d')
+    3
+    >>> date_diff_in_hours('2022-12-19', '2022-12-19', '%Y-%m-%dT%H:%M:%Sz', backup_date_format='%Y-%m-%d')
+    0
+    >>> date_diff_in_hours('2022-12-19', '2022-12-18', '%Y-%m-%dT%H:%M:%Sz', backup_date_format='%Y-%m-%d')
+    24
+    >>> date_diff_in_hours('2022-12-19', '2022-12-19 02:01:00', backup_date_format='%Y-%m-%d')
+    2
+    >>> date_diff_in_hours('2022-25-19T00:00:03.521Z', '2022-12-19', date_format='%Y-%m-%dT%H:%M:%S.%fz', backup_date_format='%Y-%m-%d', none_if_error=True) is None
+    True
+    >>> date_diff_in_hours('2022-25-19 00:00:03', '2022-12-19', date_format='%Y-%m-%dT%H:%M:%S.%fz', backup_date_format='%Y-%m-%d', none_if_error=True) is None
+    True
+    >>> date_diff_in_hours('2022-12-19', '2022-25-19', '%Y-%m-%dT%H:%M:%Sz', backup_date_format='%Y-%m-%d', none_if_error=True) is None
+    True
+    >>> date_diff_in_hours('2022-12-19', '2022-25-19 00:01:00', backup_date_format='%Y-%m-%d', none_if_error=True) is None
+    True
+    >>> date_diff_in_hours('2022-12-32 18:42:22', '2022-12-19 18:42:22', none_if_error=True) is None
+    True
+    >>> date_diff_in_hours('2022-12-18T18:42:22Z', '2022-12-19T18:42:22Z', none_if_error=True) is None
+    True
     """
     if isinstance(d0, Placeholder) or isinstance(d1, Placeholder):
         if default:
             return default
         return 0
     try:
-        return __date_diff(d0, d1, date_format, "hours")
+        return __date_diff(d0, d1, date_format, backup_date_format, "hours", none_if_error)
     except Exception:
         raise SQLTemplateException(
             "invalid date_format in function `date_diff_in_hours`, defaults to YYYY-MM-DD hh:mm:ss. Or %Y-%m-%d %H:%M:%S [.ssssss]Z, e.g. ms: 2022-12-19T18:42:22.591Z s:2022-12-19T18:42:22Z",
@@ -486,7 +532,12 @@ def date_diff_in_hours(
 
 
 def date_diff_in_minutes(
-    d0: Union[Placeholder, str], d1: Union[Placeholder, str], date_format: str = "%Y-%m-%d %H:%M:%S", default=None
+    d0: Union[Placeholder, str],
+    d1: Union[Placeholder, str],
+    date_format: str = "%Y-%m-%d %H:%M:%S",
+    default=None,
+    backup_date_format=None,
+    none_if_error=False,
 ):
     """
     >>> date_diff_in_minutes('2022-12-19T18:42:23.521Z', '2022-12-19T18:42:23.521Z', date_format='%Y-%m-%dT%H:%M:%S.%fz')
@@ -501,13 +552,33 @@ def date_diff_in_minutes(
     0
     >>> date_diff_in_minutes(Placeholder(), '')
     0
+    >>> date_diff_in_minutes('2022-12-19T03:22:12.102Z', '2022-12-19', date_format='%Y-%m-%dT%H:%M:%S.%fz', backup_date_format='%Y-%m-%d')
+    202
+    >>> date_diff_in_minutes('2022-12-19', '2022-12-19', '%Y-%m-%dT%H:%M:%Sz', backup_date_format='%Y-%m-%d')
+    0
+    >>> date_diff_in_minutes('2022-12-19', '2022-12-18', '%Y-%m-%dT%H:%M:%Sz', backup_date_format='%Y-%m-%d')
+    1440
+    >>> date_diff_in_minutes('2022-12-19', '2022-12-19 00:01:00', backup_date_format='%Y-%m-%d')
+    1
+    >>> date_diff_in_minutes('2022-25-19T00:00:03.521Z', '2022-12-19', date_format='%Y-%m-%dT%H:%M:%S.%fz', backup_date_format='%Y-%m-%d', none_if_error=True) is None
+    True
+    >>> date_diff_in_minutes('2022-12-19', '2022-25-19', '%Y-%m-%dT%H:%M:%Sz', backup_date_format='%Y-%m-%d', none_if_error=True) is None
+    True
+    >>> date_diff_in_minutes('2022-12-19', '2022-25-19 00:01:00', backup_date_format='%Y-%m-%d', none_if_error=True) is None
+    True
+    >>> date_diff_in_minutes('2022-25-19T00:00:03.521Z', '2022-12-19 00:23:12', date_format='%Y-%m-%dT%H:%M:%S.%fz', backup_date_format='%Y-%m-%d', none_if_error=True) is None
+    True
+    >>> date_diff_in_minutes('2022-12-14 18:42:22', '2022/12/19 18:42:22', none_if_error=True) is None
+    True
+    >>> date_diff_in_minutes('2022-12-14 18:42:22', '2022/12/19 18:42:22', date_format='%Y/%m/%dT%H:%M:%S.%fz', none_if_error=True) is None
+    True
     """
     if isinstance(d0, Placeholder) or isinstance(d1, Placeholder):
         if default:
             return default
         return 0
     try:
-        return __date_diff(d0, d1, date_format, "minutes")
+        return __date_diff(d0, d1, date_format, backup_date_format, "minutes", none_if_error)
     except Exception:
         raise SQLTemplateException(
             "invalid date_format in function `date_diff_in_seconds`, defaults to YYYY-MM-DD hh:mm:ss. Or %Y-%m-%d %H:%M:%S [.ssssss]Z, e.g. ms: 2022-12-19T18:42:22.591Z s:2022-12-19T18:42:22Z",
@@ -516,7 +587,12 @@ def date_diff_in_minutes(
 
 
 def date_diff_in_seconds(
-    d0: Union[Placeholder, str], d1: Union[Placeholder, str], date_format: str = "%Y-%m-%d %H:%M:%S", default=None
+    d0: Union[Placeholder, str],
+    d1: Union[Placeholder, str],
+    date_format: str = "%Y-%m-%d %H:%M:%S",
+    default=None,
+    backup_date_format=None,
+    none_if_error=False,
 ):
     """
     >>> date_diff_in_seconds('2022-12-19T18:42:23.521Z', '2022-12-19T18:42:23.521Z', date_format='%Y-%m-%dT%H:%M:%S.%fz')
@@ -537,13 +613,33 @@ def date_diff_in_seconds(
     0
     >>> date_diff_in_seconds(Placeholder(), '')
     0
+    >>> date_diff_in_seconds('2022-12-19T00:00:03.521Z', '2022-12-19', date_format='%Y-%m-%dT%H:%M:%S.%fz', backup_date_format='%Y-%m-%d')
+    3
+    >>> date_diff_in_seconds('2022-12-19', '2022-12-19', '%Y-%m-%dT%H:%M:%Sz', backup_date_format='%Y-%m-%d')
+    0
+    >>> date_diff_in_seconds('2022-12-19', '2022-12-19 00:01:00', backup_date_format='%Y-%m-%d')
+    60
+    >>> date_diff_in_seconds('2022-25-19T00:00:03.521Z', '2022-12-19', date_format='%Y-%m-%dT%H:%M:%S.%fz', backup_date_format='%Y-%m-%d', none_if_error=True) is None
+    True
+    >>> date_diff_in_seconds('2022-12-19', '2022-25-19', '%Y-%m-%dT%H:%M:%Sz', backup_date_format='%Y-%m-%d', none_if_error=True) is None
+    True
+    >>> date_diff_in_seconds('2022-12-19', '2022-25-19 00:01:00', backup_date_format='%Y-%m-%d', none_if_error=True) is None
+    True
+    >>> date_diff_in_seconds('2022-10-19T00:00:03.521Z', '2022/12/19', date_format='%Y-%m-%dT%H:%M:%S.%fz', backup_date_format='%Y-%m-%d', none_if_error=True) is None
+    True
+    >>> date_diff_in_seconds('2022-10-19 00:00:03', '2022-10-19 00:05:03', date_format='%Y-%m-%dT%H:%M:%S.%fz', none_if_error=True) is None
+    True
+    >>> date_diff_in_seconds('2022/12/19 00:00:03', '2022-10-19 00:05:03', none_if_error=True) is None
+    True
+    >>> date_diff_in_seconds('2022-25-19 00:00:03', '2022-10-19 00:05:03', none_if_error=True) is None
+    True
     """
     if isinstance(d0, Placeholder) or isinstance(d1, Placeholder):
         if default:
             return default
         return 0
     try:
-        return __date_diff(d0, d1, date_format, "seconds")
+        return __date_diff(d0, d1, date_format, backup_date_format, "seconds", none_if_error)
     except Exception:
         raise SQLTemplateException(
             "invalid date_format in function `date_diff_in_seconds`, defaults to YYYY-MM-DD hh:mm:ss. Or %Y-%m-%d %H:%M:%S [.ssssss]Z, e.g. ms: 2022-12-19T18:42:22.591Z s:2022-12-19T18:42:22Z",
@@ -551,32 +647,52 @@ def date_diff_in_seconds(
         )
 
 
-def __date_diff(d0, d1, date_format: str = "%Y-%m-%d %H:%M:%S", unit: str = "seconds", default=None):
-    if isinstance(d0, Placeholder) or isinstance(d1, Placeholder):
-        if default:
-            return default
-        return 0
+def __date_diff(
+    d0: Union[Placeholder, str],
+    d1: Union[Placeholder, str],
+    date_format: str = "%Y-%m-%d %H:%M:%S",
+    backup_date_format=None,
+    unit: str = "seconds",
+    none_if_error=False,
+):
     try:
+        formatted_d0 = _parse_datetime(d0, date_format, backup_date_format)
+        formatted_d1 = _parse_datetime(d1, date_format, backup_date_format)
+        diff = abs(formatted_d1 - formatted_d0).total_seconds()
+
         if unit == "days":
-            return int(
-                abs((datetime.strptime(d1, date_format) - datetime.strptime(d0, date_format)).total_seconds()) / 86400
-            )
+            return int(diff / 86400)
         elif unit == "hours":
-            return int(
-                abs((datetime.strptime(d1, date_format) - datetime.strptime(d0, date_format)).total_seconds()) / 3600
-            )
+            return int(diff / 3600)
         elif unit == "minutes":
-            return int(
-                abs((datetime.strptime(d1, date_format) - datetime.strptime(d0, date_format)).total_seconds()) / 60
-            )
+            return int(diff / 60)
         else:
-            return int(abs((datetime.strptime(d1, date_format) - datetime.strptime(d0, date_format)).total_seconds()))
+            return int(diff)
     except Exception:
+        if none_if_error:
+            return None
+
         raise SQLTemplateException(
             "invalid date_format in function date_diff_* function", documentation="/cli/advanced-templates.html"
         )
 
 
+def _parse_datetime(date_string, date_format, backup_date_format=None):
+    formats = [date_format]
+    if backup_date_format:
+        formats.append(backup_date_format)
+
+    for fmt in formats:
+        try:
+            return datetime.strptime(date_string, fmt)
+        except ValueError:
+            continue
+
+    raise SQLTemplateException(
+        "invalid date_format in function date_diff_* function", documentation="/cli/advanced-templates.html"
+    )
+
+
 function_list = {
     "columns": columns,
     "table": table,

{tinybird-cli-1.2.1.dev1 → tinybird-cli-1.2.1.dev2}/tinybird/tb_cli_modules/cli.py

@@ -1542,6 +1542,13 @@ async def prompt(_ctx: Context) -> None:
     help="Creates new versions of the dependent downstream resources to the changed resources.",
     hidden=True,
 )
+@click.option(
+    "--fork",
+    is_flag=True,
+    default=False,
+    help="Creates new versions of the changed resources. Use --fork-downstream to fork also the downstream dependencies of the changed resources.",
+    hidden=True,
+)
 @click.option(
     "--is-internal",
     is_flag=True,
@@ -1577,6 +1584,7 @@ async def deploy(
     folder: str,
     user_token: Optional[str],
     fork_downstream: bool,
+    fork: bool,
     is_internal: bool,
     only_changes: bool,
 ) -> None:
@@ -1584,32 +1592,43 @@ async def deploy(
 
     ignore_sql_errors = FeatureFlags.ignore_sql_errors()
     context.disable_template_security_validation.set(True)
-    await folder_push(
-        tb_client=create_tb_client(ctx),
-        dry_run=dry_run,
-        check=False,
-        push_deps=True,
-        debug=debug,
-        force=True,
-        git_release=True,
-        only_changes=only_changes,
-        override_datasource=override_datasource,
-        populate=populate,
-        populate_subset=subset,
-        populate_condition=sql_condition,
-        unlink_on_populate_error=unlink_on_populate_error,
-        upload_fixtures=fixtures,
-        wait=wait,
-        ignore_sql_errors=ignore_sql_errors,
-        skip_confirmation=yes,
-        workspace_map=dict(workspace_map),
-        workspace_lib_paths=workspace,
-        timeout=timeout,
-        run_tests=False,
-        folder=folder,
-        config=ctx.ensure_object(dict)["config"],
-        user_token=user_token,
-        fork_downstream=fork_downstream,
-        is_internal=is_internal,
-    )
-    return
+    try:
+        await folder_push(
+            tb_client=create_tb_client(ctx),
+            dry_run=dry_run,
+            check=False,
+            push_deps=True,
+            debug=debug,
+            force=True,
+            git_release=True,
+            only_changes=only_changes,
+            override_datasource=override_datasource,
+            populate=populate,
+            populate_subset=subset,
+            populate_condition=sql_condition,
+            unlink_on_populate_error=unlink_on_populate_error,
+            upload_fixtures=fixtures,
+            wait=wait,
+            ignore_sql_errors=ignore_sql_errors,
+            skip_confirmation=yes,
+            workspace_map=dict(workspace_map),
+            workspace_lib_paths=workspace,
+            timeout=timeout,
+            run_tests=False,
+            folder=folder,
+            config=ctx.ensure_object(dict)["config"],
+            user_token=user_token,
+            fork_downstream=fork_downstream,
+            fork=fork,
+            is_internal=is_internal,
+        )
+    except click.ClickException as e:
+        # custom exceptions coming from the API for the git workflow
+        # FIXME: change this in the API
+        if "--override-datasource" in str(e):
+            new_exception = type(e)(
+                f"{str(e).replace('. If you want to try to force override the Materialized View, please use the `--override-datasource` flag', '')} If you are creating a new Release update the related .datasource files and use --fork-downstream"
+            )
+            raise new_exception
+        else:
+            raise e

{tinybird-cli-1.2.1.dev1 → tinybird-cli-1.2.1.dev2}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 1.2.1.dev1
+Version: 1.2.1.dev2
 Summary: Tinybird Command Line Tool
 Home-page: https://docs.tinybird.co/cli.html
 Author: Tinybird
@@ -19,6 +19,11 @@ Changelog
 
 ---------
 
+1.2.1.dev2
+************
+
+- `Changed` Internal change
+
 1.2.1.dev1
 ************