tinybird 0.0.1.dev146__py3-none-any.whl → 0.0.1.dev147__py3-none-any.whl

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.dev146'
-__revision__ = '3ea4114'
+__version__ = '0.0.1.dev147'
+__revision__ = 'c9f089b'

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev146
+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.dev146.dist-info → tinybird-0.0.1.dev147.dist-info}/RECORD

@@ -12,14 +12,14 @@ tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=jjNVDMnkYFWXflmT8KU_Ssbo5vR8KQq3EJMk5vYgXRw,41959
 tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
 tinybird/ch_utils/engine.py,sha256=BZuPM7MFS7vaEKK5tOMR2bwSAgJudPrJt27uVEwZmTY,40512
-tinybird/tb/__cli__.py,sha256=muewLYQEYPhrk_F7Dge7hLLf0aG50ToaqnUrppWX1Q0,252
+tinybird/tb/__cli__.py,sha256=y5e2Tv-AjplQMyc8awKNZamGGJ7WtoK-0TMjVOUziXs,252
 tinybird/tb/check_pypi.py,sha256=rW4QmDRbtgKdUUwJCnBkVjmTjZSZGN-XgZhx7vMkC0w,1009
 tinybird/tb/cli.py,sha256=uPV6pvi4aYVfaiGs0DQO-eoi1g9dHlrgvhutkXkdJko,1075
 tinybird/tb/client.py,sha256=aaPKq5C77e72kR7IMv9WrvnvNki8mKMOTi9EsCp0eUc,55962
 tinybird/tb/config.py,sha256=jT9xndpeCY_g0HdB5qE2EquC0TFRRnkPnQFWZWd04jo,3998
 tinybird/tb/modules/auth.py,sha256=_OeYnmTH83lnqCgQEdS6K0bx1KBUeRmZk2M7JnRmWpk,9037
 tinybird/tb/modules/build.py,sha256=5SX59ssq0KaRrgzk21KmYUnB6xOdQ_O59n7rxFBQQ1Y,17393
-tinybird/tb/modules/cicd.py,sha256=Ug7LijuHDIqKR6rm8OLZispWp75Zv6TyonAme8K9jaI,7114
+tinybird/tb/modules/cicd.py,sha256=Cn1DyE28w2maQgIJF4IjZU7J7ULPvMG11DjN2OH-cqE,7161
 tinybird/tb/modules/cli.py,sha256=V8fC0GLt5HWtOTk6TOZM5xUAY9PoH05kyJxE6Zu4MT4,14075
 tinybird/tb/modules/common.py,sha256=WzF_zRtAl3FKqbzK6yi_IjeeGIjQNu6SKnP-PX-o3Kk,85196
 tinybird/tb/modules/config.py,sha256=ziqW_t_mRVvWOd85VoB4vKyvgMkEfpXDf9H4v38p2xc,11422
@@ -37,7 +37,7 @@ tinybird/tb/modules/job.py,sha256=n4dSSBgnA8NqD7srGahf2xRj6wxkmX9Vl0J-QJ_a2w0,29
 tinybird/tb/modules/llm.py,sha256=KfsCYmKeW1VQz0iDZhGKCRkQv_Y3kTHh6JuxvofOguE,1076
 tinybird/tb/modules/llm_utils.py,sha256=nS9r4FAElJw8yXtmdYrx-rtI2zXR8qXfi1QqUDCfxvg,3469
 tinybird/tb/modules/local.py,sha256=kxdF8NXZYYwtUwlFHxHKq_PA9CpMrG-rXOg_i_hlvnY,12158
-tinybird/tb/modules/local_common.py,sha256=Fr3U4_xqtH4AzHPo-y75dOrXlE-kC7DeC55oKeC-PMo,3255
+tinybird/tb/modules/local_common.py,sha256=3nxGcjdxA5Uq0PakhbkiPDVzd66OUwPNW4gNqyYPCe8,3381
 tinybird/tb/modules/login.py,sha256=fmXPSdvJnKPv03chptGuu3_Fm6LhP6kUsUKhrmT8rJc,8269
 tinybird/tb/modules/logout.py,sha256=ULooy1cDBD02-r7voZmhV7udA0ML5tVuflJyShrh56Y,1022
 tinybird/tb/modules/materialization.py,sha256=QJX5kCPhhm6IXBO1JsalVfbQdypCe_eOUDZ_WHJZWS8,5478
@@ -79,8 +79,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.dev146.dist-info/METADATA,sha256=rnhuGjEhF-6ijm9f0YhLP4o-UBqvepleRi_xslwwbQM,1612
-tinybird-0.0.1.dev146.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev146.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev146.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev146.dist-info/RECORD,,
+tinybird-0.0.1.dev147.dist-info/METADATA,sha256=-TJHZrxsIFnBCl47t7WdjGLoOHyNmH0Mz2zwbTR8tV4,1612
+tinybird-0.0.1.dev147.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev147.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev147.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev147.dist-info/RECORD,,