tinybird 0.0.1.dev36__tar.gz → 0.0.1.dev37__tar.gz

{tinybird-0.0.1.dev36 → tinybird-0.0.1.dev37}/PKG-INFO

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

{tinybird-0.0.1.dev36 → tinybird-0.0.1.dev37}/tinybird/client.py

@@ -378,7 +378,7 @@ class TinyB:
         return res
 
     async def pipe_file(self, pipe: str):
-        return await self._req(f"/v0/pipes/{pipe}.pipe")
+        return await self._req(f"/v1/pipes/{pipe}.pipe")
 
     async def datasource_file(self, datasource: str):
         try:

{tinybird-0.0.1.dev36 → tinybird-0.0.1.dev37}/tinybird/prompts.py

@@ -674,6 +674,7 @@ DESCRIPTION >
 NODE node_1
 SQL >
     [sql query using clickhouse syntax and tinybird templating syntax and starting always with SELECT or %\nSELECT]
+TYPE endpoint
 
 </pipe_content>
 """
@@ -686,6 +687,7 @@ pipe_instructions = """
     - Avoid more than one node per pipe unless it is really necessary or requested by the user.
     - No indentation is allowed for property names: DESCRIPTION, NODE, SQL, TYPE, etc.
     - Allowed TYPE values are: endpoint, copy, materialized, sink
+    - Add always the output node in the TYPE section.
 </pipe_file_instructions>
 """
 

{tinybird-0.0.1.dev36 → tinybird-0.0.1.dev37}/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.dev36'
-__revision__ = '5ad3ab4'
+__version__ = '0.0.1.dev37'
+__revision__ = '255b7f6'

{tinybird-0.0.1.dev36 → tinybird-0.0.1.dev37}/tinybird/tb/cli.py

@@ -9,6 +9,7 @@ import tinybird.tb.modules.build
 import tinybird.tb.modules.build_client
 import tinybird.tb.modules.cli
 import tinybird.tb.modules.common
+import tinybird.tb.modules.copy
 import tinybird.tb.modules.create
 import tinybird.tb.modules.datasource
 import tinybird.tb.modules.deployment

{tinybird-0.0.1.dev36 → tinybird-0.0.1.dev37}/tinybird/tb/modules/build.py

@@ -1,12 +1,10 @@
 import asyncio
-import glob
 import json
 import logging
-import os
 import threading
 import time
 from pathlib import Path
-from typing import List
+from typing import Optional
 
 import click
 import requests
@@ -17,25 +15,30 @@ from tinybird.tb.modules.common import push_data
 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
 from tinybird.tb.modules.watch import watch_project
 
 
 @cli.command()
-@click.option("--folder", type=str, default=os.getcwd())
 @click.option("--watch", is_flag=True, default=False, help="Watch for changes and rebuild automatically")
-def build(folder: str, watch: bool) -> None:
+@click.pass_context
+def build(ctx: click.Context, watch: bool) -> None:
     """
     Validate and build the project server side.
     """
 
-    tb_client = asyncio.run(get_tinybird_local_client(folder))
+    project: Project = ctx.ensure_object(dict)["project"]
+    tb_client = asyncio.run(get_tinybird_local_client(str(project.path)))
     click.echo(FeedbackManager.highlight(message="\n» Building project..."))
 
     time_start = time.time()
 
-    def process() -> None:
-        build_project(folder, tb_client)
+    def process(file_changed: Optional[str] = None) -> None:
+        if file_changed and file_changed.endswith(".ndjson"):
+            rebuild_fixture(project, tb_client, file_changed)
+        else:
+            build_project(project, tb_client)
 
     process()
 
@@ -44,28 +47,18 @@ def build(folder: str, watch: bool) -> None:
     click.echo(FeedbackManager.success(message=f"\n✓ Build completed in {elapsed_time:.1f}s"))
 
     if watch:
-        shell = Shell(folder=folder, client=tb_client)
+        shell = Shell(project=project, client=tb_client)
         click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
         watcher_thread = threading.Thread(
             target=watch_project,
-            args=(shell, process, folder),
+            args=(shell, process, project),
             daemon=True,
         )
         watcher_thread.start()
         shell.run()
 
 
-def get_project_files(project_path: Path) -> List[str]:
-    project_file_extensions = ("datasource", "pipe")
-    project_files = []
-    for extension in project_file_extensions:
-        for project_file in glob.glob(f"{project_path}/**/*.{extension}", recursive=True):
-            logging.debug(f"Found project file: {project_file}")
-            project_files.append(project_file)
-    return project_files
-
-
-def build_project(folder: str, tb_client: TinyB) -> None:
+def build_project(project: Project, tb_client: TinyB) -> None:
     MULTIPART_BOUNDARY_DATA_PROJECT = "data_project://"
     DATAFILE_TYPE_TO_CONTENT_TYPE = {
         ".datasource": "text/plain",
@@ -79,8 +72,8 @@ def build_project(folder: str, tb_client: TinyB) -> None:
             ("context://", ("cli-version", "1.0.0", "text/plain")),
         ]
         fds = []
-        project_path = Path(folder)
-        project_files = get_project_files(project_path)
+        project_path = project.path
+        project_files = project.get_project_files()
 
         for file_path in project_files:
             relative_path = str(Path(file_path).relative_to(project_path))
@@ -107,13 +100,13 @@ def build_project(folder: str, tb_client: TinyB) -> None:
             for ds in datasources:
                 ds_path = next((p for p in project_files if p.endswith(ds.get("name") + ".datasource")), None)
                 if ds_path:
-                    ds_path = ds_path.replace(f"{folder}/", "")
+                    ds_path = ds_path.replace(f"{project.folder}/", "")
                     click.echo(FeedbackManager.info(message=f"✓ {ds_path} created"))
             for pipe in pipes:
                 pipe_name = pipe.get("name")
                 pipe_path = next((p for p in project_files if p.endswith(pipe_name + ".pipe")), None)
                 if pipe_path:
-                    pipe_path = pipe_path.replace(f"{folder}/", "")
+                    pipe_path = pipe_path.replace(f"{project.folder}/", "")
                     click.echo(FeedbackManager.info(message=f"✓ {pipe_path} created"))
 
             for filename in project_files:
@@ -121,7 +114,7 @@ def build_project(folder: str, tb_client: TinyB) -> None:
                     ds_path = Path(filename)
                     ds_name = ds_path.stem
                     name = build_fixture_name(filename, ds_name, ds_path.read_text())
-                    fixture_folder = get_fixture_dir(folder)
+                    fixture_folder = get_fixture_dir(project.folder)
                     fixture_path = fixture_folder / f"{name}.ndjson"
 
                     if not fixture_path.exists():
@@ -163,3 +156,20 @@ def append_fixture(
             silent=True,
         )
     )
+
+
+def rebuild_fixture(project: Project, tb_client: TinyB, fixture_path: str) -> None:
+    fixture_path = Path(fixture_path)
+    datasources_path = Path(project.folder) / "datasources"
+    ds_name = fixture_path.stem
+
+    if ds_name not in project.datasources:
+        try:
+            ds_name = "_".join(fixture_path.stem.split("_")[:-1])
+        except Exception:
+            pass
+
+    ds_path = datasources_path / f"{ds_name}.datasource"
+
+    if ds_path.exists():
+        append_fixture(tb_client, ds_name, str(fixture_path))

{tinybird-0.0.1.dev36 → tinybird-0.0.1.dev37}/tinybird/tb/modules/build_client.py

@@ -13,13 +13,14 @@ from tinybird.config import FeatureFlags
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import push_data
 from tinybird.tb.modules.datafile.build import folder_build
-from tinybird.tb.modules.datafile.common import get_project_filenames, get_project_fixtures, has_internal_datafiles
+from tinybird.tb.modules.datafile.common import get_project_fixtures, has_internal_datafiles
 from tinybird.tb.modules.datafile.exceptions import ParseException
 from tinybird.tb.modules.datafile.fixture import build_fixture_name, get_fixture_dir
 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
 from tinybird.tb.modules.shell import Shell, print_table_formatted
 from tinybird.tb.modules.watch import watch_files
 
@@ -45,9 +46,6 @@ def check_filenames(filenames: List[str]):
     incl_suffix = ".incl"
 
     for filename in filenames:
-        if os.path.isdir(filename):
-            check_filenames(filenames=get_project_filenames(filename))
-
         file_suffix = Path(filename).suffix
         if file_suffix == incl_suffix:
             continue
@@ -60,23 +58,19 @@ def check_filenames(filenames: List[str]):
 
 
 @cli.command()
-@click.option(
-    "--folder",
-    default=".",
-    help="Folder from where to execute the command. By default the current folder.",
-    hidden=True,
-    type=click.types.STRING,
-)
 @click.option(
     "--watch",
     is_flag=True,
     help="Watch for changes in the files and rebuild them.",
 )
+@click.pass_context
 def build_client(
-    folder: str,
+    ctx: click.Context,
     watch: bool,
 ) -> None:
     """Build the project in Tinybird Local."""
+    project: Project = ctx.ensure_object(dict)["project"]
+    folder = project.folder
     ignore_sql_errors = FeatureFlags.ignore_sql_errors()
     context.disable_template_security_validation.set(True)
     is_internal = has_internal_datafiles(folder)
@@ -130,7 +124,7 @@ def build_client(
                 if not filename.endswith(".ndjson"):
                     await build_and_print_resource(tb_client, filename)
 
-    datafiles = get_project_filenames(folder)
+    datafiles = project.get_project_files()
     fixtures = get_project_fixtures(folder)
     filenames = datafiles + fixtures
 
@@ -172,10 +166,10 @@ def build_client(
     build_ok = asyncio.run(build_once(filenames))
 
     if watch:
-        shell = Shell(folder=folder, client=tb_client)
+        shell = Shell(project=project, client=tb_client)
         click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
         watcher_thread = threading.Thread(
-            target=watch_files, args=(filenames, process, shell, folder, build_ok), daemon=True
+            target=watch_files, args=(filenames, process, shell, project, build_ok), daemon=True
         )
         watcher_thread.start()
         shell.run()

{tinybird-0.0.1.dev36 → tinybird-0.0.1.dev37}/tinybird/tb/modules/cli.py

@@ -35,11 +35,7 @@ from tinybird.tb.modules.common import (
 )
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.datafile.build import build_graph
-from tinybird.tb.modules.datafile.common import (
-    Datafile,
-    DatafileSyntaxError,
-    get_project_filenames,
-)
+from tinybird.tb.modules.datafile.common import Datafile, DatafileSyntaxError
 from tinybird.tb.modules.datafile.diff import diff_command
 from tinybird.tb.modules.datafile.exceptions import (
     ParseException,
@@ -50,6 +46,7 @@ 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
 
 __old_click_echo = click.echo
 __old_click_secho = click.secho
@@ -68,15 +65,16 @@ VERSION = f"{__cli__.__version__} (rev {__cli__.__revision__})"
 @click.option("--token", help="Use auth token, defaults to TB_TOKEN envvar, then to the .tinyb file")
 @click.option("--host", help="Use custom host, defaults to TB_HOST envvar, then to https://api.tinybird.co")
 @click.option("--show-tokens", is_flag=True, default=False, help="Enable the output of tokens")
-@click.option("--show-tokens", is_flag=True, default=False, help="Enable the output of tokens")
-@click.option("--prod", is_flag=True, default=False, help="Run against production")
+@click.option("--prod/--local", is_flag=True, default=False, help="Run against production or local")
+@click.option("--folder", type=str, default=os.getcwd(), help="Folder where files will be placed")
 @click.version_option(version=VERSION)
 @click.pass_context
 @coro
-async def cli(ctx: Context, debug: bool, token: str, host: str, show_tokens: bool, prod: bool) -> None:
+async def cli(ctx: Context, debug: bool, token: str, host: str, show_tokens: bool, prod: bool, folder: str) -> None:
     """
     Use `OBFUSCATE_REGEX_PATTERN` and `OBFUSCATE_PATTERN_SEPARATOR` environment variables to define a regex pattern and a separator (in case of a single string with multiple regex) to obfuscate secrets in the CLI output.
     """
+    project = Project(folder=folder)
     # We need to unpatch for our tests not to break
     if show_tokens or not prod or ctx.invoked_subcommand == "build":
         __unpatch_click_output()
@@ -89,7 +87,7 @@ async def cli(ctx: Context, debug: bool, token: str, host: str, show_tokens: boo
     if debug:
         logging.basicConfig(level=logging.DEBUG)
 
-    config_temp = CLIConfig.get_project_config()
+    config_temp = CLIConfig.get_project_config(project.path)
     if token:
         config_temp.set_token(token)
     if host:
@@ -123,21 +121,25 @@ async def cli(ctx: Context, debug: bool, token: str, host: str, show_tokens: boo
 
     logging.debug("debug enabled")
 
-    skip_client = ctx.invoked_subcommand in ["auth", "login", "workspace", "local", "build"]
-    client = await create_ctx_client(config, prod, skip_client)
+    skip_client = ctx.invoked_subcommand in ["auth", "check", "login", "workspace", "local", "build"]
+    client = await create_ctx_client(config, prod, skip_client, project)
 
     if client:
         ctx.ensure_object(dict)["client"] = client
 
+    ctx.ensure_object(dict)["project"] = project
+
 
 @cli.command(hidden=True)
 @click.argument("filenames", type=click.Path(exists=True), nargs=-1, default=None)
 @click.option("--debug", is_flag=True, default=False, help="Print internal representation")
-def check(filenames: List[str], debug: bool) -> None:
+@click.pass_context
+def check(ctx: Context, filenames: List[str], debug: bool) -> None:
     """Check file syntax."""
 
     if not filenames:
-        filenames = get_project_filenames(".")
+        project: Project = ctx.ensure_object(dict)["project"]
+        filenames = project.get_project_files()
 
     def process(filenames: Iterable):
         parser_matrix = {".pipe": parse_pipe, ".datasource": parse_datasource}
@@ -145,7 +147,7 @@ def check(filenames: List[str], debug: bool) -> None:
         try:
             for filename in filenames:
                 if os.path.isdir(filename):
-                    process(filenames=get_project_filenames(filename))
+                    process(filenames=filename)
 
                 click.echo(FeedbackManager.info_processing_file(filename=filename))
 
@@ -485,11 +487,11 @@ def __unpatch_click_output():
     click.secho = __old_click_secho
 
 
-async def create_ctx_client(config: Dict[str, Any], prod: bool, skip_client: bool):
+async def create_ctx_client(config: Dict[str, Any], prod: bool, skip_client: bool, project: Project):
     if skip_client:
         return None
 
     if prod:
         return _get_tb_client(config.get("token", None), config["host"])
 
-    return await get_tinybird_local_client()
+    return await get_tinybird_local_client(str(project.path))

tinybird-0.0.1.dev37/tinybird/tb/modules/copy.py

@@ -0,0 +1,68 @@
+# This is a command file for our CLI. Please keep it clean.
+#
+# - 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 json
+import re
+
+import click
+from click import Context
+
+from tinybird.client import TinyB
+from tinybird.tb.modules.cli import cli
+from tinybird.tb.modules.common import coro, echo_safe_humanfriendly_tables_format_smart_table
+from tinybird.tb.modules.datafile.common import get_name_version
+from tinybird.tb.modules.exceptions import CLIPipeException
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+
+
+@cli.group(hidden=True)
+@click.pass_context
+def copy(ctx):
+    """Copy pipe commands"""
+
+
+@copy.command(name="ls")
+@click.option("--match", default=None, help="Retrieve any resourcing matching the pattern. eg --match _test")
+@click.option(
+    "--format",
+    "format_",
+    type=click.Choice(["json"], case_sensitive=False),
+    default=None,
+    help="Force a type of the output",
+)
+@click.pass_context
+@coro
+async def copy_ls(ctx: Context, match: str, format_: str):
+    """List copy pipes"""
+
+    client: TinyB = ctx.ensure_object(dict)["client"]
+    pipes = await client.pipes(dependencies=False, node_attrs="name", attrs="name,updated_at")
+    copies = [p for p in pipes if p.get("type") == "copy"]
+    copies = sorted(copies, key=lambda p: p["updated_at"])
+    columns = ["name", "updated at", "nodes", "url"]
+    table_human_readable = []
+    table_machine_readable = []
+    pattern = re.compile(match) if match else None
+    for t in copies:
+        tk = get_name_version(t["name"])
+        if pattern and not pattern.search(tk["name"]):
+            continue
+        table_human_readable.append((tk["name"], t["updated_at"][:-7], len(t["nodes"])))
+        table_machine_readable.append(
+            {
+                "name": tk["name"],
+                "updated at": t["updated_at"][:-7],
+                "nodes": len(t["nodes"]),
+            }
+        )
+
+    if not format_:
+        click.echo(FeedbackManager.info_pipes())
+        echo_safe_humanfriendly_tables_format_smart_table(table_human_readable, column_names=columns)
+        click.echo("\n")
+    elif format_ == "json":
+        click.echo(json.dumps({"pipes": table_machine_readable}, indent=2))
+    else:
+        raise CLIPipeException(FeedbackManager.error_pipe_ls_type())

{tinybird-0.0.1.dev36 → tinybird-0.0.1.dev37}/tinybird/tb/modules/deployment.py

@@ -1,10 +1,9 @@
-import glob
 import json
 import logging
 import time
 from datetime import datetime
 from pathlib import Path
-from typing import List, Optional
+from typing import Optional
 
 import click
 import requests
@@ -12,16 +11,7 @@ import requests
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import echo_safe_humanfriendly_tables_format_smart_table
 from tinybird.tb.modules.feedback_manager import FeedbackManager
-
-
-def project_files(project_path: Path) -> List[str]:
-    project_file_extensions = ("datasource", "pipe")
-    project_files = []
-    for extension in project_file_extensions:
-        for project_file in glob.glob(f"{project_path}/**/*.{extension}", recursive=True):
-            logging.debug(f"Found project file: {project_file}")
-            project_files.append(project_file)
-    return project_files
+from tinybird.tb.modules.project import Project
 
 
 def promote_deployment(host: Optional[str], headers: dict) -> None:
@@ -43,6 +33,9 @@ def promote_deployment(host: Optional[str], headers: dict) -> None:
 
     if candidate_deployment.get("status") != "data_ready":
         click.echo(FeedbackManager.error(message="Current deployment is not ready"))
+        deploy_errors = candidate_deployment.get("errors", [])
+        for deploy_error in deploy_errors:
+            click.echo(FeedbackManager.error(message=f"* {deploy_error}"))
         return
 
     if candidate_deployment.get("live"):
@@ -84,6 +77,9 @@ def rollback_deployment(host: Optional[str], headers: dict) -> None:
 
     if previous_deployment.get("status") != "data_ready":
         click.echo(FeedbackManager.error(message="Previous deployment is not ready"))
+        deploy_errors = previous_deployment.get("errors", [])
+        for deploy_error in deploy_errors:
+            click.echo(FeedbackManager.error(message=f"* {deploy_error}"))
         return
 
     if previous_deployment.get("live"):
@@ -115,7 +111,6 @@ def deployment_group() -> None:
 
 
 @deployment_group.command(name="create")
-@click.argument("project_path", type=click.Path(exists=True), default=Path.cwd())
 @click.option(
     "--wait/--no-wait",
     is_flag=True,
@@ -129,7 +124,7 @@ def deployment_group() -> None:
     help="Auto-promote the deployment. Only works if --wait is enabled. Disabled by default.",
 )
 @click.pass_context
-def create(ctx: click.Context, project_path: Path, wait: bool, auto: bool) -> None:
+def create(ctx: click.Context, wait: bool, auto: bool) -> None:
     """
     Validate and deploy the project server side.
     """
@@ -140,7 +135,7 @@ def create(ctx: click.Context, project_path: Path, wait: bool, auto: bool) -> No
         ".datasource": "text/plain",
         ".pipe": "text/plain",
     }
-
+    project: Project = ctx.ensure_object(dict)["project"]
     client = ctx.ensure_object(dict)["client"]
     TINYBIRD_API_URL = f"{client.host}/v1/deploy"
     TINYBIRD_API_KEY = client.token
@@ -149,8 +144,8 @@ def create(ctx: click.Context, project_path: Path, wait: bool, auto: bool) -> No
         ("context://", ("cli-version", "1.0.0", "text/plain")),
     ]
     fds = []
-    for file_path in project_files(project_path):
-        relative_path = str(Path(file_path).relative_to(project_path))
+    for file_path in project.get_project_files():
+        relative_path = str(Path(file_path).relative_to(project.path))
         fd = open(file_path, "rb")
         fds.append(fd)
         content_type = DATAFILE_TYPE_TO_CONTENT_TYPE.get(Path(file_path).suffix, "application/unknown")
@@ -166,10 +161,10 @@ def create(ctx: click.Context, project_path: Path, wait: bool, auto: bool) -> No
 
         deploy_result = result.get("result")
         if deploy_result == "success":
-            click.echo(FeedbackManager.success(message="Deploy submitted successfully"))
+            click.echo(FeedbackManager.success(message="Deployment submitted successfully"))
             deployment = result.get("deployment")
         elif deploy_result == "failed":
-            click.echo(FeedbackManager.error(message="Deploy failed"))
+            click.echo(FeedbackManager.error(message="Deployment failed"))
             deploy_errors = result.get("errors")
             for deploy_error in deploy_errors:
                 if deploy_error.get("filename", None):
@@ -190,9 +185,15 @@ def create(ctx: click.Context, project_path: Path, wait: bool, auto: bool) -> No
             TINYBIRD_API_URL = f"{client.host}/v1/deployments/{deployment.get('id')}"
             r = requests.get(TINYBIRD_API_URL, headers=HEADERS)
             result = r.json()
+            logging.debug(json.dumps(result, indent=2))
+
             deployment = result.get("deployment")
             if deployment.get("status") == "failed":
                 click.echo(FeedbackManager.error(message="Deployment failed"))
+                deploy_errors = deployment.get("errors")
+                for deploy_error in deploy_errors:
+                    click.echo(FeedbackManager.error(message=f"* {deploy_error}"))
+
                 if auto:
                     click.echo(FeedbackManager.error(message="Rolling back deployment"))
                     rollback_deployment(client.host, HEADERS)
@@ -205,9 +206,8 @@ def create(ctx: click.Context, project_path: Path, wait: bool, auto: bool) -> No
 
 
 @deployment_group.command(name="ls")
-@click.argument("project_path", type=click.Path(exists=True), default=Path.cwd())
 @click.pass_context
-def deployment_ls(ctx: click.Context, project_path: Path) -> None:
+def deployment_ls(ctx: click.Context) -> None:
     """
     List all the deployments you have in the project.
     """
@@ -238,9 +238,8 @@ def deployment_ls(ctx: click.Context, project_path: Path) -> None:
 
 
 @deployment_group.command(name="promote")
-@click.argument("project_path", type=click.Path(exists=True), default=Path.cwd())
 @click.pass_context
-def deployment_promote(ctx: click.Context, project_path: Path) -> None:
+def deployment_promote(ctx: click.Context) -> None:
     """
     Promote last deploy to ready and remove old one.
     """
@@ -253,9 +252,8 @@ def deployment_promote(ctx: click.Context, project_path: Path) -> None:
 
 
 @deployment_group.command(name="rollback")
-@click.argument("project_path", type=click.Path(exists=True), default=Path.cwd())
 @click.pass_context
-def deployment_rollback(ctx: click.Context, project_path: Path) -> None:
+def deployment_rollback(ctx: click.Context) -> None:
     """
     Rollback to the previous deployment.
     """

{tinybird-0.0.1.dev36 → tinybird-0.0.1.dev37}/tinybird/tb/modules/llm_utils.py

@@ -24,17 +24,19 @@ def parse_xml(text: str, tag: str) -> List[str]:
     return re.findall(f"<{tag}.*?>(.*?)</{tag}>", text, re.DOTALL)
 
 
-def generate(llm_call, task: str, context: str = "") -> tuple[str, str]:
+def generate(llm_call, task: str, feedback: str = "") -> tuple[str, str]:
     """Generate and improve a solution based on feedback."""
     task = f"<task>\n{task}\n</task>"
     full_prompt = (
-        f"{generator_prompt}\n<context>\n{context}\n</context>\n{task}" if context else f"{generator_prompt}\n{task}"
+        f"{generator_prompt}\n<feedback>\n{feedback}\n</feedback>\n{task}"
+        if feedback
+        else f"{generator_prompt}\n{task}"
     )
     response = llm_call(full_prompt)
     thoughts = extract_xml(response, "thoughts")
     result = extract_xml(response, "response")
 
-    return thoughts, result
+    return thoughts, result, response
 
 
 def evaluate(llm_call, content: str, task: str) -> tuple[str, str]:
@@ -95,17 +97,12 @@ Output your evaluation concisely in the following format:
 
 generator_prompt = """
 Your goal is to complete the task based on <task> tag. If there are feedback 
-from your previous generations, you should reflect on them to improve your solution
+from your previous generations, you should reflect on them to solve the task.
+All xml tags MUST be closed.
 
-Output your answer concisely in the following format: 
+Add the following tag to the requested response:
 
 <thoughts>
-[Your understanding of the task and feedback and how you plan to improve]
+[Your understanding of the task and feedback and how you plan to solve it]
 </thoughts>
-
-<response>
-[Your code implementation here]
-</response>
-
-The code implementation should not be wrapped in any markdown format.
 """