tinybird 0.0.1.dev298__tar.gz → 0.0.1.dev300__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev298
+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.dev298 → tinybird-0.0.1.dev300}/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-0.0.1.dev298 → tinybird-0.0.1.dev300}/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-0.0.1.dev298 → tinybird-0.0.1.dev300}/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.dev298'
-__revision__ = '86d8c44'
+__version__ = '0.0.1.dev300'
+__revision__ = '9791d55'

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

@@ -463,18 +463,18 @@ class TinybirdAgent:
             workspace_id = config.get("id", "")
             workspace = client.workspace(workspace_id, with_organization=True, version="v1")
             limits_data = client.organization_limits(workspace["organization"]["id"])
-            ai_credits_limits = limits_data.get("limits", {}).get("ai_credits", {})
-            current_ai_credits = ai_credits_limits.get("quantity") or 0
-            ai_credits = ai_credits_limits.get("max") or 0
-            remaining_credits = round(max(ai_credits - current_ai_credits, 0), 2)
-            current_ai_credits = round(min(ai_credits, current_ai_credits), 2)
-            if not ai_credits:
+            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 = ai_credits * 0.8
-            message_color = FeedbackManager.warning if current_ai_credits >= warning_threshold else FeedbackManager.gray
+            warning_threshold = llm_usage * 0.8
+            message_color = FeedbackManager.warning if current_llm_usage >= warning_threshold else FeedbackManager.gray
             click.echo(
                 message_color(
-                    message=f"{remaining_credits} credits left ({current_ai_credits}/{ai_credits}). You can continue using Tinybird Code. Limits will be enforced soon."
+                    message=f"{remaining_credits} credits left ({current_llm_usage}/{llm_usage}). You can continue using Tinybird Code. Limits will be enforced soon."
                 )
             )
         except Exception:

{tinybird-0.0.1.dev298 → tinybird-0.0.1.dev300}/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.dev298 → tinybird-0.0.1.dev300}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev298
+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.dev298 → tinybird-0.0.1.dev300}/tinybird.egg-info/requires.txt

@@ -4,7 +4,7 @@ boto3
 click<8.2,>=8.1.6
 clickhouse-toolset==0.34.dev0
 colorama==0.4.6
-confluent-kafka==2.8.0
+confluent-kafka==2.8.2
 cryptography~=41.0.0
 croniter==1.3.15
 docker==7.1.0
@@ -16,7 +16,7 @@ logfire-api==4.2.0
 pydantic~=2.11.7
 pydantic-ai-slim[anthropic]~=0.5.0
 pydantic-ai-slim[retries]~=0.5.0
-pyperclip==1.8.2
+pyperclip==1.9.0
 pyyaml<6.1,>=6.0
 requests<3,>=2.28.1
 shandy-sqlfmt==0.11.1

{tinybird-0.0.1.dev298 → tinybird-0.0.1.dev300}/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-0.0.1.dev298 → tinybird-0.0.1.dev300}/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