tinybird 0.0.1.dev244__py3-none-any.whl → 0.0.1.dev246__py3-none-any.whl

tinybird/datafile/common.py

@@ -1698,11 +1698,36 @@ def parse(
     def version(*args: str, **kwargs: Any) -> None:
         pass  # whatever, it's deprecated
 
-    @not_supported_yet()
     def shared_with(*args: str, **kwargs: Any) -> None:
+        # Count total workspaces collected
+        total_workspaces = 0
+
         for entries in args:
-            # In case they specify multiple workspaces
-            doc.shared_with += [workspace.strip() for workspace in entries.splitlines()]
+            # In case they specify multiple workspaces, handle both line-separated and comma-separated values
+            lines = entries.splitlines()
+            for line in lines:
+                # Split by comma and strip whitespace from each workspace name
+                workspaces = [workspace.strip().rstrip(",") for workspace in line.split(",") if workspace.strip()]
+                doc.shared_with += workspaces
+                total_workspaces += len(workspaces)
+
+        # Add warning once if any workspaces were found
+        if total_workspaces > 0:
+            warnings.append(
+                DatafileParseWarning(
+                    message=(
+                        f"{kwargs['cmd'].upper()} is not fully implemented in Forward and will be ignored while this warning is present."
+                    )
+                )
+            )
+
+        # Validate that at least one workspace was provided
+        if total_workspaces == 0:
+            raise DatafileSyntaxError(
+                "SHARED_WITH requires at least one workspace name",
+                lineno=kwargs["lineno"],
+                pos=1,
+            )
 
     def __init_engine(v: str):
         if not parser_state.current_node:

tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/forward/commands'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev244'
-__revision__ = '434c7ff'
+__version__ = '0.0.1.dev246'
+__revision__ = '5c11131'

tinybird/tb/modules/agent/agent.py

@@ -1,5 +1,5 @@
+import subprocess
 import sys
-import uuid
 from datetime import datetime
 from functools import partial
 from typing import Any
@@ -35,12 +35,17 @@ from tinybird.tb.modules.agent.prompts import (
     resources_prompt,
     sql_instructions,
 )
+from tinybird.tb.modules.agent.tools.build import build
 from tinybird.tb.modules.agent.tools.create_datafile import create_datafile
+from tinybird.tb.modules.agent.tools.deploy import deploy
+from tinybird.tb.modules.agent.tools.deploy_check import deploy_check
 from tinybird.tb.modules.agent.tools.explore import explore_data
 from tinybird.tb.modules.agent.tools.plan import plan
 from tinybird.tb.modules.agent.tools.preview_datafile import preview_datafile
 from tinybird.tb.modules.agent.utils import TinybirdAgentContext
 from tinybird.tb.modules.build_common import process as build_process
+from tinybird.tb.modules.common import _get_tb_client
+from tinybird.tb.modules.deployment_common import create_deployment
 from tinybird.tb.modules.exceptions import CLIBuildException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.local_common import get_tinybird_local_client
@@ -86,7 +91,9 @@ You have access to the following tools:
 2. `preview_datafile` - Preview the content of a datafile (datasource, endpoint, materialized, sink, copy, connection).
 3. `create_datafile` - Create a file in the project folder. Confirmation will be asked by the tool before creating the file.
 4. `plan` - Plan the creation or update of resources.
-
+5. `build` - Build the project.
+6. `deploy` - Deploy the project to Tinybird Cloud.
+7. `deploy_check` - Check if the project can be deployed to Tinybird Cloud before deploying it.
 
 # When creating or updating datafiles:
 1. Use `plan` tool to plan the creation or update of resources.
@@ -140,6 +147,9 @@ Today is {datetime.now().strftime("%Y-%m-%d")}
                 Tool(preview_datafile, docstring_format="google", require_parameter_descriptions=True, takes_ctx=False),
                 Tool(create_datafile, docstring_format="google", require_parameter_descriptions=True, takes_ctx=True),
                 Tool(plan, docstring_format="google", require_parameter_descriptions=True, takes_ctx=True),
+                Tool(build, docstring_format="google", require_parameter_descriptions=True, takes_ctx=True),
+                Tool(deploy, docstring_format="google", require_parameter_descriptions=True, takes_ctx=True),
+                Tool(deploy_check, docstring_format="google", require_parameter_descriptions=True, takes_ctx=True),
             ],
         )
 
@@ -147,22 +157,25 @@ Today is {datetime.now().strftime("%Y-%m-%d")}
         """Keep only the last 5 messages to manage token usage."""
         return self.messages[-5:] if len(self.messages) > 5 else self.messages
 
-    def run(self, user_prompt: str, project: Project) -> None:
+    def run(self, user_prompt: str, config: dict[str, Any], project: Project) -> None:
         user_prompt = f"{user_prompt}\n\n# Existing resources in the project:\n{resources_prompt(project)}"
         client = TinyB(token=self.token, host=self.host)
         folder = self.project.folder
+
         thinking_animation = ThinkingAnimation(message="Chirping", delay=0.15)
         thinking_animation.start()
-
         result = self.agent.run_sync(
             user_prompt,
             deps=TinybirdAgentContext(
                 # context does not support the whole client, so we need to pass only the functions we need
                 explore_data=client.explore_data,
-                build_project=partial(build_project, folder=folder),
+                build_project=partial(build_project, project=project, config=config),
+                deploy_project=partial(deploy_project, project=project, config=config),
+                deploy_check_project=partial(deploy_check_project, project=project, config=config),
                 get_project_files=project.get_project_files,
                 folder=folder,
                 thinking_animation=thinking_animation,
+                workspace_name=self.project.workspace_name,
             ),
             message_history=self.messages,
         )
@@ -182,9 +195,11 @@ def run_agent(config: dict[str, Any], project: Project):
         host = config["host"]
         agent = TinybirdAgent(token, host, project)
         click.echo()
-        click.echo(FeedbackManager.success(message="Welcome to Tinybird Code"))
-        click.echo(FeedbackManager.info(message="Describe what you want to create and I'll help you build it"))
-        click.echo(FeedbackManager.info(message="Commands: 'exit', 'quit', 'help', or Ctrl+C to exit"))
+        if config.get("token"):
+            click.echo(FeedbackManager.info(message="Describe what you want to create and I'll help you build it"))
+            click.echo(FeedbackManager.info(message="Run /help for more commands"))
+        else:
+            click.echo(FeedbackManager.info(message="Run /login to authenticate"))
         click.echo()
 
     except Exception as e:
@@ -207,25 +222,29 @@ def run_agent(config: dict[str, Any], project: Project):
                     ),
                 )
 
-                if user_input.lower() in ["exit", "quit"]:
+                if user_input.lower() in ["/exit", "/quit"]:
                     click.echo(FeedbackManager.info(message="Goodbye!"))
                     break
-                elif user_input.lower() == "clear":
+                elif user_input.lower() == "/clear":
                     clear_history()
                     continue
-                elif user_input.lower() == "help":
+                elif user_input.lower() == "/login":
+                    click.echo()
+                    subprocess.run(["tb", "login"], check=True)
+                    click.echo()
+                    continue
+                elif user_input.lower() == "/help":
                     click.echo()
-                    click.echo(FeedbackManager.info(message="Tinybird Code Help:"))
                     click.echo("• Describe what you want to create: 'Create a user analytics system'")
                     click.echo("• Ask for specific resources: 'Create a pipe to aggregate daily clicks'")
-                    click.echo("• Request data sources: 'Set up a Kafka connection for events'")
-                    click.echo("• Type 'exit' or 'quit' to leave")
+                    click.echo("• Connect to external services: 'Set up a Kafka connection for events'")
+                    click.echo("• Type '/exit' or '/quit' to leave")
                     click.echo()
                     continue
                 elif user_input.strip() == "":
                     continue
                 else:
-                    agent.run(user_input, project)
+                    agent.run(user_input, config, project)
 
             except KeyboardInterrupt:
                 click.echo(FeedbackManager.info(message="Goodbye!"))
@@ -239,10 +258,34 @@ def run_agent(config: dict[str, Any], project: Project):
         sys.exit(1)
 
 
-def build_project(folder: str) -> None:
-    workspace_name = f"tmp_workspace_{uuid.uuid4()}"
-    project = Project(folder, workspace_name=workspace_name)
-    local_client = get_tinybird_local_client({"path": folder, "name": workspace_name}, test=True, silent=True)
-    build_error = build_process(project=project, tb_client=local_client, watch=False, silent=True, exit_on_error=False)
+def build_project(config: dict[str, Any], project: Project, silent: bool = True, test: bool = True) -> None:
+    local_client = get_tinybird_local_client(config, test=test, silent=silent)
+    build_error = build_process(
+        project=project, tb_client=local_client, watch=False, silent=silent, exit_on_error=False
+    )
     if build_error:
         raise CLIBuildException(build_error)
+
+
+def deploy_project(config: dict[str, Any], project: Project) -> None:
+    client = _get_tb_client(config["token"], config["host"])
+    create_deployment(
+        project=project,
+        client=client,
+        config=config,
+        wait=True,
+        auto=True,
+        allow_destructive_operations=False,
+    )
+
+
+def deploy_check_project(config: dict[str, Any], project: Project) -> None:
+    client = _get_tb_client(config["token"], config["host"])
+    create_deployment(
+        project=project,
+        client=client,
+        config=config,
+        check=True,
+        wait=True,
+        auto=True,
+    )

tinybird/tb/modules/agent/prompts.py

@@ -5,23 +5,23 @@ from tinybird.tb.modules.project import Project
 plan_instructions = """
 When asked to create a plan, you MUST respond with this EXACT format and NOTHING ELSE:
 
-PLAN_DESCRIPTION: [One sentence describing what will be built]
-
-STEPS:
-1. CREATE_DATASOURCE: [name] - [description] - DEPENDS_ON: none
-2. CREATE_ENDPOINT: [name] - [description] - DEPENDS_ON: [resource_name]
-3. CREATE_MATERIALIZED_PIPE: [name] - [description] - DEPENDS_ON: [resource_name]
-4. CREATE_MATERIALIZED_DATASOURCE: [name] - [description] - DEPENDS_ON: [resource_name]
-5. CREATE_SINK: [name] - [description] - DEPENDS_ON: [resource_name]
-6. CREATE_COPY: [name] - [description] - DEPENDS_ON: [resource_name]
-7. CREATE_CONNECTION: [name] - [description] - DEPENDS_ON: none
+Plan description: [One sentence describing what will be built]
+
+Steps:
+1. Connection: [name] - [description] - Depends on: none
+2. Datasource: [name] - [description] - Depends on: [connection_name (optional)]
+3. Endpoint: [name] - [description] - Depends on: [resources]
+4. Materialized pipe: [name] - [description] - Depends on: [resources]
+5. Materialized datasource: [name] - [description] - Depends on: [resources]
+6. Sink: [name] - [description] - Depends on: [resources]
+7. Copy: [name] - [description] - Depends on: [resources]
+8. Build project
 
 You can skip steps where resources will not be created or updated.
+Always add BUILD_PROJECT step at the end of the plan.
 
-ESTIMATED_RESOURCES: [total number of steps]
-
-RESOURCE_DEPENDENCIES:
-[resource_name]: [resource_name]
+Resource dependencies:
+[resource_name]: [resources]
 """
 
 

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

@@ -0,0 +1,19 @@
+import click
+from pydantic_ai import RunContext
+
+from tinybird.tb.modules.agent.utils import TinybirdAgentContext
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+
+
+def build(ctx: RunContext[TinybirdAgentContext]) -> str:
+    """Build the project"""
+    try:
+        ctx.deps.thinking_animation.stop()
+        ctx.deps.build_project(test=False, silent=False)
+        ctx.deps.thinking_animation.start()
+        return "Project built successfully"
+    except Exception as e:
+        ctx.deps.thinking_animation.stop()
+        click.echo(FeedbackManager.error(message=e))
+        ctx.deps.thinking_animation.start()
+        return f"Error building project: {e}"

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

@@ -44,17 +44,17 @@ def create_datafile(ctx: RunContext[TinybirdAgentContext], resource: Datafile) -
         path = Path(ctx.deps.folder) / resource.pathname
         exists = str(path) in ctx.deps.get_project_files()
         confirmation = get_resource_confirmation(resource, exists)
-        ctx.deps.thinking_animation.start()
 
         if not confirmation:
+            ctx.deps.thinking_animation.start()
             return f"Resource {resource.pathname} was not created. User cancelled creation."
 
         folder_path = path.parent
         folder_path.mkdir(parents=True, exist_ok=True)
         path.touch(exist_ok=True)
-
         path.write_text(resource.content)
-        ctx.deps.build_project()
+        ctx.deps.build_project(test=True, silent=True)
+        ctx.deps.thinking_animation.start()
         return f"Created {resource.pathname}"
 
     except CLIBuildException as e:

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

@@ -0,0 +1,45 @@
+import click
+from pydantic_ai import RunContext
+
+from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_options
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+
+
+def get_deploy_confirmation() -> bool:
+    """Get user confirmation for deploying the project"""
+    while True:
+        result = show_options(
+            options=["Yes, deploy the project", "No, and tell Tinybird Code what to do"],
+            title="Do you want to deploy the project?",
+        )
+
+        if result is None:  # Cancelled
+            return False
+
+        if result.startswith("Yes"):
+            return True
+        elif result.startswith("No"):
+            return False
+
+        return False
+
+
+def deploy(ctx: RunContext[TinybirdAgentContext]) -> str:
+    """Deploy the project"""
+    try:
+        ctx.deps.thinking_animation.stop()
+        confirmation = get_deploy_confirmation()
+        ctx.deps.thinking_animation.start()
+
+        if not confirmation:
+            return "User cancelled deployment."
+
+        ctx.deps.thinking_animation.stop()
+        ctx.deps.deploy_project()
+        ctx.deps.thinking_animation.start()
+        return "Project deployed successfully"
+    except Exception as e:
+        ctx.deps.thinking_animation.stop()
+        click.echo(FeedbackManager.error(message=e))
+        ctx.deps.thinking_animation.start()
+        return f"Error depoying project: {e}"

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

@@ -0,0 +1,19 @@
+import click
+from pydantic_ai import RunContext
+
+from tinybird.tb.modules.agent.utils import TinybirdAgentContext
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+
+
+def deploy_check(ctx: RunContext[TinybirdAgentContext]) -> str:
+    """Check that project can be deployed"""
+    try:
+        ctx.deps.thinking_animation.stop()
+        ctx.deps.deploy_check_project()
+        ctx.deps.thinking_animation.start()
+        return "Project can be deployed"
+    except Exception as e:
+        ctx.deps.thinking_animation.stop()
+        click.echo(FeedbackManager.error(message=e))
+        ctx.deps.thinking_animation.start()
+        return f"Project cannot be deployed: {e}"

tinybird/tb/modules/agent/utils.py

@@ -18,11 +18,14 @@ from pydantic import BaseModel, Field
 
 
 class TinybirdAgentContext(BaseModel):
-    explore_data: Callable[[str], str]
     folder: str
-    build_project: Callable[[], None]
+    workspace_name: str
     thinking_animation: Any
     get_project_files: Callable[[], List[str]]
+    explore_data: Callable[[str], str]
+    build_project: Callable[..., None]
+    deploy_project: Callable[[], None]
+    deploy_check_project: Callable[[], None]
 
 
 default_style = Style.from_dict(