tinybird 0.0.1.dev145__tar.gz → 0.0.1.dev147__tar.gz

{tinybird-0.0.1.dev145 → tinybird-0.0.1.dev147}/PKG-INFO

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

{tinybird-0.0.1.dev145 → tinybird-0.0.1.dev147}/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.dev145'
-__revision__ = 'cb153c4'
+__version__ = '0.0.1.dev147'
+__revision__ = 'c9f089b'

{tinybird-0.0.1.dev145 → tinybird-0.0.1.dev147}/tinybird/tb/modules/cicd.py

@@ -120,6 +120,8 @@ tinybird_ci_workflow:
   services:
     - name: tinybirdco/tinybird-local:latest
       alias: tinybird-local
+  variables:
+    TB_LOCAL_HOST: tinybird-local
 """
 
 GITLAB_CD_YML = """

{tinybird-0.0.1.dev145 → tinybird-0.0.1.dev147}/tinybird/tb/modules/feedback_manager.py

@@ -618,7 +618,7 @@ You'll be creating a Google Service Account and you will grant it access to you
 STEP 2: CREATE GCP SERVICE ACCOUNT
 ──────────────────────────────────────────────────────────────
 
-1. Go to \033]8;https://console.cloud.google.com/iam-admin/serviceaccounts/create\033\\Service Accounts > + Create service account\033]8;;\033\\
+1. Go to \033]8;https://console.cloud.google.com/iam-admin/serviceaccounts/create\033\\IAM & Admin > Service Accounts > + Create Service Account\033]8;;\033\\
 2. Provide a service account name. Name the service account something meaningful (e.g., TinybirdGCS-{environment}-svc-account)
 3. Click "Create and continue"
 4. Click the "Select a role" drop down menu and select "Storage Object Viewer" (You can add IAM condition to provide access to selected buckets. More info in \033]8;;https://www.tinybird.co/docs/forward/get-data-in/connectors/gcs\033\\IAM Conditions\033]8;;\033\\)
@@ -632,7 +632,7 @@ STEP 2: CREATE GCP SERVICE ACCOUNT
 STEP 3: ADD KEY TO SERVICE ACCOUNT
 ──────────────────────────────────────────────────────────────
 
-1. Go to Keys
+1. In the Service Account you just created, go to Keys
 2. Click the "Add key" drop down menu and select "Create new key"
 3. Select "JSON" and click "Create". This should have downloaded a .json file.
 4. Copy the whole json and paste it here. This will create a tinybird secret, so there is no need to have that credentials file in the project.

{tinybird-0.0.1.dev145 → tinybird-0.0.1.dev147}/tinybird/tb/modules/local_common.py

@@ -1,6 +1,7 @@
 import hashlib
 import logging
 import os
+import re
 from typing import Any, Dict
 
 import requests
@@ -13,14 +14,15 @@ from tinybird.tb.modules.feedback_manager import FeedbackManager
 TB_IMAGE_NAME = "tinybirdco/tinybird-local:latest"
 TB_CONTAINER_NAME = "tinybird-local"
 TB_LOCAL_PORT = int(os.getenv("TB_LOCAL_PORT", 7181))
-TB_LOCAL_HOST = f"http://localhost:{TB_LOCAL_PORT}"
+TB_LOCAL_HOST = re.sub(r"^https?://", "", os.getenv("TB_LOCAL_HOST", "localhost"))
+TB_LOCAL_ADDRESS = f"http://{TB_LOCAL_HOST}:{TB_LOCAL_PORT}"
 
 
 async def get_tinybird_local_client(config_obj: Dict[str, Any], staging: bool = False) -> TinyB:
     """Get a Tinybird client connected to the local environment."""
 
     config = await get_tinybird_local_config(config_obj)
-    return config.get_client(host=TB_LOCAL_HOST, staging=staging)
+    return config.get_client(host=TB_LOCAL_ADDRESS, staging=staging)
 
 
 async def get_tinybird_local_config(config_obj: Dict[str, Any]) -> CLIConfig:
@@ -33,7 +35,7 @@ async def get_tinybird_local_config(config_obj: Dict[str, Any]) -> CLIConfig:
 
     try:
         # ruff: noqa: ASYNC210
-        tokens = requests.get(f"{TB_LOCAL_HOST}/tokens").json()
+        tokens = requests.get(f"{TB_LOCAL_ADDRESS}/tokens").json()
     except Exception:
         raise CLILocalException(
             FeedbackManager.error(message="Tinybird local is not running. Please run `tb local start` first.")
@@ -44,7 +46,7 @@ async def get_tinybird_local_config(config_obj: Dict[str, Any]) -> CLIConfig:
     default_token = tokens["workspace_admin_token"]
     # Create a new workspace if path is provided. This is used to isolate the build in a different workspace.
     if path:
-        user_client = config.get_client(host=TB_LOCAL_HOST, token=user_token)
+        user_client = config.get_client(host=TB_LOCAL_ADDRESS, token=user_token)
         ws_name = config.get("name") or config_obj.get("name") or get_build_workspace_name(path)
         if not ws_name:
             raise AuthNoTokenException()
@@ -52,7 +54,7 @@ async def get_tinybird_local_config(config_obj: Dict[str, Any]) -> CLIConfig:
         logging.debug(f"Workspace used for build: {ws_name}")
 
         user_workspaces = requests.get(
-            f"{TB_LOCAL_HOST}/v1/user/workspaces?with_organization=true&token={admin_token}"
+            f"{TB_LOCAL_ADDRESS}/v1/user/workspaces?with_organization=true&token={admin_token}"
         ).json()
         user_org_id = user_workspaces.get("organization_id", {})
         local_workspaces = user_workspaces.get("workspaces", [])
@@ -63,7 +65,7 @@ async def get_tinybird_local_config(config_obj: Dict[str, Any]) -> CLIConfig:
             await user_client.create_workspace(
                 ws_name, template=None, assign_to_organization_id=user_org_id, version="v1"
             )
-            user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v1/user/workspaces?token={admin_token}").json()
+            user_workspaces = requests.get(f"{TB_LOCAL_ADDRESS}/v1/user/workspaces?token={admin_token}").json()
             ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
             if not ws:
                 raise AuthNoTokenException()
@@ -71,11 +73,11 @@ async def get_tinybird_local_config(config_obj: Dict[str, Any]) -> CLIConfig:
         ws_token = ws["token"]
 
         config.set_token(ws_token)
-        config.set_token_for_host(TB_LOCAL_HOST, ws_token)
-        config.set_host(TB_LOCAL_HOST)
+        config.set_token_for_host(TB_LOCAL_ADDRESS, ws_token)
+        config.set_host(TB_LOCAL_ADDRESS)
     else:
         config.set_token(default_token)
-        config.set_token_for_host(TB_LOCAL_HOST, default_token)
+        config.set_token_for_host(TB_LOCAL_ADDRESS, default_token)
 
     config.set_user_token(user_token)
     return config

{tinybird-0.0.1.dev145 → tinybird-0.0.1.dev147}/tinybird.egg-info/PKG-INFO

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