tinybird 0.0.1.dev121__tar.gz → 0.0.1.dev123__tar.gz

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev121
+Version: 0.0.1.dev123
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/tinybird/datafile.py

@@ -1174,6 +1174,8 @@ def parse(
             else:
                 doc.filtering_tags += filtering_tags
 
+    # WARNING! This code is duplicate for Tinybird Forward in tinybird/tb/modules/datafile/common.py
+    # If you make any changes here, it's very likely that you need to also change the other module. If in doubt, ask
     cmds = {
         "from": assign("from"),
         "source": sources,

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/tinybird/tb/__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__ = '0.0.1.dev121'
-__revision__ = '3609440'
+__version__ = '0.0.1.dev123'
+__revision__ = '01f52fe'

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/tinybird/tb/modules/build.py

@@ -103,6 +103,8 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
 
         logging.debug(json.dumps(result, indent=2))
 
+        output_pre_formatted = False
+
         build_result = result.get("result")
         if build_result == "success":
             build = result.get("build")
@@ -150,19 +152,21 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
             except Exception as e:
                 click.echo(FeedbackManager.error_exception(error=f"Error appending fixtures for '{ds_name}': {e}"))
 
-            feedback = result.get("feedback", [])
+            feedback = build.get("feedback", [])
             for f in feedback:
                 click.echo(
                     FeedbackManager.warning(message=f"△ {f.get('level')}: {f.get('resource')}: {f.get('message')}")
                 )
         elif build_result == "failed":
             build_errors = result.get("errors")
-            error_msg = None
+            full_error_msg = ""
             for build_error in build_errors:
-                filename_bit = f"{build_error.get('filename', '')}"
+                output_pre_formatted = True
+                filename_bit = FeedbackManager.build_result_error_title(message=f"{build_error.get('filename', '')}")
                 error_bit = build_error.get("error") or build_error.get("message") or ""
-                error_msg = ((filename_bit + "\n\n") if filename_bit else "") + error_bit
-            error = error_msg or "Unknown build error"
+                error_msg = ((filename_bit + "\n") if filename_bit else "") + error_bit
+                full_error_msg += error_msg + "\n\n"
+            error = full_error_msg.strip("\n") or "Unknown build error"
         else:
             error = f"Unknown build result. Error: {result.get('error')}"
     except Exception as e:
@@ -171,7 +175,10 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
         for fd in fds:
             fd.close()
         if error:
-            raise click.ClickException(error)
+            if not output_pre_formatted:
+                raise click.ClickException(error)
+            click.echo(error)
+            raise click.ClickException("")  # Needed so the caller shows the right message
 
 
 def append_fixture(
@@ -267,7 +274,7 @@ def process(
 
     rebuild_str = "Rebuild" if watch and file_changed else "Build"
     if build_failed:
-        click.echo(FeedbackManager.error(message=f"\n✗ {rebuild_str} failed"))
+        click.echo(FeedbackManager.error(message=f"✗ {rebuild_str} failed"))
         if not watch:
             sys.exit(1)
     else:

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/tinybird/tb/modules/datafile/build.py

@@ -934,7 +934,7 @@ async def process_file(
         return params
 
     if DataFileExtensions.DATASOURCE in filename:
-        doc = parse_datasource(filename)
+        doc = parse_datasource(filename).datafile
         node = doc.nodes[0]
         deps: List[str] = []
         # reemplace tables on materialized columns
@@ -1094,7 +1094,7 @@ async def process_file(
         return resources
 
     elif DataFileExtensions.PIPE in filename:
-        doc = parse_pipe(filename)
+        doc = parse_pipe(filename).datafile
         version = f"__v{doc.version}" if doc.version is not None else ""
         name = os.path.basename(filename).split(".")[0]
         description = doc.description if doc.description is not None else ""

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/tinybird/tb/modules/datafile/common.py

@@ -17,7 +17,7 @@ from enum import Enum
 from io import StringIO
 from pathlib import Path
 from string import Template
-from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple, cast
+from typing import Any, Callable, Dict, Iterable, List, Literal, NamedTuple, Optional, Tuple, cast
 
 import click
 from croniter import croniter
@@ -1163,6 +1163,19 @@ def parse_table_structure(schema: str) -> List[Dict[str, Any]]:
     return _parse_table_structure(schema)
 
 
+@dataclass
+class DatafileParseWarning:
+    message: str
+
+    def __str__(self) -> str:
+        return self.message
+
+
+class ParseResult(NamedTuple):
+    datafile: Datafile
+    warnings: list[DatafileParseWarning]
+
+
 def parse(
     s: str,
     default_node: Optional[str] = None,
@@ -1170,10 +1183,10 @@ def parse(
     replace_includes: bool = True,
     skip_eval: bool = False,
     kind: Optional[DatafileKind] = None,
-) -> Datafile:
+) -> ParseResult:
     """
     Parses `s` string into a document
-    >>> d = parse("NODE \\"test_01\\"\\n    DESCRIPTION this is a node that does whatever\\nSQL >\\n\\n        SELECT * from test_00\\n\\n\\nNODE \\"test_02\\"\\n    DESCRIPTION this is a node that does whatever\\nSQL >\\n\\n    SELECT * from test_01\\n    WHERE a > 1\\n    GROUP by a\\n")
+    >>> d, w = parse("NODE \\"test_01\\"\\n    DESCRIPTION this is a node that does whatever\\nSQL >\\n\\n        SELECT * from test_00\\n\\n\\nNODE \\"test_02\\"\\n    DESCRIPTION this is a node that does whatever\\nSQL >\\n\\n    SELECT * from test_01\\n    WHERE a > 1\\n    GROUP by a\\n")
     >>> len(d.nodes)
     2
     >>> d.nodes[0]
@@ -1184,6 +1197,8 @@ def parse(
     lines = list(StringIO(s, newline=None))
 
     doc = Datafile()
+    warnings: List[DatafileParseWarning] = []
+
     if kind is not None:
         doc.set_kind(kind)
     doc.raw = list(StringIO(s, newline=None))
@@ -1212,16 +1227,30 @@ def parse(
 
         return error_if_multiline
 
-    def deprecated(func: Callable[..., Any]) -> Callable[..., Any]:
-        @functools.wraps(func)
-        def raise_deprecation_error(*args: Any, **kwargs: Any) -> Any:
-            raise DatafileSyntaxError(
-                f"{kwargs['cmd'].upper()} has been deprecated",
-                lineno=kwargs["lineno"],
-                pos=1,
-            )
+    def deprecated(severity: Literal["error", "warning"]) -> Callable[..., Any]:
+        def inner(func: Callable[..., Any]) -> Callable[..., Any]:
+            @functools.wraps(func)
+            def raise_deprecation_error(*args: Any, **kwargs: Any) -> Any:
+                raise DatafileSyntaxError(
+                    f"{kwargs['cmd'].upper()} has been deprecated",
+                    lineno=kwargs["lineno"],
+                    pos=1,
+                )
 
-        return raise_deprecation_error
+            @functools.wraps(func)
+            def add_deprecation_warning(*args: Any, **kwargs: Any) -> Any:
+                warnings.append(
+                    DatafileParseWarning(
+                        message=f"{kwargs['cmd'].upper()} has been deprecated and will be ignored.",
+                    )
+                )
+
+            if severity == "error":
+                return raise_deprecation_error
+            elif severity == "warning":
+                return add_deprecation_warning
+
+        return inner
 
     def not_supported_yet(extra_message: str = "") -> Callable[..., Any]:
         def inner(func: Callable[..., Any]) -> Callable[..., Any]:
@@ -1288,7 +1317,7 @@ def parse(
             pos=1,
         )
 
-    @deprecated
+    @deprecated(severity="error")
     def sources(x: str, **kwargs: Any) -> None:
         pass  # Deprecated
 
@@ -1423,7 +1452,7 @@ def parse(
         except FileNotFoundError:
             raise IncludeFileNotFoundException(f, lineno)
 
-    @deprecated
+    @deprecated(severity="warning")
     def version(*args: str, **kwargs: Any) -> None:
         pass  # whatever, it's deprecated
 
@@ -1506,6 +1535,8 @@ def parse(
         "kafka_store_raw_value": assign_var("kafka_store_raw_value"),
         "kafka_store_headers": assign_var("kafka_store_headers"),
         "kafka_store_binary_headers": assign_var("kafka_store_binary_headers"),
+        "kafka_key_format": assign_var("kafka_key_format"),
+        "kafka_value_format": assign_var("kafka_key_format"),
         "kafka_key_avro_deserialization": kafka_key_avro_deserialization,
         "kafka_ssl_ca_pem": assign_var("kafka_ssl_ca_pem"),
         "kafka_security_protocol": assign_var("kafka_security_protocol"),
@@ -1634,7 +1665,7 @@ def parse(
         traceback.print_tb(e.__traceback__)
         raise ParseException(f"Unexpected error: {e}", lineno=lineno)
 
-    return doc
+    return ParseResult(datafile=doc, warnings=warnings)
 
 
 class ImportReplacements:

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/tinybird/tb/modules/datafile/format_datasource.py

@@ -29,7 +29,9 @@ async def format_datasource(
     if datafile:
         doc = datafile
     else:
-        doc = parse_datasource(filename, replace_includes=replace_includes, skip_eval=skip_eval, content=content)
+        doc = parse_datasource(
+            filename, replace_includes=replace_includes, skip_eval=skip_eval, content=content
+        ).datafile
 
     file_parts: List[str] = []
     if for_diff:

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/tinybird/tb/modules/datafile/format_pipe.py

@@ -136,7 +136,7 @@ async def format_pipe(
     if datafile:
         doc = datafile
     else:
-        doc = parse_pipe(filename, replace_includes=replace_includes, skip_eval=skip_eval, content=content)
+        doc = parse_pipe(filename, replace_includes=replace_includes, skip_eval=skip_eval, content=content).datafile
 
     file_parts: List[str] = []
     format_maintainer(file_parts, doc)
@@ -162,7 +162,7 @@ async def format_pipe(
                 if "." in include_file
                 else eval_var(include_file)
             )
-            included_pipe = parse_pipe(include_file, skip_eval=skip_eval)
+            included_pipe = parse_pipe(include_file, skip_eval=skip_eval).datafile
             pipe_nodes = doc.nodes.copy()
             for included_node in included_pipe.nodes.copy():
                 unrolled_included_node = next(

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/tinybird/tb/modules/datafile/parse_datasource.py

@@ -5,9 +5,9 @@ import click
 
 from tinybird.sql_template import render_template_with_secrets
 from tinybird.tb.modules.datafile.common import (
-    Datafile,
     DatafileKind,
     DatafileSyntaxError,
+    ParseResult,
     format_filename,
     parse,
 )
@@ -23,7 +23,7 @@ def parse_datasource(
     hide_folders: bool = False,
     add_context_to_datafile_syntax_errors: bool = True,
     secrets: Optional[Dict[str, str]] = None,
-) -> Datafile:
+) -> ParseResult:
     basepath = ""
     if not content:
         with open(filename) as file:
@@ -35,7 +35,7 @@ def parse_datasource(
     s = render_template_with_secrets(filename, s, secrets=secrets or {})
     filename = format_filename(filename, hide_folders)
     try:
-        doc = parse(
+        doc, warnings = parse(
             s, "default", basepath, replace_includes=replace_includes, skip_eval=skip_eval, kind=DatafileKind.datasource
         )
         doc.validate()
@@ -52,4 +52,4 @@ def parse_datasource(
             FeedbackManager.error_parsing_file(filename=filename, lineno=e.lineno, error=e)
         ) from None
 
-    return doc
+    return ParseResult(datafile=doc, warnings=warnings)

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/tinybird/tb/modules/datafile/parse_pipe.py

@@ -5,9 +5,9 @@ import click
 
 from tinybird.sql_template import get_template_and_variables, render_sql_template
 from tinybird.tb.modules.datafile.common import (
-    Datafile,
     DatafileKind,
     DatafileSyntaxError,
+    ParseResult,
     format_filename,
     parse,
 )
@@ -24,7 +24,7 @@ def parse_pipe(
     hide_folders: bool = False,
     add_context_to_datafile_syntax_errors: bool = True,
     secrets: Optional[Dict[str, str]] = None,
-) -> Datafile:
+) -> ParseResult:
     basepath = ""
     if not content:
         with open(filename) as file:
@@ -37,7 +37,7 @@ def parse_pipe(
     try:
         sql = ""
         try:
-            doc = parse(
+            doc, warnings = parse(
                 s, basepath=basepath, replace_includes=replace_includes, skip_eval=skip_eval, kind=DatafileKind.pipe
             )
             doc.validate()
@@ -86,4 +86,4 @@ def parse_pipe(
         raise click.ClickException(FeedbackManager.error_not_found_include(filename=e, lineno=e.lineno))
     except ModuleNotFoundError:
         pass
-    return doc
+    return ParseResult(datafile=doc, warnings=warnings)

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/tinybird/tb/modules/datafile/playground.py

@@ -1091,7 +1091,7 @@ async def process_file(
         return params
 
     if DataFileExtensions.DATASOURCE in filename:
-        doc = parse_datasource(filename)
+        doc, warnings = parse_datasource(filename)
         node = doc.nodes[0]
         deps: List[str] = []
         # reemplace tables on materialized columns
@@ -1251,7 +1251,7 @@ async def process_file(
         return resources
 
     elif DataFileExtensions.PIPE in filename:
-        doc = parse_pipe(filename)
+        doc, warnings = parse_pipe(filename)
         version = f"__v{doc.version}" if doc.version is not None else ""
         name = os.path.basename(filename).split(".")[0]
         description = doc.description if doc.description is not None else ""

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/tinybird/tb/modules/feedback_manager.py

@@ -1150,3 +1150,4 @@ Please enter the ARN of the role you just created"""
     error = error_message("{message}")
     gray = gray_message("{message}")
     warning = warning_message("{message}")
+    build_result_error_title = print_message("\033[91m{message}", bcolors.BOLD)

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/tinybird/tb/modules/project.py

@@ -57,13 +57,13 @@ class Project:
 
     def get_pipe_datafile(self, filename: str) -> Optional[Datafile]:
         try:
-            return parse_pipe(filename)
+            return parse_pipe(filename).datafile
         except Exception:
             return None
 
     def get_datasource_datafile(self, filename: str) -> Optional[Datafile]:
         try:
-            return parse_datasource(filename)
+            return parse_datasource(filename).datafile
         except Exception:
             return None
 

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/tinybird/tb/modules/shell.py

@@ -247,6 +247,8 @@ class Shell:
             self.handle_auth()
         elif cmd == "workspace":
             self.handle_workspace()
+        elif cmd == "deploy":
+            self.handle_deploy()
         elif cmd == "mock":
             self.handle_mock(arg)
         elif cmd == "tb":
@@ -256,13 +258,16 @@ class Shell:
             self.default(line)
 
     def handle_build(self):
-        click.echo(FeedbackManager.error(message="'tb build' command is not available in watch mode"))
+        click.echo(FeedbackManager.error(message="'tb build' is not available in the dev shell"))
 
     def handle_auth(self):
-        click.echo(FeedbackManager.error(message="'tb auth' command is not available in watch mode"))
+        click.echo(FeedbackManager.error(message="'tb auth' is not available in the dev shell"))
 
     def handle_workspace(self):
-        click.echo(FeedbackManager.error(message="'tb workspace' command is not available in watch mode"))
+        click.echo(FeedbackManager.error(message="'tb workspace' is not available in the dev shell"))
+
+    def handle_deploy(self):
+        click.echo(FeedbackManager.error(message="'tb deploy' is not available in the dev shell"))
 
     def handle_mock(self, arg):
         if "mock" in arg.strip().lower():

{tinybird-0.0.1.dev121 → tinybird-0.0.1.dev123}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev121
+Version: 0.0.1.dev123
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird