tinybird 0.0.1.dev299__py3-none-any.whl → 0.0.1.dev300__py3-none-any.whl

tinybird/datafile/common.py

@@ -630,7 +630,10 @@ class Datafile:
     def _validate_single_column(self, col_name: str, column_info: Dict[str, Any]) -> None:
         """Validate a single column for use in sorting keys."""
         col_type = column_info.get("type", "").lower()
-        is_nullable = column_info.get("nullable", False)
+
+        # we need to check any presence of Nullable in the column type
+        is_nullable = column_info.get("nullable", False) or "Nullable(" in column_info.get("type", "")
+
         if is_nullable:
             raise DatafileValidationError(
                 f"Sorting key contains nullable column '{col_name}'. Nullable columns cannot be used in sorting keys."

tinybird/service_datasources.py

@@ -428,6 +428,34 @@ def get_tinybird_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "total_cpu_time_seconds", "type": "Float64"},
             ],
         },
+        {
+            "name": "tinybird.llm_usage",
+            "description": "LLM usage metrics from Tinybird AI features including token consumption, costs, and model usage for each request in the workspace.",
+            "dateColumn": "start_time",
+            "engine": {
+                "engine": "MergeTree",
+                "sorting_key": "workspace_id, start_time, user_email, request_id",
+                "partition_key": "toYYYYMM(start_time)",
+            },
+            "columns": [
+                {"name": "start_time", "type": "DateTime"},
+                {"name": "end_time", "type": "DateTime"},
+                {"name": "organization_id", "type": "String"},
+                {"name": "organization_name", "type": "String"},
+                {"name": "workspace_id", "type": "String"},
+                {"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"},
+                {"name": "duration", "type": "Float32"},
+                {"name": "cost", "type": "Float32"},
+                {"name": "origin", "type": "String"},
+                {"name": "feature", "type": "String"},
+            ],
+        },
     ]
 
 
@@ -881,6 +909,34 @@ def get_organization_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "total_written_bytes", "type": "UInt64"},
             ],
         },
+        {
+            "name": "organization.llm_usage",
+            "description": "LLM usage metrics from Tinybird AI features including token consumption, costs, and model usage for each request in the organization.",
+            "dateColumn": "start_time",
+            "engine": {
+                "engine": "MergeTree",
+                "sorting_key": "workspace_id, start_time, user_email, request_id",
+                "partition_key": "toYYYYMM(start_time)",
+            },
+            "columns": [
+                {"name": "start_time", "type": "DateTime"},
+                {"name": "end_time", "type": "DateTime"},
+                {"name": "organization_id", "type": "String"},
+                {"name": "organization_name", "type": "String"},
+                {"name": "workspace_id", "type": "String"},
+                {"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"},
+                {"name": "duration", "type": "Float32"},
+                {"name": "cost", "type": "Float32"},
+                {"name": "origin", "type": "String"},
+                {"name": "feature", "type": "String"},
+            ],
+        },
     ]
 
 

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.dev299'
-__revision__ = '7e8ff36'
+__version__ = '0.0.1.dev300'
+__revision__ = '9791d55'

tinybird/tb/modules/local.py

@@ -2,8 +2,8 @@ from pathlib import Path
 
 import click
 import requests
-
 from docker.client import DockerClient
+
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import update_cli
 from tinybird.tb.modules.feedback_manager import FeedbackManager

tinybird/tb/modules/local_common.py

@@ -11,10 +11,10 @@ from typing import Any, Dict, Optional
 import boto3
 import click
 import requests
-
-import docker
 from docker.client import DockerClient
 from docker.models.containers import Container
+
+import docker
 from tinybird.tb.client import AuthNoTokenException, TinyB
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import CLILocalException

tinybird/tornado_template.py

@@ -1169,7 +1169,7 @@ def check_valid_expr(expr):
                 check_valid_expr(expr.slice.lower)
             if expr.slice.upper is not None:
                 check_valid_expr(expr.slice.upper)
-        elif isinstance(expr.slice, ast.Constant) or isinstance(expr.slice, ast.Subscript):
+        elif isinstance(expr.slice, (ast.Constant, ast.Subscript)):
             check_valid_expr(expr.slice)
         else:
             raise SecurityException(f"Invalid Slice expression: {ast.dump(expr.slice)}")
@@ -1178,7 +1178,7 @@ def check_valid_expr(expr):
             check_valid_expr(key)
         for value in expr.values:
             check_valid_expr(value)
-    elif isinstance(expr, ast.Tuple) or isinstance(expr, ast.List) or isinstance(expr, ast.Set):
+    elif isinstance(expr, (ast.Tuple, ast.List, ast.Set)):
         for x in expr.elts:
             check_valid_expr(x)
     elif isinstance(expr, ast.JoinedStr):

{tinybird-0.0.1.dev299.dist-info → tinybird-0.0.1.dev300.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev299
+Version: 0.0.1.dev300
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -13,7 +13,7 @@ Requires-Dist: boto3
 Requires-Dist: click<8.2,>=8.1.6
 Requires-Dist: clickhouse-toolset==0.34.dev0
 Requires-Dist: colorama==0.4.6
-Requires-Dist: confluent-kafka==2.8.0
+Requires-Dist: confluent-kafka==2.8.2
 Requires-Dist: cryptography~=41.0.0
 Requires-Dist: croniter==1.3.15
 Requires-Dist: docker==7.1.0
@@ -25,7 +25,7 @@ Requires-Dist: logfire-api==4.2.0
 Requires-Dist: pydantic~=2.11.7
 Requires-Dist: pydantic-ai-slim[anthropic]~=0.5.0
 Requires-Dist: pydantic-ai-slim[retries]~=0.5.0
-Requires-Dist: pyperclip==1.8.2
+Requires-Dist: pyperclip==1.9.0
 Requires-Dist: pyyaml<6.1,>=6.0
 Requires-Dist: requests<3,>=2.28.1
 Requires-Dist: shandy-sqlfmt==0.11.1

{tinybird-0.0.1.dev299.dist-info → tinybird-0.0.1.dev300.dist-info}/RECORD

@@ -4,21 +4,21 @@ tinybird/datatypes.py,sha256=r4WCvspmrXTJHiPjjyOTiZyZl31FO3Ynkwq4LQsYm6E,11059
 tinybird/feedback_manager.py,sha256=XY8d83pRlq-LH7xHMApkaEebfXEWLjDzrGe1prpcTHE,69778
 tinybird/git_settings.py,sha256=Sw_8rGmribEFJ4Z_6idrVytxpFYk7ez8ei0qHULzs3E,3934
 tinybird/prompts.py,sha256=HoDv9TxPiP8v2XoGTWYxP133dK9CEbXVv4XE5IT339c,45483
-tinybird/service_datasources.py,sha256=o6Az3T6OvcChR_7GXRu7sJH173KzGg1Gv-dNd0bI_vY,46085
+tinybird/service_datasources.py,sha256=zpQJxgmV9iZwa6PLjF1oMmXYNHFTld-FrKkN4r69sv8,49052
 tinybird/sql.py,sha256=7pkwQMUVy0CH5zFgLMZyCx1BeaJSQYC05EmOb9vO3Ls,48694
 tinybird/sql_template.py,sha256=rNePArEmx5GemxW6GJAiNnln0NRWncGgFe0EbC8G2f4,102463
 tinybird/sql_template_fmt.py,sha256=KUHdj5rYCYm_rKKdXYSJAE9vIyXUQLB0YSZnUXHeBlY,10196
 tinybird/sql_toolset.py,sha256=Y2_fQrbk5GSNoRncAmRS_snpV61XQbiOy4uYkeF6pr4,19767
 tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
-tinybird/tornado_template.py,sha256=jjNVDMnkYFWXflmT8KU_Ssbo5vR8KQq3EJMk5vYgXRw,41959
+tinybird/tornado_template.py,sha256=ADKooqQfXHIwPcypILvpQpd1mrt7HGBa9r4MmsbcuJs,41897
 tinybird/ch_utils/constants.py,sha256=yTNizMzgYNBzUc2EV3moBfdrDIggOe9hiuAgWF7sv2c,4333
 tinybird/ch_utils/engine.py,sha256=4X1B-iuhdW_mxKnX_m3iCsxgP9RPVgR75g7yH1vsJ6A,40851
-tinybird/datafile/common.py,sha256=hr9Qv4Xot21l2dW6xKPa5_JUu8pnGuDNnVpDf8pgthc,105659
+tinybird/datafile/common.py,sha256=_76V_oaKYFwTivBYUNM1JaAh8YLnkAuyJMVl5O8SU04,105778
 tinybird/datafile/exceptions.py,sha256=8rw2umdZjtby85QbuRKFO5ETz_eRHwUY5l7eHsy1wnI,556
 tinybird/datafile/parse_connection.py,sha256=tRyn2Rpr1TeWet5BXmMoQgaotbGdYep1qiTak_OqC5E,1825
 tinybird/datafile/parse_datasource.py,sha256=ssW8QeFSgglVFi3sDZj_HgkJiTJ2069v2JgqnH3CkDE,1825
 tinybird/datafile/parse_pipe.py,sha256=8e9LMecSQVWHC4AXf8cdxoQ1nxUR4fTObYxTctO_EXQ,3816
-tinybird/tb/__cli__.py,sha256=9xQZS6K0YDCjiorgU1hjPlnG_m1PzNU9a3uRw5TdU1A,247
+tinybird/tb/__cli__.py,sha256=kmXWs7vrFSKf5ehCuYtRgMNypconz5KmXGqxZKS23P0,247
 tinybird/tb/check_pypi.py,sha256=Gp0HkHHDFMSDL6nxKlOY51z7z1Uv-2LRexNTZSHHGmM,552
 tinybird/tb/cli.py,sha256=FdDFEIayjmsZEVsVSSvRiVYn_FHOVg_zWQzchnzfWho,1008
 tinybird/tb/client.py,sha256=IQRaInDjOwr9Fzaz3_xXc3aUGqh94tM2lew7IZbB9eM,53733
@@ -45,8 +45,8 @@ tinybird/tb/modules/infra.py,sha256=JE9oLIyF4bi_JBoe-BgZ5HhKp_lQgSihuSV1KIS02Qs,
 tinybird/tb/modules/job.py,sha256=wBsnu8UPTOha2rkLvucgmw4xYv73ubmui3eeSIF68ZM,3107
 tinybird/tb/modules/llm.py,sha256=fPBBCmM3KlCksLlgJkg4joDn6y3H5QjDzE-Pm4YNf7E,1782
 tinybird/tb/modules/llm_utils.py,sha256=nS9r4FAElJw8yXtmdYrx-rtI2zXR8qXfi1QqUDCfxvg,3469
-tinybird/tb/modules/local.py,sha256=kW3IHwJPvhBsa1eMh_xzow9Az3yYpHthkzsLSHeP5HE,6512
-tinybird/tb/modules/local_common.py,sha256=vHgFIH7cLNX6085iCls_grj_Dud_yRegr9Zia5Fgtgw,18528
+tinybird/tb/modules/local.py,sha256=cez8ZV7Gt9F1siz54dpgtynEw-il3Y9mNcQgEtOVvmw,6512
+tinybird/tb/modules/local_common.py,sha256=KhALzU0L3AC56vqs3peBe-dqGzw5hWkOg_CfS0skohk,18528
 tinybird/tb/modules/login.py,sha256=zerXZqIv15pbFk5XRt746xGcVnp01YmL_403byBf4jQ,1245
 tinybird/tb/modules/login_common.py,sha256=CKXD_BjivhGUmBtNbLTJwzQDr6885C72XPZjo0GLLvI,12010
 tinybird/tb/modules/logout.py,sha256=sniI4JNxpTrVeRCp0oGJuQ3yRerG4hH5uz6oBmjv724,1009
@@ -121,8 +121,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.dev299.dist-info/METADATA,sha256=jyFm0Dv3xSAaUqQjb4IyV9Yj2V4rjxYOL-Wqo5MAsa8,1845
-tinybird-0.0.1.dev299.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev299.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev299.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev299.dist-info/RECORD,,
+tinybird-0.0.1.dev300.dist-info/METADATA,sha256=yAfqcIHVKoPkyppgAcTSTcSSQ_xehIQ3mEN-bfu8VEY,1845
+tinybird-0.0.1.dev300.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev300.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev300.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev300.dist-info/RECORD,,