tinybird 0.0.1.dev288__tar.gz → 0.0.1.dev290__tar.gz

{tinybird-0.0.1.dev288 → tinybird-0.0.1.dev290}/PKG-INFO

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

{tinybird-0.0.1.dev288 → tinybird-0.0.1.dev290}/tinybird/datafile/common.py

@@ -1877,16 +1877,6 @@ def parse(
                 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(

{tinybird-0.0.1.dev288 → tinybird-0.0.1.dev290}/tinybird/sql_toolset.py

@@ -144,7 +144,7 @@ def format_where_for_mutation_command(where_clause: str) -> str:
     return f"DELETE WHERE {quoted_condition[1:-1]}"
 
 
-@lru_cache(maxsize=2**13)
+@lru_cache(maxsize=2**15)
 def sql_get_used_tables_cached(
     sql: str,
     raising: bool = False,
@@ -301,7 +301,7 @@ def replacements_to_tuples(replacements: dict) -> dict:
     return parsed_replacements
 
 
-@lru_cache(maxsize=2**13)
+@lru_cache(maxsize=2**15)
 def replace_tables_chquery_cached(
     sql: str,
     sorted_replacements: Optional[tuple] = None,

{tinybird-0.0.1.dev288 → tinybird-0.0.1.dev290}/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.dev288'
-__revision__ = '6cd5b6c'
+__version__ = '0.0.1.dev290'
+__revision__ = '4d1cca4'

{tinybird-0.0.1.dev288 → tinybird-0.0.1.dev290}/tinybird/tb/modules/agent/agent.py

@@ -23,6 +23,7 @@ from tinybird.tb.modules.agent.banner import display_banner
 from tinybird.tb.modules.agent.command_agent import CommandAgent
 from tinybird.tb.modules.agent.compactor import compact_messages
 from tinybird.tb.modules.agent.explore_agent import ExploreAgent
+from tinybird.tb.modules.agent.file_agent import FileAgent
 from tinybird.tb.modules.agent.memory import (
     clear_history,
     clear_messages,
@@ -50,7 +51,13 @@ from tinybird.tb.modules.agent.tools.get_endpoint_stats import get_endpoint_stat
 from tinybird.tb.modules.agent.tools.get_openapi_definition import get_openapi_definition
 from tinybird.tb.modules.agent.tools.plan import complete_plan, plan
 from tinybird.tb.modules.agent.tools.secret import create_or_update_secrets
-from tinybird.tb.modules.agent.utils import AgentRunCancelled, TinybirdAgentContext, show_confirmation, show_input
+from tinybird.tb.modules.agent.utils import (
+    AgentRunCancelled,
+    SubAgentRunCancelled,
+    TinybirdAgentContext,
+    show_confirmation,
+    show_input,
+)
 from tinybird.tb.modules.build_common import process as build_process
 from tinybird.tb.modules.common import (
     _analyze,
@@ -179,6 +186,16 @@ class TinybirdAgent:
             workspace_id=workspace_id,
             project=self.project,
         )
+        self.file_agent = FileAgent(
+            dangerously_skip_permissions=self.dangerously_skip_permissions,
+            prompt_mode=prompt_mode,
+            thinking_animation=self.thinking_animation,
+            token=self.token,
+            user_token=self.user_token,
+            host=self.host,
+            workspace_id=workspace_id,
+            project=self.project,
+        )
 
         @self.agent.tool
         def manage_tests(ctx: RunContext[TinybirdAgentContext], task: str) -> str:
@@ -207,8 +224,11 @@ class TinybirdAgent:
             Returns:
                 str: The result of the command.
             """
-            result = self.command_agent.run(task, deps=ctx.deps, usage=ctx.usage)
-            return f"Result: {result.output}\nDo not repeat in your response the result again, because it is already displayed in the terminal."
+            try:
+                result = self.command_agent.run(task, deps=ctx.deps, usage=ctx.usage)
+                return f"Result: {result.output}\nDo not repeat in your response the result again, because it is already displayed in the terminal."
+            except SubAgentRunCancelled as e:
+                return f"User does not want to continue with the proposed solution. Reason: {e}"
 
         @self.agent.tool
         def explore_data(ctx: RunContext[TinybirdAgentContext], task: str) -> str:
@@ -242,6 +262,19 @@ class TinybirdAgent:
             result = self.mock_agent.run(user_input, deps=ctx.deps, usage=ctx.usage)
             return result.output or "No result returned"
 
+        @self.agent.tool
+        def manage_files(ctx: RunContext[TinybirdAgentContext], task: str) -> str:
+            """List file/folders and read any type of file in the current directory. Use this tool when you need to list or read non Tinybird project files (e.g. .txt, .md).
+
+            Args:
+                task (str): The task to solve. Required.
+
+            Returns:
+                str: The result of the task.
+            """
+            result = self.file_agent.run(task, deps=ctx.deps, usage=ctx.usage)
+            return result.output or "No result returned"
+
         @self.agent.instructions
         def get_local_host(ctx: RunContext[TinybirdAgentContext]) -> str:
             return f"""

tinybird-0.0.1.dev290/tinybird/tb/modules/agent/file_agent.py

@@ -0,0 +1,64 @@
+from pydantic_ai import Agent, Tool
+from pydantic_ai.messages import ModelMessage
+from pydantic_ai.usage import Usage
+
+from tinybird.tb.modules.agent.animations import ThinkingAnimation
+from tinybird.tb.modules.agent.models import create_model
+from tinybird.tb.modules.agent.prompts import tone_and_style_instructions
+from tinybird.tb.modules.agent.tools.file import list_files, read_file
+from tinybird.tb.modules.agent.utils import TinybirdAgentContext
+from tinybird.tb.modules.project import Project
+
+
+class FileAgent:
+    def __init__(
+        self,
+        token: str,
+        user_token: str,
+        host: str,
+        workspace_id: str,
+        project: Project,
+        dangerously_skip_permissions: bool,
+        prompt_mode: bool,
+        thinking_animation: ThinkingAnimation,
+    ):
+        self.token = token
+        self.user_token = user_token
+        self.host = host
+        self.workspace_id = workspace_id
+        self.dangerously_skip_permissions = dangerously_skip_permissions or prompt_mode
+        self.project = project
+        self.thinking_animation = thinking_animation
+        self.messages: list[ModelMessage] = []
+        self.agent = Agent(
+            model=create_model(user_token, host, workspace_id),
+            deps_type=TinybirdAgentContext,
+            instructions=[
+                """
+You are part of Tinybird Code, an agentic CLI that can help users to work with Tinybird.                 
+You are a sub-agent of the main Tinybird Code agent. You are responsible for managing files.
+You can do the following:
+- List files in a directory.
+- Read a file.
+
+IMPORTANT: Use the `list_files` tool always before `read_file` to get the correct file path.
+""",
+                tone_and_style_instructions,
+            ],
+            tools=[
+                Tool(list_files, docstring_format="google", require_parameter_descriptions=True, takes_ctx=True),
+                Tool(read_file, docstring_format="google", require_parameter_descriptions=True, takes_ctx=True),
+            ],
+        )
+
+    def run(self, task: str, deps: TinybirdAgentContext, usage: Usage):
+        result = self.agent.run_sync(
+            task,
+            deps=deps,
+            usage=usage,
+            message_history=self.messages,
+            model=create_model(self.user_token, self.host, self.workspace_id, run_id=deps.run_id),
+        )
+        new_messages = result.new_messages()
+        self.messages.extend(new_messages)
+        return result

{tinybird-0.0.1.dev288 → tinybird-0.0.1.dev290}/tinybird/tb/modules/agent/tools/append.py

@@ -24,7 +24,7 @@ def append_file(
     Args:
         datasource_name: Name of the datasource to append fixture to
         fixture_pathname: Path to the fixture file to append
-        cloud: Whether to append the fixture to the cloud or local environment. If None (user didn't specify), will ask user to clarify. Defaults to local (False) in dangerous skip permissions mode.
+        cloud: Whether to append the fixture to the cloud or local environment. If None (user didn't specify in a previous step), will ask user to clarify. Defaults to local (False) in dangerous skip permissions mode.
 
     Returns:
         str: Message indicating the success or failure of the appending
@@ -54,6 +54,7 @@ def append_file(
 
         cloud_or_local = "Cloud" if cloud else "Local"
         active_plan = ctx.deps.get_plan() is not None and not cloud
+        ctx.deps.thinking_animation.stop()
         confirmation = show_confirmation(
             title=f"Append fixture {fixture_pathname} to datasource '{datasource_name}' in Tinybird {cloud_or_local}?",
             skip_confirmation=ctx.deps.dangerously_skip_permissions or active_plan,

tinybird-0.0.1.dev290/tinybird/tb/modules/agent/tools/file.py

@@ -0,0 +1,82 @@
+from glob import glob
+from pathlib import Path
+
+import click
+from pydantic_ai import RunContext
+
+from tinybird.tb.modules.agent.utils import TinybirdAgentContext
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+
+
+def list_files(
+    ctx: RunContext[TinybirdAgentContext],
+    folder_path: str = ".",
+    search_pattern: str = "*",
+) -> str:
+    """Lists all files and folders in a directory.
+
+    Args:
+        folder_path (str): The path to the directory to list. If not provided, it will list the files in the current directory. Default: "."
+        search_pattern (str): The pattern to search for in the files and folders. Default: "*"
+    Returns:
+        str: The list of files in the directory.
+    """
+    try:
+        ctx.deps.thinking_animation.stop()
+        if folder_path:
+            path = Path(folder_path)
+        else:
+            path = Path.cwd()
+
+        display_folder = "current directory" if (folder_path == "." or not folder_path) else folder_path
+
+        click.echo(
+            FeedbackManager.highlight(message=f"» Searching in {display_folder} with pattern '{search_pattern}'")
+        )
+
+        if not path.exists():
+            ctx.deps.thinking_animation.start()
+            return f"Folder {folder_path} does not exist"
+
+        result = glob(f"{path}/**/{search_pattern}", recursive=True)
+        folders = [f for f in result if Path(f).is_dir()]
+        files = [f for f in result if Path(f).is_file()]
+
+        ctx.deps.thinking_animation.start()
+        return f"Folders: {folders}\nFiles: {files}"
+    except Exception as e:
+        ctx.deps.thinking_animation.start()
+        return f"Error listing files: {e}"
+
+
+def read_file(ctx: RunContext[TinybirdAgentContext], file_path: str) -> str:
+    """Reads a file from the local filesystem. The file_path parameter must be an absolute path, not a relative path. Any lines longer than 2000 characters will be truncated.
+
+    Args:
+        file_path (str): The path to the file to read.
+
+    Returns:
+        str: The content of the file.
+    """
+    try:
+        ctx.deps.thinking_animation.stop()
+        click.echo(FeedbackManager.highlight(message=f"» Reading file {file_path}"))
+        path = Path(file_path)
+
+        if not path.exists():
+            ctx.deps.thinking_animation.start()
+            return f"File {file_path} does not exist"
+
+        content = path.read_text()
+        chunks = content.split("\n")
+
+        if len(chunks) > 2000:
+            first_2000 = "\n".join(chunks[0:2000])
+            ctx.deps.thinking_animation.start()
+            return f"This file is too large to be read by the agent. Showing first 2000 lines instead:\n\n{first_2000}"
+
+        ctx.deps.thinking_animation.start()
+        return content
+    except Exception as e:
+        ctx.deps.thinking_animation.start()
+        return f"Error reading file: {e}"

{tinybird-0.0.1.dev288 → tinybird-0.0.1.dev290}/tinybird/tb/modules/agent/tools/run_command.py

@@ -3,7 +3,13 @@ import subprocess
 import click
 from pydantic_ai import RunContext
 
-from tinybird.tb.modules.agent.utils import AgentRunCancelled, TinybirdAgentContext, show_confirmation, show_input
+from tinybird.tb.modules.agent.utils import (
+    AgentRunCancelled,
+    SubAgentRunCancelled,
+    TinybirdAgentContext,
+    show_confirmation,
+    show_input,
+)
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 
@@ -24,7 +30,7 @@ def run_command(ctx: RunContext[TinybirdAgentContext], command: str):
         if confirmation == "review":
             feedback = show_input(ctx.deps.workspace_name)
             ctx.deps.thinking_animation.start()
-            return f"User did not confirm the command and gave the following feedback: {feedback}"
+            raise SubAgentRunCancelled(f"""User did not confirm the command `{command}`. Reason: {feedback}.""")
 
         click.echo(FeedbackManager.highlight(message=f"» Running command: {command}"))
         command = command.replace("tb", "tb --no-version-warning")
@@ -32,7 +38,7 @@ def run_command(ctx: RunContext[TinybirdAgentContext], command: str):
         click.echo(result.stdout)
         ctx.deps.thinking_animation.start()
         return result.stdout
-    except AgentRunCancelled as e:
+    except (AgentRunCancelled, SubAgentRunCancelled) as e:
         raise e
     except Exception as e:
         click.echo(FeedbackManager.error(message=f"Error running command: {e}"))

{tinybird-0.0.1.dev288 → tinybird-0.0.1.dev290}/tinybird/tb/modules/agent/utils.py

@@ -721,6 +721,12 @@ class AgentRunCancelled(Exception):
     pass
 
 
+class SubAgentRunCancelled(Exception):
+    """Exception raised when sub-agent cancels an operation"""
+
+    pass
+
+
 def show_confirmation(title: str, skip_confirmation: bool = False, show_review: bool = True) -> ConfirmationResult:
     if skip_confirmation:
         return "yes"

{tinybird-0.0.1.dev288 → tinybird-0.0.1.dev290}/tinybird/tb/modules/local_common.py

@@ -24,6 +24,7 @@ from tinybird.tb.modules.telemetry import add_telemetry_event
 TB_IMAGE_NAME = "tinybirdco/tinybird-local:latest"
 TB_CONTAINER_NAME = "tinybird-local"
 TB_LOCAL_PORT = int(os.getenv("TB_LOCAL_PORT", 7181))
+TB_LOCAL_CLICKHOUSE_INTERFACE_PORT = int(os.getenv("TB_LOCAL_CLICKHOUSE_INTERFACE_PORT", 7182))
 TB_LOCAL_HOST = re.sub(r"^https?://", "", os.getenv("TB_LOCAL_HOST", "localhost"))
 TB_LOCAL_ADDRESS = f"http://{TB_LOCAL_HOST}:{TB_LOCAL_PORT}"
 TB_LOCAL_DEFAULT_WORKSPACE_NAME = "Tinybird_Local_Testing"
@@ -269,7 +270,7 @@ def start_tinybird_local(
             TB_IMAGE_NAME,
             name=TB_CONTAINER_NAME,
             detach=True,
-            ports={"7181/tcp": TB_LOCAL_PORT},
+            ports={"7181/tcp": TB_LOCAL_PORT, "7182/tcp": TB_LOCAL_CLICKHOUSE_INTERFACE_PORT},
             remove=False,
             platform="linux/amd64",
             environment=environment,

{tinybird-0.0.1.dev288 → tinybird-0.0.1.dev290}/tinybird.egg-info/PKG-INFO

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

{tinybird-0.0.1.dev288 → tinybird-0.0.1.dev290}/tinybird.egg-info/SOURCES.txt

@@ -87,6 +87,7 @@ tinybird/tb/modules/agent/banner.py
 tinybird/tb/modules/agent/command_agent.py
 tinybird/tb/modules/agent/compactor.py
 tinybird/tb/modules/agent/explore_agent.py
+tinybird/tb/modules/agent/file_agent.py
 tinybird/tb/modules/agent/memory.py
 tinybird/tb/modules/agent/mock_agent.py
 tinybird/tb/modules/agent/models.py
@@ -102,6 +103,7 @@ tinybird/tb/modules/agent/tools/deploy.py
 tinybird/tb/modules/agent/tools/deploy_check.py
 tinybird/tb/modules/agent/tools/diff_resource.py
 tinybird/tb/modules/agent/tools/execute_query.py
+tinybird/tb/modules/agent/tools/file.py
 tinybird/tb/modules/agent/tools/get_endpoint_stats.py
 tinybird/tb/modules/agent/tools/get_openapi_definition.py
 tinybird/tb/modules/agent/tools/mock.py