tinybird 0.0.1.dev291__py3-none-any.whl → 1.0.5__py3-none-any.whl

tinybird/tb/modules/agent/models.py

@@ -8,7 +8,7 @@ from pydantic_ai.retries import AsyncTenacityTransport, wait_retry_after
 from tenacity import AsyncRetrying, retry_if_exception_type, stop_after_attempt, wait_exponential
 
 
-def create_retrying_client(token: str, workspace_id: str):
+def create_retrying_client(token: str, workspace_id: str, feature: Optional[str] = None):
     """Create a client with smart retry handling for multiple error types."""
 
     def should_retry_status(response):
@@ -29,7 +29,10 @@ def create_retrying_client(token: str, workspace_id: str):
         ),
         validate_response=should_retry_status,
     )
-    return AsyncClient(transport=transport, params={"token": token, "workspace_id": workspace_id})
+    params = {"token": token, "workspace_id": workspace_id}
+    if feature:
+        params["feature"] = feature
+    return AsyncClient(transport=transport, params=params)
 
 
 def create_model(
@@ -38,6 +41,7 @@ def create_model(
     workspace_id: str,
     model: AnthropicModelName = "claude-4-sonnet-20250514",
     run_id: Optional[str] = None,
+    feature: Optional[str] = None,
 ):
     default_headers = {}
     if run_id:

tinybird/tb/modules/agent/prompts.py

@@ -35,8 +35,10 @@ available_commands = [
     "`tb sink ls`: List all sinks",
     "`tb workspace current`: Show the current workspace",
     "`tb workspace clear --yes`: Delete all resources in the workspace (Only available in Tinybird Local)",
+    "`tb workspace ls`: List all workspaces",
     "`tb local start --skip-new-version`: Start Tinybird Local container in non-interactive mode",
     "`tb local restart --skip-new-version --yes`: Restart Tinybird Local container in non-interactive mode",
+    "`tb pull --only-vendored`: Pull only the vendored datasources from other workspaces",
 ]
 
 plan_instructions = """
@@ -166,7 +168,6 @@ SQL >
 
 def resources_prompt(project: Project) -> str:
     files = project.get_project_files()
-    fixture_files = project.get_fixture_files()
 
     resources_content = "# Existing resources in the project:\n"
     if files:
@@ -184,7 +185,36 @@ def resources_prompt(project: Project) -> str:
     else:
         resources_content += "No resources found"
 
+    return resources_content
+
+
+def vendor_files_prompt(project: Project) -> str:
+    files = project.get_vendored_files()
+    content = "# Datasources shared from other workspaces:\n"
+    if files:
+        resources: list[dict[str, Any]] = []
+        for filename in files:
+            file_path = Path(filename)
+            workspace_name = file_path.parent.parent.name
+            resource = {
+                "path": str(file_path.relative_to(project.folder)),
+                "type": get_resource_type(file_path),
+                "name": f"{workspace_name}.{file_path.stem}",
+                "content": file_path.read_text(),
+                "origin_workspace": workspace_name,
+            }
+            resources.append(resource)
+        content += format_as_xml(resources, root_tag="resources", item_tag="resource")
+    else:
+        content += "No datasources shared from other workspaces"
+
+    return content
+
+
+def fixtures_prompt(project: Project) -> str:
+    fixture_files = project.get_fixture_files()
     fixture_content = "# Fixture files in the project:\n"
+
     if fixture_files:
         fixtures: list[dict[str, Any]] = []
         for filename in fixture_files:
@@ -199,7 +229,7 @@ def resources_prompt(project: Project) -> str:
     else:
         fixture_content += "No fixture files found"
 
-    return resources_content + "\n" + fixture_content
+    return fixture_content
 
 
 def service_datasources_prompt() -> str:
@@ -954,6 +984,23 @@ After changes have been deployed and promoted, if you want to deploy other chang
 If after running a deployment, the error contains a recommended forward query, use it to update the .datasource file.
 </dev_notes>
 
+## Sharing datasources with other workspaces
+To share a Data Source, in the .datasource file you want to share, add the destination workspace(s). For example:
+
+```
+SHARED_WITH >
+    destination_workspace,
+    other_destination_workspace
+```
+
+## Working with shared datasources:
+
+The following limitations apply to shared datasources:
+- Shared datasources are read-only.
+- You can't share a shared datasource, only the original.
+- You can't check the quarantine of a shared datasource.
+- You can't create a Materialized View from a shared datasource.
+
 # Working with any type of pipe file:
 {pipe_instructions}
 {pipe_example}

tinybird/tb/modules/agent/tools/deploy.py

@@ -24,7 +24,7 @@ def deploy(ctx: RunContext[TinybirdAgentContext], allow_destructive_operations:
                 FeedbackManager.warning(message="Destructive operations flag is enabled due to a file deleted recently")
             )
 
-        click.echo()
+        click.echo("")
         confirmation = show_confirmation(
             title="Deploy the project?",
             skip_confirmation=False,

tinybird/tb/modules/agent/tools/execute_query.py

@@ -121,27 +121,24 @@ def execute_query(
         bytes_read = humanfriendly.format_size(stats["bytes_read"])
 
         click.echo(FeedbackManager.info_query_stats(seconds=seconds, rows=rows_read, bytes=bytes_read))
-        click.echo()
+        click.echo("")
 
         if not result["data"]:
             click.echo(FeedbackManager.info_no_rows())
+        elif script:
+            try:
+                # Execute the LLM-generated plotext script
+                chart_output = _execute_plotext_script(script, result["data"], result["meta"])
+                click.echo(chart_output)
+            except Exception as script_error:
+                click.echo(FeedbackManager.error(message=f"There was an error rendering the chart.\n{script_error}"))
+                ctx.deps.thinking_animation.start()
+                return f"After executing the query: {query}, there was an error rendering the chart: {script_error}. Fix the script and render the chart again."
         else:
-            if script:
-                try:
-                    # Execute the LLM-generated plotext script
-                    chart_output = _execute_plotext_script(script, result["data"], result["meta"])
-                    click.echo(chart_output)
-                except Exception as script_error:
-                    click.echo(
-                        FeedbackManager.error(message=f"There was an error rendering the chart.\n{script_error}")
-                    )
-                    ctx.deps.thinking_animation.start()
-                    return f"After executing the query: {query}, there was an error rendering the chart: {script_error}. Fix the script and render the chart again."
-            else:
-                echo_safe_humanfriendly_tables_format_pretty_table(
-                    data=[d.values() for d in result["data"]], column_names=result["data"][0].keys()
-                )
-                click.echo("Showing first 10 results\n")
+            echo_safe_humanfriendly_tables_format_pretty_table(
+                data=[d.values() for d in result["data"]], column_names=result["data"][0].keys()
+            )
+            click.echo("Showing first 10 results\n")
 
         ctx.deps.thinking_animation.start()
         display_format = "chart" if script else "table"
@@ -151,7 +148,7 @@ def execute_query(
         ctx.deps.thinking_animation.stop()
         click.echo(FeedbackManager.error(message=error))
         ctx.deps.thinking_animation.start()
-        if "not found" in error.lower() and cloud:
+        if "not found" in error.lower() and cloud_or_local == "cloud":
             return f"Error executing query: {error}. Please run the query against Tinybird local instead of cloud."
         else:
             return f"Error executing query: {error}. Please try again."

tinybird/tb/modules/agent/tools/request_endpoint.py

@@ -87,7 +87,7 @@ def request_endpoint(
         click.echo(FeedbackManager.error(message=error))
         ctx.deps.thinking_animation.start()
         not_found_errors = ["not found", "does not exist"]
-        if any(not_found_error in error.lower() for not_found_error in not_found_errors) and cloud:
+        if any(not_found_error in error.lower() for not_found_error in not_found_errors) and cloud_or_local == "cloud":
             return f"Error executing query: {error}. Please run the query against Tinybird local instead of cloud."
         else:
             return f"Error executing query: {error}. Please try again."

tinybird/tb/modules/agent/tools/run_command.py

@@ -3,6 +3,7 @@ import subprocess
 import click
 from pydantic_ai import RunContext
 
+from tinybird.tb.modules.agent.prompts import available_commands
 from tinybird.tb.modules.agent.utils import (
     AgentRunCancelled,
     SubAgentRunCancelled,
@@ -20,6 +21,14 @@ def run_command(ctx: RunContext[TinybirdAgentContext], command: str):
         command (str): The command to run. Required. Examples: `tb --local sql "select 1"`, `tb --cloud datasource ls`, `tb --help`
     """
     try:
+        clean_commands = [cmd.split(":")[0].replace("`", "").split("[")[0] for cmd in available_commands]
+        available_commands_to_cloud = [f"tb --cloud {command.replace('tb ', '')}" for command in clean_commands]
+        available_commands_to_local = [f"tb --local {command.replace('tb ', '')}" for command in clean_commands]
+        all_commands = clean_commands + available_commands_to_cloud + available_commands_to_local
+
+        if not any(cmd.startswith(command) for cmd in all_commands):
+            raise SubAgentRunCancelled(f"Command {command} not found in the list of available commands")
+
         ctx.deps.thinking_animation.stop()
         force_confirmation = " deploy" in command.lower() or " truncate" in command.lower()
         confirmation = show_confirmation(

tinybird/tb/modules/agent/utils.py

@@ -44,7 +44,6 @@ class TinybirdAgentContext(BaseModel):
     build_project_test: Callable[..., None]
     deploy_project: Callable[..., None]
     deploy_check_project: Callable[[], None]
-    mock_data: Callable[..., list[dict[str, Any]]]
     append_data_local: Callable[..., None]
     append_data_cloud: Callable[..., None]
     analyze_fixture: Callable[..., dict[str, Any]]
@@ -512,7 +511,7 @@ def create_terminal_box(content: str, new_content: Optional[str] = None, title:
                     new_line_num = int(match.group(2))
                     old_index = old_line_num - 1
                     new_index = new_line_num - 1
-            elif line.startswith("---") or line.startswith("+++"):
+            elif line.startswith(("---", "+++")):
                 # Skip file headers
                 pass
             elif line.startswith(" "):
@@ -581,59 +580,50 @@ def create_terminal_box(content: str, new_content: Optional[str] = None, title:
             else:
                 line_num_str = f"{line_num:>4}"
 
-            if diff_marker:
-                if COLORAMA_AVAILABLE:
-                    if diff_marker == "-":
-                        # Fill the entire content area with red background
-                        content_with_bg = f"{Back.RED}{diff_marker}   {content}{Style.RESET_ALL}"
-                        # Calculate padding needed for the content area
-                        content_area_width = available_width - 9  # 9 is reduced prefix length
-                        content_padding = content_area_width - len(f"{diff_marker}   {content}")
-                        if content_padding > 0:
-                            content_with_bg = (
-                                f"{Back.RED}{diff_marker}   {content}{' ' * content_padding}{Style.RESET_ALL}"
-                            )
-                        line = f"{vertical} {line_num_str} {content_with_bg}"
-                    elif diff_marker == "+":
-                        # Fill the entire content area with green background
-                        content_with_bg = f"{Back.GREEN}{diff_marker}   {content}{Style.RESET_ALL}"
-                        # Calculate padding needed for the content area
-                        content_area_width = available_width - 9  # 9 is reduced prefix length
-                        content_padding = content_area_width - len(f"{diff_marker}   {content}")
-                        if content_padding > 0:
-                            content_with_bg = (
-                                f"{Back.GREEN}{diff_marker}   {content}{' ' * content_padding}{Style.RESET_ALL}"
-                            )
-                        line = f"{vertical} {line_num_str} {content_with_bg}"
-                else:
-                    line = f"{vertical} {line_num:>4} {diff_marker}   {content}"
-            else:
-                line = f"{vertical} {line_num_str}     {content}"
-        else:
-            # Continuation line without number - fill background starting from where symbol would be
-            if diff_marker and COLORAMA_AVAILABLE:
+        if diff_marker:
+            if COLORAMA_AVAILABLE:
                 if diff_marker == "-":
-                    # Calculate how much space we need to fill with background
+                    # Fill the entire content area with red background
+                    content_with_bg = f"{Back.RED}{diff_marker}   {content}{Style.RESET_ALL}"
+                    # Calculate padding needed for the content area
                     content_area_width = available_width - 9  # 9 is reduced prefix length
-                    content_padding = content_area_width - len(
-                        content
-                    )  # Don't subtract spaces, they're in the background
+                    content_padding = content_area_width - len(f"{diff_marker}   {content}")
                     if content_padding > 0:
-                        line = f"{vertical}      {Back.RED}    {content}{' ' * content_padding}{Style.RESET_ALL}"
-                    else:
-                        line = f"{vertical}      {Back.RED}    {content}{Style.RESET_ALL}"
+                        content_with_bg = f"{Back.RED}{diff_marker}   {content}{' ' * content_padding}{Style.RESET_ALL}"
+                    line = f"{vertical} {line_num_str} {content_with_bg}"
                 elif diff_marker == "+":
-                    # Calculate how much space we need to fill with background
+                    # Fill the entire content area with green background
+                    content_with_bg = f"{Back.GREEN}{diff_marker}   {content}{Style.RESET_ALL}"
+                    # Calculate padding needed for the content area
                     content_area_width = available_width - 9  # 9 is reduced prefix length
-                    content_padding = content_area_width - len(
-                        content
-                    )  # Don't subtract spaces, they're in the background
+                    content_padding = content_area_width - len(f"{diff_marker}   {content}")
                     if content_padding > 0:
-                        line = f"{vertical}      {Back.GREEN}    {content}{' ' * content_padding}{Style.RESET_ALL}"
-                    else:
-                        line = f"{vertical}      {Back.GREEN}    {content}{Style.RESET_ALL}"
+                        content_with_bg = (
+                            f"{Back.GREEN}{diff_marker}   {content}{' ' * content_padding}{Style.RESET_ALL}"
+                        )
+                    line = f"{vertical} {line_num_str} {content_with_bg}"
             else:
-                line = f"{vertical}          {content}"
+                line = f"{vertical} {line_num:>4} {diff_marker}   {content}"
+        elif diff_marker and COLORAMA_AVAILABLE:
+            # Continuation line without number - fill background starting from where symbol would be
+            if diff_marker == "-":
+                # Calculate how much space we need to fill with background
+                content_area_width = available_width - 9  # 9 is reduced prefix length
+                content_padding = content_area_width - len(content)  # Don't subtract spaces, they're in the background
+                if content_padding > 0:
+                    line = f"{vertical}      {Back.RED}    {content}{' ' * content_padding}{Style.RESET_ALL}"
+                else:
+                    line = f"{vertical}      {Back.RED}    {content}{Style.RESET_ALL}"
+            elif diff_marker == "+":
+                # Calculate how much space we need to fill with background
+                content_area_width = available_width - 9  # 9 is reduced prefix length
+                content_padding = content_area_width - len(content)  # Don't subtract spaces, they're in the background
+                if content_padding > 0:
+                    line = f"{vertical}      {Back.GREEN}    {content}{' ' * content_padding}{Style.RESET_ALL}"
+                else:
+                    line = f"{vertical}      {Back.GREEN}    {content}{Style.RESET_ALL}"
+        else:
+            line = f"{vertical}          {content}"
 
         # Pad to terminal width
         # Need to account for ANSI escape sequences not taking visual space

tinybird/tb/modules/branch.py

@@ -0,0 +1,150 @@
+# 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.
+
+from typing import List, Optional, Tuple
+
+import click
+
+from tinybird.tb.modules.cli import cli
+from tinybird.tb.modules.common import (
+    MAIN_BRANCH,
+    create_workspace_branch,
+    echo_safe_humanfriendly_tables_format_smart_table,
+    get_current_main_workspace,
+    get_current_workspace_branches,
+    get_workspace_member_email,
+    switch_to_workspace_by_user_workspace_data,
+    try_update_config_with_remote,
+)
+from tinybird.tb.modules.config import CLIConfig
+from tinybird.tb.modules.exceptions import CLIBranchException, CLIException
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+
+
+@cli.group()
+def branch() -> None:
+    """Branch commands. Custom branches is an experimental feature in beta."""
+    pass
+
+
+@branch.command(name="ls")
+@click.option("--sort/--no-sort", default=False, help="Sort the table rows by name")
+def branch_ls(sort: bool) -> None:
+    """List all the branches available in the current workspace"""
+
+    config = CLIConfig.get_project_config()
+    _ = try_update_config_with_remote(config, only_if_needed=True)
+
+    client = config.get_client()
+
+    current_main_workspace = get_current_main_workspace(config)
+    assert isinstance(current_main_workspace, dict)
+
+    if current_main_workspace["id"] != config["id"]:
+        client = config.get_client(token=current_main_workspace["token"])
+
+    response = client.branches()
+
+    columns = ["name", "id", "created_at", "owner", "current"]
+
+    table: List[Tuple[str, str, str, str, bool]] = []
+
+    for branch in response["environments"]:
+        branch_owner_email = get_workspace_member_email(branch, branch["owner"])
+
+        table.append(
+            (branch["name"], branch["id"], branch["created_at"], branch_owner_email, config["id"] == branch["id"])
+        )
+
+    current_branch = [row for row in table if row[4]]
+    other_branches = [row for row in table if not row[4]]
+
+    if sort:
+        other_branches.sort(key=lambda x: x[0])
+
+    sorted_table = current_branch + other_branches
+
+    click.echo(FeedbackManager.info(message="\n** Branches:"))
+    echo_safe_humanfriendly_tables_format_smart_table(sorted_table, column_names=columns)
+
+
+@branch.command(name="create", short_help="Create a new branch in the current Workspace")
+@click.argument("branch_name", required=False)
+@click.option(
+    "--last-partition",
+    is_flag=True,
+    default=False,
+    help="Attach the last modified partition from the current workspace to the new branch",
+)
+@click.option(
+    "-i",
+    "--ignore-datasource",
+    "ignore_datasources",
+    type=str,
+    multiple=True,
+    help="Ignore specified data source partitions",
+)
+@click.option(
+    "--wait/--no-wait",
+    is_flag=True,
+    default=True,
+    help="Wait for data branch jobs to finish, showing a progress bar. Disabled by default.",
+)
+def create_branch(branch_name: Optional[str], last_partition: bool, ignore_datasources: List[str], wait: bool) -> None:
+    create_workspace_branch(branch_name, last_partition, False, list(ignore_datasources), wait)
+
+
+@branch.command(name="rm", short_help="Removes an branch from the workspace. It can't be recovered.")
+@click.argument("branch_name_or_id")
+@click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
+def delete_branch(branch_name_or_id: str, yes: bool) -> None:
+    """Remove an branch"""
+
+    config = CLIConfig.get_project_config()
+    _ = try_update_config_with_remote(config)
+
+    client = config.get_client()
+
+    if branch_name_or_id == MAIN_BRANCH:
+        raise CLIException(FeedbackManager.error_not_allowed_in_main_branch())
+
+    try:
+        workspace_branches = get_current_workspace_branches(config)
+        workspace_to_delete = next(
+            (
+                workspace
+                for workspace in workspace_branches
+                if workspace["name"] == branch_name_or_id or workspace["id"] == branch_name_or_id
+            ),
+            None,
+        )
+    except Exception as e:
+        raise CLIBranchException(FeedbackManager.error_exception(error=str(e)))
+
+    if not workspace_to_delete:
+        raise CLIBranchException(FeedbackManager.error_branch(branch=branch_name_or_id))
+
+    if yes or click.confirm(FeedbackManager.warning_confirm_delete_branch(branch=workspace_to_delete["name"])):
+        need_to_switch_to_main = workspace_to_delete.get("main") and config["id"] == workspace_to_delete["id"]
+        # get origin workspace if deleting current branch
+        if need_to_switch_to_main:
+            try:
+                workspaces = (client.user_workspaces()).get("workspaces", [])
+                workspace_main = next(
+                    (workspace for workspace in workspaces if workspace["id"] == workspace_to_delete["main"]), None
+                )
+            except Exception:
+                workspace_main = None
+        try:
+            client.delete_branch(workspace_to_delete["id"])
+            click.echo(FeedbackManager.success_branch_deleted(branch_name=workspace_to_delete["name"]))
+        except Exception as e:
+            raise CLIBranchException(FeedbackManager.error_exception(error=str(e)))
+        else:
+            if need_to_switch_to_main:
+                if workspace_main:
+                    switch_to_workspace_by_user_workspace_data(config, workspace_main)
+                else:
+                    raise CLIException(FeedbackManager.error_switching_to_main())

tinybird/tb/modules/build.py

@@ -3,12 +3,12 @@ import time
 from copy import deepcopy
 from functools import partial
 from pathlib import Path
-from typing import Any, Callable, Dict, List
+from typing import Any, Callable, Dict, List, Optional
 from urllib.parse import urlencode
 
 import click
 
-import tinybird.context as context
+from tinybird import context
 from tinybird.datafile.exceptions import ParseException
 from tinybird.datafile.parse_datasource import parse_datasource
 from tinybird.datafile.parse_pipe import parse_pipe
@@ -34,7 +34,11 @@ def build(ctx: click.Context, watch: bool) -> None:
     obj: Dict[str, Any] = ctx.ensure_object(dict)
     project: Project = ctx.ensure_object(dict)["project"]
     tb_client: TinyB = ctx.ensure_object(dict)["client"]
-    if obj["env"] == "cloud":
+    config: Dict[str, Any] = ctx.ensure_object(dict)["config"]
+    is_branch = bool(ctx.ensure_object(dict)["branch"])
+
+    # TODO: Explain that you can use custom branches too once they are open for everyone
+    if obj["env"] == "cloud" and not is_branch:
         raise click.ClickException(FeedbackManager.error_build_only_supported_in_local())
 
     if project.has_deeper_level():
@@ -47,48 +51,89 @@ def build(ctx: click.Context, watch: bool) -> None:
         )
 
     click.echo(FeedbackManager.highlight_building_project())
-    process(project=project, tb_client=tb_client, watch=False)
+    process(project=project, tb_client=tb_client, watch=False, config=config, is_branch=is_branch)
     if watch:
         run_watch(
             project=project,
             tb_client=tb_client,
-            process=partial(process, project=project, tb_client=tb_client, watch=True),
+            config=config,
+            process=partial(
+                process,
+                project=project,
+                tb_client=tb_client,
+                watch=True,
+                config=config,
+                is_branch=is_branch,
+            ),
         )
 
 
 @cli.command("dev", help="Build the project server side and watch for changes.")
 @click.option("--data-origin", type=str, default="", help="Data origin: local or cloud")
-@click.option("--ui", is_flag=True, default=False, help="Connect your local project to Tinybird UI")
+@click.option("--ui/--skip-ui", is_flag=True, default=True, help="Connect your local project to Tinybird UI")
 @click.pass_context
 def dev(ctx: click.Context, data_origin: str, ui: bool) -> None:
+    obj: Dict[str, Any] = ctx.ensure_object(dict)
+    branch: Optional[str] = ctx.ensure_object(dict)["branch"]
+    is_branch = bool(branch)
+
+    if obj["env"] == "cloud" and not is_branch:
+        raise click.ClickException(FeedbackManager.error_build_only_supported_in_local())
+
     if data_origin == "cloud":
+        click.echo(
+            FeedbackManager.warning(
+                message="--data-origin=cloud is deprecated and will be removed in a future version. Create an branch and use `tb --branch <branch_name> dev`"
+            )
+        )
         return dev_cloud(ctx)
+
     project: Project = ctx.ensure_object(dict)["project"]
     tb_client: TinyB = ctx.ensure_object(dict)["client"]
+    config: Dict[str, Any] = ctx.ensure_object(dict)["config"]
+
     build_status = BuildStatus()
     if ui:
         server_thread = threading.Thread(
-            target=start_server, args=(project, tb_client, process, build_status), daemon=True
+            target=start_server, args=(project, tb_client, process, build_status, branch), daemon=True
         )
         server_thread.start()
         # Wait for the server to start
         time.sleep(0.5)
 
     click.echo(FeedbackManager.highlight_building_project())
-    process(project=project, tb_client=tb_client, watch=True, build_status=build_status)
+    process(
+        project=project,
+        tb_client=tb_client,
+        watch=True,
+        config=config,
+        build_status=build_status,
+        is_branch=is_branch,
+    )
     run_watch(
         project=project,
         tb_client=tb_client,
-        process=partial(process, project=project, tb_client=tb_client, build_status=build_status),
+        config=config,
+        branch=branch,
+        process=partial(
+            process,
+            project=project,
+            tb_client=tb_client,
+            build_status=build_status,
+            config=config,
+            is_branch=is_branch,
+        ),
     )
 
 
-def run_watch(project: Project, tb_client: TinyB, process: Callable) -> None:
-    shell = Shell(project=project, tb_client=tb_client, playground=False)
+def run_watch(
+    project: Project, tb_client: TinyB, process: Callable, config: dict[str, Any], branch: Optional[str] = None
+) -> None:
+    shell = Shell(project=project, tb_client=tb_client, branch=branch)
     click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
     watcher_thread = threading.Thread(
         target=watch_project,
-        args=(shell, process, project),
+        args=(shell, process, project, config),
         daemon=True,
     )
     watcher_thread.start()
@@ -136,7 +181,7 @@ def dev_cloud(
     context.disable_template_security_validation.set(True)
 
     def process(filenames: List[str], watch: bool = False):
-        datafiles = [f for f in filenames if f.endswith(".datasource") or f.endswith(".pipe")]
+        datafiles = [f for f in filenames if f.endswith((".datasource", ".pipe"))]
         if len(datafiles) > 0:
             check_filenames(filenames=datafiles)
             folder_playground(