tinybird 0.0.1.dev276__tar.gz → 0.0.1.dev278__tar.gz

{tinybird-0.0.1.dev276 → tinybird-0.0.1.dev278}/PKG-INFO

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

{tinybird-0.0.1.dev276 → tinybird-0.0.1.dev278}/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.dev276'
-__revision__ = '6716ae6'
+__version__ = '0.0.1.dev278'
+__revision__ = '422553e'

{tinybird-0.0.1.dev276 → tinybird-0.0.1.dev278}/tinybird/tb/modules/agent/agent.py

@@ -95,7 +95,7 @@ class TinybirdAgent:
         self.agent = Agent(
             model=create_model(user_token, host, workspace_id),
             deps_type=TinybirdAgentContext,
-            system_prompt=agent_system_prompt,
+            instructions=[agent_system_prompt],
             tools=[
                 Tool(create_datafile, docstring_format="google", require_parameter_descriptions=True, takes_ctx=True),
                 Tool(remove_file, docstring_format="google", require_parameter_descriptions=True, takes_ctx=True),
@@ -193,7 +193,7 @@ class TinybirdAgent:
                 str: The result of the command.
             """
             result = self.command_agent.run(task, deps=ctx.deps, usage=ctx.usage)
-            return result.output
+            return f"Result: {result.output}\nDo not repeat in your response the result again, because it is already displayed in the terminal."
 
         @self.agent.tool
         def explore_data(ctx: RunContext[TinybirdAgentContext], task: str) -> str:
@@ -740,7 +740,7 @@ def is_natural_language(user_input: str, user_token: str, host: str) -> bool:
 
     prompt = """Analyze the following text and determine if it's natural language or a SQL query.
 
-Respond with only "NATURAL" if it's natural language (like a question, request, or conversational text), or "SQL" if it's a SQL query (like SELECT, WITH, INSERT, UPDATE, DELETE, etc. statements).
+Respond with only "NATURAL" if it's natural language (like a question, request, or conversational text), or "SQL" if it's a SQL query starting with SELECT or WITH statements.
 
 Examples:
 - "show me all users" -> NATURAL
@@ -748,8 +748,11 @@ Examples:
 - "SELECT * FROM users" -> SQL
 - "WITH cte AS (SELECT...) SELECT..." -> SQL
 - "select count(*) from orders" -> SQL
-- "help me analyze the data" -> NATURAL"""
+- "help me analyze the data" -> NATURAL
+- "select some page hits from analytics_events that happened yesterday" -> NATURAL
 
+IMPORTANT: If you're not sure, default to NATURAL.
+"""
     try:
         thinking_animation = ThinkingAnimation()
         thinking_animation.start()

{tinybird-0.0.1.dev276 → tinybird-0.0.1.dev278}/tinybird/tb/modules/agent/command_agent.py

@@ -4,7 +4,7 @@ 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 tests_files_prompt
+from tinybird.tb.modules.agent.prompts import available_commands, tests_files_prompt
 from tinybird.tb.modules.agent.tools.run_command import run_command
 from tinybird.tb.modules.agent.utils import TinybirdAgentContext
 from tinybird.tb.modules.project import Project
@@ -34,13 +34,17 @@ class CommandAgent:
             model=create_model(user_token, host, workspace_id),
             deps_type=TinybirdAgentContext,
             instructions=[
-                """
+                f"""
 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 running commands on the user's machine.
 You will be given a task to perform and you will use `run_command` tool to complete it.
 If you do not find a command that can solve the task, just say that there is no command that can solve the task.
 You can run `-h` in every level of the command to get help. E.g. `tb -h`, `tb datasource -h`, `tb datasource ls -h`.
 When you need to access Tinybird Cloud, add the `--cloud` flag. E.g. `tb --cloud datasource ls`.
+Available commands:
+{available_commands}
+IMPORTANT: Do NOT use any command that is not in the list above. 
+IMPORTANT: If you don't have the proper command to solve the task, just answer that you cannot solve the task.
 Token and host are not required to add to the commands.
 Always run first help commands to be sure that the commands you are running is not interactive.
 """,

{tinybird-0.0.1.dev276 → tinybird-0.0.1.dev278}/tinybird/tb/modules/agent/prompts.py

@@ -15,6 +15,28 @@ from tinybird.prompts import (
 )
 from tinybird.tb.modules.project import Project
 
+available_commands = [
+    "`tb connection ls`: List all connections",
+    "`tb copy ls`: List all copy pipes",
+    "`tb copy run [pipe_name] --mode [mode] --param [param]`: Run a copy pipe",
+    "`tb datasource ls`: List all datasources",
+    "`tb datasource sync [datasource_name] --yes`: Sync a datasource with an s3 or gcs connection",
+    "`tb datasource truncate [datasource_name] --yes`: Truncate a datasource",
+    "`tb endpoint ls`: List all endpoints",
+    "`tb open`: Open the dashboard in the browser",
+    "`tb info`: Show information about the project",
+    "`tb job ls`: List all jobs",
+    "`tb job cancel [job_id]`: Cancel a job",
+    "`tb deployment ls`: List all deployments (if user does not specify use tb --cloud)",
+    "`tb deployment discard`: Discard a deployment (if user does not specify use tb --cloud)",
+    "`tb token ls`: List all tokens",
+    "`tb materialization ls`: List all materializations",
+    "`tb pipe ls`: List all pipes",
+    "`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)",
+]
+
 plan_instructions = """
 When asked to create a plan, you MUST respond with this EXACT format and NOTHING ELSE:
 
@@ -118,6 +140,32 @@ datafile_instructions = """
 </datafile_instructions>
 """
 
+datasource_example_with_token = """
+<datasource_example_with_token>
+TOKEN app_read READ
+TOKEN landing_read READ
+TOKEN landing_append APPEND
+
+DESCRIPTION >
+    ...
+
+SCHEMA >
+    ...
+</datasource_example_with_token>
+"""
+
+pipe_example_with_token = """
+<pipe_example_with_token>
+TOKEN app_read READ
+
+NODE node_1
+SQL >
+    %
+    SELECT
+    ..
+</pipe_example_with_token>
+"""
+
 
 def resources_prompt(project: Project) -> str:
     files = project.get_project_files()
@@ -796,6 +844,22 @@ IMPORTANT: Every time you finish a plan and start a new resource creation or upd
 {pipe_instructions}
 {pipe_example}
 
+# When working with tokens:
+- Resource-scoped tokens are created and updated through datafiles. 
+- Tinybird will keep track of which ones to create or destroy based on all the tokens defined within the data files in your project.
+- Scopes available are:
+  - DATASOURCES:READ:datasource_name => `TOKEN <token_name> READ` in .datasource files
+  - DATASOURCES:APPEND:datasource_name => `TOKEN <token_name> APPEND` in .datasource files
+  - PIPES:READ:pipe_name => `TOKEN <token_name> READ` in .pipe files
+- Examples:
+{datasource_example_with_token}
+{pipe_example_with_token}
+- For operational tokens that are not tied to specific resources. Run the following command in the CLI:
+```
+tb token create static new_admin_token --scope <scope> 
+```
+where <scope> is one of the following: `TOKENS`, `ADMIN`, `ORG_DATASOURCES:READ`
+
 # Working with materialized pipe files:
 {materialized_pipe_instructions}
 
@@ -844,6 +908,10 @@ IMPORTANT: Every time you finish a plan and start a new resource creation or upd
 
 # Working with commands:
 - If you dont have a tool that can solve the task, use `run_command` tool to check if the task can be solved with a normal tinybird cli command.
+- Available commands: {available_commands}
+
+# When asked about the files in the project:
+- You can rely in your own context to answer the question.
 
 # Info
 Today is {datetime.now().strftime("%Y-%m-%d")}

{tinybird-0.0.1.dev276 → tinybird-0.0.1.dev278}/tinybird/tb/modules/agent/tools/run_command.py

@@ -15,10 +15,10 @@ def run_command(ctx: RunContext[TinybirdAgentContext], command: str):
     """
     try:
         ctx.deps.thinking_animation.stop()
-        is_deploy = " deploy " in command.lower()
+        force_confirmation = " deploy" in command.lower() or " truncate" in command.lower()
         confirmation = show_confirmation(
             title=f"Run command: {command}?",
-            skip_confirmation=ctx.deps.dangerously_skip_permissions and not is_deploy,
+            skip_confirmation=ctx.deps.dangerously_skip_permissions and not force_confirmation,
         )
 
         if confirmation == "review":

{tinybird-0.0.1.dev276 → tinybird-0.0.1.dev278}/tinybird/tb/modules/datasource.py

@@ -629,6 +629,8 @@ def datasource_export(
 @click.option("--yes", is_flag=True, default=False, help="Do not ask for confirmation")
 @click.pass_context
 def datasource_sync(ctx: Context, datasource_name: str, yes: bool):
+    """Sync from a GCS or S3 connection defined in .datasource file"""
+
     try:
         client: TinyB = ctx.obj["client"]
         ds = client.get_datasource(datasource_name)

{tinybird-0.0.1.dev276 → tinybird-0.0.1.dev278}/tinybird/tb/modules/workspace.py

@@ -134,12 +134,6 @@ def workspace_current(ctx: Context):
 
 @workspace.command(name="create", short_help="Create a new Workspace for your Tinybird user")
 @click.argument("workspace_name", required=False)
-@click.option(
-    "--fork",
-    is_flag=True,
-    default=False,
-    help="When enabled, tb will share all data sources from the current workspace with the new one",
-)
 @click.option(
     "--organization-id",
     "organization_id",
@@ -151,7 +145,6 @@ def workspace_current(ctx: Context):
 def create_workspace(
     ctx: Context,
     workspace_name: str,
-    fork: bool,
     organization_id: Optional[str],
 ) -> None:
     config = CLIConfig.get_project_config()
@@ -165,6 +158,7 @@ def create_workspace(
 
     config = CLIConfig.get_project_config()
     user_token = config.get_user_token()
+    fork = False
 
     if not user_token:
         raise CLIWorkspaceException(

{tinybird-0.0.1.dev276 → tinybird-0.0.1.dev278}/tinybird.egg-info/PKG-INFO

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