tinybird 0.0.1.dev270__py3-none-any.whl → 0.0.1.dev272__py3-none-any.whl

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/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/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/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/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/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.dist-info → tinybird-0.0.1.dev272.dist-info}/METADATA

@@ -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.dist-info → tinybird-0.0.1.dev272.dist-info}/RECORD

@@ -17,10 +17,10 @@ tinybird/datafile/exceptions.py,sha256=8rw2umdZjtby85QbuRKFO5ETz_eRHwUY5l7eHsy1w
 tinybird/datafile/parse_connection.py,sha256=tRyn2Rpr1TeWet5BXmMoQgaotbGdYep1qiTak_OqC5E,1825
 tinybird/datafile/parse_datasource.py,sha256=ssW8QeFSgglVFi3sDZj_HgkJiTJ2069v2JgqnH3CkDE,1825
 tinybird/datafile/parse_pipe.py,sha256=xf4m0Tw44QWJzHzAm7Z7FwUoUUtr7noMYjU1NiWnX0k,3880
-tinybird/tb/__cli__.py,sha256=0CNLom7h-n1LVg5AImNZKydZhrXvMFV4o0p8IvRVHlk,247
+tinybird/tb/__cli__.py,sha256=s5oRxeoOkXoJmiNFK4NqIPzdBDisEOHAWlbA-u4cJlg,247
 tinybird/tb/check_pypi.py,sha256=Gp0HkHHDFMSDL6nxKlOY51z7z1Uv-2LRexNTZSHHGmM,552
 tinybird/tb/cli.py,sha256=FdDFEIayjmsZEVsVSSvRiVYn_FHOVg_zWQzchnzfWho,1008
-tinybird/tb/client.py,sha256=OVNlCXI16kpD-Ph8BDhkyKbR68TdZcR_j4ng91Iiybg,54706
+tinybird/tb/client.py,sha256=IQRaInDjOwr9Fzaz3_xXc3aUGqh94tM2lew7IZbB9eM,53733
 tinybird/tb/config.py,sha256=mhMTGnMB5KcxGoh3dewIr2Jjsa6pHE183gCPAQWyp6o,3973
 tinybird/tb/modules/build.py,sha256=efD-vamK1NPaDo9R86Hn8be2DYoW0Hh5bZiH7knK5dk,7790
 tinybird/tb/modules/build_common.py,sha256=dthlaDn_CuwZnedQcUi7iIdDoHWfSbbbGQwiDgNcmC0,13062
@@ -28,12 +28,12 @@ tinybird/tb/modules/cicd.py,sha256=0KLKccha9IP749QvlXBmzdWv1On3mFwMY4DUcJlBxiE,7
 tinybird/tb/modules/cli.py,sha256=OC4jqGciUAgPQLgmo4ztjiQTOiGzqX3yILfxjbZ-CIs,16686
 tinybird/tb/modules/common.py,sha256=tj6DR2yOqMMQ0PILwFGXmMogxdrbQCgj36HdSM611rs,82657
 tinybird/tb/modules/config.py,sha256=gK7rgaWTDd4ZKCrNEg_Uemr26EQjqWt6TjyQKujxOws,11462
-tinybird/tb/modules/connection.py,sha256=-MY56NUAai6EMC4-wpi7bT0_nz_SA8QzTmHkV7HB1IQ,17810
+tinybird/tb/modules/connection.py,sha256=axp8Fny1_4PSLJGN4UF6WygyRbQtM3Lbt6thxHKTxzw,17790
 tinybird/tb/modules/copy.py,sha256=dPZkcIDvxjJrlQUIvToO0vsEEEs4EYumbNV77-BzNoU,4404
 tinybird/tb/modules/create.py,sha256=pJxHXG69c9Z_21s-7VuJ3RZOF_nJU51LEwiAkvI3dZY,23251
 tinybird/tb/modules/datasource.py,sha256=pae-ENeHYIF1HHYRSOziFC-2FPLUFa0KS60YpdlKCS8,41725
-tinybird/tb/modules/deployment.py,sha256=EDEVOqFk5fp0fvvs2jV0mT5POFd-i_8uZIUREwzAbEk,13199
-tinybird/tb/modules/deployment_common.py,sha256=6Ws3YTtEyVl9Id7gyxXkEhe0GJpUJeibS-XGTtTA9DI,19076
+tinybird/tb/modules/deployment.py,sha256=v0layOmG0IMnuXc3RT39mpGfa5M8yPlrL9F089fJFCo,15964
+tinybird/tb/modules/deployment_common.py,sha256=gP2jYdRw8aehfKIHVQaS3DoS7sA43I-sQkLykcL83jE,19193
 tinybird/tb/modules/deprecations.py,sha256=rrszC1f_JJeJ8mUxGoCxckQTJFBCR8wREf4XXXN-PRc,4507
 tinybird/tb/modules/dev_server.py,sha256=57FCKuWpErwYUYgHspYDkLWEm9F4pbvVOtMrFXX1fVU,10129
 tinybird/tb/modules/endpoint.py,sha256=ksRj6mfDb9Xv63PhTkV_uKSosgysHElqagg3RTt21Do,11958
@@ -108,7 +108,7 @@ tinybird/tb/modules/datafile/format_datasource.py,sha256=X5N65vDpprFKaWaxkSwFnHa
 tinybird/tb/modules/datafile/format_pipe.py,sha256=_64RGD8XI-gpQBMzhymUAVGMhpQK6zar_irDrJFQrHY,7378
 tinybird/tb/modules/datafile/pipe_checker.py,sha256=dxsCQoA6ruxg1fvF6sMLFowpjaqws8lUQcM7XyhgZPE,24609
 tinybird/tb/modules/datafile/playground.py,sha256=47q4XcvDhclHWYv7oFNEqmF1T5NXd9GPWkrT6Av2VhY,56343
-tinybird/tb/modules/datafile/pull.py,sha256=oVQaMJktX9Es8E5tiO2SBONlbM-mRAY4f72OpASDPWg,4329
+tinybird/tb/modules/datafile/pull.py,sha256=BB-JSAPDRL8WotaSo73PHBDdAKBx4ZM-YeZCVcXdRTQ,4311
 tinybird/tb/modules/tinyunit/tinyunit.py,sha256=sJeBnKDHcUNn8t0sdsKB_M2w8IdzeeQ1PzJuleeQ2-E,11695
 tinybird/tb/modules/tinyunit/tinyunit_lib.py,sha256=hGh1ZaXC1af7rKnX7222urkj0QJMhMWclqMy59dOqwE,1922
 tinybird/tb_cli_modules/cicd.py,sha256=0lMkb6CVOFZl5HOwgY8mK4T4mgI7O8335UngLXtCc-c,13851
@@ -117,8 +117,8 @@ tinybird/tb_cli_modules/config.py,sha256=IsgdtFRnUrkY8-Zo32lmk6O7u3bHie1QCxLwgp4
 tinybird/tb_cli_modules/exceptions.py,sha256=pmucP4kTF4irIt7dXiG-FcnI-o3mvDusPmch1L8RCWk,3367
 tinybird/tb_cli_modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb_cli_modules/telemetry.py,sha256=Hh2Io8ZPROSunbOLuMvuIFU4TqwWPmQTqal4WS09K1A,10449
-tinybird-0.0.1.dev270.dist-info/METADATA,sha256=Qyq9d5eVbZ4ffQBnj4TDLyCARzfTBcYAJDjYDeY3ABY,1763
-tinybird-0.0.1.dev270.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev270.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev270.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev270.dist-info/RECORD,,
+tinybird-0.0.1.dev272.dist-info/METADATA,sha256=Ait5uLqtYO9yjOWIF4F7i4ULQE8rxaqqsyrjfYpxyyc,1763
+tinybird-0.0.1.dev272.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev272.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev272.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev272.dist-info/RECORD,,