tinybird 0.0.1.dev270__tar.gz → 0.0.1.dev272__tar.gz

{tinybird-0.0.1.dev270 → tinybird-0.0.1.dev272}/PKG-INFO

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

{tinybird-0.0.1.dev270 → tinybird-0.0.1.dev272}/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.dev270'
-__revision__ = '77ee059'
+__version__ = '0.0.1.dev272'
+__revision__ = '6fc56e0'

{tinybird-0.0.1.dev270 → tinybird-0.0.1.dev272}/tinybird/tb/client.py

@@ -300,13 +300,10 @@ class TinyB:
         response = self._req(f"/v0/connectors?{urlencode(params)}")
         return response["connectors"]
 
-    def connections(self, connector: Optional[str] = None, skip_bigquery: Optional[bool] = False):
+    def connections(self, connector: Optional[str] = None):
         response = self._req("/v0/connectors")
         connectors = response["connectors"]
-        bigquery_connection = None
-        if not skip_bigquery:
-            bigquery_connection = self.bigquery_connection() if connector == "bigquery" or connector is None else None
-        connectors = [*connectors, bigquery_connection] if bigquery_connection else connectors
+
         if connector:
             return [
                 {
@@ -328,24 +325,9 @@ class TinyB:
                 **c["settings"],
             }
             for c in connectors
+            if c["service"] != "gcscheduler"
         ]
 
-    def bigquery_connection(self):
-        bigquery_resources = self.list_gcp_resources()
-        if len(bigquery_resources) == 0:
-            return None
-
-        gcp_account_details: Dict[str, Any] = self.get_gcp_service_account_details()
-        datasources = self.datasources()
-        bigquery_datasources = [ds["name"] for ds in datasources if ds["type"] == "bigquery"]
-        return {
-            "id": gcp_account_details["account"].split("@")[0],
-            "service": "bigquery",
-            "name": "bigquery",
-            "linkers": bigquery_datasources,
-            "settings": gcp_account_details,
-        }
-
     def get_datasource(self, ds_name: str, used_by: bool = False) -> Dict[str, Any]:
         params = {
             "attrs": "used_by" if used_by else "",
@@ -1037,10 +1019,9 @@ class TinyB:
         name_or_id: str,
         service: Optional[str] = None,
         key: Optional[str] = "name",
-        skip_bigquery: Optional[bool] = False,
     ) -> Optional[Dict[str, Any]]:
         return next(
-            (c for c in self.connections(connector=service, skip_bigquery=skip_bigquery) if c[key] == name_or_id),
+            (c for c in self.connections(connector=service) if c[key] == name_or_id),
             None,
         )
 

{tinybird-0.0.1.dev270 → tinybird-0.0.1.dev272}/tinybird/tb/modules/connection.py

@@ -121,7 +121,7 @@ def connection_ls(ctx: Context, service: Optional[DataConnectorType] = None) ->
     obj: Dict[str, Any] = ctx.ensure_object(dict)
     client: TinyB = obj["client"]
 
-    connections = client.connections(connector=service, skip_bigquery=True)
+    connections = client.connections(connector=service)
     columns = []
     table = []
 

{tinybird-0.0.1.dev270 → tinybird-0.0.1.dev272}/tinybird/tb/modules/datafile/pull.py

@@ -89,7 +89,7 @@ def folder_pull(
     try:
         datasources = client.datasources()
         pipes = client.pipes()
-        connections = client.connections(skip_bigquery=True)
+        connections = client.connections()
 
         write_files(
             resources=datasources,

{tinybird-0.0.1.dev270 → tinybird-0.0.1.dev272}/tinybird/tb/modules/deployment.py

@@ -1,6 +1,6 @@
 import json
 import logging
-from datetime import datetime
+from datetime import datetime, timedelta, timezone
 from pathlib import Path
 from typing import Any, Dict, Optional
 
@@ -405,4 +405,84 @@ def create_deployment_cmd(
         click.echo(FeedbackManager.success(message="Template downloaded successfully"))
     client = ctx.ensure_object(dict)["client"]
     config: Dict[str, Any] = ctx.ensure_object(dict)["config"]
-    create_deployment(project, client, config, wait, auto, verbose, check, allow_destructive_operations)
+    is_web_analytics_starter_kit = bool(template and "web-analytics-starter-kit" in template)
+    create_deployment(
+        project,
+        client,
+        config,
+        wait,
+        auto,
+        verbose,
+        check,
+        allow_destructive_operations,
+        ingest_hint=not is_web_analytics_starter_kit,
+    )
+    show_web_analytics_starter_kit_hints(client, is_web_analytics_starter_kit)
+
+
+def show_web_analytics_starter_kit_hints(client, is_web_analytics_starter_kit: bool) -> None:
+    try:
+        if not is_web_analytics_starter_kit:
+            return
+
+        from tinybird.tb.modules.cli import __unpatch_click_output
+
+        __unpatch_click_output()
+        tokens = client.tokens()
+        tracker_token = next((token for token in tokens if token["name"] == "tracker"), None)
+        if tracker_token:
+            click.echo(FeedbackManager.highlight(message="» Ingest data using the script below:"))
+            click.echo(
+                FeedbackManager.info(
+                    message=f"""
+<script
+defer
+src="https://unpkg.com/@tinybirdco/flock.js"
+data-token="{tracker_token["token"]}"
+data-host="{client.host}"
+></script>
+            """
+                )
+            )
+
+        try:
+            ttl = timedelta(days=365 * 10)
+            expiration_time = int((ttl + datetime.now(timezone.utc)).timestamp())
+            datasources = client.datasources()
+            pipes = client.pipes()
+
+            scopes = []
+            for res in pipes:
+                scope_data = {
+                    "type": "PIPES:READ",
+                    "resource": res["name"],
+                }
+
+                scopes.append(scope_data)
+
+            for res in datasources:
+                scope_data = {
+                    "type": "DATASOURCES:READ",
+                    "resource": res["name"],
+                }
+
+                scopes.append(scope_data)
+
+            response = client.create_jwt_token("web_analytics_starter_kit_jwt", expiration_time, scopes)
+            click.echo(FeedbackManager.highlight(message="» Open this URL in your browser to see the dashboard:\n"))
+            click.echo(
+                FeedbackManager.info(
+                    message=f"https://analytics.tinybird.co?token={response['token']}&host={client.host}"
+                )
+            )
+        except Exception:
+            dashboard_token = next((token for token in tokens if token["name"] == "dashboard"), None)
+            if dashboard_token:
+                click.echo(FeedbackManager.highlight(message="» Open this URL in your browser to see the dashboard:\n"))
+                click.echo(
+                    FeedbackManager.info(
+                        message=f"https://analytics.tinybird.co?token={dashboard_token['token']}&host={client.host}"
+                    )
+                )
+    except Exception:
+        pass

{tinybird-0.0.1.dev270 → tinybird-0.0.1.dev272}/tinybird/tb/modules/deployment_common.py

@@ -66,7 +66,7 @@ def api_post(
 
 # TODO(eclbg): This logic should be in the server, and there should be a dedicated endpoint for promoting a deployment
 # potato
-def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
+def promote_deployment(host: Optional[str], headers: dict, wait: bool, ingest_hint: Optional[bool] = True) -> None:
     TINYBIRD_API_URL = f"{host}/v1/deployments"
     result = api_fetch(TINYBIRD_API_URL, headers)
 
@@ -123,7 +123,7 @@ def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
                 break
 
             time.sleep(5)
-    if last_deployment.get("id") == "0":
+    if last_deployment.get("id") == "0" and ingest_hint:
         # This is the first deployment, so we prompt the user to ingest data
         click.echo(
             FeedbackManager.info(
@@ -197,6 +197,7 @@ def create_deployment(
     verbose: bool = False,
     check: Optional[bool] = None,
     allow_destructive_operations: Optional[bool] = None,
+    ingest_hint: Optional[bool] = True,
 ) -> None:
     # TODO: This code is duplicated in build_server.py
     # Should be refactored to be shared
@@ -349,7 +350,7 @@ def create_deployment(
         click.echo(FeedbackManager.info(message="✓ Deployment is ready"))
 
         if auto:
-            promote_deployment(client.host, HEADERS, wait=wait)
+            promote_deployment(client.host, HEADERS, wait=wait, ingest_hint=ingest_hint)
 
 
 def _build_data_movement_message(kind: str, source_mv_name: Optional[str]) -> str:

{tinybird-0.0.1.dev270 → tinybird-0.0.1.dev272}/tinybird.egg-info/PKG-INFO

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