tinybird 0.0.1.dev48__py3-none-any.whl → 0.0.1.dev49__py3-none-any.whl

tinybird/prompts.py

@@ -651,32 +651,6 @@ DATASOURCE sales_by_hour
 """
 
 
-def ask_prompt(existing_resources: str) -> str:
-    return """
-You are a Tinybird expert. You will be given a prompt to ask questions about Tinybird resources.
-<existing_resources>{existing_resources}</existing_resources>
-{datasource_instructions}
-{pipe_instructions}
-{sql_instructions}
-{datasource_example}
-{pipe_example}
-{copy_pipe_instructions}
-{materialized_pipe_instructions}
-
-The previous instructions are explanations of how things work in Tinybird. Answer in natural language.
-
-""".format(
-        existing_resources=existing_resources,
-        datasource_instructions=datasource_instructions,
-        datasource_example=datasource_example,
-        pipe_instructions=pipe_instructions,
-        pipe_example=pipe_example,
-        sql_instructions=sql_instructions,
-        copy_pipe_instructions=copy_pipe_instructions,
-        materialized_pipe_instructions=materialized_pipe_instructions,
-    )
-
-
 datasource_instructions = """
 <datasource_file_instructions>
     - Content cannot be empty.
@@ -790,39 +764,6 @@ sql_instructions = """
 )
 
 
-def update_prompt(existing_resources: str) -> str:
-    return """
-You are a Tinybird expert. You will be given a prompt to update the existing Tinybird resources: datasources and/or pipes. 
-You will return the resources that need to be updated.
-<existing_resources>{existing_resources}</existing_resources>
-{datasource_instructions}
-{pipe_instructions}
-{sql_instructions}
-{datasource_example}
-{pipe_example}
-{copy_pipe_instructions}
-{materialized_pipe_instructions}
-Use the following format to generate the response and do not wrap it in any other text, including the <response> tag.
-<response>
-    <resource>
-        <type>[datasource or pipe]</type>
-        <name>[resource name here]</name>
-        <content>[resource content here]</content>
-    </resource>
-</response>
-
-""".format(
-        existing_resources=existing_resources,
-        datasource_instructions=datasource_instructions,
-        pipe_instructions=pipe_instructions,
-        sql_instructions=sql_instructions,
-        datasource_example=datasource_example,
-        pipe_example=pipe_example,
-        copy_pipe_instructions=copy_pipe_instructions,
-        materialized_pipe_instructions=materialized_pipe_instructions,
-    )
-
-
 def rules_prompt(source: Optional[str] = None) -> str:
     base_command = source or "tb"
     return """

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.dev48'
-__revision__ = '6d638e9'
+__version__ = '0.0.1.dev49'
+__revision__ = 'a0a2378'

tinybird/tb/cli.py

@@ -23,7 +23,6 @@ import tinybird.tb.modules.pipe
 import tinybird.tb.modules.tag
 import tinybird.tb.modules.test
 import tinybird.tb.modules.token
-import tinybird.tb.modules.update
 import tinybird.tb.modules.workspace
 import tinybird.tb.modules.workspace_members
 

tinybird/tb/modules/build.py

@@ -1,6 +1,7 @@
 import asyncio
 import json
 import logging
+import sys
 import threading
 import time
 from pathlib import Path
@@ -15,7 +16,6 @@ from tinybird.tb.modules.common import push_data
 from tinybird.tb.modules.datafile.build import folder_build
 from tinybird.tb.modules.datafile.fixture import build_fixture_name, get_fixture_dir
 from tinybird.tb.modules.feedback_manager import FeedbackManager
-from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.project import Project
 from tinybird.tb.modules.shell import Shell, print_table_formatted
 from tinybird.tb.modules.watch import watch_project
@@ -29,7 +29,7 @@ def build(ctx: click.Context, watch: bool) -> None:
     Validate and build the project server side.
     """
     project: Project = ctx.ensure_object(dict)["project"]
-    tb_client = asyncio.run(get_tinybird_local_client(str(project.path), build=True))
+    tb_client: TinyB = ctx.ensure_object(dict)["client"]
     click.echo(FeedbackManager.highlight_building_project())
     time_start = time.time()
 
@@ -40,15 +40,21 @@ def build(ctx: click.Context, watch: bool) -> None:
             build_project(project, tb_client, file_changed)
             try:
                 if file_changed:
-                    asyncio.run(folder_build(project, filenames=[file_changed]))
-                    build_and_print_resource(tb_client, file_changed, diff)
+                    asyncio.run(folder_build(project, tb_client, filenames=[file_changed]))
+                    show_data(tb_client, file_changed, diff)
             except Exception:
                 pass
 
-    process()
-    time_end = time.time()
-    elapsed_time = time_end - time_start
-    click.echo(FeedbackManager.success(message=f"\n✓ Build completed in {elapsed_time:.1f}s"))
+    try:
+        process()
+    except click.ClickException as e:
+        click.echo(e)
+        if not watch:
+            sys.exit(1)
+    else:
+        time_end = time.time()
+        elapsed_time = time_end - time_start
+        click.echo(FeedbackManager.success(message=f"\n✓ Build completed in {elapsed_time:.1f}s"))
 
     if watch:
         shell = Shell(project=project, tb_client=tb_client)
@@ -137,9 +143,16 @@ def build_project(project: Project, tb_client: TinyB, file_changed: Optional[str
 
                         if fixture_path.exists():
                             append_fixture(tb_client, ds_name, str(fixture_path))
+
             except Exception:
                 pass
 
+            feedback = result.get("feedback", [])
+            for f in feedback:
+                click.echo(
+                    FeedbackManager.warning(message=f"△ {f.get('level')}: {f.get('resource')}: {f.get('message')}")
+                )
+
         elif build_result == "failed":
             build_errors = result.get("errors")
             error = True
@@ -198,7 +211,7 @@ def rebuild_fixture(project: Project, tb_client: TinyB, fixture: str) -> None:
         click.echo(FeedbackManager.error_exception(error=e))
 
 
-def build_and_print_resource(tb_client: TinyB, filename: str, diff: Optional[str] = None):
+def show_data(tb_client: TinyB, filename: str, diff: Optional[str] = None):
     table_name = diff
     resource_path = Path(filename)
     resource_name = resource_path.stem

tinybird/tb/modules/cli.py

@@ -7,7 +7,6 @@ import json
 import logging
 import os
 from os import getcwd
-from pathlib import Path
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
 import click
@@ -20,7 +19,6 @@ from tinybird.client import (
     TinyB,
 )
 from tinybird.config import get_config
-from tinybird.prompts import ask_prompt
 from tinybird.tb import __cli__
 from tinybird.tb.modules.common import (
     CatchAuthExceptions,
@@ -37,7 +35,6 @@ from tinybird.tb.modules.datafile.build import build_graph
 from tinybird.tb.modules.datafile.diff import diff_command
 from tinybird.tb.modules.datafile.pull import folder_pull
 from tinybird.tb.modules.feedback_manager import FeedbackManager
-from tinybird.tb.modules.llm import LLM
 from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.project import Project
 
@@ -124,13 +121,9 @@ async def cli(
 
     logging.debug("debug enabled")
 
-    skip_client = ctx.invoked_subcommand in ["auth", "check", "login", "local", "build"]
-    client = await create_ctx_client(config, prod, build, skip_client, project)
+    client = await create_ctx_client(ctx, config, prod, build, project)
 
     if client:
-        if not build:
-            target = config.get("name", "production") if prod else "Tinybird local"
-            click.echo(FeedbackManager.gray(message=f"Running against {target}\n"))
         ctx.ensure_object(dict)["client"] = client
 
     ctx.ensure_object(dict)["project"] = project
@@ -358,56 +351,6 @@ async def sql(
         click.echo(FeedbackManager.info_no_rows())
 
 
-@cli.command(hidden=True)
-@click.argument("prompt")
-@click.option("--folder", default=os.getcwd(), help="The folder to use for the project")
-@coro
-async def ask(prompt: str, folder: str) -> None:
-    """Ask things about your data project."""
-    try:
-        config = CLIConfig.get_project_config(folder)
-        user_token = config.get_user_token()
-
-        if not user_token:
-            raise CLIException("This action requires authentication. Run 'tb login' first.")
-
-        datasource_paths = [
-            Path(folder) / "datasources" / f
-            for f in os.listdir(Path(folder) / "datasources")
-            if f.endswith(".datasource")
-        ]
-        pipe_folders = ["endpoints", "pipes", "copies", "materializations", "sinks"]
-        pipe_paths = [
-            Path(folder) / pipe_folder / f
-            for pipe_folder in pipe_folders
-            if (Path(folder) / pipe_folder).exists()
-            for f in os.listdir(Path(folder) / pipe_folder)
-            if f.endswith(".pipe")
-        ]
-        resources_xml = "\n".join(
-            [
-                f"<resource><type>{resource_type}</type><name>{resource_name}</name><content>{resource_content}</content></resource>"
-                for resource_type, resource_name, resource_content in [
-                    ("datasource", ds.stem, ds.read_text()) for ds in datasource_paths
-                ]
-                + [
-                    (
-                        "pipe",
-                        pipe.stem,
-                        pipe.read_text(),
-                    )
-                    for pipe in pipe_paths
-                ]
-            ]
-        )
-
-        client = config.get_client()
-        llm = LLM(user_token=user_token, host=client.host)
-        click.echo(llm.ask(system_prompt=ask_prompt(resources_xml), prompt=prompt))
-    except Exception as e:
-        raise CLIException(FeedbackManager.error_exception(error=e))
-
-
 def __patch_click_output():
     import re
 
@@ -445,11 +388,23 @@ def __unpatch_click_output():
     click.secho = __old_click_secho
 
 
-async def create_ctx_client(config: Dict[str, Any], prod: bool, build: bool, skip_client: bool, project: Project):
-    if skip_client:
+async def create_ctx_client(ctx: Context, config: Dict[str, Any], prod: bool, build: bool, project: Project):
+    commands_without_ctx_client = ["auth", "check", "login", "local"]
+    command = ctx.invoked_subcommand
+    if command in commands_without_ctx_client:
         return None
 
-    if prod:
+    commands_always_prod = ["pull"]
+    commands_always_build = ["build", "test"]
+    commands_always_local = ["create", "mock"]
+    if (
+        (prod or command in commands_always_prod)
+        and command not in commands_always_build
+        and command not in commands_always_local
+    ):
+        click.echo(FeedbackManager.gray(message=f"Running against {config.get('name') or 'production'}"))
         return _get_tb_client(config.get("token", None), config["host"])
-
+    build = command in commands_always_build or build
+    if not build and command not in commands_always_local and command not in commands_always_build:
+        click.echo(FeedbackManager.gray(message="Running against Tinybird local\n"))
     return await get_tinybird_local_client(str(project.path), build=build)

tinybird/tb/modules/create.py

@@ -17,7 +17,6 @@ from tinybird.tb.modules.exceptions import CLIException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.llm import LLM
 from tinybird.tb.modules.llm_utils import extract_xml, parse_xml
-from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.project import Project
 
 
@@ -41,8 +40,8 @@ from tinybird.tb.modules.project import Project
     help="Folder where datafiles will be placed",
 )
 @click.option("--rows", type=int, default=10, help="Number of events to send")
-@click.option("--cursor", default=False, is_flag=True, help="Create .cursorrules file with Tinybird rules")
 @click.option("--source", type=str, default="tb", help="Source of the command")
+@click.option("--skip", is_flag=True, default=False, help="Skip following up on the generated data")
 @click.pass_context
 @coro
 async def create(
@@ -51,11 +50,12 @@ async def create(
     prompt: Optional[str],
     folder: Optional[str],
     rows: int,
-    cursor: bool,
     source: str,
+    skip: bool,
 ) -> None:
     """Initialize a new project."""
     project: Project = ctx.ensure_object(dict)["project"]
+    local_client: TinyB = ctx.ensure_object(dict)["client"]
     folder = folder or getcwd()
     folder_path = Path(folder)
     if not folder_path.exists():
@@ -78,7 +78,6 @@ async def create(
                     )
                 )
                 return
-        local_client = await get_tinybird_local_client(folder)
 
         if not validate_project_structure(folder):
             click.echo(FeedbackManager.highlight(message="\n» Creating new project structure..."))
@@ -88,7 +87,7 @@ async def create(
         result = ""
         if data or prompt:
             click.echo(FeedbackManager.highlight(message="\n» Creating resources..."))
-            result = await create_resources(local_client, tb_client, user_token, data, prompt, folder)
+            result = await create_resources(local_client, tb_client, user_token, data, prompt, folder, skip)
             click.echo(FeedbackManager.success(message="✓ Done!\n"))
 
         if not already_has_cicd(folder):
@@ -97,6 +96,11 @@ async def create(
             await init_cicd(data_project_dir=os.path.relpath(folder))
             click.echo(FeedbackManager.success(message="✓ Done!\n"))
 
+        if not already_has_cursor_rules(folder):
+            click.echo(FeedbackManager.highlight(message="\n» Creating .cursorrules..."))
+            create_rules(folder, source, "cursor")
+            click.echo(FeedbackManager.success(message="✓ Done!\n"))
+
         if should_generate_fixtures(result):
             click.echo(FeedbackManager.highlight(message="\n» Generating fixtures..."))
 
@@ -130,12 +134,6 @@ async def create(
                         if data:
                             persist_fixture(fixture_name, data, folder)
                             click.echo(FeedbackManager.info(message=f"✓ /fixtures/{datasource_name}"))
-
-        if cursor:
-            click.echo(FeedbackManager.highlight(message="\n» Creating .cursorrules..."))
-            create_rules(folder, source, "cursor")
-            click.echo(FeedbackManager.success(message="✓ Done!\n"))
-
     except Exception as e:
         click.echo(FeedbackManager.error(message=f"Error: {str(e)}"))
 
@@ -158,6 +156,11 @@ def already_has_cicd(folder: str) -> bool:
     return any((Path(folder) / path).exists() for path in ci_cd_paths)
 
 
+def already_has_cursor_rules(folder: str) -> bool:
+    cursor_rules_paths = (".cursorrules", ".windsurfrules")
+    return any((Path(folder) / path).exists() for path in cursor_rules_paths)
+
+
 def create_project_structure(folder: str):
     folder_path = Path(folder)
     for x in PROJECT_PATHS:
@@ -176,6 +179,7 @@ async def create_resources(
     data: Optional[str],
     prompt: Optional[str],
     folder: str,
+    skip: bool,
 ):
     result = ""
     folder_path = Path(folder)
@@ -285,7 +289,8 @@ TYPE ENDPOINT
                     content = pipe["content"].replace("```", "")
                     pipe_path = generate_pipe_file(pipe["name"], content, folder)
                     generated_paths.append(pipe_path)
-
+                if skip:
+                    break
                 iterations += 1
 
         if iterations == 10:

tinybird/tb/modules/datafile/build.py

@@ -42,12 +42,12 @@ from tinybird.tb.modules.datafile.exceptions import AlreadyExistsException, Incl
 from tinybird.tb.modules.datafile.parse_datasource import parse_datasource
 from tinybird.tb.modules.datafile.parse_pipe import parse_pipe
 from tinybird.tb.modules.feedback_manager import FeedbackManager
-from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.project import Project
 
 
 async def folder_build(
     project: Project,
+    tb_client: TinyB,
     filenames: Optional[List[str]] = None,
     is_internal: bool = False,
     is_vendor: bool = False,
@@ -67,7 +67,6 @@ async def folder_build(
     fork = False
     release_created = False
     folder = str(project.path)
-    tb_client = await get_tinybird_local_client(folder)
     datasources: List[Dict[str, Any]] = await tb_client.datasources()
     pipes: List[Dict[str, Any]] = await tb_client.pipes(dependencies=True)
 

tinybird/tb/modules/datafile/common.py

@@ -207,7 +207,7 @@ class Datafile:
             #  [x] SQL in all nodes
             #  [x] Materialized nodes have target datasource
             #  [x] Only one materialized node
-            #  [ ] Only one node of any specific type
+            #  [x] Only one node of any specific type
             #  [ ] ...
             repeated_node_names = [
                 name for name, count in filter(lambda x: x[1] > 1, Counter(n["name"] for n in self.nodes).items())
@@ -219,16 +219,14 @@ class Datafile:
             for node in self.nodes:
                 if "sql" not in node:
                     raise DatafileValidationError(f"SQL missing for node {repr(node['name'])}")
-            materialized_nodes_count = 0
+            non_standard_nodes_count = 0
             for node in self.nodes:
-                if node.get("type", "").lower() == "materialized":
-                    materialized_nodes_count += 1
-                    if materialized_nodes_count > 1:
-                        raise DatafileValidationError("Multiple materialized nodes in pipe. There can only be one")
-                    if "datasource" not in node:
-                        raise DatafileValidationError(
-                            f"Materialized node {repr(node['name'])} missing target datasource"
-                        )
+                if node.get("type", "").lower() not in {PipeNodeTypes.STANDARD, ""}:
+                    non_standard_nodes_count += 1
+                    if non_standard_nodes_count > 1:
+                        raise DatafileValidationError("Multiple non-standard nodes in pipe. There can only be one")
+                if node.get("type", "").lower() == PipeNodeTypes.MATERIALIZED and "datasource" not in node:
+                    raise DatafileValidationError(f"Materialized node {repr(node['name'])} missing target datasource")
         elif self.kind == DatafileKind.datasource:
             # TODO(eclbg):
             #  [x] Just one node

tinybird/tb/modules/deployment.py

@@ -1,5 +1,6 @@
 import json
 import logging
+import sys
 import time
 from datetime import datetime
 from pathlib import Path
@@ -14,7 +15,7 @@ from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.project import Project
 
 
-def promote_deployment(host: Optional[str], headers: dict) -> None:
+def promote_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     TINYBIRD_API_URL = f"{host}/v1/deployments"
     r = requests.get(TINYBIRD_API_URL, headers=headers)
     result = r.json()
@@ -23,11 +24,11 @@ def promote_deployment(host: Optional[str], headers: dict) -> None:
     deployments = result.get("deployments")
     if not deployments:
         click.echo(FeedbackManager.error(message="No deployments found"))
-        return
+        sys.exit(1)
 
     if len(deployments) < 2:
         click.echo(FeedbackManager.error(message="Only one deployment found"))
-        return
+        sys.exit(1)
 
     last_deployment, candidate_deployment = deployments[0], deployments[1]
 
@@ -36,7 +37,7 @@ def promote_deployment(host: Optional[str], headers: dict) -> None:
         deploy_errors = candidate_deployment.get("errors", [])
         for deploy_error in deploy_errors:
             click.echo(FeedbackManager.error(message=f"* {deploy_error}"))
-        return
+        sys.exit(1)
 
     if candidate_deployment.get("live"):
         click.echo(FeedbackManager.error(message="Candidate deployment is already live"))
@@ -55,10 +56,23 @@ def promote_deployment(host: Optional[str], headers: dict) -> None:
     result = r.json()
     logging.debug(json.dumps(result, indent=2))
 
+    if wait:
+        while True:
+            TINYBIRD_API_URL = f"{host}/v1/deployments/{last_deployment.get('id')}"
+            r = requests.get(TINYBIRD_API_URL, headers=headers)
+            result = r.json()
+            logging.debug(json.dumps(result, indent=2))
+
+            last_deployment = result.get("deployment")
+            if last_deployment.get("status") == "deleted":
+                break
+
+            time.sleep(5)
+
     click.echo(FeedbackManager.success(message="Deployment promoted successfully"))
 
 
-def rollback_deployment(host: Optional[str], headers: dict) -> None:
+def rollback_deployment(host: Optional[str], headers: dict, wait: bool) -> None:
     TINYBIRD_API_URL = f"{host}/v1/deployments"
     r = requests.get(TINYBIRD_API_URL, headers=headers)
     result = r.json()
@@ -99,6 +113,18 @@ def rollback_deployment(host: Optional[str], headers: dict) -> None:
     result = r.json()
     logging.debug(json.dumps(result, indent=2))
 
+    if wait:
+        while True:
+            TINYBIRD_API_URL = f"{host}/v1/deployments/{current_deployment.get('id')}"
+            r = requests.get(TINYBIRD_API_URL, headers=headers)
+            result = r.json()
+            logging.debug(json.dumps(result, indent=2))
+
+            current_deployment = result.get("deployment")
+            if current_deployment.get("status") == "deleted":
+                break
+            time.sleep(5)
+
     click.echo(FeedbackManager.success(message="Deployment rolled back successfully"))
 
 
@@ -165,7 +191,13 @@ def deployment_ls(ctx: click.Context) -> None:
 
 @deployment_group.command(name="promote")
 @click.pass_context
-def deployment_promote(ctx: click.Context) -> None:
+@click.option(
+    "--wait/--no-wait",
+    is_flag=True,
+    default=False,
+    help="Wait for deploy to finish. Disabled by default.",
+)
+def deployment_promote(ctx: click.Context, wait: bool) -> None:
     """
     Promote last deploy to ready and remove old one.
     """
@@ -174,12 +206,18 @@ def deployment_promote(ctx: click.Context) -> None:
     TINYBIRD_API_KEY = client.token
     HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
 
-    promote_deployment(client.host, HEADERS)
+    promote_deployment(client.host, HEADERS, wait=wait)
 
 
 @deployment_group.command(name="rollback")
 @click.pass_context
-def deployment_rollback(ctx: click.Context) -> None:
+@click.option(
+    "--wait/--no-wait",
+    is_flag=True,
+    default=False,
+    help="Wait for deploy to finish. Disabled by default.",
+)
+def deployment_rollback(ctx: click.Context, wait: bool) -> None:
     """
     Rollback to the previous deployment.
     """
@@ -188,7 +226,7 @@ def deployment_rollback(ctx: click.Context) -> None:
     TINYBIRD_API_KEY = client.token
     HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
 
-    rollback_deployment(client.host, HEADERS)
+    rollback_deployment(client.host, HEADERS, wait=wait)
 
 
 @cli.command(name="deploy", hidden=True)
@@ -248,6 +286,12 @@ def create_deployment(ctx: click.Context, wait: bool, auto: bool) -> None:
         if deploy_result == "success":
             click.echo(FeedbackManager.success(message="Deployment submitted successfully"))
             deployment = result.get("deployment")
+            feedback = deployment.get("feedback", [])
+            for f in feedback:
+                click.echo(
+                    FeedbackManager.warning(message=f"△ {f.get('level')}: {f.get('resource')}: {f.get('message')}")
+                )
+
         elif deploy_result == "failed":
             click.echo(FeedbackManager.error(message="Deployment failed"))
             deploy_errors = result.get("errors")
@@ -264,9 +308,11 @@ def create_deployment(ctx: click.Context, wait: bool, auto: bool) -> None:
         for fd in fds:
             fd.close()
 
+        if not deployment:
+            sys.exit(1)
+
     if deployment and wait:
-        while deployment.get("status") != "data_ready":
-            time.sleep(5)
+        while True:
             TINYBIRD_API_URL = f"{client.host}/v1/deployments/{deployment.get('id')}"
             r = requests.get(TINYBIRD_API_URL, headers=HEADERS)
             result = r.json()
@@ -281,10 +327,15 @@ def create_deployment(ctx: click.Context, wait: bool, auto: bool) -> None:
 
                 if auto:
                     click.echo(FeedbackManager.error(message="Rolling back deployment"))
-                    rollback_deployment(client.host, HEADERS)
-                return
+                    rollback_deployment(client.host, HEADERS, wait=wait)
+                sys.exit(1)
+
+            if deployment.get("status") == "data_ready":
+                break
+
+            time.sleep(5)
 
         click.echo(FeedbackManager.success(message="Deployment is ready"))
 
         if auto:
-            promote_deployment(client.host, HEADERS)
+            promote_deployment(client.host, HEADERS, wait=wait)

tinybird/tb/modules/feedback_manager.py

@@ -73,9 +73,7 @@ class FeedbackManager:
     error_exception = error_exception("{error}")
     simple_error_exception = simple_error_message("{error}")
     error_exception_trace = error_message("{error}\n** Trace:\n{trace}")
-    error_notoken = error_message(
-        "No auth token provided. Run 'tb auth' to configure them or re-run the command passing the --token param (example: tb --token <the_token> datasource ls)."
-    )
+    error_notoken = error_message("This action requires authentication. Run 'tb login' first")
     error_auth_config = error_message("{config_file} does not exist")
     error_file_config = error_message("{config_file} can't be written, check write permissions on this folder")
     error_load_file_config = error_message("{config_file} can't be loaded, remove it and run the command again")

tinybird/tb/modules/local_common.py

@@ -4,7 +4,7 @@ import os
 
 import requests
 
-from tinybird.client import TinyB
+from tinybird.client import AuthNoTokenException, TinyB
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import CLIException
 
@@ -40,8 +40,10 @@ async def get_tinybird_local_config(path: str, build: bool = False) -> CLIConfig
     if path:
         folder_hash = hashlib.sha256(path.encode()).hexdigest()
         user_client = config.get_client(host=TB_LOCAL_HOST, token=user_token)
-        ws_name = config.get("name")
-        ws_name = f"Tinybird_Local_Build_{folder_hash}" if build else ws_name
+        ws_name = f"Tinybird_Local_Build_{folder_hash}" if build else config.get("name")
+        if not ws_name:
+            raise AuthNoTokenException()
+
         logging.debug(f"Workspace used for build: {ws_name}")
 
         user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={user_token}").json()
@@ -54,7 +56,7 @@ async def get_tinybird_local_config(path: str, build: bool = False) -> CLIConfig
             user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={user_token}").json()
             ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
             if not ws:
-                raise CLIException(f"Workspace {ws_name} not found after creation")
+                raise AuthNoTokenException()
 
         ws_token = ws["token"]
 

tinybird/tb/modules/login.py

@@ -121,7 +121,7 @@ async def login(host: str, workspace: str):
     """Authenticate using the browser."""
     auth_event = threading.Event()
     auth_code = [None]  # Using a list to store the code, as it's mutable
-    host = host or "https://api.tinybird.co"
+    host = host or "https://api.wadus2.gcp.tinybird.co"
 
     def auth_callback(code):
         auth_code[0] = code

tinybird/tb/modules/mock.py

@@ -5,6 +5,7 @@ from typing import Optional
 
 import click
 
+from tinybird.client import TinyB
 from tinybird.prompts import mock_prompt
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import CLIException, check_user_token_with_client, coro
@@ -13,7 +14,6 @@ from tinybird.tb.modules.datafile.fixture import build_fixture_name, persist_fix
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.llm import LLM
 from tinybird.tb.modules.llm_utils import extract_xml
-from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.project import Project
 
 
@@ -40,6 +40,7 @@ async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str, skip
     """
 
     try:
+        tb_client: TinyB = ctx.ensure_object(dict)["client"]
         project: Project = ctx.ensure_object(dict)["project"]
         datasource_path = Path(datasource)
         datasource_name = datasource
@@ -76,7 +77,6 @@ async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str, skip
             click.echo(FeedbackManager.error(message="This action requires authentication. Run 'tb login' first."))
             return
         llm = LLM(user_token=user_token, host=user_client.host)
-        tb_client = await get_tinybird_local_client(folder)
         prompt = f"<datasource_schema>{datasource_content}</datasource_schema>\n<user_input>{prompt}</user_input>"
         iterations = 0
         history = ""

tinybird/tb/modules/project.py

@@ -40,11 +40,11 @@ class Project:
 
     @property
     def datasources(self) -> List[str]:
-        return [Path(f).stem for f in glob.glob(f"{self.path}/**/*.datasource", recursive=True)]
+        return sorted([Path(f).stem for f in glob.glob(f"{self.path}/**/*.datasource", recursive=True)])
 
     @property
     def pipes(self) -> List[str]:
-        return [Path(f).stem for f in glob.glob(f"{self.path}/**/*.pipe", recursive=True)]
+        return sorted([Path(f).stem for f in glob.glob(f"{self.path}/**/*.pipe", recursive=True)])
 
     def get_pipe_datafile(self, filename: str) -> Optional[Datafile]:
         try:

tinybird/tb/modules/shell.py

@@ -69,14 +69,27 @@ class DynamicCompleter(Completer):
         if not words:
             return
 
-        # If we just typed 'from' or there's a space after 'from', suggest datasources
-        if words[-1] == "from" or (
-            "from" in words and len(words) > words.index("from") + 1 and text_lower.endswith(" ")
-        ):
-            for x in self.project.datasources:
-                yield Completion(x, start_position=0, display=x, style="class:completion.datasource")
-            for x in self.project.pipes:
-                yield Completion(x, start_position=0, display=x, style="class:completion.pipe")
+        # If we're after FROM, suggest filtered datasources and pipes
+        if "from" in words:
+            from_index = words.index("from")
+            # Check if we're typing after FROM
+            if len(words) > from_index + 1:
+                current_word = words[-1].lower()
+                # Suggest filtered datasources and pipes based on current word
+                for x in self.project.datasources:
+                    if current_word in x.lower():
+                        yield Completion(
+                            x, start_position=-len(current_word), display=x, style="class:completion.datasource"
+                        )
+                for x in self.project.pipes:
+                    if current_word in x.lower():
+                        yield Completion(x, start_position=-len(current_word), display=x, style="class:completion.pipe")
+            else:
+                # Just typed FROM, show all datasources and pipes
+                for x in self.project.datasources:
+                    yield Completion(x, start_position=0, display=x, style="class:completion.datasource")
+                for x in self.project.pipes:
+                    yield Completion(x, start_position=0, display=x, style="class:completion.pipe")
             return
 
         # If we're starting a query, suggest SQL keywords
@@ -88,13 +101,20 @@ class DynamicCompleter(Completer):
                     )
 
     def _handle_mock_completions(self, words: List[str]):
-        if len(words) == 1:
+        if len(words) == 1 or len(words) == 2:
             # After 'mock', show datasources
-            for ds in self.project.datasources:
-                yield Completion(ds, start_position=0, display=ds, style="class:completion.datasource")
+            current_word = words[-1]
+            for cmd in self.project.datasources:
+                if current_word in cmd.lower():
+                    yield Completion(
+                        cmd,
+                        start_position=-len(current_word) if current_word else 0,
+                        display=cmd,
+                        style="class:completion.datasource",
+                    )
             return
 
-        if len(words) == 2 or len(words) == 4:
+        if len(words) == 3 or len(words) == 4:
             # After datasource or after a flag value, show available flags
             available_flags = [f for f in self.mock_flags if f not in words]
             for flag in available_flags:
@@ -113,9 +133,16 @@ class DynamicCompleter(Completer):
             for cmd in self.test_commands:
                 yield Completion(cmd, start_position=0, display=cmd, style="class:completion.cmd")
             return
-        elif len(words) == 2:
+        elif len(words) == 2 or len(words) == 3:
+            current_word = words[-1]
             for cmd in self.project.pipes:
-                yield Completion(cmd, start_position=0, display=cmd, style="class:completion.pipe")
+                if current_word in cmd.lower():
+                    yield Completion(
+                        cmd,
+                        start_position=-len(current_word) if current_word else 0,
+                        display=cmd,
+                        style="class:completion.pipe",
+                    )
             return
 
     def _yield_static_commands(self, current_word: str):
@@ -129,7 +156,7 @@ class DynamicCompleter(Completer):
                 )
 
         for cmd in self.project.datasources:
-            if cmd.startswith(current_word):
+            if current_word in cmd.lower():
                 yield Completion(
                     cmd,
                     start_position=-len(current_word) if current_word else 0,
@@ -138,7 +165,7 @@ class DynamicCompleter(Completer):
                 )
 
         for cmd in self.project.pipes:
-            if cmd.startswith(current_word):
+            if current_word in cmd.lower():
                 yield Completion(
                     cmd,
                     start_position=-len(current_word) if current_word else 0,
@@ -245,7 +272,7 @@ class Shell:
         click.echo(FeedbackManager.error(message=f"'tb {arg}' command is not available in watch mode"))
 
     def handle_mock(self, arg):
-        subprocess.run(f"tb --build --folder {self.project.folder} mock {arg}", shell=True, text=True)
+        subprocess.run(f"tb --build --folder {self.project.folder} mock {arg} --skip", shell=True, text=True)
 
     def handle_tb(self, arg):
         click.echo("")
@@ -259,6 +286,9 @@ class Shell:
         elif arg.startswith("mock"):
             self.handle_mock(arg)
         else:
+            need_skip = ("mock", "test create", "create")
+            if any(arg.startswith(cmd) for cmd in need_skip):
+                arg = f"{arg} --skip"
             subprocess.run(f"tb --build --folder {self.project.folder} {arg}", shell=True, text=True)
 
     def default(self, argline):
@@ -271,6 +301,9 @@ class Shell:
         elif len(arg.split()) == 1 and arg in self.project.pipes + self.project.datasources:
             self.run_sql(f"select * from {arg}")
         else:
+            need_skip = ("mock", "test create", "create")
+            if any(arg.startswith(cmd) for cmd in need_skip):
+                arg = f"{arg} --skip"
             subprocess.run(f"tb --build --folder {self.project.folder} {arg}", shell=True, text=True)
 
     def run_sql(self, query, rows_limit=20):

tinybird/tb/modules/test.py

@@ -5,7 +5,6 @@
 
 import difflib
 import glob
-import os
 import urllib.parse
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
@@ -14,6 +13,7 @@ import click
 import yaml
 from requests import Response
 
+from tinybird.client import TinyB
 from tinybird.prompts import test_create_prompt
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import coro
@@ -22,7 +22,6 @@ from tinybird.tb.modules.exceptions import CLIException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.llm import LLM
 from tinybird.tb.modules.llm_utils import extract_xml, parse_xml
-from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.project import Project
 
 yaml.SafeDumper.org_represent_str = yaml.SafeDumper.represent_str  # type: ignore[attr-defined]
@@ -79,6 +78,7 @@ async def test_create(ctx: click.Context, name_or_filename: str, prompt: str, sk
     Create a test for an existing pipe
     """
     project: Project = ctx.ensure_object(dict)["project"]
+    client: TinyB = ctx.ensure_object(dict)["client"]
     root_path = Path(project.folder)
     folder = project.folder
     try:
@@ -102,7 +102,6 @@ async def test_create(ctx: click.Context, name_or_filename: str, prompt: str, sk
         pipe_path = root_path / pipe_path
         pipe_content = pipe_path.read_text()
 
-        client = await get_tinybird_local_client(folder, build=True)
         pipe = await client._req(f"/v0/pipes/{pipe_name}")
         parameters = set([param["name"] for node in pipe["nodes"] for param in node["params"]])
 
@@ -200,10 +199,11 @@ async def test_create(ctx: click.Context, name_or_filename: str, prompt: str, sk
     type=click.Path(exists=True, file_okay=False),
     help="Folder where datafiles will be placed",
 )
+@click.pass_context
 @coro
-async def test_update(pipe: str, folder: str) -> None:
+async def test_update(ctx: click.Context, pipe: str, folder: str) -> None:
     try:
-        client = await get_tinybird_local_client(os.path.abspath(folder))
+        client: TinyB = ctx.ensure_object(dict)["client"]
         pipe_tests_path = Path(pipe)
         pipe_name = pipe
         if pipe_tests_path.suffix == ".yaml":
@@ -252,10 +252,11 @@ async def test_update(pipe: str, folder: str) -> None:
     type=click.Path(exists=True, file_okay=False),
     help="Folder where tests will be placed",
 )
+@click.pass_context
 @coro
-async def run_tests(name: Tuple[str, ...], folder: str) -> None:
+async def run_tests(ctx: click.Context, name: Tuple[str, ...], folder: str) -> None:
     click.echo(FeedbackManager.highlight(message="\n» Running tests"))
-    client = await get_tinybird_local_client(os.path.abspath(folder))
+    client: TinyB = ctx.ensure_object(dict)["client"]
     paths = [Path(n) for n in name]
     endpoints = [f"./tests/{p.stem}.yaml" for p in paths]
     test_files: List[str] = endpoints if len(endpoints) > 0 else glob.glob("./tests/**/*.y*ml", recursive=True)
@@ -311,7 +312,7 @@ async def run_tests(name: Tuple[str, ...], folder: str) -> None:
         click.echo(FeedbackManager.success(message=f"\n✓ {test_count}/{test_count} passed"))
 
 
-async def get_pipe_data(client, pipe_name: str, test_params: str) -> Response:
+async def get_pipe_data(client: TinyB, pipe_name: str, test_params: str) -> Response:
     pipe = await client._req(f"/v0/pipes/{pipe_name}")
     output_node = next(
         (node for node in pipe["nodes"] if node["node_type"] != "default" and node["node_type"] != "standard"),

{tinybird-0.0.1.dev48.dist-info → tinybird-0.0.1.dev49.dist-info}/METADATA

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

{tinybird-0.0.1.dev48.dist-info → tinybird-0.0.1.dev49.dist-info}/RECORD

@@ -6,7 +6,7 @@ tinybird/context.py,sha256=A3GBApac9xO6hrAMJ1s9dMrI_ou9aKF84CdEjtPddMk,1417
 tinybird/datatypes.py,sha256=XNypumfqNjsvLJ5iNXnbVHRvAJe0aQwI3lS6Cxox-e0,10979
 tinybird/feedback_manager.py,sha256=g1r9NcFfKXdk_13soaiTZLvdoUGleVfawl6Yfj3zmRw,67823
 tinybird/git_settings.py,sha256=Sw_8rGmribEFJ4Z_6idrVytxpFYk7ez8ei0qHULzs3E,3934
-tinybird/prompts.py,sha256=M9Gh6XO1utkGZYLB6dmW8iSHl_LxOy4m2On_THMCgEU,32645
+tinybird/prompts.py,sha256=unaqHksayhVtxFaTTxuL6Dftb1IM9vQncXtpTI3pxuY,30545
 tinybird/sql.py,sha256=LBi74GxhNAYTb6m2-KNGpAkguSKh7rcvBbERbE7nalA,46195
 tinybird/sql_template.py,sha256=GmMLAI10MTqjQo9qztuQHLRWs67teozsWDxUBdvkAn4,93668
 tinybird/sql_template_fmt.py,sha256=KUHdj5rYCYm_rKKdXYSJAE9vIyXUQLB0YSZnUXHeBlY,10196
@@ -15,48 +15,47 @@ tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=FL85SMPq2dH4JqKovmSbaolGdEzwOO91NqOzqXo2Qr0,41863
 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=1T9gM4V33CKJ7ISsAivZ7G4ve2JMT0lY6SqWdJEd0sg,251
-tinybird/tb/cli.py,sha256=X6zLCVI10wOxcu-USGfbp_jjz1cojH5X-9dL7D8c8aI,960
+tinybird/tb/__cli__.py,sha256=Yocwg57d8BTpRpM9BAwbi73DJuatECKd9hhtsD5-Y3U,251
+tinybird/tb/cli.py,sha256=FD1pfbzu9YHJHEG6Vtn_EwPLTYhwqw-I6AxXeTaRHU8,926
 tinybird/tb/modules/auth.py,sha256=EzRWFmwRkXNhUmRaruEVFLdkbUg8xMSix0cAWl5D4Jg,9029
-tinybird/tb/modules/build.py,sha256=lQXivX0kn3ej0CzeJK34ZFYBWAm2QB1JyPWciuH2c-Q,8060
+tinybird/tb/modules/build.py,sha256=LvopBeGSuTey7UDMOABl7xpLRyyVQS2E2wiUHxxWPnc,8340
 tinybird/tb/modules/cicd.py,sha256=xxXwy-QekJcG14kkJeGNl7LkHduhZXfvBZE8WrU6-t4,5351
-tinybird/tb/modules/cli.py,sha256=KlG4ii--pqestUILJwSx9-e-D_X1MBllwojWpejg7s8,17623
+tinybird/tb/modules/cli.py,sha256=882TimWnFyq1v0sfLDTtmPA_lFuVyL-GwmFpufB5Rxg,16075
 tinybird/tb/modules/common.py,sha256=TWcGJUgzJCQvzI1oMKbNdx-KTRmMGvB25BawHpsaV8Q,70610
 tinybird/tb/modules/config.py,sha256=mie3oMVTf5YOUFEiLs88P16U4LkJafJjSpjwyAkFHog,10979
 tinybird/tb/modules/copy.py,sha256=wxyxZg8BPiWDgbW5HXJKYQp7_EumBXmAilo3McbCQOo,5916
-tinybird/tb/modules/create.py,sha256=fqEI83cENISWgFnoNPlXNsNx_R0Im-zMaL1PfJDGWUQ,14263
+tinybird/tb/modules/create.py,sha256=_eAMjntZ85uub1HqHoDekWC7ks79FQ2Zbc_6grjhT_g,14472
 tinybird/tb/modules/datasource.py,sha256=TQ4wSag3CCw34d54FEXPJFGLQNYyNqv2nQbU6QT9uAE,14725
-tinybird/tb/modules/deployment.py,sha256=0e00lLMaNoVnONYdA51Zy9Sa_-4jWqePoYeFyHUn5PU,10241
+tinybird/tb/modules/deployment.py,sha256=Ezb_7ZK6ym967GNPzuSUH3K6ukAMWXaHb1gFXNet2pA,11859
 tinybird/tb/modules/endpoint.py,sha256=9arqN1JQCMb0Nd3-EJ7lukOYkGHHCpQmiiZpp5FqPhc,9432
 tinybird/tb/modules/exceptions.py,sha256=4A2sSjCEqKUMqpP3WI00zouCWW4uLaghXXLZBSw04mY,3363
-tinybird/tb/modules/feedback_manager.py,sha256=0DSaHP4tPT1PnYVrH4N2d2vnealrBS1jI3CSMex_Us8,68572
+tinybird/tb/modules/feedback_manager.py,sha256=mrw5tdYycfvg6WLXlM0KIjfJardm_aNpnJkUg2vH0cA,68463
 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=AC0VSphTOM2t-v1_3NLvNN_FIbgMo4dTyMqIv5nniPo,835
 tinybird/tb/modules/llm_utils.py,sha256=nS9r4FAElJw8yXtmdYrx-rtI2zXR8qXfi1QqUDCfxvg,3469
 tinybird/tb/modules/local.py,sha256=x4xuCGVkoa8KLYGZEJnFUP8HUkKX05Frp_djRVjVjTs,5669
-tinybird/tb/modules/local_common.py,sha256=lUcMIqMJxygtpBEf-B57pTt68FpVz-W9YC5tBpnqOws,2744
-tinybird/tb/modules/login.py,sha256=0cS-f3MsQFHc6xjw8FRWJm4EJBH9C7Ri68EcO_tiwes,6508
+tinybird/tb/modules/local_common.py,sha256=UW6tNexC98aGRC6ca2w8qDDzyTTn-GDfr3uRy7zRHBM,2767
+tinybird/tb/modules/login.py,sha256=cnB2Vwjc94FpG9C-7Y-l7Lb0Xilp2oUFDzqbQW0tpkU,6519
 tinybird/tb/modules/materialization.py,sha256=HQKRTH6lkcYiDQJihbFqF_in58ezXG4ggZ_7Ywp_nUM,5738
-tinybird/tb/modules/mock.py,sha256=maaPY91mQx8m9x-1-2r9svljRO8VO8-uqD-71VfXBCU,5271
+tinybird/tb/modules/mock.py,sha256=PzFtZL-6bZAZ3EiCC2nYJo058I4m50fD7FcBHISn3cI,5235
 tinybird/tb/modules/pipe.py,sha256=pH2KwgH6Xbvl3kT8vMelpKvT6bcyB4EKFDvGfOsxXbg,2418
-tinybird/tb/modules/project.py,sha256=YH-pwioIBIYxSmy6awM6Ya6WoB7MSM2fte-x9Gbr6lc,2604
+tinybird/tb/modules/project.py,sha256=rucAh_6K1EsW2dxjmqHPJ7bt6IliOWR0dNtEYG454fw,2620
 tinybird/tb/modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
-tinybird/tb/modules/shell.py,sha256=iVJ_TC0WEOMVacc6LximIZWHeL2RGohQKv-oU75HpL4,13018
+tinybird/tb/modules/shell.py,sha256=LShGXwP_kzYAOUiTcvHMmcDugVr0crIfdNb5En6cfxo,14604
 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=s15UQg1TzYrI-9WUA7eYpQcx-BsCRTa6Oj71K-Zbcr0,13100
+tinybird/tb/modules/test.py,sha256=UoYGwTSY6_0ijS2sClMq-1OdOBbg-IXMDD8oLfZXvUg,13093
 tinybird/tb/modules/token.py,sha256=sPdJoBE-6dd3Sd6W-prst7VOoJ0NbvP0uTaB6dXHs5s,12711
-tinybird/tb/modules/update.py,sha256=GWYfbKnB0yf4ywAUp8jItaZY0ltBnaIMcLSiPpwtbMc,6832
 tinybird/tb/modules/watch.py,sha256=Kredt5C7OOiI6YOivuR5QBdiDY4J_xLiwqHOROnfcsU,8591
 tinybird/tb/modules/workspace.py,sha256=sfT9QkoeFlN7ndUXxyImp4a7EFEHjY9MlGlldOViz0Y,6404
 tinybird/tb/modules/workspace_members.py,sha256=Ai6iCOzXX1zQ8q9iXIFSFHsBJlT-8Q28DaG5Ie-UweY,8726
-tinybird/tb/modules/datafile/build.py,sha256=VgQ0k-dBNE0hXdnxB12NW5I0XpxEosN2vaszboj3LZY,51045
+tinybird/tb/modules/datafile/build.py,sha256=seGFSvmgyRrAM1-icsKBkuog3WccfGUYFTPT-xoA5W8,50940
 tinybird/tb/modules/datafile/build_common.py,sha256=IXl-Z51zUi1dypV7meNenX0iu2UmowNeqgG6WHyMHlk,4562
 tinybird/tb/modules/datafile/build_datasource.py,sha256=4aP8_DYCRGghXntZSeWDNJxjps1QRVa7WHoYCzQwQts,17355
 tinybird/tb/modules/datafile/build_pipe.py,sha256=Jgv3YKIvMfjPiSIdw1k2mpaoDdAWMiMRaSHwRgyI97E,28258
-tinybird/tb/modules/datafile/common.py,sha256=rk0jHAmyl9ogWZhayVruoPihtNhNmdgCK2e4PEHadg4,78829
+tinybird/tb/modules/datafile/common.py,sha256=E_JDdlYqsPq3TVEt8FMcMpuF5xbKLtl8uLpj99RXSgE,78848
 tinybird/tb/modules/datafile/diff.py,sha256=-0J7PsBO64T7LOZSkZ4ZFHHCPvT7cKItnJkbz2PkndU,6754
 tinybird/tb/modules/datafile/exceptions.py,sha256=8rw2umdZjtby85QbuRKFO5ETz_eRHwUY5l7eHsy1wnI,556
 tinybird/tb/modules/datafile/fixture.py,sha256=bdZndItV6ibOegPCrN3OgKdkpjDFCFvoSoiZVsCV_XQ,1852
@@ -75,8 +74,8 @@ tinybird/tb_cli_modules/config.py,sha256=6u6B5QCdiQLbJkCkwtnKGs9H3nP-KXXhC75mF7B
 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.dev48.dist-info/METADATA,sha256=onz2vfZ9IkLQVpwSoaCIuUPbnzAsqFH1FIoe9wRDceg,2482
-tinybird-0.0.1.dev48.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-tinybird-0.0.1.dev48.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev48.dist-info/top_level.txt,sha256=pgw6AzERHBcW3YTi2PW4arjxLkulk2msOz_SomfOEuc,45
-tinybird-0.0.1.dev48.dist-info/RECORD,,
+tinybird-0.0.1.dev49.dist-info/METADATA,sha256=xwzvzDJ7ucjTfGvI0bPguc6fKa-C06ub0NSPwUmqC3g,2482
+tinybird-0.0.1.dev49.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+tinybird-0.0.1.dev49.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev49.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev49.dist-info/RECORD,,

{tinybird-0.0.1.dev48.dist-info → tinybird-0.0.1.dev49.dist-info}/top_level.txt

@@ -1,4 +1,5 @@
 tests
 tests_e2e
 tests_e2e_ingestion
+tests_tb
 tinybird

tinybird/tb/modules/update.py

@@ -1,182 +0,0 @@
-import os
-import re
-from os import getcwd
-from pathlib import Path
-from typing import Optional
-
-import click
-
-from tinybird.client import TinyB
-from tinybird.prompts import mock_prompt, update_prompt
-from tinybird.tb.modules.cli import cli
-from tinybird.tb.modules.common import check_user_token_with_client, coro, generate_datafile
-from tinybird.tb.modules.config import CLIConfig
-from tinybird.tb.modules.datafile.fixture import build_fixture_name, persist_fixture
-from tinybird.tb.modules.exceptions import CLIException
-from tinybird.tb.modules.feedback_manager import FeedbackManager
-from tinybird.tb.modules.llm import LLM
-from tinybird.tb.modules.llm_utils import extract_xml, parse_xml
-from tinybird.tb.modules.local_common import get_tinybird_local_client
-
-
-@cli.command(hidden=True)
-@click.argument("prompt")
-@click.option(
-    "--folder",
-    default=".",
-    type=click.Path(exists=False, file_okay=False),
-    help="Folder where project files will be placed",
-)
-@coro
-async def update(
-    prompt: str,
-    folder: str,
-) -> None:
-    """Update resources in the project."""
-    folder = folder or getcwd()
-    folder_path = Path(folder)
-    if not folder_path.exists():
-        folder_path.mkdir()
-
-    try:
-        config = CLIConfig.get_project_config(folder)
-        tb_client = config.get_client()
-        user_token: Optional[str] = None
-        try:
-            user_token = config.get_user_token()
-            if not user_token:
-                raise CLIException("No user token found")
-            await check_user_token_with_client(tb_client, token=user_token)
-        except Exception as e:
-            click.echo(
-                FeedbackManager.error(message=f"This action requires authentication. Run 'tb login' first. Error: {e}")
-            )
-            return
-
-        local_client = await get_tinybird_local_client(folder)
-
-        click.echo(FeedbackManager.highlight(message="\n» Updating resources..."))
-        datasources_updated = await update_resources(tb_client, user_token, prompt, folder)
-        click.echo(FeedbackManager.success(message="✓ Done!\n"))
-
-        if datasources_updated and user_token:
-            click.echo(FeedbackManager.highlight(message="\n» Generating fixtures..."))
-
-            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(user_token=user_token, host=tb_client.host)
-                datasource_name = datasource_path.stem
-                datasource_content = datasource_path.read_text()
-                has_json_path = "`json:" in datasource_content
-                if has_json_path:
-                    prompt = f"<datasource_schema>{datasource_content}</datasource_schema>\n<user_input>{prompt}</user_input>"
-                    response = llm.ask(system_prompt=mock_prompt(rows=20), prompt=prompt)
-                    sql = extract_xml(response, "sql")
-                    sql = sql.split("FORMAT")[0]
-                    result = await local_client.query(f"{sql} FORMAT JSON")
-                    data = result.get("data", [])
-                    fixture_name = build_fixture_name(
-                        datasource_path.absolute().as_posix(), datasource_name, datasource_content
-                    )
-                    if data:
-                        persist_fixture(fixture_name, data, folder)
-                        click.echo(FeedbackManager.info(message=f"✓ /fixtures/{datasource_name}"))
-
-            click.echo(FeedbackManager.success(message="✓ Done!\n"))
-    except Exception as e:
-        click.echo(FeedbackManager.error(message=f"Error: {str(e)}"))
-
-
-async def update_resources(
-    tb_client: TinyB,
-    user_token: str,
-    prompt: str,
-    folder: str,
-):
-    datasource_paths = [
-        Path(folder) / "datasources" / f for f in os.listdir(Path(folder) / "datasources") if f.endswith(".datasource")
-    ]
-    pipes_paths = [
-        Path(folder) / "endpoints" / f for f in os.listdir(Path(folder) / "endpoints") if f.endswith(".pipe")
-    ]
-    resources_xml = "\n".join(
-        [
-            f"<resource><type>{resource_type}</type><name>{resource_name}</name><content>{resource_content}</content></resource>"
-            for resource_type, resource_name, resource_content in [
-                ("datasource", ds.stem, ds.read_text()) for ds in datasource_paths
-            ]
-            + [
-                (
-                    "pipe",
-                    pipe.stem,
-                    pipe.read_text(),
-                )
-                for pipe in pipes_paths
-            ]
-        ]
-    )
-    llm = LLM(user_token=user_token, host=tb_client.host)
-    result = llm.ask(system_prompt=update_prompt(resources_xml), prompt=prompt)
-    result = extract_xml(result, "response")
-    resources = parse_xml(result, "resource")
-    datasources = []
-    pipes = []
-    for resource_xml in resources:
-        resource_type = extract_xml(resource_xml, "type")
-        name = extract_xml(resource_xml, "name")
-        content = extract_xml(resource_xml, "content")
-        resource = {
-            "name": name,
-            "content": content,
-        }
-        if resource_type.lower() == "datasource":
-            datasources.append(resource)
-        elif resource_type.lower() == "pipe":
-            pipes.append(resource)
-
-    for ds in datasources:
-        content = ds["content"].replace("```", "")
-        filename = f"{ds['name']}.datasource"
-        generate_datafile(
-            content,
-            filename=filename,
-            data=None,
-            _format="ndjson",
-            force=True,
-            folder=folder,
-        )
-
-    for pipe in pipes:
-        content = pipe["content"].replace("```", "")
-        generate_pipe_file(pipe["name"], content, folder)
-
-    return len(datasources) > 0
-
-
-def generate_pipe_file(name: str, content: str, folder: str):
-    def is_copy(content: str) -> bool:
-        return re.search(r"TYPE copy", content, re.IGNORECASE) is not None
-
-    def is_materialization(content: str) -> bool:
-        return re.search(r"TYPE materialized", content, re.IGNORECASE) is not None
-
-    def is_sink(content: str) -> bool:
-        return re.search(r"TYPE sink", content, re.IGNORECASE) is not None
-
-    if is_copy(content):
-        pathname = "copies"
-    elif is_materialization(content):
-        pathname = "materializations"
-    elif is_sink(content):
-        pathname = "sinks"
-    else:
-        pathname = "endpoints"
-
-    base = Path(folder) / pathname
-    if not base.exists():
-        base = Path()
-    f = base / (f"{name}.pipe")
-    with open(f"{f}", "w") as file:
-        file.write(content)
-    click.echo(FeedbackManager.info_file_created(file=f.relative_to(folder)))