tinybird 0.0.1.dev326__tar.gz → 0.0.1.dev327__tar.gz

{tinybird-0.0.1.dev326 → tinybird-0.0.1.dev327}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev326
+Version: 0.0.1.dev327
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

{tinybird-0.0.1.dev326 → tinybird-0.0.1.dev327}/tinybird/sql_template_fmt.py

@@ -261,7 +261,13 @@ def _calc_str(self) -> str:
 Comment._calc_str = property(_calc_str)
 
 
-def format_sql_template(sql: str, line_length: Optional[int] = None, lower_keywords: bool = False) -> str:
+def format_sql_template(
+    sql: str,
+    line_length: Optional[int] = None,
+    lower_keywords: bool = False,
+    resource_name: Optional[str] = None,
+    resource_source: Optional[str] = None,
+) -> str:
     try:
         # https://github.com/tconbeer/sqlfmt/blob/c11775b92d8a45f0e91d871b81a88a894d620bec/src/sqlfmt/mode.py#L16-L29
         config: Dict[str, Any] = {
@@ -277,5 +283,7 @@ def format_sql_template(sql: str, line_length: Optional[int] = None, lower_keywo
             else api.format_string(sql, mode=mode).strip()
         )
     except Exception as e:
-        logging.warning(f"sqlfmt error: {str(e)}")
+        resource_info = f" in '{resource_name}'" if resource_name else ""
+        source_info = f" ({resource_source})" if resource_source else ""
+        logging.warning(f"sqlfmt error{resource_info}{source_info}: {str(e)}")
         return sql

{tinybird-0.0.1.dev326 → tinybird-0.0.1.dev327}/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__ = '0.0.1.dev326'
-__revision__ = '4414501'
+__version__ = '0.0.1.dev327'
+__revision__ = '011a278'

{tinybird-0.0.1.dev326 → tinybird-0.0.1.dev327}/tinybird/tb/modules/common.py

@@ -987,7 +987,10 @@ def push_data(
     cb.prev_done = 0  # type: ignore[attr-defined]
 
     if not silent:
-        click.echo(FeedbackManager.highlight(message=f"\n» Appending data to {datasource_name}..."))
+        if mode == "replace":
+            click.echo(FeedbackManager.highlight(message=f"\n» Replacing data in {datasource_name}..."))
+        else:
+            click.echo(FeedbackManager.highlight(message=f"\n» Appending data to {datasource_name}..."))
 
     if isinstance(url, list):
         urls = url

{tinybird-0.0.1.dev326 → tinybird-0.0.1.dev327}/tinybird/tb/modules/datafile/format_pipe.py

@@ -25,11 +25,25 @@ from tinybird.tb.modules.datafile.format_datasource import format_engine
 
 
 def format_node_sql(
-    file_parts: List[str], node: Dict[str, Any], line_length: Optional[int] = None, lower_keywords: bool = False
+    file_parts: List[str],
+    node: Dict[str, Any],
+    line_length: Optional[int] = None,
+    lower_keywords: bool = False,
+    resource_name: Optional[str] = None,
+    resource_source: Optional[str] = None,
 ) -> List[str]:
     file_parts.append("SQL >")
     file_parts.append(DATAFILE_NEW_LINE)
-    file_parts.append(format_sql(node["sql"], DATAFILE_INDENT, line_length=line_length, lower_keywords=lower_keywords))
+    file_parts.append(
+        format_sql(
+            node["sql"],
+            DATAFILE_INDENT,
+            line_length=line_length,
+            lower_keywords=lower_keywords,
+            resource_name=resource_name,
+            resource_source=resource_source,
+        )
+    )
     file_parts.append(DATAFILE_NEW_LINE)
     file_parts.append(DATAFILE_NEW_LINE)
     return file_parts
@@ -93,8 +107,21 @@ def format_pipe_include(file_parts: List[str], node: Dict[str, Any], includes: D
     return file_parts
 
 
-def format_sql(sql: str, DATAFILE_INDENT: str, line_length: Optional[int] = None, lower_keywords: bool = False) -> str:
-    sql = format_sql_template(sql.strip(), line_length=line_length, lower_keywords=lower_keywords)
+def format_sql(
+    sql: str,
+    DATAFILE_INDENT: str,
+    line_length: Optional[int] = None,
+    lower_keywords: bool = False,
+    resource_name: Optional[str] = None,
+    resource_source: Optional[str] = None,
+) -> str:
+    sql = format_sql_template(
+        sql.strip(),
+        line_length=line_length,
+        lower_keywords=lower_keywords,
+        resource_name=resource_name,
+        resource_source=resource_source,
+    )
     return "\n".join([f"{DATAFILE_INDENT}{part}" for part in sql.split("\n") if len(part.strip())])
 
 
@@ -105,6 +132,8 @@ def format_node(
     line_length: Optional[int] = None,
     unroll_includes: bool = False,
     lower_keywords: bool = False,
+    resource_name: Optional[str] = None,
+    resource_source: Optional[str] = None,
 ) -> None:
     if not unroll_includes:
         format_pipe_include(file_parts, node, includes)
@@ -119,7 +148,14 @@ def format_node(
 
     Doc = namedtuple("Doc", ["description"])
     format_description(file_parts, Doc(node.get("description", "")))
-    format_node_sql(file_parts, node, line_length=line_length, lower_keywords=lower_keywords)
+    format_node_sql(
+        file_parts,
+        node,
+        line_length=line_length,
+        lower_keywords=lower_keywords,
+        resource_name=resource_name,
+        resource_source=resource_source,
+    )
     format_node_type(file_parts, node)
 
 
@@ -132,6 +168,7 @@ def format_pipe(
     for_deploy_diff: bool = False,
     skip_eval: bool = False,
     content: Optional[str] = None,
+    resource_source: Optional[str] = None,
 ) -> str:
     if datafile:
         doc = datafile
@@ -178,6 +215,8 @@ def format_pipe(
             line_length=line_length,
             unroll_includes=unroll_includes,
             lower_keywords=bool(for_deploy_diff),
+            resource_name=filename,
+            resource_source=resource_source,
         )
 
     if not unroll_includes:

{tinybird-0.0.1.dev326 → tinybird-0.0.1.dev327}/tinybird/tb_cli_modules/cli.py

@@ -983,8 +983,8 @@ async def materialize(
     ctx: Context,
     filename: str,
     push_deps: bool,
-    workspace_map: List[str],
-    workspace: List[str],
+    workspace_map: Tuple[Tuple[str, str], ...],
+    workspace: Tuple[Tuple[str, str], ...],
     no_versions: bool,
     verbose: bool,
     force_populate: Optional[str],
@@ -999,7 +999,7 @@ async def materialize(
     click.echo(deprecation_notice)
     cl = create_tb_client(ctx)
 
-    async def _try_push_pipe_to_analyze(pipe_name):
+    async def _try_push_pipe_to_analyze(pipe_name: str) -> Optional[Any]:
         try:
             to_run = await folder_push(
                 cl,
@@ -1020,7 +1020,7 @@ async def materialize(
         except AlreadyExistsException as e:
             if "Datasource" in str(e):
                 click.echo(str(e))
-                return
+                return None
             if override_pipe or click.confirm(FeedbackManager.info_pipe_exists(name=pipe_name)):
                 to_run = await folder_push(
                     cl,
@@ -1038,7 +1038,7 @@ async def materialize(
                     verbose=verbose,
                 )
             else:
-                return
+                return None
         except click.ClickException as ex:
             # HACK: By now, datafile raises click.ClickException instead of
             # CLIException to avoid circular imports. Thats we need to trace
@@ -1229,7 +1229,7 @@ async def materialize(
         raise CLIException(FeedbackManager.error_exception(error=str(e)))
 
 
-def __patch_click_output():
+def __patch_click_output() -> None:
     import re
 
     CUSTOM_PATTERNS: List[str] = []

{tinybird-0.0.1.dev326 → tinybird-0.0.1.dev327}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev326
+Version: 0.0.1.dev327
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird