tinybird 0.0.1.dev15__py3-none-any.whl → 0.0.1.dev17__py3-none-any.whl

tinybird/tb/modules/local.py

@@ -1,25 +1,14 @@
-import hashlib
 import os
 import time
-from typing import Optional
 
 import click
-import requests
 
 import docker
 from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb.modules.cli import cli
-from tinybird.tb.modules.common import (
-    coro,
-)
-from tinybird.tb.modules.config import CLIConfig
+from tinybird.tb.modules.common import coro
 from tinybird.tb.modules.exceptions import CLIException
-
-# TODO: Use the official Tinybird image once it's available 'tinybirdco/tinybird-local:latest'
-TB_IMAGE_NAME = "registry.gitlab.com/tinybird/analytics/tinybird-local-jammy-3.11:latest"
-TB_CONTAINER_NAME = "tinybird-local"
-TB_LOCAL_PORT = int(os.getenv("TB_LOCAL_PORT", 80))
-TB_LOCAL_HOST = f"http://localhost:{TB_LOCAL_PORT}"
+from tinybird.tb.modules.local_common import TB_CONTAINER_NAME, TB_IMAGE_NAME, TB_LOCAL_PORT
 
 
 def start_tinybird_local(
@@ -113,39 +102,6 @@ def remove_tinybird_local(docker_client):
         pass
 
 
-async def get_tinybird_local_client(path: Optional[str] = None):
-    """Get a Tinybird client connected to the local environment."""
-    config = CLIConfig.get_project_config()
-    try:
-        # ruff: noqa: ASYNC210
-        tokens = requests.get(f"{TB_LOCAL_HOST}/tokens").json()
-    except Exception:
-        raise CLIException("Tinybird local is not running. Please run `tb local start` first.")
-
-    user_token = tokens["user_token"]
-    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:
-        folder_hash = hashlib.sha256(path.encode()).hexdigest()
-        user_client = config.get_client(host=TB_LOCAL_HOST, token=user_token)
-
-        ws_name = f"Tinybird_Local_Build_{folder_hash}"
-
-        user_workspaces = await user_client.user_workspaces()
-        ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
-        if not ws:
-            await user_client.create_workspace(ws_name, template=None)
-            user_workspaces = await user_client.user_workspaces()
-            ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
-
-        token = ws["token"]
-
-        config.set_token(token)
-        config.set_host(TB_LOCAL_HOST)
-        config.set_user_token(user_token)
-    return config.get_client(host=TB_LOCAL_HOST, token=token)
-
-
 @cli.command()
 def upgrade():
     """Upgrade Tinybird CLI to the latest version"""

tinybird/tb/modules/local_common.py

@@ -0,0 +1,54 @@
+import hashlib
+import os
+from typing import Optional
+
+import requests
+
+from tinybird.client import TinyB
+from tinybird.tb.modules.config import CLIConfig
+from tinybird.tb.modules.exceptions import CLIException
+
+# TODO: Use the official Tinybird image once it's available 'tinybirdco/tinybird-local:latest'
+TB_IMAGE_NAME = "registry.gitlab.com/tinybird/analytics/tinybird-local-jammy-3.11:latest"
+TB_CONTAINER_NAME = "tinybird-local"
+TB_LOCAL_PORT = int(os.getenv("TB_LOCAL_PORT", 80))
+TB_LOCAL_HOST = f"http://localhost:{TB_LOCAL_PORT}"
+
+
+async def get_tinybird_local_client(path: Optional[str] = None) -> TinyB:
+    """Get a Tinybird client connected to the local environment."""
+    config = CLIConfig.get_project_config()
+    try:
+        # ruff: noqa: ASYNC210
+        tokens = requests.get(f"{TB_LOCAL_HOST}/tokens").json()
+    except Exception:
+        raise CLIException("Tinybird local is not running. Please run `tb local start` first.")
+
+    user_token = tokens["user_token"]
+    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.
+    path = path or os.getcwd()
+    if path:
+        folder_hash = hashlib.sha256(path.encode()).hexdigest()
+        user_client = config.get_client(host=TB_LOCAL_HOST, token=user_token)
+
+        ws_name = f"Tinybird_Local_Build_{folder_hash}"
+
+        user_workspaces = await user_client.user_workspaces()
+        ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
+        if not ws:
+            await user_client.create_workspace(ws_name, template=None)
+            user_workspaces = await user_client.user_workspaces()
+            ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
+
+        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)
+    else:
+        config.set_token(default_token)
+        config.set_token_for_host(TB_LOCAL_HOST, default_token)
+
+    config.set_user_token(user_token)
+    return config.get_client(host=TB_LOCAL_HOST)

tinybird/tb/modules/mock.py

@@ -9,7 +9,7 @@ from tinybird.tb.modules.common import CLIException, coro
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.datafile.fixture import build_fixture_name, persist_fixture
 from tinybird.tb.modules.llm import LLM
-from tinybird.tb.modules.local import get_tinybird_local_client
+from tinybird.tb.modules.local_common import get_tinybird_local_client
 
 
 @cli.command()

tinybird/tb/modules/pipe.py

@@ -17,7 +17,6 @@ import tinybird.context as context
 from tinybird.client import AuthNoTokenException, DoesNotExistException, TinyB
 from tinybird.config import DEFAULT_API_HOST, FeatureFlags
 from tinybird.feedback_manager import FeedbackManager
-from tinybird.tb.modules.branch import warn_if_in_live
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import (
     coro,
@@ -499,9 +498,6 @@ async def pipe_delete(ctx: click.Context, pipe_name_or_id: str, yes: bool):
         result = await process_file(file_path, client)
         pipe_name_or_id = result[0]["name"]
 
-    semver: str = ctx.ensure_object(dict)["config"]["semver"]
-    await warn_if_in_live(semver)
-
     if yes or click.confirm(FeedbackManager.warning_confirm_delete_pipe(pipe=pipe_name_or_id)):
         try:
             await client.pipe_delete(pipe_name_or_id)

tinybird/tb/modules/test.py

@@ -3,8 +3,8 @@
 # - If it makes sense and only when strictly necessary, you can create utility functions in this file.
 # - But please, **do not** interleave utility functions and command definitions.
 
+import difflib
 import glob
-import json
 import os
 from pathlib import Path
 from typing import Iterable, List, Optional, Tuple
@@ -18,7 +18,7 @@ from tinybird.tb.modules.common import coro
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import CLIException
 from tinybird.tb.modules.llm import LLM, TestExpectation
-from tinybird.tb.modules.local import get_tinybird_local_client
+from tinybird.tb.modules.local_common import get_tinybird_local_client
 
 
 @cli.group()
@@ -70,22 +70,26 @@ async def test_create(ctx: click.Context, pipe: str, prompt: Optional[str], fold
         pipe_path = Path(folder) / pipe_path
         pipe_content = pipe_path.read_text()
 
-        llm_config = CLIConfig.get_llm_config()
-        llm = LLM(key=llm_config["api_key"])
-
         client = await get_tinybird_local_client(os.path.abspath(folder))
+        pipe_nodes = await client._req(f"/v0/pipes/{pipe_name}")
+        pipe_params = set([param["name"] for node in pipe_nodes["nodes"] for param in node["params"]])
+
+        llm_config = CLIConfig.get_llm_config()
+        llm = LLM(client=client, api_key=llm_config["api_key"])
 
-        test_expectations = await llm.create_test_commands(pipe_content=pipe_content, context=prompt)
+        test_expectations = await llm.create_test_commands(
+            pipe_content=pipe_content, pipe_params=pipe_params, context=prompt
+        )
         valid_test_expectations = []
         for test in test_expectations.tests:
+            test_params = test.parameters if test.parameters.startswith("?") else f"?{test.parameters}"
             try:
-                response = await client._req(f"/v0/pipes/{pipe_name}.ndjson?{test.parameters}")
+                response = await client._req(f"/v0/pipes/{pipe_name}.ndjson{test_params}")
             except Exception:
                 continue
 
-            test.expected_result = json.dumps(response)
+            test.expected_result = response
             valid_test_expectations.append(test.model_dump())
-
         if valid_test_expectations:
             generate_test_file(pipe_name, valid_test_expectations)
             click.echo(FeedbackManager.info(message=f"✓ /tests/{pipe_name}.yaml"))
@@ -117,11 +121,18 @@ async def test_run(ctx: click.Context, file: Tuple[str, ...], folder: Optional[s
         for test in test_file_content:
             try:
                 response = await client._req(f"/v0/pipes/{test_file_path.stem}.ndjson?{test['parameters']}")
-                if test["expected_result"] != json.dumps(response):
-                    raise Exception("Test failed")
+                if test["expected_result"] != response:
+                    diff = difflib.ndiff(
+                        test["expected_result"].splitlines(keepends=True), response.splitlines(keepends=True)
+                    )
+                    printable_diff = "".join(diff)
+                    raise Exception(
+                        f"\nExpected: \n{test['expected_result']}\nGot: \n{response}\nDiff: \n{printable_diff}"
+                    )
                 click.echo(FeedbackManager.success(message=f"✓ {test_file_path.name} - {test['name']}"))
-            except Exception:
+            except Exception as e:
                 click.echo(FeedbackManager.error(message=f"✗ {test_file_path.name} - {test['name']}"))
+                click.echo(FeedbackManager.error(message=f"Output and expected output are different: \n{e}"))
 
     for test_file in file_list:
         await run_test(test_file)

{tinybird-0.0.1.dev15.dist-info → tinybird-0.0.1.dev17.dist-info}/METADATA

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

{tinybird-0.0.1.dev15.dist-info → tinybird-0.0.1.dev17.dist-info}/RECORD

@@ -1,11 +1,12 @@
 tinybird/__cli__.py,sha256=pgYsVLcqL16wtSn6KtKweNZYoYJdEksTgSvQAW7hH64,250
-tinybird/client.py,sha256=nd97gD2-8Ap8yDonBcVwk9eXDAL43hmIYdo-Pse43RE,50738
+tinybird/client.py,sha256=_voHMgKOwOhmncSaPH6DL94X6YPqKJJzcY-EKp8xLug,50810
 tinybird/config.py,sha256=Z-BX9FrjgsLw1YwcCdF0IztLB97Zpc70VVPplO_pDSY,6089
 tinybird/connectors.py,sha256=lkpVSUmSuViEZBa4QjTK7YmPHUop0a5UFoTrSmlVq6k,15244
 tinybird/context.py,sha256=kutUQ0kCwparowI74_YLXx6wtTzGLRouJ6oGHVBPzBo,1291
 tinybird/datatypes.py,sha256=IHyhZ86ib54Vnd1pbod9y2aS8DDvDKZm1HJGlThdbuQ,10460
-tinybird/feedback_manager.py,sha256=-nDkg13DoiNk40AztzSJdbldbKhfuTsCZcSOviK9sik,67790
+tinybird/feedback_manager.py,sha256=U_VbVl3RBCPV-qc3g8vz124Mg9XeMmKk055eqiIaBqY,68338
 tinybird/git_settings.py,sha256=XUL9ZUj59-ZVQJDYmMEq4UpnuuOuQOHGlNcX3JgQHjQ,3954
+tinybird/prompts.py,sha256=pCqN1JAHqdA-PgxBnzjIYpCXjpko89Xu4EHl6ol0iNs,6417
 tinybird/sql.py,sha256=gfRKjdqEygcE1WOTeQ1QV2Jal8Jzl4RSX8fftu1KSEs,45825
 tinybird/sql_template.py,sha256=IqYRfUxDYBCoOYjqqvn--_8QXLv9FSRnJ0bInx7q1Xs,93051
 tinybird/sql_template_fmt.py,sha256=1z-PuqSZXtzso8Z_mPqUc-NxIxUrNUcVIPezNieZk-M,10196
@@ -14,38 +15,38 @@ tinybird/syncasync.py,sha256=fAvq0qkRgqXqXMKwbY2iJNYqLT_r6mDsh1MRpGKrdRU,27763
 tinybird/tornado_template.py,sha256=o2HguxrL1Evnt8o3IvrsI8Zm6JtRQ3zhLJKf1XyR3SQ,41965
 tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
 tinybird/ch_utils/engine.py,sha256=OXkBhlzGjZotjD0vaT-rFIbSGV4tpiHxE8qO_ip0SyQ,40454
-tinybird/tb/cli.py,sha256=NipQJ0V-uqJDQSb4xkTw04ALzgqSfe1twmjkBkQJWT4,784
+tinybird/tb/cli.py,sha256=onCxcKvTV4RuokC5V3t82OXWAIwgU6pMWs8rpWOUi_o,815
 tinybird/tb/modules/auth.py,sha256=hynZ-Temot8YBsySUWKSFzZlYadtFPxG3o6lCSu1n6E,9018
-tinybird/tb/modules/branch.py,sha256=R1tTUBGyI0p_dt2IAWbuyNOvemhjCIPwYxEmOxL3zOg,38468
-tinybird/tb/modules/build.py,sha256=_EvBtX5FO7fnpHP74qlrBJqm7Uk1Bx9NarJ8P-M8vvg,12901
+tinybird/tb/modules/build.py,sha256=3YEcUBSsp8DREyox5x27BabcdYHFEokGnQ-f8-etDmo,8412
+tinybird/tb/modules/build_shell.py,sha256=jN06ZT7BK3lHtMgBjaOn4sD6yooUy9v8uuZnE-jjmlU,5485
 tinybird/tb/modules/cicd.py,sha256=KCFfywFfvGRh24GZwqrhICiTK_arHelPs_X4EB-pXIw,7331
-tinybird/tb/modules/cli.py,sha256=pF7bxobeLJP-aN7RwJmLaYOKQZHlBnneZpYbiAbTmaM,55511
-tinybird/tb/modules/common.py,sha256=Vubc2AIR8BfEupnT5e1Y8OYGEyvNoIcjo8th-SaUflw,80111
-tinybird/tb/modules/config.py,sha256=ppWvACHrSLkb5hOoQLYNby2w8jR76-8Kx2NBCst7ntQ,11760
+tinybird/tb/modules/cli.py,sha256=PRURYKphzjqVltMG647D8ADGS-YFR2rAkDNEwUTTDjk,53082
+tinybird/tb/modules/common.py,sha256=ZvkuI1JYVVwBZOZ9VDiNLR_-HHRavTHqSe6uVPJ8MS4,76431
+tinybird/tb/modules/config.py,sha256=ri4Gwyzqol6-NofTjHnWquuDzJOjHbkaAnboO8JNENY,11499
 tinybird/tb/modules/connection.py,sha256=ZSqBGoRiJedjHKEyB_fr1ybucOHtaad8d7uqGa2Q92M,28668
-tinybird/tb/modules/create.py,sha256=WL2GzJBgH3z1m6oU58uZXyUQRzVB2rH4ig4BIdOJkLw,6307
-tinybird/tb/modules/datasource.py,sha256=tjcf5o-HYIdTkb_c1ErGUFIE-W6G992vsvCuDGcxb9Q,35818
+tinybird/tb/modules/create.py,sha256=fr418rucTn9etxcOfdBViV9dk_mIQJpB_L0XO8NF4e0,10059
+tinybird/tb/modules/datasource.py,sha256=rX7RnrXl4xxPwGxkj1DgLr521wjNXEixAeAyxMrkJJk,35472
 tinybird/tb/modules/exceptions.py,sha256=4A2sSjCEqKUMqpP3WI00zouCWW4uLaghXXLZBSw04mY,3363
 tinybird/tb/modules/fmt.py,sha256=UszEQO15fdzQ49QEj7Unhu68IKwSuKPsOrKhk2p2TAg,3547
 tinybird/tb/modules/job.py,sha256=eoBVyA24lYIPonU88Jn7FF9hBKz1kScy9_w_oWreuc4,2952
-tinybird/tb/modules/llm.py,sha256=j8AZl-4BaCrtpM3_ozGt2Pr0BPfPFG5qYAaFgjJabGk,2008
-tinybird/tb/modules/local.py,sha256=ajOrQMttYLXNs-4uDW9njw7-eIAHENvlbrNbURhr6gI,6926
+tinybird/tb/modules/llm.py,sha256=duwf3r1caLaKzuOJC_stI_Hx54ncr-5uWaWeZ3HN65o,3099
+tinybird/tb/modules/local.py,sha256=hV2fvHPaVHVzKwVoVDFAIbJZslOX1_COx96DZrR-dW8,5151
+tinybird/tb/modules/local_common.py,sha256=Z2JYIE5HIJVNuzdIv1_NFxSEs8DOsLoCzbmT1iy0-HU,2172
 tinybird/tb/modules/login.py,sha256=vIeysdttfGDBMkf_i3cqAVNR5s0X0D6exATcRsDdWiA,5849
-tinybird/tb/modules/mock.py,sha256=HorUdULzxCCCGsFlPvL4RJeMJvVNnKnhbxxSog2Cn1Y,2817
-tinybird/tb/modules/pipe.py,sha256=9wnfKbp2FkmLiJgVk3qbra76ktwsUTXghu6j9cCEahQ,31058
-tinybird/tb/modules/prompts.py,sha256=KIDoAC0FvBSSsTft_mhpY6vxliNRBYOCsqikr_Hx0HA,9655
+tinybird/tb/modules/mock.py,sha256=5xhR_djr1-_JwJPI-Oy1exI3ndz7srmmvlei0DMQCAk,2824
+tinybird/tb/modules/pipe.py,sha256=P_W5HW1-UEidWlw0pty-n_qYvCAyMlNorBmWzmCP7cU,30906
 tinybird/tb/modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb/modules/table.py,sha256=hG-PRDVuFp2uph41WpoLRV1yjp3RI2fi_iGGiI0rdxU,7695
 tinybird/tb/modules/tag.py,sha256=1qQWyk1p3Btv3LzM8VbJG-k7x2-pFuAlYCg3QL6QewI,3480
 tinybird/tb/modules/telemetry.py,sha256=iEGnMuCuNhvF6ln__j6X9MSTwL_0Hm-GgFHHHvhfknk,10466
-tinybird/tb/modules/test.py,sha256=UR7Fz8AHhIptZfxofidzNzTnfAgwhCSWaGyjKbD2TAQ,4605
+tinybird/tb/modules/test.py,sha256=wWOg9FFyAiJkF7qjYapJUne5SVyXwmmhStfpCAZwZ80,5383
 tinybird/tb/modules/token.py,sha256=r0oeG1RpOOzHtqbUaHBiOmhE55HfNIvReAAWyKl9fJg,12695
 tinybird/tb/modules/workspace.py,sha256=FVlh-kbiZp5Gvp6dGFxi0UD8ail77rMamXLhqdVwrZ0,10916
 tinybird/tb/modules/workspace_members.py,sha256=08W0onEYkKLEC5TkAI07cxN9XSquEm7HnL7OkHAVDjo,8715
 tinybird/tb/modules/datafile/build.py,sha256=rFdK_GerPDgPfyPfZ4EZ0-cQqWfHd6htS0ls-Yy7khk,92491
 tinybird/tb/modules/datafile/build_common.py,sha256=74547h5ja4C66DAwDMabj75FA_BUTJxTJv-24tSFmrs,4551
 tinybird/tb/modules/datafile/build_datasource.py,sha256=fquzEGwk9NL_0K5YYG86Xtvgn4J5YHtRUoKJxbQGO0s,17344
-tinybird/tb/modules/datafile/build_pipe.py,sha256=sSSl1rQMkR4uUbFCxK_aDXZi3JwKV64YZlBdBWgGKjo,27657
+tinybird/tb/modules/datafile/build_pipe.py,sha256=V5u21NEpSCWNVl46Cdn_I_bOojxpgSrg1MnScPDqx4U,27648
 tinybird/tb/modules/datafile/common.py,sha256=NkoCdj4p-Ak3n80DJB5a33Ucw2WTcSYa8iqw4KsRZGs,81082
 tinybird/tb/modules/datafile/diff.py,sha256=-iaP7GvAzZtZSa8jPgVpOFlTRutxgxRBLBcGL1_RFr4,6743
 tinybird/tb/modules/datafile/exceptions.py,sha256=8rw2umdZjtby85QbuRKFO5ETz_eRHwUY5l7eHsy1wnI,556
@@ -65,8 +66,8 @@ tinybird/tb_cli_modules/config.py,sha256=6NTgIdwf0X132A1j6G_YrdPep87ymZ9b5pABabK
 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=iEGnMuCuNhvF6ln__j6X9MSTwL_0Hm-GgFHHHvhfknk,10466
-tinybird-0.0.1.dev15.dist-info/METADATA,sha256=D7NcYU4DyAQdBn5hevIYUm3gugIyzdVfXYT7L5DxTYQ,2405
-tinybird-0.0.1.dev15.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-tinybird-0.0.1.dev15.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev15.dist-info/top_level.txt,sha256=pgw6AzERHBcW3YTi2PW4arjxLkulk2msOz_SomfOEuc,45
-tinybird-0.0.1.dev15.dist-info/RECORD,,
+tinybird-0.0.1.dev17.dist-info/METADATA,sha256=eu-lIaxe76zXyzD78jMIjloB-BEVztY_wQeN3mJFoOI,2405
+tinybird-0.0.1.dev17.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+tinybird-0.0.1.dev17.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev17.dist-info/top_level.txt,sha256=pgw6AzERHBcW3YTi2PW4arjxLkulk2msOz_SomfOEuc,45
+tinybird-0.0.1.dev17.dist-info/RECORD,,