tinybird 0.0.1.dev122__tar.gz → 0.0.1.dev124__tar.gz

{tinybird-0.0.1.dev122 → tinybird-0.0.1.dev124}/PKG-INFO

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

{tinybird-0.0.1.dev122 → tinybird-0.0.1.dev124}/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.dev122 → tinybird-0.0.1.dev124}/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.dev122'
-__revision__ = '2212d5c'
+__version__ = '0.0.1.dev124'
+__revision__ = '325c83b'

{tinybird-0.0.1.dev122 → tinybird-0.0.1.dev124}/tinybird/tb/config.py

@@ -65,6 +65,10 @@ async def get_config(
     config["host"] = host or config.get("host", DEFAULT_API_HOST)
     config["workspaces"] = config.get("workspaces", [])
     config["cwd"] = config.get("cwd", getcwd())
+    config["user_email"] = config.get("user_email", None)
+    config["user_id"] = config.get("user_id", None)
+    config["workspace_id"] = config.get("id", None)
+    config["workspace_name"] = config.get("name", None)
     return config
 
 

{tinybird-0.0.1.dev122 → tinybird-0.0.1.dev124}/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")
@@ -157,12 +159,14 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
                 )
         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.dev122 → tinybird-0.0.1.dev124}/tinybird/tb/modules/common.py

@@ -243,7 +243,7 @@ class CatchAuthExceptions(AliasedGroup):
         formatter.write_heading("Telemetry")
         formatter.write_text(
             """
-  Tinybird collects anonymous usage data and errors to improve the command
+  Tinybird collects usage data and errors to improve the command
 line experience. To opt-out, set TB_CLI_TELEMETRY_OPTOUT to '1' or 'true'."""
         )
         formatter.write_paragraph()

{tinybird-0.0.1.dev122 → tinybird-0.0.1.dev124}/tinybird/tb/modules/create.py

@@ -88,7 +88,8 @@ async def create(
             click.echo(FeedbackManager.success(message="✓ Scaffolding completed!\n"))
             created_something = True
         result = ""
-        if (data or prompt) and user_token:
+
+        if data or (prompt and user_token):
             click.echo(FeedbackManager.highlight(message="\n» Creating resources..."))
             result, created_something = await create_resources(
                 local_client, tb_client, user_token, data, prompt, folder

{tinybird-0.0.1.dev122 → tinybird-0.0.1.dev124}/tinybird/tb/modules/datafile/common.py

@@ -1535,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"),

{tinybird-0.0.1.dev122 → tinybird-0.0.1.dev124}/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.dev122 → tinybird-0.0.1.dev124}/tinybird/tb/modules/telemetry.py

@@ -1,4 +1,5 @@
 import functools
+import hashlib
 import json
 import os
 import platform
@@ -13,7 +14,8 @@ from urllib.parse import urlencode
 
 import requests
 
-from tinybird.tb.config import CURRENT_VERSION
+from tinybird.syncasync import async_to_sync
+from tinybird.tb.config import CURRENT_VERSION, get_config
 
 TELEMETRY_TIMEOUT: int = 1
 TELEMETRY_DATASOURCE: str = "tb_cli_telemetry"
@@ -80,7 +82,11 @@ def _hide_tokens(text: str) -> str:
 
 
 class TelemetryHelper:
-    def __init__(self, tb_host: Optional[str] = None, max_enqueued_events: int = 5) -> None:
+    def __init__(
+        self,
+        tb_host: Optional[str] = None,
+        max_enqueued_events: int = 5,
+    ) -> None:
         self.tb_host = tb_host or os.getenv("TB_CLI_TELEMETRY_HOST", "https://api.tinybird.co")
         self.max_enqueued_events: int = max_enqueued_events
 
@@ -112,6 +118,15 @@ class TelemetryHelper:
             self.log("Not sending events in local development mode")
             return
 
+        event_data["fingerprint_id"] = hashlib.sha256(platform.node().encode()).hexdigest()
+
+        config = async_to_sync(get_config)(None, None)
+        if config:
+            event_data["workspace_id"] = config.get("workspace_id", "")
+            event_data["workspace_name"] = config.get("workspace_name", "")
+            event_data["user_email"] = config.get("user_email", "")
+            event_data["user_id"] = config.get("user_id", "")
+
         # Let's save deep copies to not interfere with original objects
         event_dict: Dict[str, Any] = deepcopy(self._defaults)
         event_dict["event"] = event

{tinybird-0.0.1.dev122 → tinybird-0.0.1.dev124}/tinybird.egg-info/PKG-INFO

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