tinybird 0.0.1.dev255__py3-none-any.whl → 0.0.1.dev256__py3-none-any.whl

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.dev255'
-__revision__ = '208306e'
+__version__ = '0.0.1.dev256'
+__revision__ = '78e1011'

tinybird/tb/modules/agent/agent.py

@@ -26,7 +26,7 @@ from tinybird.prompts import (
 from tinybird.tb.client import TinyB
 from tinybird.tb.modules.agent.animations import ThinkingAnimation
 from tinybird.tb.modules.agent.banner import display_banner
-from tinybird.tb.modules.agent.memory import clear_history
+from tinybird.tb.modules.agent.memory import clear_history, clear_messages, load_messages, save_messages
 from tinybird.tb.modules.agent.models import create_model, model_costs
 from tinybird.tb.modules.agent.prompts import (
     datafile_instructions,
@@ -55,7 +55,7 @@ from tinybird.tb.modules.build_common import process as build_process
 from tinybird.tb.modules.common import _analyze, _get_tb_client
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.deployment_common import create_deployment
-from tinybird.tb.modules.exceptions import CLIBuildException, CLIMockException
+from tinybird.tb.modules.exceptions import CLIBuildException, CLIDeploymentException, CLIMockException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.login_common import login
@@ -78,7 +78,8 @@ class TinybirdAgent:
         self.host = host
         self.dangerously_skip_permissions = dangerously_skip_permissions
         self.project = project
-        self.messages: list[ModelMessage] = []
+        # we load the last 5 messages to manage token usage
+        self.messages: list[ModelMessage] = load_messages()[-5:]
         self.agent = Agent(
             model=create_model(user_token, host, workspace_id),
             deps_type=TinybirdAgentContext,
@@ -186,13 +187,23 @@ Kafka: {kafka_connection_example}
 S3: {s3_connection_example}
 GCS: {gcs_connection_example}
 
-# When executing a query or requesting an endpoint:
+# When executing a query or requesting/testing an endpoint:
 - You need to be sure that the selected resource is updated to the last version in the environment you are working on.
 - Use `diff_resource` tool to compare the content of the resource to compare the differences between environments.
 - Project local file is the source of truth.
 - If the resource is not present or updated to the last version in Tinybird Local, it means you need to build the project. 
 - If the resource is not present or updated to the last version in Tinybird Cloud, it means you need to deploy the project.
 
+# How to use apppend tools:
+- Use append as part of the creation of a new landing datasource if the user provided a file or an external url
+- Use append if user explicitly asks for it
+- Do not append data if user requests to test an endpoint
+
+# How to use `mock` tool:
+- Use `mock` tool as part of the creation of a new landing datasource if the user did not provided a file or an external url
+- Use `mock` tool if user explicitly asks for it
+- Do not use `mock` tool if user requests to test an endpoint.
+
 # Info
 Today is {datetime.now().strftime("%Y-%m-%d")}
 """,
@@ -268,6 +279,7 @@ Today is {datetime.now().strftime("%Y-%m-%d")}
         )
         new_messages = result.new_messages()
         self.messages.extend(new_messages)
+        save_messages(new_messages)
         thinking_animation.stop()
         usage = result.usage()
         request_tokens = usage.request_tokens or 0
@@ -311,9 +323,12 @@ def run_agent(
                 login(host, auth_host="https://cloud.tinybird.co", workspace=None, interactive=False, method="browser")
                 click.echo()
                 cli_config = CLIConfig.get_project_config()
+                config = {**config, **cli_config.to_dict()}
                 token = cli_config.get_token()
                 user_token = cli_config.get_user_token()
                 host = cli_config.get_host()
+                workspace_id = cli_config.get("id", "")
+                workspace_name = cli_config.get("name", "")
 
             if not token or not host or not user_token:
                 click.echo(
@@ -357,6 +372,7 @@ def run_agent(
                     break
                 elif user_input.lower() == "/clear":
                     clear_history()
+                    clear_messages()
                     continue
                 elif user_input.lower() == "/login":
                     click.echo()
@@ -399,26 +415,25 @@ def build_project(config: dict[str, Any], project: Project, silent: bool = True,
 
 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,
-    )
+    try:
+        create_deployment(
+            project=project,
+            client=client,
+            config=config,
+            wait=True,
+            auto=True,
+            allow_destructive_operations=False,
+        )
+    except SystemExit as e:
+        raise CLIDeploymentException(e.args[0])
 
 
 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,
-    )
+    try:
+        create_deployment(project=project, client=client, config=config, check=True, wait=True, auto=True)
+    except SystemExit as e:
+        raise CLIDeploymentException(e.args[0])
 
 
 def append_data(config: dict[str, Any], datasource_name: str, path: str) -> None:

tinybird/tb/modules/agent/memory.py

@@ -1,7 +1,13 @@
+import json
 from pathlib import Path
 from typing import Optional
 
+import click
 from prompt_toolkit.history import FileHistory
+from pydantic_ai.messages import ModelMessage, ModelMessagesTypeAdapter
+from pydantic_core import to_jsonable_python
+
+from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 
 def get_history_file_path():
@@ -39,3 +45,59 @@ def clear_history():
     """Clear the history file"""
     history_file = get_history_file_path()
     history_file.unlink(missing_ok=True)
+
+
+def clear_messages():
+    """Clear the messages file"""
+    messages_file = get_messages_file_path()
+    messages_file.unlink(missing_ok=True)
+
+
+def get_messages_file_path():
+    """Get the history file path based on current working directory"""
+    # Get current working directory
+    cwd = Path.cwd()
+
+    # Get user's home directory
+    home = Path.home()
+
+    # Calculate relative path from home to current directory
+    try:
+        relative_path = cwd.relative_to(home)
+    except ValueError:
+        # If current directory is not under home, use absolute path components
+        relative_path = Path(*cwd.parts[1:]) if cwd.is_absolute() else cwd
+
+    # Create history directory structure
+    history_dir = home / ".tinybird" / "projects" / relative_path
+    history_dir.mkdir(parents=True, exist_ok=True)
+
+    # Return history file path
+    return history_dir / "messages.json"
+
+
+def load_messages() -> list[ModelMessage]:
+    try:
+        messages_file = get_messages_file_path()
+        messages_file.touch()
+        if not messages_file.exists():
+            messages_file.touch(exist_ok=True)
+            messages_file.write_text("[]")
+            return []
+        with open(messages_file, "r") as f:
+            messages_json = json.loads(f.read() or "[]")
+            return ModelMessagesTypeAdapter.validate_python(messages_json)
+    except Exception as e:
+        click.echo(FeedbackManager.error(message=f"Could not load previous messages: {e}"))
+        messages_file.unlink(missing_ok=True)
+        return []
+
+
+def save_messages(new_messages: list[ModelMessage]):
+    messages_file = get_messages_file_path()
+    messages_file.touch(exist_ok=True)
+    messages = load_messages()
+    messages.extend(new_messages)
+    messages_json = to_jsonable_python(messages)
+    with open(messages_file, "w") as f:
+        f.write(json.dumps(messages_json))

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

@@ -30,7 +30,5 @@ def deploy(ctx: RunContext[TinybirdAgentContext]) -> str:
         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

@@ -2,7 +2,6 @@ import click
 from pydantic_ai import RunContext
 
 from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_confirmation, show_input
-from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 
 def deploy_check(ctx: RunContext[TinybirdAgentContext]) -> str:
@@ -28,7 +27,5 @@ def deploy_check(ctx: RunContext[TinybirdAgentContext]) -> str:
         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-0.0.1.dev255.dist-info → tinybird-0.0.1.dev256.dist-info}/METADATA

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

{tinybird-0.0.1.dev255.dist-info → tinybird-0.0.1.dev256.dist-info}/RECORD

@@ -17,7 +17,7 @@ tinybird/datafile/exceptions.py,sha256=8rw2umdZjtby85QbuRKFO5ETz_eRHwUY5l7eHsy1w
 tinybird/datafile/parse_connection.py,sha256=tRyn2Rpr1TeWet5BXmMoQgaotbGdYep1qiTak_OqC5E,1825
 tinybird/datafile/parse_datasource.py,sha256=ssW8QeFSgglVFi3sDZj_HgkJiTJ2069v2JgqnH3CkDE,1825
 tinybird/datafile/parse_pipe.py,sha256=xf4m0Tw44QWJzHzAm7Z7FwUoUUtr7noMYjU1NiWnX0k,3880
-tinybird/tb/__cli__.py,sha256=51Rg-OvKFWGEJgEjFVuc2XEUi5XT3bb5o8ZEUJ1bdhA,247
+tinybird/tb/__cli__.py,sha256=BW9MQs4o1rm0FvIF2XLehXnuzpfC7A9JS2Fu2hJCJ2Y,247
 tinybird/tb/check_pypi.py,sha256=Gp0HkHHDFMSDL6nxKlOY51z7z1Uv-2LRexNTZSHHGmM,552
 tinybird/tb/cli.py,sha256=FdDFEIayjmsZEVsVSSvRiVYn_FHOVg_zWQzchnzfWho,1008
 tinybird/tb/client.py,sha256=pJbdkWMXGAqKseNAvdsRRnl_c7I-DCMB0dWCQnG82nU,54146
@@ -68,10 +68,10 @@ tinybird/tb/modules/watch.py,sha256=No0bK1M1_3CYuMaIgylxf7vYFJ72lTJe3brz6xQ-mJo,
 tinybird/tb/modules/workspace.py,sha256=Q_8HcxMsNg8QG9aBlwcWS2umrDP5IkTIHqqz3sfmGuc,11341
 tinybird/tb/modules/workspace_members.py,sha256=5JdkJgfuEwbq-t6vxkBhYwgsiTDxF790wsa6Xfif9nk,8608
 tinybird/tb/modules/agent/__init__.py,sha256=i3oe3vDIWWPaicdCM0zs7D7BJ1W0k7th93ooskHAV00,54
-tinybird/tb/modules/agent/agent.py,sha256=HtXB75QJ71YH21BdbWhx2Pb1c2KUFu1_3TfdVulCoh4,25349
+tinybird/tb/modules/agent/agent.py,sha256=mCQRrrheH7mEgRg6BF19lSLt2XzaD_mw6mhyugTQLyw,26412
 tinybird/tb/modules/agent/animations.py,sha256=4WOC5_2BracttmMCrV0H91tXfWcUzQHBUaIJc5FA7tE,3490
 tinybird/tb/modules/agent/banner.py,sha256=KX_e467uiy1gWOZ4ofTZt0GCFGQqHQ_8Ob27XLQqda0,3053
-tinybird/tb/modules/agent/memory.py,sha256=H6SJK--2L5C87B7AJd_jMqsq3sCvFvZwZXmajuT0GBE,1171
+tinybird/tb/modules/agent/memory.py,sha256=O6Kumn9AyKxcTkhI45yjAUZ3ZIAibLOcNWoiEuLYeqY,3245
 tinybird/tb/modules/agent/models.py,sha256=LW1D27gjcd_jwFmghEzteCgToDfodX2B6B5S8BYbysw,735
 tinybird/tb/modules/agent/prompts.py,sha256=qyAv3H1x9qctlYQSel0DHxLlRJM2_8HTg7M-foSoR0k,17567
 tinybird/tb/modules/agent/utils.py,sha256=5mUnc4LZATHLzQZThotNErzZdHQDwK3eur6W4NZULWA,26561
@@ -80,8 +80,8 @@ tinybird/tb/modules/agent/tools/analyze.py,sha256=7oxJ3waCS24Qja_k5GUB59_XiHTG9p
 tinybird/tb/modules/agent/tools/append.py,sha256=ekG7OxOzPjjjAjYUONAfp_PWlzyLT1GDfQhECgO-DYY,5065
 tinybird/tb/modules/agent/tools/build.py,sha256=LhzJMx6tbxC7gogIrxhfKJc-SDgoSR-FC6IunfaCdn8,758
 tinybird/tb/modules/agent/tools/create_datafile.py,sha256=wcPcChACTIFKw0lKFTlhm0sWJKhQkMLPLnGNpKyeETA,2962
-tinybird/tb/modules/agent/tools/deploy.py,sha256=WrsSlaufKGOBx0S13uoMQQH2DnKue5LQ231Rx4RXh2I,1443
-tinybird/tb/modules/agent/tools/deploy_check.py,sha256=LBE8aENYvCEaxbVTVKMSI2NGGiHeh-y60_MPlfrcvFk,1331
+tinybird/tb/modules/agent/tools/deploy.py,sha256=dxNmzz8vCLIPNrfwyzof74gJK5cF-GfKHUfQ1vEX4hg,1347
+tinybird/tb/modules/agent/tools/deploy_check.py,sha256=9roUI7FOvhNXbvi1iilS1RNYso4-WsNDVR9m7rmeOy4,1170
 tinybird/tb/modules/agent/tools/diff_resource.py,sha256=euKo_mD9FZHC1X6yESv3D_CXMzBMB8EWHLeZjIRqjJg,2637
 tinybird/tb/modules/agent/tools/execute_query.py,sha256=hMRahWZkyP9qa-nMGzY0Z7MjDa9sb5O9V1evmA_V_w8,2702
 tinybird/tb/modules/agent/tools/explore.py,sha256=ihALc_kBcsjrKT3hZyicqyIowB0g_K3AtNNi-5uz9-8,412
@@ -111,8 +111,8 @@ tinybird/tb_cli_modules/config.py,sha256=IsgdtFRnUrkY8-Zo32lmk6O7u3bHie1QCxLwgp4
 tinybird/tb_cli_modules/exceptions.py,sha256=pmucP4kTF4irIt7dXiG-FcnI-o3mvDusPmch1L8RCWk,3367
 tinybird/tb_cli_modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb_cli_modules/telemetry.py,sha256=Hh2Io8ZPROSunbOLuMvuIFU4TqwWPmQTqal4WS09K1A,10449
-tinybird-0.0.1.dev255.dist-info/METADATA,sha256=oudst3Nwc1lfUUD-RID7T4ncAgcIuWnv5_VNlSjK08c,1733
-tinybird-0.0.1.dev255.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev255.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev255.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev255.dist-info/RECORD,,
+tinybird-0.0.1.dev256.dist-info/METADATA,sha256=QFATRwPa6QPBUcV7rO4TwGvOBOyt5Dd2VmFjlnFUdV0,1733
+tinybird-0.0.1.dev256.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev256.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev256.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev256.dist-info/RECORD,,