tinybird 0.0.1.dev300__tar.gz → 0.0.1.dev301__tar.gz

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/PKG-INFO

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

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/connectors.py

@@ -369,13 +369,7 @@ class Snowflake(Connector):
             the_type = "String"
             if t.startswith("NUMBER"):
                 the_type = "Int32"
-            if (
-                t.startswith("FLOAT")
-                or t.startswith("DOUBLE")
-                or t.startswith("REAL")
-                or t.startswith("NUMERIC")
-                or t.startswith("DECIMAL")
-            ):
+            if t.startswith(("FLOAT", "DOUBLE", "REAL", "NUMERIC", "DECIMAL")):
                 the_type = "Float32"
             if t == "DATE":
                 the_type = "Date"

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/datafile/common.py

@@ -2051,11 +2051,7 @@ def parse(
                 lexer = list(sa)
             if lexer:
                 cmd, args = lexer[0], lexer[1:]
-                if (
-                    parser_state.multiline
-                    and cmd.lower() in cmds
-                    and not (line.startswith(" ") or line.startswith("\t"))
-                ):
+                if parser_state.multiline and cmd.lower() in cmds and not line.startswith((" ", "\t")):
                     cmds[parser_state.command](
                         parser_state.multiline_string,
                         lineno=lineno,
@@ -2508,7 +2504,7 @@ def is_file_a_datasource(filename: str) -> bool:
 
         for line in lines:
             trimmed_line = line.strip().lower()
-            if trimmed_line.startswith("schema") or trimmed_line.startswith("engine"):
+            if trimmed_line.startswith(("schema", "engine")):
                 return True
 
     return False

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/service_datasources.py

@@ -446,7 +446,6 @@ def get_tinybird_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "workspace_name", "type": "String"},
                 {"name": "user_email", "type": "String"},
                 {"name": "request_id", "type": "String"},
-                {"name": "model", "type": "LowCardinality(String)"},
                 {"name": "prompt_tokens", "type": "UInt32"},
                 {"name": "completion_tokens", "type": "UInt32"},
                 {"name": "total_tokens", "type": "UInt32"},
@@ -927,7 +926,6 @@ def get_organization_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "workspace_name", "type": "String"},
                 {"name": "user_email", "type": "String"},
                 {"name": "request_id", "type": "String"},
-                {"name": "model", "type": "LowCardinality(String)"},
                 {"name": "prompt_tokens", "type": "UInt32"},
                 {"name": "completion_tokens", "type": "UInt32"},
                 {"name": "total_tokens", "type": "UInt32"},

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/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.dev300'
-__revision__ = '9791d55'
+__version__ = '0.0.1.dev301'
+__revision__ = '1ce40fd'

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tb/client.py

@@ -1390,7 +1390,3 @@ class TinyB:
 
     def delete_tag(self, name: str):
         self._req(f"/v0/tags/{name}", method="DELETE")
-
-    def explore_data(self, prompt: str) -> str:
-        params = urlencode({"prompt": prompt, "host": self.host, "origin": "cli"})
-        return self._req(f"/v1/agents/explore?{params}")

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tb/modules/agent/agent.py

@@ -7,7 +7,7 @@ import urllib.parse
 import uuid
 from functools import partial
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any, Callable, Optional
 
 import click
 import humanfriendly
@@ -67,6 +67,7 @@ from tinybird.tb.modules.common import (
     echo_safe_humanfriendly_tables_format_pretty_table,
     get_region_from_host,
     get_regions,
+    sys_exit,
     update_cli,
 )
 from tinybird.tb.modules.config import CLIConfig
@@ -428,7 +429,6 @@ class TinybirdAgent:
         save_messages(new_messages)
         self.thinking_animation.stop()
         click.echo(result.output)
-        self.echo_usage(config)
 
     async def run_iter(self, user_prompt: str, config: dict[str, Any], run_id: Optional[str] = None) -> None:
         model = create_model(self.user_token, self.host, self.workspace_id, run_id=run_id)
@@ -455,28 +455,57 @@ class TinybirdAgent:
             self.messages.extend(new_messages)
             save_messages(new_messages)
             self.thinking_animation.stop()
-            self.echo_usage(config)
 
-    def echo_usage(self, config: dict[str, Any]) -> None:
+    def echo_usage(self, config: dict[str, Any], show_credits: bool = False) -> None:
         try:
             client = _get_tb_client(config["user_token"], config["host"])
             workspace_id = config.get("id", "")
             workspace = client.workspace(workspace_id, with_organization=True, version="v1")
+            is_free_plan = workspace["organization"]["plan"].get("billing") == "free_shared_infrastructure_usage"
+
+            if not is_free_plan and not show_credits:
+                return
+
             limits_data = client.organization_limits(workspace["organization"]["id"])
             llm_usage_limits = limits_data.get("limits", {}).get("llm_usage", {})
             current_llm_usage = llm_usage_limits.get("quantity") or 0
             llm_usage = llm_usage_limits.get("max") or 0
             remaining_credits = round(max(llm_usage - current_llm_usage, 0), 2)
             current_llm_usage = round(min(llm_usage, current_llm_usage), 2)
+
             if not llm_usage:
                 return
-            warning_threshold = llm_usage * 0.8
-            message_color = FeedbackManager.warning if current_llm_usage >= warning_threshold else FeedbackManager.gray
+
+            def get_message(current_llm_usage, llm_usage: int) -> tuple[Callable[..., str], str, bool]:
+                warning_threshold = llm_usage * 0.8
+                ui_host = get_display_cloud_host(config["host"])
+
+                if is_free_plan:
+                    upgrade_link = f"{ui_host}/organizations/{workspace['organization']['name']}/upgrade?from=agent"
+                    if current_llm_usage >= llm_usage:
+                        return (
+                            FeedbackManager.error,
+                            f" You have reached the maximum number of credits. Please upgrade to continue using Tinybird Code: {upgrade_link}",
+                            True,
+                        )
+                    if current_llm_usage >= warning_threshold:
+                        return (
+                            FeedbackManager.warning,
+                            f" You are reaching the maximum number of credits. Please upgrade to continue using Tinybird Code: {upgrade_link}",
+                            False,
+                        )
+                return FeedbackManager.gray, "", False
+
+            message_color, upgrade_message, should_exit = get_message(current_llm_usage, llm_usage)
             click.echo(
                 message_color(
-                    message=f"{remaining_credits} credits left ({current_llm_usage}/{llm_usage}). You can continue using Tinybird Code. Limits will be enforced soon."
+                    message=f"{remaining_credits} credits left ({current_llm_usage}/{llm_usage}).{upgrade_message}"
                 )
             )
+
+            if should_exit:
+                sys_exit("tinybird_code_error", "Maximum number of credits reached")
+
         except Exception:
             pass
 
@@ -577,7 +606,6 @@ def run_agent(
             )
         )
         agent.echo_usage(config)
-        click.echo()
 
     except Exception as e:
         click.echo(FeedbackManager.error(message=f"Failed to initialize agent: {e}"))
@@ -630,6 +658,9 @@ def run_agent(
                 elif user_input.lower() == "/help":
                     subprocess.run(["tb", "--help"], check=True)
                     continue
+                elif user_input.lower() == "/usage":
+                    agent.echo_usage(config, show_credits=True)
+                    continue
                 elif user_input.strip() == "":
                     continue
                 else:

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tb/modules/agent/utils.py

@@ -512,7 +512,7 @@ def create_terminal_box(content: str, new_content: Optional[str] = None, title:
                     new_line_num = int(match.group(2))
                     old_index = old_line_num - 1
                     new_index = new_line_num - 1
-            elif line.startswith("---") or line.startswith("+++"):
+            elif line.startswith(("---", "+++")):
                 # Skip file headers
                 pass
             elif line.startswith(" "):

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tb/modules/build.py

@@ -8,7 +8,7 @@ from urllib.parse import urlencode
 
 import click
 
-import tinybird.context as context
+from tinybird import context
 from tinybird.datafile.exceptions import ParseException
 from tinybird.datafile.parse_datasource import parse_datasource
 from tinybird.datafile.parse_pipe import parse_pipe
@@ -140,7 +140,7 @@ def dev_cloud(
     context.disable_template_security_validation.set(True)
 
     def process(filenames: List[str], watch: bool = False):
-        datafiles = [f for f in filenames if f.endswith(".datasource") or f.endswith(".pipe")]
+        datafiles = [f for f in filenames if f.endswith((".datasource", ".pipe"))]
         if len(datafiles) > 0:
             check_filenames(filenames=datafiles)
             folder_playground(

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tb/modules/build_common.py

@@ -51,7 +51,7 @@ def process(
             return build_status.error
         else:
             build_status.building = True
-    if file_changed and (file_changed.endswith(FixtureExtension.NDJSON) or file_changed.endswith(FixtureExtension.CSV)):
+    if file_changed and file_changed.endswith((FixtureExtension.NDJSON, FixtureExtension.CSV)):
         rebuild_fixture(project, tb_client, file_changed)
         if build_status:
             build_status.building = False
@@ -61,7 +61,7 @@ def process(
         if build_status:
             build_status.building = False
             build_status.error = None
-    elif file_changed and (file_changed.endswith(".env.local") or file_changed.endswith(".env")):
+    elif file_changed and file_changed.endswith((".env.local", ".env")):
         if build_status:
             build_status.building = False
             build_status.error = None

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tb/modules/cli.py

@@ -302,7 +302,7 @@ def sql(
             )
 
             query = ""
-            for _, elem in dependencies_graph.to_run.items():
+            for elem in dependencies_graph.to_run.values():
                 for _node in elem["nodes"]:
                     if _node["params"]["name"].lower() == node.lower():
                         query = "".join(_node["sql"])

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tb/modules/common.py

@@ -908,7 +908,7 @@ def get_format_from_filename_or_url(filename_or_url: str) -> str:
     'csv'
     """
     filename_or_url = filename_or_url.lower()
-    if filename_or_url.endswith("json") or filename_or_url.endswith("ndjson"):
+    if filename_or_url.endswith(("json", "ndjson")):
         return "ndjson"
     if filename_or_url.endswith("parquet"):
         return "parquet"
@@ -916,7 +916,7 @@ def get_format_from_filename_or_url(filename_or_url: str) -> str:
         return "csv"
     try:
         parsed = urlparse(filename_or_url)
-        if parsed.path.endswith("json") or parsed.path.endswith("ndjson"):
+        if parsed.path.endswith(("json", "ndjson")):
             return "ndjson"
         if parsed.path.endswith("parquet"):
             return "parquet"

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tb/modules/datafile/diff.py

@@ -168,7 +168,7 @@ def diff_command(
                 sys.stdout.writelines(diff_lines)
                 click.echo("")
 
-    for rfilename, _ in local_resources.items():
+    for rfilename in local_resources.keys():
         if rfilename not in changed:
             for resource in remote_datasources + remote_pipes:
                 properties = get_name_version(resource["name"])

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tb/modules/datafile/format_pipe.py

@@ -181,7 +181,7 @@ def format_pipe(
         )
 
     if not unroll_includes:
-        for k, _ in doc.includes.items():
+        for k in doc.includes.keys():
             if ".incl" not in k:
                 continue
             file_parts.append(f"INCLUDE {k}")

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tb/modules/exceptions.py

@@ -127,6 +127,13 @@ class CLIMockException(CLIException):
         super().__init__(message, "mock_error", **kw_telemetry_event_data)
 
 
+class CLIAgentException(CLIException):
+    """Exceptions generated by the agent commands"""
+
+    def __init__(self, message: str, **kw_telemetry_event_data: Any) -> None:
+        super().__init__(message, "agent_error", **kw_telemetry_event_data)
+
+
 class CLILoginException(CLIException):
     """Exceptions generated by the login commands"""
 

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tb/modules/shell.py

@@ -294,7 +294,7 @@ class Shell:
         arg = argline.strip().lower()
         if not arg:
             return
-        if arg.startswith("with") or arg.startswith("select"):
+        if arg.startswith(("with", "select")):
             self.run_sql(argline)
         elif len(arg.split()) == 1 and arg in self.project.pipes + self.project.datasources:
             self.run_sql(f"select * from {argline}")

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tb_cli_modules/cli.py

@@ -19,7 +19,7 @@ import humanfriendly
 from click import Context
 from packaging import version
 
-import tinybird.context as context
+from tinybird import context
 from tinybird.client import (
     AuthException,
     AuthNoTokenException,
@@ -904,7 +904,7 @@ async def sql(
                 verbose=False,
             )
             query = ""
-            for _, elem in dependencies_graph.to_run.items():
+            for elem in dependencies_graph.to_run.values():
                 for _node in elem["nodes"]:
                     if _node["params"]["name"].lower() == node.lower():
                         query = "".join(_node["sql"])

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tb_cli_modules/common.py

@@ -1042,7 +1042,7 @@ def get_format_from_filename_or_url(filename_or_url: str) -> str:
     'csv'
     """
     filename_or_url = filename_or_url.lower()
-    if filename_or_url.endswith("json") or filename_or_url.endswith("ndjson"):
+    if filename_or_url.endswith(("json", "ndjson")):
         return "ndjson"
     if filename_or_url.endswith("parquet"):
         return "parquet"
@@ -1050,7 +1050,7 @@ def get_format_from_filename_or_url(filename_or_url: str) -> str:
         return "csv"
     try:
         parsed = urlparse(filename_or_url)
-        if parsed.path.endswith("json") or parsed.path.endswith("ndjson"):
+        if parsed.path.endswith(("json", "ndjson")):
             return "ndjson"
         if parsed.path.endswith("parquet"):
             return "parquet"

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tb_cli_modules/pipe.py

@@ -13,7 +13,7 @@ import click
 import humanfriendly
 from click import Context
 
-import tinybird.context as context
+from tinybird import context
 from tinybird.client import AuthNoTokenException, DoesNotExistException, TinyB
 from tinybird.config import DEFAULT_API_HOST, FeatureFlags
 from tinybird.datafile_common import PipeNodeTypes, PipeTypes, folder_push, get_name_version, process_file, wait_job

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird/tornado_template.py

@@ -291,7 +291,7 @@ class Template:
                 whitespace = loader.whitespace
             else:
                 # Whitespace defaults by filename.
-                if name.endswith(".html") or name.endswith(".js"):
+                if name.endswith((".html", ".js")):
                     whitespace = "single"
                 else:
                     whitespace = "all"

{tinybird-0.0.1.dev300 → tinybird-0.0.1.dev301}/tinybird.egg-info/PKG-INFO

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