tinybird 0.0.1.dev257__tar.gz → 0.0.1.dev258__tar.gz

{tinybird-0.0.1.dev257 → tinybird-0.0.1.dev258}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev257
+Version: 0.0.1.dev258
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

{tinybird-0.0.1.dev257 → tinybird-0.0.1.dev258}/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.dev257'
-__revision__ = '249ae8d'
+__version__ = '0.0.1.dev258'
+__revision__ = 'ca57848'

{tinybird-0.0.1.dev257 → tinybird-0.0.1.dev258}/tinybird/tb/modules/agent/agent.py

@@ -10,7 +10,7 @@ import click
 import humanfriendly
 from pydantic_ai import Agent, RunContext, Tool
 from pydantic_ai.agent import AgentRunResult
-from pydantic_ai.messages import ModelMessage
+from pydantic_ai.messages import ModelMessage, ModelRequest, UserPromptPart
 
 from tinybird.tb.client import TinyB
 from tinybird.tb.modules.agent.animations import ThinkingAnimation
@@ -32,7 +32,7 @@ from tinybird.tb.modules.agent.tools.mock import mock
 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.tools.request_endpoint import request_endpoint
-from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_input
+from tinybird.tb.modules.agent.utils import AgentRunCancelled, TinybirdAgentContext, show_input
 from tinybird.tb.modules.build_common import process as build_process
 from tinybird.tb.modules.common import _analyze, _get_tb_client, echo_safe_humanfriendly_tables_format_pretty_table
 from tinybird.tb.modules.config import CLIConfig
@@ -119,6 +119,9 @@ class TinybirdAgent:
 
         self.thinking_animation = ThinkingAnimation()
 
+    def add_message(self, message: ModelMessage) -> None:
+        self.messages.append(message)
+
     def _keep_recent_messages(self, messages: list[ModelMessage]) -> list[ModelMessage]:
         """Keep only the last 5 messages to manage token usage."""
         return messages[-5:] if len(messages) > 5 else messages
@@ -320,7 +323,18 @@ def run_agent(
                     continue
                 else:
                     asyncio.run(agent.run_iter(user_input, config))
-
+            except AgentRunCancelled:
+                click.echo(FeedbackManager.info(message="User cancelled the operation"))
+                agent.add_message(
+                    ModelRequest(
+                        parts=[
+                            UserPromptPart(
+                                content="User cancelled the operation",
+                            )
+                        ]
+                    )
+                )
+                continue
             except KeyboardInterrupt:
                 click.echo(FeedbackManager.info(message="Goodbye!"))
                 break

{tinybird-0.0.1.dev257 → tinybird-0.0.1.dev258}/tinybird/tb/modules/agent/banner.py

@@ -53,3 +53,4 @@ def display_banner():
             char_count += 1
 
         click.echo(colored_line + reset)
+    click.echo()

{tinybird-0.0.1.dev257 → tinybird-0.0.1.dev258}/tinybird/tb/modules/agent/tools/analyze.py

@@ -5,7 +5,7 @@ from urllib.parse import urlparse
 import click
 from pydantic_ai import RunContext
 
-from tinybird.tb.modules.agent.utils import TinybirdAgentContext
+from tinybird.tb.modules.agent.utils import AgentRunCancelled, TinybirdAgentContext
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 
@@ -37,6 +37,8 @@ def analyze_file(ctx: RunContext[TinybirdAgentContext], fixture_pathname: str):
         columns = response["analysis"]["columns"]
 
         return f"#Result of analysis of {fixture_pathname}:\n##Columns:\n{json.dumps(columns)}\n##Data sample:\n{json.dumps(data)}"
+    except AgentRunCancelled as e:
+        raise e
     except Exception as e:
         ctx.deps.thinking_animation.stop()
         click.echo(FeedbackManager.error(message=f"Error analyzing {fixture_pathname}: {e}"))

{tinybird-0.0.1.dev257 → tinybird-0.0.1.dev258}/tinybird/tb/modules/agent/tools/append.py

@@ -1,7 +1,7 @@
 import click
 from pydantic_ai import RunContext
 
-from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_confirmation, show_input
+from tinybird.tb.modules.agent.utils import AgentRunCancelled, TinybirdAgentContext, show_confirmation, show_input
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 
@@ -31,10 +31,6 @@ def append_file(
             ctx.deps.thinking_animation.start()
             return f"User did not confirm appending {fixture_pathname} fixture in Tinybird {cloud_or_local} and gave the following feedback: {feedback}"
 
-        if confirmation == "cancel":
-            ctx.deps.thinking_animation.start()
-            return f"User rejected appending {fixture_pathname} fixture in Tinybird {cloud_or_local}. Skip this step"
-
         ctx.deps.thinking_animation.stop()
         click.echo(FeedbackManager.highlight(message=f"» Appending {fixture_pathname} to {datasource_name}..."))
         if cloud:
@@ -44,6 +40,8 @@ def append_file(
         click.echo(FeedbackManager.success(message=f"✓ Data appended to {datasource_name}"))
         ctx.deps.thinking_animation.start()
         return f"Data appended to {datasource_name} in Tinybird {cloud_or_local}"
+    except AgentRunCancelled as e:
+        raise e
     except Exception as e:
         error_message = str(e)
         ctx.deps.thinking_animation.stop()
@@ -79,10 +77,6 @@ def append_url(
             ctx.deps.thinking_animation.start()
             return f"User did not confirm appending URL {fixture_url} in Tinybird {cloud_or_local} and gave the following feedback: {feedback}"
 
-        if confirmation == "cancel":
-            ctx.deps.thinking_animation.start()
-            return f"User rejected appending URL {fixture_url} in Tinybird {cloud_or_local}. Skip this step"
-
         ctx.deps.thinking_animation.stop()
         click.echo(FeedbackManager.highlight(message=f"» Appending {fixture_url} to {datasource_name}..."))
         if cloud:
@@ -92,6 +86,8 @@ def append_url(
         click.echo(FeedbackManager.success(message=f"✓ Data appended to {datasource_name}"))
         ctx.deps.thinking_animation.start()
         return f"Data appended to {datasource_name} in Tinybird {cloud_or_local}"
+    except AgentRunCancelled as e:
+        raise e
     except Exception as e:
         error_message = str(e)
         ctx.deps.thinking_animation.stop()

{tinybird-0.0.1.dev257 → tinybird-0.0.1.dev258}/tinybird/tb/modules/agent/tools/build.py

@@ -2,6 +2,7 @@ import click
 from pydantic_ai import RunContext
 
 from tinybird.tb.modules.agent.utils import TinybirdAgentContext
+from tinybird.tb.modules.exceptions import CLIBuildException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 
@@ -13,7 +14,7 @@ def build(ctx: RunContext[TinybirdAgentContext]) -> str:
         ctx.deps.build_project(test=False, silent=False)
         ctx.deps.thinking_animation.start()
         return "Project built successfully"
-    except Exception as e:
+    except CLIBuildException as e:
         ctx.deps.thinking_animation.stop()
         click.echo(FeedbackManager.error(message=e))
         ctx.deps.thinking_animation.start()

{tinybird-0.0.1.dev257 → tinybird-0.0.1.dev258}/tinybird/tb/modules/agent/tools/create_datafile.py

@@ -5,6 +5,7 @@ import click
 from pydantic_ai import RunContext
 
 from tinybird.tb.modules.agent.utils import (
+    AgentRunCancelled,
     Datafile,
     TinybirdAgentContext,
     create_terminal_box,
@@ -46,10 +47,6 @@ def create_datafile(ctx: RunContext[TinybirdAgentContext], resource: Datafile) -
             ctx.deps.thinking_animation.start()
             return f"User did not confirm the proposed changes and gave the following feedback: {feedback}"
 
-        if confirmation == "cancel":
-            ctx.deps.thinking_animation.start()
-            return f"User cancelled {action} of {resource.pathname}. Stop resource creation."
-
         click.echo(FeedbackManager.highlight(message=f"» Building {resource.pathname}..."))
         folder_path = path.parent
         folder_path.mkdir(parents=True, exist_ok=True)
@@ -60,7 +57,8 @@ def create_datafile(ctx: RunContext[TinybirdAgentContext], resource: Datafile) -
         click.echo(FeedbackManager.success(message=f"✓ {resource.pathname} {action_text}"))
         ctx.deps.thinking_animation.start()
         return f"{action_text} {resource.pathname}"
-
+    except AgentRunCancelled as e:
+        raise e
     except CLIBuildException as e:
         ctx.deps.thinking_animation.stop()
         click.echo(FeedbackManager.error(message=e))

{tinybird-0.0.1.dev257 → tinybird-0.0.1.dev258}/tinybird/tb/modules/agent/tools/deploy.py

@@ -2,6 +2,7 @@ import click
 from pydantic_ai import RunContext
 
 from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_confirmation, show_input
+from tinybird.tb.modules.exceptions import CLIDeploymentException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 
@@ -19,15 +20,11 @@ def deploy(ctx: RunContext[TinybirdAgentContext]) -> str:
             ctx.deps.thinking_animation.start()
             return f"User did not confirm deployment and gave the following feedback: {feedback}"
 
-        if confirmation == "cancel":
-            ctx.deps.thinking_animation.start()
-            return "User cancelled deployment. Stop deployment."
-
         click.echo(FeedbackManager.highlight(message="» Deploying project..."))
         ctx.deps.deploy_project()
         click.echo(FeedbackManager.success(message="✓ Project deployed successfully"))
         ctx.deps.thinking_animation.start()
         return "Project deployed successfully"
-    except Exception as e:
+    except CLIDeploymentException as e:
         ctx.deps.thinking_animation.start()
         return f"Error depoying project: {e}"

{tinybird-0.0.1.dev257 → tinybird-0.0.1.dev258}/tinybird/tb/modules/agent/tools/deploy_check.py

@@ -1,6 +1,7 @@
 from pydantic_ai import RunContext
 
 from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_confirmation, show_input
+from tinybird.tb.modules.exceptions import CLIDeploymentException
 
 
 def deploy_check(ctx: RunContext[TinybirdAgentContext]) -> str:
@@ -17,13 +18,9 @@ def deploy_check(ctx: RunContext[TinybirdAgentContext]) -> str:
             ctx.deps.thinking_animation.start()
             return f"User did not confirm deployment check and gave the following feedback: {feedback}"
 
-        if confirmation == "cancel":
-            ctx.deps.thinking_animation.start()
-            return "User cancelled deployment check. Stop deployment check."
-
         ctx.deps.deploy_check_project()
         ctx.deps.thinking_animation.start()
         return "Project can be deployed"
-    except Exception as e:
+    except CLIDeploymentException as e:
         ctx.deps.thinking_animation.start()
         return f"Project cannot be deployed: {e}"

{tinybird-0.0.1.dev257 → tinybird-0.0.1.dev258}/tinybird/tb/modules/agent/tools/mock.py

@@ -3,7 +3,7 @@ from typing import Optional
 import click
 from pydantic_ai import RunContext
 
-from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_confirmation, show_input
+from tinybird.tb.modules.agent.utils import AgentRunCancelled, TinybirdAgentContext, show_confirmation, show_input
 from tinybird.tb.modules.datafile.fixture import persist_fixture
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
@@ -41,10 +41,6 @@ def mock(
             ctx.deps.thinking_animation.start()
             return f"User did not confirm mock data for datasource '{datasource_name}' in Tinybird {cloud_or_local} and gave the following feedback: {feedback}"
 
-        if confirmation == "cancel":
-            ctx.deps.thinking_animation.start()
-            return f"User cancelled mock data for datasource '{datasource_name}' in Tinybird {cloud_or_local}. Stop mock data generation."
-
         click.echo(FeedbackManager.highlight(message=f"» Generating mock data for {datasource_name}..."))
         data = ctx.deps.mock_data(datasource_name=datasource_name, data_format=data_format, rows=rows, context=context)
         fixture_path = persist_fixture(datasource_name, data, ctx.deps.folder, format=data_format)
@@ -55,6 +51,8 @@ def mock(
         click.echo(FeedbackManager.success(message=f"✓ Data generated for {datasource_name}"))
         ctx.deps.thinking_animation.start()
         return f"Mock data generated successfully for datasource '{datasource_name}' in Tinybird {cloud_or_local}"
+    except AgentRunCancelled as e:
+        raise e
     except Exception as e:
         ctx.deps.thinking_animation.stop()
         error_message = str(e)

tinybird-0.0.1.dev258/tinybird/tb/modules/agent/tools/plan.py

@@ -0,0 +1,29 @@
+import click
+from pydantic_ai import RunContext
+
+from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_confirmation, show_input
+
+
+def plan(ctx: RunContext[TinybirdAgentContext], plan: str) -> str:
+    """Given a plan, ask the user for confirmation to implement it
+
+    Args:
+        plan (str): The plan to implement. Required.
+
+    Returns:
+        str: If the plan was implemented or not.
+    """
+    ctx.deps.thinking_animation.stop()
+    plan = plan.strip()
+    click.echo(plan)
+    confirmation = show_confirmation(
+        title="Do you want to continue with the plan?", skip_confirmation=ctx.deps.dangerously_skip_permissions
+    )
+
+    if confirmation == "review":
+        feedback = show_input(ctx.deps.workspace_name)
+        ctx.deps.thinking_animation.start()
+        return f"User did not confirm the proposed plan and gave the following feedback: {feedback}"
+
+    ctx.deps.thinking_animation.start()
+    return "User confirmed the plan. Implementing..."

{tinybird-0.0.1.dev257 → tinybird-0.0.1.dev258}/tinybird/tb/modules/agent/utils.py

@@ -352,7 +352,7 @@ def show_options(options: List[str], title: str = "Select an option") -> Optiona
     return result["option"]
 
 
-ConfirmationResult = Literal["yes", "review", "cancel"]
+ConfirmationResult = Literal["yes", "review"]
 
 
 def load_existing_resources(folder: str) -> str:
@@ -703,6 +703,12 @@ def show_input(workspace_name: str) -> str:
     )
 
 
+class AgentRunCancelled(Exception):
+    """Exception raised when user cancels an operation"""
+
+    pass
+
+
 def show_confirmation(title: str, skip_confirmation: bool = False) -> ConfirmationResult:
     if skip_confirmation:
         return "yes"
@@ -714,11 +720,11 @@ def show_confirmation(title: str, skip_confirmation: bool = False) -> Confirmati
         )
 
         if result is None:  # Cancelled
-            return "cancel"
+            raise AgentRunCancelled(f"User cancelled the operation: {title}")
 
         if result.startswith("Yes"):
             return "yes"
         elif result.startswith("No"):
             return "review"
 
-        return "cancel"
+        raise AgentRunCancelled(f"User cancelled the operation: {title}")

{tinybird-0.0.1.dev257 → tinybird-0.0.1.dev258}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev257
+Version: 0.0.1.dev258
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

tinybird-0.0.1.dev257/tinybird/tb/modules/agent/tools/plan.py

@@ -1,37 +0,0 @@
-import click
-from pydantic_ai import RunContext
-
-from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_confirmation, show_input
-
-
-def plan(ctx: RunContext[TinybirdAgentContext], plan: str) -> str:
-    """Given a plan, ask the user for confirmation to implement it
-
-    Args:
-        plan (str): The plan to implement. Required.
-
-    Returns:
-        str: If the plan was implemented or not.
-    """
-    try:
-        ctx.deps.thinking_animation.stop()
-        plan = plan.strip()
-        click.echo(plan)
-        confirmation = show_confirmation(
-            title="Do you want to continue with the plan?", skip_confirmation=ctx.deps.dangerously_skip_permissions
-        )
-
-        if confirmation == "review":
-            feedback = show_input(ctx.deps.workspace_name)
-            ctx.deps.thinking_animation.start()
-            return f"User did not confirm the proposed plan and gave the following feedback: {feedback}"
-
-        ctx.deps.thinking_animation.start()
-
-        if confirmation == "cancel":
-            return "User cancelled the plan. Stop the process."
-
-        return "User confirmed the plan. Implementing..."
-
-    except Exception as e:
-        return f"Error implementing the plan: {e}"