tinybird 0.0.1.dev20__py3-none-any.whl → 0.0.1.dev21__py3-none-any.whl

tinybird/prompts.py

@@ -122,7 +122,7 @@ FROM numbers({rows})
 
 """
 
-create_test_calls_prompt = """
+create_test_prompt = """
 You are a Tinybird expert. You will be given a pipe endpoint containing different nodes with SQL and Tinybird templating syntax. You will generate URLs to test it with different parameters combinations.
 
 <test>
@@ -141,6 +141,6 @@ You are a Tinybird expert. You will be given a pipe endpoint containing differen
     - The test command can have as many parameters as are needed to test the pipe.
     - The parameter within Tinybird templating syntax looks like this one {{String(my_param_name, default_value)}}.
     - If there are no parameters in the , you can omit parametrs and generate a single test command.
-    - Extra context: {context}
+    - Extra context: {prompt}
 </instructions>
 """

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.dev20'
-__revision__ = '6125327'
+__version__ = '0.0.1.dev21'
+__revision__ = '523adc6'

tinybird/tb/modules/create.py

@@ -56,10 +56,11 @@ async def create(
     folder = folder or getcwd()
     try:
         config = CLIConfig.get_project_config(folder)
+        user_token: Optional[str] = None
 
         if prompt:
-            user_token = config.get_user_token()
             try:
+                user_token = config.get_user_token()
                 if not user_token:
                     raise CLIException("No user token found")
                 await check_user_token(ctx, token=user_token)
@@ -69,7 +70,7 @@ async def create(
 
         tb_client = config.get_client()
         click.echo(FeedbackManager.gray(message="Creating new project structure..."))
-        await project_create(tb_client, data, prompt, folder)
+        await project_create(tb_client, user_token, data, prompt, folder)
         click.echo(FeedbackManager.success(message="✓ Scaffolding completed!\n"))
 
         click.echo(FeedbackManager.gray(message="\nCreating CI/CD files for GitHub and GitLab..."))
@@ -145,11 +146,11 @@ async def create(
             )
             click.echo(FeedbackManager.info(message=f"✓ /fixtures/{ds_name}"))
             persist_fixture(fixture_name, data_content)
-        elif prompt:
+        elif prompt and user_token:
             datasource_files = [f for f in os.listdir(Path(folder) / "datasources") if f.endswith(".datasource")]
             for datasource_file in datasource_files:
                 datasource_path = Path(folder) / "datasources" / datasource_file
-                llm = LLM(client=tb_client)
+                llm = LLM(user_token=user_token, client=tb_client)
                 datasource_name = datasource_path.stem
                 datasource_content = datasource_path.read_text()
                 has_json_path = "`json:" in datasource_content
@@ -171,6 +172,7 @@ async def create(
 
 async def project_create(
     client: TinyB,
+    user_token: Optional[str],
     data: Optional[str],
     prompt: Optional[str],
     folder: str,
@@ -203,9 +205,9 @@ TYPE ENDPOINT
             """,
             folder,
         )
-    elif prompt:
+    elif prompt and user_token:
         try:
-            llm = LLM(client=client)
+            llm = LLM(user_token=user_token, client=client)
             result = await llm.create_project(prompt)
             for ds in result.datasources:
                 content = ds.content.replace("```", "")

tinybird/tb/modules/llm.py

@@ -8,8 +8,6 @@ from openai import OpenAI
 from pydantic import BaseModel
 
 from tinybird.client import TinyB
-from tinybird.prompts import create_test_calls_prompt
-from tinybird.tb.modules.config import CLIConfig
 
 
 class DataFile(BaseModel):
@@ -33,13 +31,10 @@ class TestExpectations(BaseModel):
 
 
 class LLM:
-    def __init__(self, client: TinyB, api_key: Optional[str] = None):
-        self.client = client
-        user_token = CLIConfig.get_project_config().get_user_token()
-        user_client = deepcopy(client)
-        if user_token:
-            user_client.token = user_token
-        self.user_client = user_client
+    def __init__(self, user_token: str, client: TinyB, api_key: Optional[str] = None):
+        self.user_client = deepcopy(client)
+        self.user_client.token = user_token
+
         self.openai = OpenAI(api_key=api_key) if api_key else None
 
     async def _execute(self, action_fn: Callable[[], Awaitable[str]], checker_fn: Callable[[str], bool]):
@@ -79,20 +74,12 @@ class LLM:
         result = response.get("result", "")
         return result.replace("elementAt", "arrayElement")
 
-    async def create_test_commands(
-        self, pipe_content: str, pipe_params: set[str], context: Optional[str] = None
-    ) -> TestExpectations:
-        if not self.openai:
-            raise ValueError("OpenAI API key is not set")
-
-        completion = self.openai.beta.chat.completions.parse(
-            model="gpt-4o",
-            messages=[
-                {"role": "system", "content": create_test_calls_prompt.format(context=context or "")},
-                {"role": "user", "content": f"Pipe content: {pipe_content}\nPipe params: {pipe_params}"},
-            ],
-            temperature=0.2,
-            seed=42,
-            response_format=TestExpectations,
+    async def create_tests(self, pipe_content: str, pipe_params: set[str], prompt: str = "") -> TestExpectations:
+        response = await self.user_client._req(
+            "/v0/llm/create/tests",
+            method="POST",
+            data=json.dumps({"pipe_content": pipe_content, "pipe_params": list(pipe_params), "prompt": prompt}),
+            headers={"Content-Type": "application/json"},
         )
-        return completion.choices[0].message.parsed or TestExpectations(tests=[])
+        result = response.get("result", "")
+        return TestExpectations.model_validate(result)

tinybird/tb/modules/local.py

@@ -59,18 +59,14 @@ def start_tinybird_local(
         )
 
     click.echo(FeedbackManager.info(message="* Waiting for Tinybird Local to be ready..."))
-    for attempt in range(10):
-        try:
-            run = container.exec_run("tb --no-version-warning sql 'SELECT 1 AS healthcheck' --format json").output
-            # dont parse the json as docker sometimes returns warning messages
-            # todo: rafa, make this rigth
-            if b'"healthcheck": 1' in run:
-                break
-            raise RuntimeError("Unexpected response from Tinybird")
-        except Exception:
-            if attempt == 9:  # Last attempt
-                raise CLIException("Tinybird Local not ready yet. Please try again in a few seconds.")
-            time.sleep(5)  # Wait 5 seconds before retrying
+    while True:
+        health = container.attrs.get("State", {}).get("Health", {}).get("Status")
+        if health == "healthy":
+            break
+        if health == "unhealthy":
+            raise CLIException("Tinybird Local is unhealthy. Please try running `tb local restart` in a few seconds.")
+
+        time.sleep(5)
 
     # Remove tinybird-local dangling images to avoid running out of disk space
     images = docker_client.images.list(name=re.sub(r":.*$", "", TB_IMAGE_NAME), all=True, filters={"dangling": True})

tinybird/tb/modules/mock.py

@@ -41,7 +41,6 @@ async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str, fold
         if not prompt:
             # load the prompt from the fixture.prompt file if it exists
             if prompt_path.exists():
-                click.echo(FeedbackManager.gray(message=f"Using prompt for {prompt_path}..."))
                 prompt = prompt_path.read_text()
         else:
             click.echo(FeedbackManager.gray(message=f"Overriding prompt for {datasource_name}..."))
@@ -61,7 +60,7 @@ async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str, fold
             click.echo(FeedbackManager.error(message="This action requires authentication. Run 'tb login' first."))
             return
 
-        llm = LLM(client=user_client)
+        llm = LLM(user_token=user_token, client=user_client)
         tb_client = await get_tinybird_local_client(os.path.abspath(folder))
         sql = await llm.generate_sql_sample_data(datasource_content, rows=rows, prompt=prompt)
         if os.environ.get("TB_DEBUG", "") != "":

tinybird/tb/modules/test.py

@@ -89,11 +89,12 @@ async def test_create(pipe: str, prompt: Optional[str], folder: str) -> None:
         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"])
+        config = CLIConfig.get_project_config(folder)
+        user_token = config.get_user_token()
+        llm = LLM(user_token=user_token, client=config.get_client())
 
-        test_expectations = await llm.create_test_commands(
-            pipe_content=pipe_content, pipe_params=pipe_params, context=prompt
+        test_expectations = await llm.create_tests(
+            pipe_content=pipe_content, pipe_params=pipe_params, prompt=prompt or ""
         )
         valid_test_expectations = []
         for test in test_expectations.tests:

{tinybird-0.0.1.dev20.dist-info → tinybird-0.0.1.dev21.dist-info}/METADATA

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

{tinybird-0.0.1.dev20.dist-info → tinybird-0.0.1.dev21.dist-info}/RECORD

@@ -6,7 +6,7 @@ tinybird/context.py,sha256=kutUQ0kCwparowI74_YLXx6wtTzGLRouJ6oGHVBPzBo,1291
 tinybird/datatypes.py,sha256=IHyhZ86ib54Vnd1pbod9y2aS8DDvDKZm1HJGlThdbuQ,10460
 tinybird/feedback_manager.py,sha256=cNUbt0Jxim02UiIdlyP12DJfXfFFzxDCfJK9XRWZ9A0,67488
 tinybird/git_settings.py,sha256=XUL9ZUj59-ZVQJDYmMEq4UpnuuOuQOHGlNcX3JgQHjQ,3954
-tinybird/prompts.py,sha256=pCqN1JAHqdA-PgxBnzjIYpCXjpko89Xu4EHl6ol0iNs,6417
+tinybird/prompts.py,sha256=t2AuOlyBy7dEOuZcUVZzTXExP7VnK337u7z-GftSY-Q,6410
 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
@@ -15,7 +15,7 @@ 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=nqO4DG-X3kMoScr83GpbljzQXL1sm9WSdYJVL14dEFg,251
+tinybird/tb/__cli__.py,sha256=1VxxptKXBoOejwGSsyZYVR5OdTVsLgpfAiAB6C5DI3c,251
 tinybird/tb/cli.py,sha256=onCxcKvTV4RuokC5V3t82OXWAIwgU6pMWs8rpWOUi_o,815
 tinybird/tb/modules/auth.py,sha256=EzRWFmwRkXNhUmRaruEVFLdkbUg8xMSix0cAWl5D4Jg,9029
 tinybird/tb/modules/build.py,sha256=qJsmJCphanQitSnv86dqeoThM7mOg9Yg9JJLQjQ56ws,7074
@@ -24,24 +24,24 @@ tinybird/tb/modules/cli.py,sha256=rHfc93DFFSQfWrAX-JBFrcZF43ttk7lYtYTBTn9TdMU,20
 tinybird/tb/modules/common.py,sha256=shaF6GIl2L9e3Rm8aFsIIollSNSBsb2ozBklpnsmRTc,70560
 tinybird/tb/modules/config.py,sha256=ri4Gwyzqol6-NofTjHnWquuDzJOjHbkaAnboO8JNENY,11499
 tinybird/tb/modules/connection.py,sha256=FhDM-OAnLN2epbO2YonpjJQhHqBjyuanBsZmKlDXrqg,28679
-tinybird/tb/modules/create.py,sha256=LzhPdeL3_nTIZ2-ESS3FdVlNGSriRcz_DytfmykcMxU,10207
+tinybird/tb/modules/create.py,sha256=kHmHoPIXh7V1opRzKKDm0q4UbZ6rz9tJwWMsUroA3I8,10371
 tinybird/tb/modules/datasource.py,sha256=3ySFOTXVnuqwQQNJBYhD8Sq41S2BJO2ymZRsFmEvHqY,32899
 tinybird/tb/modules/exceptions.py,sha256=4A2sSjCEqKUMqpP3WI00zouCWW4uLaghXXLZBSw04mY,3363
 tinybird/tb/modules/feedback_manager.py,sha256=a76KSrIdtNT5cs56jMYUfpqoXMwEPq_SErRGlX0i4hc,68384
 tinybird/tb/modules/fmt.py,sha256=poh6_cwVGSf-sBu6LKWuO2TANL_J8Sgm25sPpwxa3Aw,3558
 tinybird/tb/modules/job.py,sha256=956Pj8BEEsiD2GZsV9RKKVM3I_CveOLgS82lykO5ukk,2963
-tinybird/tb/modules/llm.py,sha256=cVMLAmkdDEQ5BNBL_JWFErtq3lGofHauQAJ46g6xVf0,3208
-tinybird/tb/modules/local.py,sha256=OALOxW5_KZ1DHtyybF9jXVDIYpXhX1pSK3CnqbneOCY,5516
+tinybird/tb/modules/llm.py,sha256=9oJzI213eFv68Ttcfl3XNgEetaxfr6m56s2-IyBhNZ8,2713
+tinybird/tb/modules/local.py,sha256=xWUVQzGw2bdWrezJd2Qa3YmXnpg4VdGtQduJpPfKMck,5194
 tinybird/tb/modules/local_common.py,sha256=oemeKBCdEkNHXuGv1p6I9vhjkSXvqDsV5kT-rPN3mvk,2145
 tinybird/tb/modules/login.py,sha256=KYGpM35fsjIVkp04Xm1kHvlEOXysRSvLfBUNTxNx26A,6044
-tinybird/tb/modules/mock.py,sha256=4EFV5zGiEaX76e9n1j6r2CYB1drBIVAmsra2HGTFETM,3303
+tinybird/tb/modules/mock.py,sha256=BbDe60Qdlxg5-WewxFYRPETNBExj1qqBn5Ngz5T8G2Q,3231
 tinybird/tb/modules/pipe.py,sha256=eYmMBiSj1Ur_hXUs74YZ9mCSAyiICDmkuKuTemlxPUY,27018
 tinybird/tb/modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb/modules/shell.py,sha256=OfFQ4lx3v_XSTr5cm_mTDG6CLc3zFdikM2pOamifG84,13469
 tinybird/tb/modules/table.py,sha256=4XrtjM-N0zfNtxVkbvLDQQazno1EPXnxTyo7llivfXk,11035
 tinybird/tb/modules/tag.py,sha256=anPmMUBc-TbFovlpFi8GPkKA18y7Y0GczMsMms5TZsU,3502
 tinybird/tb/modules/telemetry.py,sha256=iEGnMuCuNhvF6ln__j6X9MSTwL_0Hm-GgFHHHvhfknk,10466
-tinybird/tb/modules/test.py,sha256=BvXFG_-t-qf1snbKIj-_UTeQppiwWYR1SSNEhTeF2J0,8780
+tinybird/tb/modules/test.py,sha256=loB9lNbtHuHcF9TwBJJLEkSyQakxnyUTHmCFYVsMnDA,8833
 tinybird/tb/modules/token.py,sha256=AePr-QMv_vtWwZDWQ92Zp0kPrCjze61i4npiPhoLMZg,12717
 tinybird/tb/modules/watch.py,sha256=xCIUvqTgeb2s63CYw26czgUGV3zzJpdmuyHGH2TLp1E,2349
 tinybird/tb/modules/workspace.py,sha256=6icAgnTvfL3d1kx4L1Z1cGXCD_2Yx0fNRjbZHNxRbYc,10927
@@ -69,8 +69,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.dev20.dist-info/METADATA,sha256=jYT6C0i9jPiQgVXQBjPgKEkOhdzxr5alwHMXMTIfosc,2446
-tinybird-0.0.1.dev20.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-tinybird-0.0.1.dev20.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev20.dist-info/top_level.txt,sha256=pgw6AzERHBcW3YTi2PW4arjxLkulk2msOz_SomfOEuc,45
-tinybird-0.0.1.dev20.dist-info/RECORD,,
+tinybird-0.0.1.dev21.dist-info/METADATA,sha256=FMzNtUcWW-VbxL1Fvu5zVrBsEJb0mDEowNSDKibTL0U,2446
+tinybird-0.0.1.dev21.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+tinybird-0.0.1.dev21.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev21.dist-info/top_level.txt,sha256=pgw6AzERHBcW3YTi2PW4arjxLkulk2msOz_SomfOEuc,45
+tinybird-0.0.1.dev21.dist-info/RECORD,,