tinybird 0.0.1.dev249__py3-none-any.whl → 0.0.1.dev251__py3-none-any.whl

tinybird/prompts.py

@@ -815,7 +815,7 @@ pipe_instructions = """
 <pipe_file_instructions>
     - The pipe names must be unique.
     - Nodes do NOT use the same name as the Pipe they belong to. So if the pipe name is "my_pipe", the nodes must be named different like "my_pipe_node_1", "my_pipe_node_2", etc.
-    - Nodes can't have the same exact name as the Pipe they belong to.
+    - Node names MUST be different from the resource names in the project.
     - Avoid more than one node per pipe unless it is really necessary or requested by the user.
     - No indentation is allowed for property names: DESCRIPTION, NODE, SQL, TYPE, etc.
     - Allowed TYPE values are: endpoint, copy, materialized, sink.

tinybird/sql_template.py

@@ -1388,13 +1388,14 @@ _namespace = {
     "close": None,
     "print": None,
     "input": None,
-    "id": None,
 }
 
 
 reserved_vars = set(["_tt_tmp", "_tt_append", "isinstance", "str", "error", "custom_error", *list(vars(builtins))])
 for p in DEFAULT_PARAM_NAMES:  # we handle these in an specific manner
     reserved_vars.discard(p)  # `format` is part of builtins
+# Allow 'id' to be used as a template parameter - https://gitlab.com/tinybird/analytics/-/issues/19119
+reserved_vars.discard("id")
 error_vars = ["error", "custom_error"]
 
 
@@ -1463,6 +1464,9 @@ def generate(self, **kwargs) -> Tuple[str, TemplateExecutionResults]:
         return Expression(f"-- disable {feature}\n")
 
     namespace.update(_namespace)
+    # This is to fix the issue https://gitlab.com/tinybird/analytics/-/issues/19119
+    # We need to do the override here because if we modify the _namespace, we would filter out parameters from the users
+    namespace.update({"id": None})
     namespace.update(kwargs)
     namespace.update(
         {

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.dev249'
-__revision__ = 'ef4e98c'
+__version__ = '0.0.1.dev251'
+__revision__ = 'c11760c'

tinybird/tb/modules/agent/agent.py

@@ -4,12 +4,9 @@ import sys
 from datetime import datetime
 from functools import partial
 from pathlib import Path
-from typing import Any
+from typing import Any, Optional
 
 import click
-from prompt_toolkit import prompt
-from prompt_toolkit.cursor_shapes import CursorShape
-from prompt_toolkit.styles import Style
 from pydantic_ai import Agent, Tool
 from pydantic_ai.messages import ModelMessage
 
@@ -29,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, load_history
+from tinybird.tb.modules.agent.memory import clear_history
 from tinybird.tb.modules.agent.models import create_model, model_costs
 from tinybird.tb.modules.agent.prompts import (
     datafile_instructions,
@@ -43,11 +40,13 @@ 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.get_endpoint_stats import get_endpoint_stats
+from tinybird.tb.modules.agent.tools.get_openapi_definition import get_openapi_definition
 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.read_fixture_data import read_fixture_data
-from tinybird.tb.modules.agent.utils import TinybirdAgentContext
+from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_input
 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
@@ -115,6 +114,8 @@ You have access to the following tools:
 8. `mock` - Create mock data for a landing datasource.
 9. `read_fixture_data` - Read a fixture data file present in the project folder.
 10. `append` - Append existing fixture to a datasource.
+11. `get_endpoint_stats` - Get metrics of the requests to an endpoint.
+12. `get_openapi_definition` - Get the OpenAPI definition for all endpoints that are built/deployed to Tinybird Cloud or Local.
 
 # When creating or updating datafiles:
 1. Use `plan` tool to plan the creation or update of resources.
@@ -126,6 +127,24 @@ You have access to the following tools:
 7. If the datafile was not created, finish the process and just wait for a new user prompt.
 8. If the datafile was created successfully, but the built failed, try to fix the error and repeat the process.
 
+# When creating a landing datasource given a .ndjson file:
+- If the user does not specify anything about the desired schema, create a schema like this:
+SCHEMA >
+    `data` String `json:$`
+- Use always json paths with .ndjson files.
+
+# When user wants to optimize an endpoint:
+First check if the query is optimized. E.g is filtering by a column present in the sorting key.
+Avoid when possible to not update the landing datasource.
+Check endpoint stats to analyze how the endpoint is performing. Use `get_endpoint_stats` tool to get the stats.
+When your data is in Tinybird, you can create intermediate data sources to preprocess data and make the endpoints faster. This can be done by using materialized views or copy pipes.
+- Copy pipes capture the result of a pipe at a specific point in time and write it to a target data source. They can run on a schedule or run on demand, making them ideal for event-sourced snapshots, data experimentation, and deduplication with snapshots.
+- Materialized views continuously re-evaluate a query as new events are inserted, maintaining an always up-to-date derived dataset. Unlike copy pipes which create point-in-time snapshots, materialized views provide real-time transformations of your data.
+Each approach has its own strengths and use cases:
+- Use copy pipes when you need scheduled or on-demand snapshots of your data.
+- Use materialized views when you need continuous, real-time transformations.
+Finally, update the existing endpoint itself, do not add a new one.
+
 IMPORTANT: If the user cancels some of the steps or there is an error in file creation, DO NOT continue with the plan. Stop the process and wait for the user before using any other tool.
 IMPORTANT: Every time you finish a plan and start a new resource creation or update process, create a new plan before starting with the changes.
 
@@ -175,6 +194,15 @@ Today is {datetime.now().strftime("%Y-%m-%d")}
                 Tool(mock, docstring_format="google", require_parameter_descriptions=True, takes_ctx=True),
                 Tool(read_fixture_data, docstring_format="google", require_parameter_descriptions=True, takes_ctx=True),
                 Tool(append, docstring_format="google", require_parameter_descriptions=True, takes_ctx=True),
+                Tool(
+                    get_endpoint_stats, docstring_format="google", require_parameter_descriptions=True, takes_ctx=True
+                ),
+                Tool(
+                    get_openapi_definition,
+                    docstring_format="google",
+                    require_parameter_descriptions=True,
+                    takes_ctx=True,
+                ),
             ],
         )
 
@@ -186,7 +214,7 @@ Today is {datetime.now().strftime("%Y-%m-%d")}
         user_prompt = f"{user_prompt}\n\n{resources_prompt(project)}"
         client = TinyB(token=self.token, host=self.host)
         folder = self.project.folder
-
+        click.echo()
         thinking_animation = ThinkingAnimation(message="Chirping", delay=0.15)
         thinking_animation.start()
         result = self.agent.run_sync(
@@ -200,11 +228,16 @@ Today is {datetime.now().strftime("%Y-%m-%d")}
                 mock_data=partial(mock_data, project=project, config=config),
                 append_data=partial(append_data, config=config),
                 analyze_fixture=partial(analyze_fixture, config=config),
+                execute_cloud_query=partial(execute_cloud_query, config=config),
+                execute_local_query=partial(execute_local_query, config=config),
                 get_project_files=project.get_project_files,
                 folder=folder,
                 thinking_animation=thinking_animation,
                 workspace_name=self.project.workspace_name,
                 dangerously_skip_permissions=self.dangerously_skip_permissions,
+                token=self.token,
+                user_token=self.user_token,
+                host=self.host,
             ),
             message_history=self.messages,
         )
@@ -219,13 +252,15 @@ Today is {datetime.now().strftime("%Y-%m-%d")}
             request_tokens * model_costs["input_cost_per_token"]
             + response_tokens * model_costs["output_cost_per_token"]
         )
-        click.echo()
         click.echo(result.output)
         click.echo("\n")
-        click.echo(f"Input tokens: {request_tokens}")
-        click.echo(f"Output tokens: {response_tokens}")
-        click.echo(f"Total tokens: {total_tokens}")
-        click.echo(f"Cost: ${cost:.6f}")
+
+        if "@tinybird.co" in config.get("user_email", ""):
+            click.echo(f"Input tokens: {request_tokens}")
+            click.echo(f"Output tokens: {response_tokens}")
+            click.echo(f"Total tokens: {total_tokens}")
+            click.echo(f"Cost: ${cost:.6f}")
+            click.echo("\n")
 
 
 def run_agent(config: dict[str, Any], project: Project, dangerously_skip_permissions: bool):
@@ -233,6 +268,7 @@ def run_agent(config: dict[str, Any], project: Project, dangerously_skip_permiss
     host = config.get("host", None)
     user_token = config.get("user_token", None)
     workspace_id = config.get("id", None)
+    workspace_name = config.get("name", None)
     try:
         if not token or not host or not workspace_id or not user_token:
             yes = click.confirm(
@@ -274,20 +310,11 @@ def run_agent(config: dict[str, Any], project: Project, dangerously_skip_permiss
     try:
         while True:
             try:
-                user_input = prompt(
-                    [("class:prompt", f"tb ({project.workspace_name}) » ")],
-                    history=load_history(),
-                    cursor=CursorShape.BLOCK,
-                    style=Style.from_dict(
-                        {
-                            "prompt": "#40a8a8 bold",
-                            "": "",  # Normal color for user input
-                        }
-                    ),
-                )
+                user_input = show_input(workspace_name)
                 if user_input.startswith("tb "):
                     cmd_parts = shlex.split(user_input)
-                    subprocess.run(cmd_parts, check=True)
+                    subprocess.run(cmd_parts)
+                    click.echo()
                     continue
                 if user_input.lower() in ["/exit", "/quit"]:
                     click.echo(FeedbackManager.info(message="Goodbye!"))
@@ -364,7 +391,12 @@ def append_data(config: dict[str, Any], datasource_name: str, path: str) -> None
 
 
 def mock_data(
-    config: dict[str, Any], project: Project, datasource_name: str, data_format: str, rows: int
+    config: dict[str, Any],
+    project: Project,
+    datasource_name: str,
+    data_format: str,
+    rows: int,
+    context: Optional[str] = None,
 ) -> list[dict[str, Any]]:
     client = get_tinybird_local_client(config, test=False, silent=False)
     cli_config = CLIConfig.get_project_config()
@@ -374,12 +406,11 @@ def mock_data(
         raise CLIMockException(f"Datasource {datasource_name} not found")
 
     datasource_content = Path(datasource_path).read_text()
-    prompt = ""
     return create_mock_data(
         datasource_name,
         datasource_content,
         rows,
-        prompt,
+        context or "",
         cli_config,
         config,
         cli_config.get_user_token() or "",
@@ -393,3 +424,13 @@ def analyze_fixture(config: dict[str, Any], fixture_path: str) -> dict[str, Any]
     local_client = get_tinybird_local_client(config, test=False, silent=True)
     meta, _data = _analyze(fixture_path, local_client, Path(fixture_path).suffix.lstrip("."))
     return meta
+
+
+def execute_cloud_query(config: dict[str, Any], query: str, pipe_name: Optional[str] = None) -> str:
+    client = _get_tb_client(config["token"], config["host"])
+    return client.query(sql=query, pipeline=pipe_name)
+
+
+def execute_local_query(config: dict[str, Any], query: str, pipe_name: Optional[str] = None) -> str:
+    local_client = get_tinybird_local_client(config, test=False, silent=True)
+    return local_client.query(sql=query, pipeline=pipe_name)

tinybird/tb/modules/agent/animations.py

@@ -4,15 +4,13 @@ import threading
 from time import sleep
 from typing import Optional
 
-import click
-
 
 class ThinkingAnimation:
     """Thinking animation that shows changing sparkles as a prefix."""
 
     def __init__(
         self,
-        message: str = "Thinking",
+        message: str = "Chirping",
         delay: float = 0.15,
         colors: bool = True,
         dots: bool = True,
@@ -37,17 +35,35 @@ class ThinkingAnimation:
         ]
         self.reset_color = "\033[0m"
 
-    def start(self):
+    def start(self, message: Optional[str] = None):
         """Start the animation in a separate thread."""
+        # Stop any existing animation first
+        if self.running:
+            self._stop_without_reset()
+
+        if message:
+            self.message = message
         self.running = True
         self.thread = threading.Thread(target=self._run_animation)
         self.thread.daemon = True
 
-        click.echo("\n")
+        # Clear the current line before starting new animation
+        sys.stdout.write("\r" + " " * (len(self.message) + 10) + "\r")
+        sys.stdout.flush()
         self.thread.start()
 
     def stop(self):
         """Stop the animation."""
+        self.message = "Chirping"
+        self.running = False
+        if self.thread:
+            self.thread.join()
+        # Clear the line and reset cursor position
+        sys.stdout.write("\r" + " " * (len(self.message) + 10) + "\r")
+        sys.stdout.flush()
+
+    def _stop_without_reset(self):
+        """Stop the animation without resetting the message."""
         self.running = False
         if self.thread:
             self.thread.join()
@@ -78,8 +94,11 @@ class ThinkingAnimation:
             else:
                 display_message = self.message
 
-            # Print the message with the prefix sparkle
-            sys.stdout.write(f"\r{colored_sparkle} {display_message}")
+            # Print the message with the prefix sparkle, padding to clear any leftover characters
+            line_content = f"{colored_sparkle} {display_message}"
+            # Pad with spaces to clear any leftover characters from longer previous messages
+            padded_line = line_content.ljust(len(self.message) + 10)
+            sys.stdout.write(f"\r{padded_line}")
             sys.stdout.flush()
 
             sleep(self.delay)

tinybird/tb/modules/agent/prompts.py

@@ -22,8 +22,10 @@ Steps:
 <dev_notes>
 You can skip steps where resources will not be created or updated.
 Always add 'Build project' step after generating resources.
-Always add 'Generate mock data' step after building project if a landing datasource was created.
-Always add 'Append existing fixture' step after building project if a fixture file was provided at the beginning of the plan.
+Always add 'Generate mock data' step after building project if a landing datasource was created without providing a fixture file.
+Always add 'Append existing fixture' step after building project if a landing datasource was created after providing a fixture file.
+Solve the specific user request, do not add extra steps that are not related to the user request.
+Reuse the existing resources if possible.
 </dev_notes>
 
 Resource dependencies:

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

@@ -1,29 +1,10 @@
 import click
 from pydantic_ai import RunContext
 
-from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_options
+from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_confirmation, show_input
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 
-def get_append_confirmation(datasource_name: str) -> bool:
-    """Get user confirmation for appending existing fixture"""
-    while True:
-        result = show_options(
-            options=["Yes, append existing fixture", "No, and tell Tinybird Code what to do"],
-            title=f"Do you want to append existing fixture for datasource {datasource_name}?",
-        )
-
-        if result is None:  # Cancelled
-            return False
-
-        if result.startswith("Yes"):
-            return True
-        elif result.startswith("No"):
-            return False
-
-        return False
-
-
 def append(ctx: RunContext[TinybirdAgentContext], datasource_name: str, fixture_pathname: str) -> str:
     """Append existing fixture to a datasource
 
@@ -36,10 +17,20 @@ def append(ctx: RunContext[TinybirdAgentContext], datasource_name: str, fixture_
     """
     try:
         ctx.deps.thinking_animation.stop()
-        confirmation = ctx.deps.dangerously_skip_permissions or get_append_confirmation(datasource_name)
+        confirmation = show_confirmation(
+            title=f"Append existing fixture for datasource {datasource_name}?",
+            skip_confirmation=ctx.deps.dangerously_skip_permissions,
+        )
+
         ctx.deps.thinking_animation.start()
 
-        if not confirmation:
+        if confirmation == "review":
+            click.echo()
+            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}"
+
+        if confirmation == "cancel":
             return "User rejected appending existing fixture. Skipping..."
 
         ctx.deps.thinking_animation.stop()

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

@@ -3,31 +3,17 @@ from pathlib import Path
 import click
 from pydantic_ai import RunContext
 
-from tinybird.tb.modules.agent.utils import Datafile, TinybirdAgentContext, create_terminal_box, show_options
+from tinybird.tb.modules.agent.utils import (
+    Datafile,
+    TinybirdAgentContext,
+    create_terminal_box,
+    show_confirmation,
+    show_input,
+)
 from tinybird.tb.modules.exceptions import CLIBuildException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 
-def get_resource_confirmation(resource: Datafile, exists: bool) -> bool:
-    """Get user confirmation for creating a resource"""
-    while True:
-        action = "create" if not exists else "update"
-        result = show_options(
-            options=[f"Yes, {action} {resource.type} '{resource.name}'", "No, and tell Tinybird Code what to do"],
-            title=f"What would you like to do with {resource.type} '{resource.name}'?",
-        )
-
-        if result is None:  # Cancelled
-            return False
-
-        if result.startswith("Yes"):
-            return True
-        elif result.startswith("No"):
-            return False
-
-        return False
-
-
 def create_datafile(ctx: RunContext[TinybirdAgentContext], resource: Datafile) -> str:
     """Given a resource representation, create a file in the project folder
 
@@ -48,19 +34,34 @@ def create_datafile(ctx: RunContext[TinybirdAgentContext], resource: Datafile) -
         else:
             content = create_terminal_box(resource.content, title=resource.pathname)
         click.echo(content)
-        confirmation = ctx.deps.dangerously_skip_permissions or get_resource_confirmation(resource, exists)
 
-        if not confirmation:
+        action = "Create" if not exists else "Update"
+        confirmation = show_confirmation(
+            title=f"{action} '{resource.pathname}'?",
+            skip_confirmation=ctx.deps.dangerously_skip_permissions,
+        )
+
+        if confirmation == "review":
+            click.echo()
+            feedback = show_input(ctx.deps.workspace_name)
+            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"Resource {resource.pathname} was not created. User cancelled creation."
+            return f"User cancelled {action} of {resource.pathname}. Stop resource creation."
 
+        action_text = "Creating" if not exists else "Updating"
+        click.echo(FeedbackManager.highlight(message=f"\n» {action_text} {resource.pathname}..."))
         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(test=True, silent=True)
+        action_text = "created" if not exists else "updated"
+        click.echo(FeedbackManager.success(message=f"✓ {resource.pathname} {action_text} successfully"))
         ctx.deps.thinking_animation.start()
-        return f"Created {resource.pathname}"
+        return f"{action_text} {resource.pathname}"
 
     except CLIBuildException as e:
         ctx.deps.thinking_animation.stop()
@@ -68,4 +69,7 @@ def create_datafile(ctx: RunContext[TinybirdAgentContext], resource: Datafile) -
         ctx.deps.thinking_animation.start()
         return f"Error building project: {e}"
     except Exception as e:
+        ctx.deps.thinking_animation.stop()
+        click.echo(FeedbackManager.error(message=e))
+        ctx.deps.thinking_animation.start()
         return f"Error creating {resource.pathname}: {e}"

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

@@ -1,41 +1,32 @@
 import click
 from pydantic_ai import RunContext
 
-from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_options
+from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_confirmation, show_input
 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 = ctx.deps.dangerously_skip_permissions or get_deploy_confirmation()
-        ctx.deps.thinking_animation.start()
+        confirmation = show_confirmation(
+            title="Deploy the project?",
+            skip_confirmation=ctx.deps.dangerously_skip_permissions,
+        )
 
-        if not confirmation:
-            return "User cancelled deployment."
+        if confirmation == "review":
+            click.echo()
+            feedback = show_input(ctx.deps.workspace_name)
+            ctx.deps.thinking_animation.start()
+            return f"User did not confirm deployment and gave the following feedback: {feedback}"
 
-        ctx.deps.thinking_animation.stop()
+        if confirmation == "cancel":
+            ctx.deps.thinking_animation.start()
+            return "User cancelled deployment. Stop deployment."
+
+        click.echo(FeedbackManager.highlight(message="\n» 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:

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

@@ -0,0 +1,51 @@
+import click
+from pydantic_ai import RunContext
+
+from tinybird.tb.modules.agent.utils import TinybirdAgentContext
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+
+
+def get_endpoint_stats(
+    ctx: RunContext[TinybirdAgentContext], endpoint_name: str, interval_days: int = 1, cloud: bool = True
+):
+    """Get stats for an endpoint:
+
+    Args:
+        endpoint_name (str): The name of the endpoint to get stats for. Required.
+        interval_days (int): The number of days to get stats for. Optional.
+        cloud (bool): Whether to get stats from cloud or local. Optional.
+
+    Returns:
+        str: The result of the stats.
+    """
+    if interval_days == 1:
+        pipe_stats = "tinybird.pipe_stats_rt"
+        date_column = "start_datetime"
+    else:
+        pipe_stats = "tinybird.pipe_stats"
+        date_column = "date"
+
+    days = "day" if interval_days == 1 else "days"
+    cloud_or_local = "cloud" if cloud else "local"
+    ctx.deps.thinking_animation.stop()
+
+    click.echo(
+        FeedbackManager.highlight(
+            message=f"» Analyzing {cloud_or_local} requests in the last {interval_days} {days} for '{endpoint_name}' endpoint"
+        )
+    )
+
+    query = f"""SELECT * FROM {pipe_stats} 
+    WHERE {date_column} > NOW() - INTERVAL {interval_days} DAY
+    AND pipe_name = '{endpoint_name}'
+    LIMIT 100
+    FORMAT JSON
+    """
+
+    execute_query = ctx.deps.execute_cloud_query if cloud else ctx.deps.execute_local_query
+
+    result = execute_query(query=query)
+    click.echo(FeedbackManager.success(message="✓ Done!"))
+    click.echo()
+    ctx.deps.thinking_animation.start()
+    return f"Result for {endpoint_name} in the last {interval_days} {days}: {result}"

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

@@ -0,0 +1,39 @@
+import click
+import requests
+from pydantic_ai import RunContext
+
+from tinybird.tb.modules.agent.utils import TinybirdAgentContext
+from tinybird.tb.modules.feedback_manager import FeedbackManager
+
+
+def get_openapi_definition(ctx: RunContext[TinybirdAgentContext], cloud: bool = True):
+    """Get the OpenAPI definition for all endpoints in the project:
+
+    Args:
+        cloud (bool): Whether to get the OpenAPI spec from cloud or local. Optional.
+
+    Returns:
+        str: The OpenAPI spec for all endpoints in the project.
+    """
+
+    cloud_or_local = "Cloud" if cloud else "Local"
+    ctx.deps.thinking_animation.stop()
+
+    click.echo(FeedbackManager.highlight(message=f"» Accessing Tinybird {cloud_or_local} endpoints"))
+    try:
+        url = f"{ctx.deps.host}/v0/pipes/openapi.json"
+
+        result = requests.get(url, headers={"Authorization": f"Bearer {ctx.deps.token}"})
+        if result.status_code != 200:
+            raise Exception(f"Failed to get OpenAPI spec: {result.status_code} {result.text}")
+
+        openapi_spec = result.text
+
+        click.echo(FeedbackManager.success(message="✓ Done!"))
+        click.echo()
+        ctx.deps.thinking_animation.start()
+        return f"OpenAPI spec for {cloud_or_local} endpoints: {openapi_spec}. <dev_note>Add the base url to each path so the user can copy paste if needed: {ctx.deps.host}</dev_note>"
+    except Exception as e:
+        click.echo(FeedbackManager.error(message=f"Error getting OpenAPI spec: {e}"))
+        ctx.deps.thinking_animation.start()
+        return f"Error getting OpenAPI spec: {e}"

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

@@ -1,52 +1,50 @@
+from typing import Optional
+
 import click
 from pydantic_ai import RunContext
 
-from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_options
+from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_confirmation, show_input
 from tinybird.tb.modules.datafile.fixture import persist_fixture
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 
 
-def get_mock_confirmation(datasource_name: str) -> bool:
-    """Get user confirmation for creating mock data"""
-    while True:
-        result = show_options(
-            options=["Yes, create mock data", "No, and tell Tinybird Code what to do"],
-            title=f"Do you want to generate mock data for datasource {datasource_name}?",
-        )
-
-        if result is None:  # Cancelled
-            return False
-
-        if result.startswith("Yes"):
-            return True
-        elif result.startswith("No"):
-            return False
-
-        return False
-
-
-def mock(ctx: RunContext[TinybirdAgentContext], datasource_name: str, data_format: str, rows: int) -> str:
+def mock(
+    ctx: RunContext[TinybirdAgentContext],
+    datasource_name: str,
+    data_format: str,
+    rows: int,
+    context: Optional[str] = None,
+) -> str:
     """Create mock data for a datasource
 
     Args:
         datasource_name: Name of the datasource to create mock data for
         data_format: Format of the mock data to create. Options: ndjson, csv
         rows: Number of rows to create. If not provided, the default is 10
+        context: Extra context to be used to generate the mock data. Optional.
 
     Returns:
         str: Message indicating the success or failure of the mock data generation
     """
     try:
         ctx.deps.thinking_animation.stop()
-        confirmation = ctx.deps.dangerously_skip_permissions or get_mock_confirmation(datasource_name)
-        ctx.deps.thinking_animation.start()
+        confirmation = show_confirmation(
+            title=f"Generate mock data for datasource '{datasource_name}'?",
+            skip_confirmation=ctx.deps.dangerously_skip_permissions,
+        )
 
-        if not confirmation:
-            return "User rejected mock data generation. Skipping..."
+        if confirmation == "review":
+            click.echo()
+            feedback = show_input(ctx.deps.workspace_name)
+            ctx.deps.thinking_animation.start()
+            return f"User did not confirm mock data generation and gave the following feedback: {feedback}"
+
+        if confirmation == "cancel":
+            ctx.deps.thinking_animation.start()
+            return "User cancelled mock data generation. Stop mock data generation."
 
-        ctx.deps.thinking_animation.stop()
         click.echo(FeedbackManager.highlight(message=f"\n» Generating mock data for {datasource_name}..."))
-        data = ctx.deps.mock_data(datasource_name=datasource_name, data_format=data_format, rows=rows)
+        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)
         ctx.deps.append_data(datasource_name=datasource_name, path=str(fixture_path))
         click.echo(FeedbackManager.success(message=f"✓ Data generated for {datasource_name}"))
@@ -54,6 +52,22 @@ def mock(ctx: RunContext[TinybirdAgentContext], datasource_name: str, data_forma
         return f"Mock data generated successfully for datasource {datasource_name}"
     except Exception as e:
         ctx.deps.thinking_animation.stop()
-        click.echo(FeedbackManager.error(message=e))
+        error_message = str(e)
+        click.echo(FeedbackManager.error(message=error_message))
+        try:
+            if "in quarantine" in error_message:
+                click.echo(
+                    FeedbackManager.highlight(message=f"\n» Looking for errors in {datasource_name}_quarantine...")
+                )
+                query = f"select * from {datasource_name}_quarantine order by insertion_date desc limit 5 FORMAT CSVWithNames"
+                quarantine_data = ctx.deps.execute_local_query(query=query)
+                error_message = (
+                    error_message
+                    + f"\nThese are the first 5 rows of the quarantine table for datasource '{datasource_name}':\n{quarantine_data}. Use again `mock` tool but add this issue to the context."
+                )
+
+        except Exception as quarantine_error:
+            error_message = error_message + f"\nError accessing to {datasource_name}_quarantine: {quarantine_error}"
+
         ctx.deps.thinking_animation.start()
-        return f"Error generating mock data: {e}"
+        return f"Error generating mock data: {error_message}"

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

@@ -1,26 +1,7 @@
 import click
 from pydantic_ai import RunContext
 
-from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_options
-
-
-def get_plan_confirmation() -> bool:
-    """Get user confirmation for implementing a plan"""
-    while True:
-        result = show_options(
-            options=["Yes, implement the plan", "No, and tell Tinybird Code what to do"],
-            title="Do you want to implement the plan?",
-        )
-
-        if result is None:  # Cancelled
-            return False
-
-        if result.startswith("Yes"):
-            return True
-        elif result.startswith("No"):
-            return False
-
-        return False
+from tinybird.tb.modules.agent.utils import TinybirdAgentContext, show_confirmation, show_input
 
 
 def plan(ctx: RunContext[TinybirdAgentContext], plan: str) -> str:
@@ -35,11 +16,20 @@ def plan(ctx: RunContext[TinybirdAgentContext], plan: str) -> str:
     try:
         ctx.deps.thinking_animation.stop()
         click.echo(plan)
-        confirmation = ctx.deps.dangerously_skip_permissions or get_plan_confirmation()
+        confirmation = show_confirmation(
+            title="Do you want to implement the plan?", skip_confirmation=ctx.deps.dangerously_skip_permissions
+        )
+
+        if confirmation == "review":
+            click.echo()
+            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 not confirmation:
-            return "Plan was not implemented. User cancelled implementation."
+        if confirmation == "cancel":
+            return "User cancelled the plan. Stop the process."
 
         return "User confirmed the plan. Implementing..."
 

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

@@ -1,9 +1,11 @@
 import json
 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 read_fixture_data(ctx: RunContext[TinybirdAgentContext], fixture_pathname: str):
@@ -15,12 +17,18 @@ def read_fixture_data(ctx: RunContext[TinybirdAgentContext], fixture_pathname: s
     Returns:
         str: The content of the fixture data file.
     """
+    ctx.deps.thinking_animation.stop()
+    click.echo(FeedbackManager.highlight(message=f"» Analyzing {fixture_pathname}..."))
     fixture_path = Path(ctx.deps.folder) / fixture_pathname.lstrip("/")
 
     if not fixture_path.exists():
+        click.echo(FeedbackManager.error(message=f"No fixture data found for {fixture_pathname}."))
+        ctx.deps.thinking_animation.start()
         return f"No fixture data found for {fixture_pathname}. Please check the name of the fixture and try again."
 
     response = ctx.deps.analyze_fixture(fixture_path=str(fixture_path))
+    click.echo(FeedbackManager.success(message="✓ Done!\n"))
+    ctx.deps.thinking_animation.start()
     # limit content to first 10 rows
     data = response["preview"]["data"][:10]
     columns = response["analysis"]["columns"]

tinybird/tb/modules/agent/utils.py

@@ -1,10 +1,12 @@
 import difflib
 import os
 from contextlib import contextmanager
-from typing import Any, Callable, List, Optional, Tuple
+from typing import Any, Callable, List, Literal, Optional, Tuple
 
 import click
+from prompt_toolkit import prompt as prompt_toolkit_prompt
 from prompt_toolkit.application import Application, get_app
+from prompt_toolkit.cursor_shapes import CursorShape
 from prompt_toolkit.filters import IsDone
 from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.layout import Layout
@@ -17,6 +19,8 @@ from prompt_toolkit.shortcuts import PromptSession
 from prompt_toolkit.styles import Style as PromptStyle
 from pydantic import BaseModel, Field
 
+from tinybird.tb.modules.agent.memory import load_history
+
 try:
     from colorama import Back, Fore, Style, init
 
@@ -38,7 +42,12 @@ class TinybirdAgentContext(BaseModel):
     mock_data: Callable[..., list[dict[str, Any]]]
     append_data: Callable[..., None]
     analyze_fixture: Callable[..., dict[str, Any]]
+    execute_cloud_query: Callable[..., str]
+    execute_local_query: Callable[..., str]
     dangerously_skip_permissions: bool
+    token: str
+    user_token: str
+    host: str
 
 
 default_style = PromptStyle.from_dict(
@@ -345,6 +354,9 @@ def show_options(options: List[str], title: str = "Select an option") -> Optiona
     return result["option"]
 
 
+ConfirmationResult = Literal["yes", "review", "cancel"]
+
+
 def load_existing_resources(folder: str) -> str:
     """Load existing Tinybird resources from the workspace"""
     existing_resources = []
@@ -677,3 +689,38 @@ def _process_line(
                 remaining = remaining[content_width:]
 
     return processed
+
+
+def show_input(workspace_name: str) -> str:
+    return prompt_toolkit_prompt(
+        [("class:prompt", f"tb ({workspace_name}) » ")],
+        history=load_history(),
+        cursor=CursorShape.BLOCK,
+        style=PromptStyle.from_dict(
+            {
+                "prompt": "#40a8a8 bold",
+                "": "",  # Normal color for user input
+            }
+        ),
+    )
+
+
+def show_confirmation(title: str, skip_confirmation: bool = False) -> ConfirmationResult:
+    if skip_confirmation:
+        return "yes"
+
+    while True:
+        result = show_options(
+            options=["Yes, continue", "No, tell Tinybird Code what to do", "Cancel"],
+            title=title,
+        )
+
+        if result is None:  # Cancelled
+            return "cancel"
+
+        if result.startswith("Yes"):
+            return "yes"
+        elif result.startswith("No"):
+            return "review"
+
+        return "cancel"

{tinybird-0.0.1.dev249.dist-info → tinybird-0.0.1.dev251.dist-info}/METADATA

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

{tinybird-0.0.1.dev249.dist-info → tinybird-0.0.1.dev251.dist-info}/RECORD

@@ -3,9 +3,9 @@ tinybird/context.py,sha256=FfqYfrGX_I7PKGTQo93utaKPDNVYWelg4Hsp3evX5wM,1291
 tinybird/datatypes.py,sha256=r4WCvspmrXTJHiPjjyOTiZyZl31FO3Ynkwq4LQsYm6E,11059
 tinybird/feedback_manager.py,sha256=1INQFfRfuMCb9lfB8KNf4r6qC2khW568hoHjtk-wshI,69305
 tinybird/git_settings.py,sha256=Sw_8rGmribEFJ4Z_6idrVytxpFYk7ez8ei0qHULzs3E,3934
-tinybird/prompts.py,sha256=Dx9pD5kyXdbzkGOcWdULWUg_aN5F1CUPAISm5PyMzOM,45498
+tinybird/prompts.py,sha256=4VmdaMX7oUFoqjseXe8QuF9wTtIabbDkdwVGmd34S7s,45502
 tinybird/sql.py,sha256=BufnOgclQokDyihtuXesOwHBsebN6wRXIxO5wKRkOwE,48299
-tinybird/sql_template.py,sha256=LChDztXUUrNO4Qukv2RMsdjQ-vhmepWiHVoX6yr140E,99983
+tinybird/sql_template.py,sha256=AezE1o6_BzbHFi0J9OIqTrXQ5WvoX5eNVq4QCbFjGcs,100338
 tinybird/sql_template_fmt.py,sha256=KUHdj5rYCYm_rKKdXYSJAE9vIyXUQLB0YSZnUXHeBlY,10196
 tinybird/sql_toolset.py,sha256=M2rpLYkgV2W8NnYEYPC1tJdpy4uZHXVF64NBSKLQka4,19549
 tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
@@ -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=WAhvVHhg2X2uVpfHu3VLfJ2jxnMmru4kGnAeWrgBzQE,247
+tinybird/tb/__cli__.py,sha256=ldJiOCMSMd-ptHqIVlOItLL_kL3ehE--VamyNzl-O8E,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,24 +68,26 @@ 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=dch7zQzdw_8KvORGDj73dGfiz03bGEISkdGYN_r9QQg,18519
-tinybird/tb/modules/agent/animations.py,sha256=z0MNLf8TnUO8qAjgYvth_wc9a9283pNVz1Z4jl15Ggs,2558
+tinybird/tb/modules/agent/agent.py,sha256=Uxo2FNNu-YW-J-AbZizZe0eKYKdZRwbPJCgA9EsXlgs,21208
+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/models.py,sha256=LW1D27gjcd_jwFmghEzteCgToDfodX2B6B5S8BYbysw,735
-tinybird/tb/modules/agent/prompts.py,sha256=fZMTbTbq8SHWob8-wA5fQFnZ9lJa7Y_66_9JvJT3xuc,6818
-tinybird/tb/modules/agent/utils.py,sha256=7Y8bq_rZlqre8_OvLVjIvE8ZLOBpuKmXamyaNs02zzc,25231
+tinybird/tb/modules/agent/prompts.py,sha256=wbe6vUnm-fskceWgP13R5VW1v_YF7_wLDe-wBN6rlWw,6998
+tinybird/tb/modules/agent/utils.py,sha256=dWdjtptsBRKUAtg6wz2SNf5fmmGKMG-WKNk9miNWZ-s,26520
 tinybird/tb/modules/agent/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tinybird/tb/modules/agent/tools/append.py,sha256=2q5y32jeNHJgbMsVmABn7y-KCoKwkqbMFJAm8OZ4zQc,2161
+tinybird/tb/modules/agent/tools/append.py,sha256=Db576-ziulykJyaWl03zUp-KI-NVURh0WcFIAPNbNPw,1974
 tinybird/tb/modules/agent/tools/build.py,sha256=LhzJMx6tbxC7gogIrxhfKJc-SDgoSR-FC6IunfaCdn8,758
-tinybird/tb/modules/agent/tools/create_datafile.py,sha256=ZVLj5VT8udfYDqfbYu9U3f2IG2wSB3POwC-zB_JvfsA,2692
-tinybird/tb/modules/agent/tools/deploy.py,sha256=Vv1SHalxZsl5QttaON0jBwJenj1cVOQiQ-cMiK2ULZg,1443
+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=VqMYC7l3_cihmmM_pi8w1t8rJ3P0xDc7pHs_st9k-9Q,684
 tinybird/tb/modules/agent/tools/explore.py,sha256=ihALc_kBcsjrKT3hZyicqyIowB0g_K3AtNNi-5uz9-8,412
-tinybird/tb/modules/agent/tools/mock.py,sha256=c4fY8_D92tOUBr0DoqoA5lEE3FgvUQHP6JE75mfTBko,2491
-tinybird/tb/modules/agent/tools/plan.py,sha256=wQY4gNtFTOEy2yZUGf8VqefPUbbz5DgMZdrzGRk-wiE,1365
+tinybird/tb/modules/agent/tools/get_endpoint_stats.py,sha256=_3wAvDykJitIOb5BRnP7wCy6y06y1qlULHLWB-MvS2M,1705
+tinybird/tb/modules/agent/tools/get_openapi_definition.py,sha256=9cQ-SUeB1NVhPJN1s8aQh9KQxqI9-DEEW1Ot5r2JbOk,1575
+tinybird/tb/modules/agent/tools/mock.py,sha256=Omog_gdEdm8YuBXNrJdHwxHqjL_ji9UIr75mALF4ozI,3408
+tinybird/tb/modules/agent/tools/plan.py,sha256=pr6LnItz6vlOeCG8GE459ExsrBEG0KLx-g02SZGNjXU,1217
 tinybird/tb/modules/agent/tools/preview_datafile.py,sha256=e9q5fR0afApcrntzFrnuHmd10ex7MG_GM6T0Pwc9bRI,850
-tinybird/tb/modules/agent/tools/read_fixture_data.py,sha256=XgeDld6YTOjWNcJ7cr8bHD2phG6W-h5UuC2amGSBnQw,977
+tinybird/tb/modules/agent/tools/read_fixture_data.py,sha256=rvTdVlZsu3rQTSWqXzpFt4LEwnBcMLIT8hlI5C7MVN4,1430
 tinybird/tb/modules/datafile/build.py,sha256=NFKBrusFLU0WJNCXePAFWiEDuTaXpwc0lHlOQWEJ43s,51117
 tinybird/tb/modules/datafile/build_common.py,sha256=2yNdxe49IMA9wNvl25NemY2Iaz8L66snjOdT64dm1is,4511
 tinybird/tb/modules/datafile/build_datasource.py,sha256=Ra8pVQBDafbFRUKlhpgohhTsRyp_ADKZJVG8Gd69idY,17227
@@ -106,8 +108,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.dev249.dist-info/METADATA,sha256=Mp5zwKJya4hnqnJMIPbvKeUKcal8q0tvZUcmCXD-Nsk,1733
-tinybird-0.0.1.dev249.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev249.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev249.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev249.dist-info/RECORD,,
+tinybird-0.0.1.dev251.dist-info/METADATA,sha256=7hx0f5-Lb5i3niyVL2AsZ9LcJzp3cTAoX0QHuATZv5A,1733
+tinybird-0.0.1.dev251.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev251.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev251.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev251.dist-info/RECORD,,