tinybird 0.0.1.dev216__py3-none-any.whl → 0.0.1.dev220__py3-none-any.whl

tinybird/ch_utils/constants.py

@@ -242,3 +242,16 @@ FORBIDDEN_SQL_KEYWORDS = {
 
 CH_SETTINGS_JOIN_ALGORITHM_HASH = "hash"  # uses 'hash' by default, https://clickhouse.com/docs/en/operations/settings/settings/#settings-join_algorithm
 CH_SETTINGS_JOIN_ALGORITHM_AUTO = "auto,hash"
+
+VALID_QUERY_FORMATS = (
+    "JSON",
+    "CSV",
+    "CSVWithNames",
+    "TSV",
+    "TSVWithNames",
+    "PrettyCompact",
+    "JSONEachRow",
+    "Parquet",
+    "JSONStrings",
+    "Prometheus",
+)

tinybird/datafile/common.py

@@ -1710,6 +1710,8 @@ def parse(
             "s3_access_key": assign_var("s3_access_key"),
             "s3_secret": assign_var("s3_secret"),
             "gcs_service_account_credentials_json": assign_var_json("gcs_service_account_credentials_json"),
+            "gcs_hmac_access_id": assign_var("gcs_hmac_access_id"),
+            "gcs_hmac_secret": assign_var("gcs_hmac_secret"),
             "include": include,
         },
     }

tinybird/prompts.py

@@ -1,3 +1,4 @@
+from datetime import date
 from typing import Optional
 
 general_functions = [
@@ -453,6 +454,8 @@ Use the following format to generate the response and do not wrap it in any othe
 
 
 def mock_prompt(rows: int, feedback: str = "") -> str:
+    today = date.today().isoformat()
+
     if feedback:
         feedback = f"""In case the <feedback> tag is present and not empty,
 it means there was a previous attempt to generate the resources and the system provided feedback about the previous response.
@@ -495,6 +498,10 @@ FROM numbers({rows})
 - The query MUST return a sample of EXACTLY {rows} rows.
 - The query MUST be valid for clickhouse and Tinybird.
 - FROM numbers({rows}) part is mandatory.
+- If json paths are present (e.g. `userAgent` String `json:$.userAgent`), rely on the json paths to generate the sample record.
+- If the schema has nested json paths (e.g. `json:$.location.country`), generate nested JSON objects accordingly.
+- When working with dates, take into account that the current date is {today}.
+- Use recent dates to avoid generating dates that are too far in the past.
 - Do NOT include ```clickhouse or ```sql or any other wrapping text to the sql query.
 - Do NOT use any of these functions: elementAt
 - Do NOT add a semicolon at the end of the query
@@ -539,58 +546,55 @@ SELECT
   arrayMap(x -> concat('item_', toString(x)), range(1, rand() % 5 + 1)) AS items
 FROM numbers(ROWS)
 
-## Example schema with a nested JSON field:
+## Example schema with nested JSON paths:
 
 ### Schema:
 
 SCHEMA >
-    `request_id` String `json:$.request_id`,
     `timestamp` DateTime `json:$.timestamp`,
-    `model` String `json:$.request.model`,
-    `temperature` Float32 `json:$.request.options.temperature`,
-    `max_tokens` UInt32 `json:$.request.options.max_tokens`,
-    `stream` UInt8 `json:$.request.options.stream`
-
-### Desired final output of the query:
-
-Note that the important part is generating the nested fields:
-json:$.request.options.max_tokens > this means that the max_tokens field is nested inside the options field inside the request field.
-
+    `location_country` String `json:$.location.country`,
+    `location_region` String `json:$.location.region`,
+    `location_city` String `json:$.location.city`,
+    `location_latitude` String `json:$.location.latitude`,
+    `location_longitude` String `json:$.location.longitude`
+
+### Important: Understanding JSON paths
+When you see json paths like `json:$.location.country`, it means the data should be structured as nested JSON:
+- `json:$.location.country` → the country field is nested inside the location object
+- `json:$.location.region` → the region field is nested inside the location object
+
+### Desired final output structure:
 {{
-  "request_id": "req_abc123",
   "timestamp": "2024-11-30T10:30:00.000Z",
-  "request": {{
-    "model": "gpt-4",
-    "options": {{
-      "temperature": 0.7,
-      "max_tokens": 1000,
-      "stream": false
-    }}
+  "location": {{
+    "country": "United States",
+    "region": "California", 
+    "city": "San Francisco",
+    "latitude": "37.7749",
+    "longitude": "-122.4194"
   }}
 }}
 
-### Example SQL output with nested fields:
+### Example SQL output for nested JSON paths:
 
 SELECT
-    request_id,
     timestamp,
     CAST(concat('{{
-        "model": "', model, '",
-        "options": {{
-            "temperature": ', temperature, ',
-            "max_tokens": ', max_tokens, ',
-            "stream": ', IF(stream = 1, 'true', 'false'), '
-        }}
-    }}'), 'JSON') AS request
+        "country": "', country, '",
+        "region": "', region, '",
+        "city": "', city, '",
+        "latitude": "', latitude, '",
+        "longitude": "', longitude, '"
+    }}'), 'JSON') AS location
 FROM
 (
     SELECT
-        concat('req_', lower(hex(randomString(6)))) AS request_id,
-        (now() - toIntervalDay(rand() % 30)) + toIntervalSecond(rand() % 86400) AS timestamp,
-        ['gpt-4', 'gpt-3.5-turbo', 'gpt-4-turbo'][(rand() % 3) + 1] AS model,
-        round(rand() / 10, 2) AS temperature,
-        500 + (rand() % 2500) AS max_tokens,
-        rand() % 2 AS stream
+        now() - rand() % 86400 AS timestamp,
+        ['United States', 'Canada', 'United Kingdom', 'Germany', 'France'][(rand() % 5) + 1] AS country,
+        ['California', 'Texas', 'New York', 'Ontario', 'London'][(rand() % 5) + 1] AS region,
+        ['San Francisco', 'Los Angeles', 'New York', 'Toronto', 'London'][(rand() % 5) + 1] AS city,
+        toString(round(rand() * 180 - 90, 4)) AS latitude,
+        toString(round(rand() * 360 - 180, 4)) AS longitude
     FROM numbers(ROWS)
 )
 </more_examples>

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.dev216'
-__revision__ = 'b1646cc'
+__version__ = '0.0.1.dev220'
+__revision__ = 'd9c7b3e'

tinybird/tb/modules/cli.py

@@ -379,6 +379,15 @@ async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, s
         click.echo(
             FeedbackManager.gray(message=f"Running against Tinybird Cloud: Workspace {config.get('name', 'default')}")
         )
+
+        method = None
+        if ctx.params.get("token"):
+            method = "token via --token option"
+        elif os.environ.get("TB_TOKEN"):
+            method = "token from TB_TOKEN environment variable"
+        if method:
+            click.echo(FeedbackManager.gray(message=f"Authentication method: {method}"))
+
         return _get_tb_client(config.get("token", None), config["host"], staging=staging)
     local = command in commands_always_local
     test = command in command_always_test

tinybird/tb/modules/create.py

@@ -101,7 +101,7 @@ async def create(
         if prompt:
             prompt_result = await create_resources_from_prompt(tb_client, user_token, prompt, project)
             result.extend(prompt_result)
-            readme_path = Path(root_folder) / "README.md"
+            readme_path = folder_path / "README.md"
             if readme_path.exists():
                 click.echo(FeedbackManager.highlight(message="\n» Updating project description..."))
             else:

tinybird/tb/modules/local.py

@@ -98,8 +98,9 @@ async def stop() -> None:
 
 
 @local.command()
+@click.pass_context
 @coro
-async def status() -> None:
+async def status(ctx: click.Context) -> None:
     """Check status of Tinybird Local"""
     docker_client = get_docker_client()
     container = get_existing_container_with_matching_env(docker_client, TB_CONTAINER_NAME, {})
@@ -110,6 +111,11 @@ async def status() -> None:
 
         if status == "running" and health == "healthy":
             click.echo(FeedbackManager.success(message="✓ Tinybird Local is ready!"))
+            click.echo(FeedbackManager.highlight(message="\n» Tinybird Local:"))
+            from tinybird.tb.modules.info import get_local_info
+
+            config = ctx.ensure_object(dict).get("config", {})
+            await get_local_info(config)
         elif status == "restarting" or (status == "running" and health == "starting"):
             click.echo(FeedbackManager.highlight(message="* Tinybird Local is starting..."))
         elif status == "removing":

tinybird/tb/modules/workspace.py

@@ -288,14 +288,25 @@ async def clear_workspace() -> None:
 
     ws = next((ws for ws in local_workspaces if ws["name"] == ws_name), None)
 
+    if not ws:
+        raise CLIWorkspaceException(FeedbackManager.error(message=f"Workspace '{ws_name}' not found."))
+
+    requests.delete(f"{TB_LOCAL_ADDRESS}/v1/workspaces/{ws['id']}?token={user_token}&hard_delete_confirmation=yes")  # noqa: ASYNC210
+    user_workspaces = await user_client.user_workspaces(version="v1")
+    ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
+
     if ws:
-        requests.delete(f"{TB_LOCAL_ADDRESS}/v1/workspaces/{ws['id']}?token={user_token}&hard_delete_confirmation=yes")  # noqa: ASYNC210
-        ws = None
+        raise CLIWorkspaceException(
+            FeedbackManager.error(message=f"Workspace '{ws_name}' was not cleared properly. Please try again.")
+        )
+
+    await user_client.create_workspace(ws_name, assign_to_organization_id=user_org_id, version="v1")
+    user_workspaces = requests.get(f"{TB_LOCAL_ADDRESS}/v1/user/workspaces?token={admin_token}").json()  # noqa: ASYNC210
+    ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
 
     if not ws:
-        await user_client.create_workspace(ws_name, assign_to_organization_id=user_org_id, version="v1")
-        user_workspaces = requests.get(f"{TB_LOCAL_ADDRESS}/v1/user/workspaces?token={admin_token}").json()  # noqa: ASYNC210
-        ws = next((ws for ws in user_workspaces["workspaces"] if ws["name"] == ws_name), None)
+        raise CLIWorkspaceException(
+            FeedbackManager.error(message=f"Workspace '{ws_name}' was not cleared properly. Please try again.")
+        )
 
-    if ws:
-        click.echo(FeedbackManager.success(message=f"\n✓ Workspace '{ws_name}' cleared"))
+    click.echo(FeedbackManager.success(message=f"✓ Workspace '{ws_name}' cleared"))

{tinybird-0.0.1.dev216.dist-info → tinybird-0.0.1.dev220.dist-info}/METADATA

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

{tinybird-0.0.1.dev216.dist-info → tinybird-0.0.1.dev220.dist-info}/RECORD

@@ -3,33 +3,33 @@ 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=ZdpY7FyJh9vg7SfZkR0h5h-dy2VecbBMkli3nI7-eVo,38006
+tinybird/prompts.py,sha256=6lr5EaSUzdh7dqOg2BFba8q8HKy3rfFG5SNw1rnAdtA,38656
 tinybird/sql.py,sha256=BufnOgclQokDyihtuXesOwHBsebN6wRXIxO5wKRkOwE,48299
 tinybird/sql_template.py,sha256=WjsTBjpQLVBHGZbY2dZuhZUurFR-rbJ_KRRy5vx4Y5E,99967
 tinybird/sql_template_fmt.py,sha256=KUHdj5rYCYm_rKKdXYSJAE9vIyXUQLB0YSZnUXHeBlY,10196
 tinybird/sql_toolset.py,sha256=M2rpLYkgV2W8NnYEYPC1tJdpy4uZHXVF64NBSKLQka4,19549
 tinybird/syncasync.py,sha256=IPnOx6lMbf9SNddN1eBtssg8vCLHMt76SuZ6YNYm-Yk,27761
 tinybird/tornado_template.py,sha256=jjNVDMnkYFWXflmT8KU_Ssbo5vR8KQq3EJMk5vYgXRw,41959
-tinybird/ch_utils/constants.py,sha256=aYvg2C_WxYWsnqPdZB1ZFoIr8ZY-XjUXYyHKE9Ansj0,3890
+tinybird/ch_utils/constants.py,sha256=F19-_nQ7uNmayD0T9pO1Qu7bh9MFowwj0b6ATH45vwk,4083
 tinybird/ch_utils/engine.py,sha256=X4tE9OrfaUy6kO9cqVEzyI9cDcmOF3IAssRRzsTsfEQ,40781
-tinybird/datafile/common.py,sha256=JPhLqYfmGYCc5dln7zMbr4m2TvUwbqZTxmC_pF5BzJY,91534
+tinybird/datafile/common.py,sha256=9hC1APatnfFeYXyTm_s47VmXP0JUajvpkw1vsrSXo70,91664
 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=xf4m0Tw44QWJzHzAm7Z7FwUoUUtr7noMYjU1NiWnX0k,3880
-tinybird/tb/__cli__.py,sha256=mA8tARgcpYXiyhPqdbnpYFDjf_bvSisl_rENpsTa58Y,247
+tinybird/tb/__cli__.py,sha256=Tub058Oz-n2aVt35P5GpJu4UOrSf1cvZsXjKxAWsm10,247
 tinybird/tb/check_pypi.py,sha256=i3l2L8IajeB7sreikR7oPlYJki9MtS3c_M4crnmbByc,760
 tinybird/tb/cli.py,sha256=0xYk2Ip4vb3nNFbxfTdG3VoIgdRvUKVbUVU_mviErPA,1107
 tinybird/tb/client.py,sha256=FKj61vY9STPW03kfVcxYuY1_csI-kP-mc1ERQfqJtg8,56505
 tinybird/tb/config.py,sha256=jT9xndpeCY_g0HdB5qE2EquC0TFRRnkPnQFWZWd04jo,3998
 tinybird/tb/modules/build.py,sha256=T36msoBK5g9AZlrJnFRPvlZbrdE265LY1q3Y4YqvS3w,20067
 tinybird/tb/modules/cicd.py,sha256=Njb6eZOHHbUkoJJx6KoixO9PsfA_T-3Ybkya9-50Ca8,7328
-tinybird/tb/modules/cli.py,sha256=k6Bp-lWC-ruMMB47lxwsinLQt4qJL_n84hjyxi9JYt4,15676
+tinybird/tb/modules/cli.py,sha256=zTUob6oSZszCx-lk6MJbQ_VuNOXBo8b0DOHPWezzMOg,15997
 tinybird/tb/modules/common.py,sha256=WWvbDSQmyYUy9Xyc_BqtrdRzpDdzLuE9i_pWhoA1a8k,83440
 tinybird/tb/modules/config.py,sha256=VnzYVUo4q1RBEEMMce4_OCrKp4erhgkRPHElydVlKj0,11488
 tinybird/tb/modules/connection.py,sha256=rdEsdcP-AqyHiW3KNoETGPeTjk7Wt3It6z_SnmInGcc,18648
 tinybird/tb/modules/copy.py,sha256=zHN1d5NA-MFsgbk2kKJq2P9qA8dNOnIsIa60QpVnSwc,4458
-tinybird/tb/modules/create.py,sha256=sncG6iaeS_AApY1EmmfYEdj9B6-1CPZJzvTmfJQj_Rc,22112
+tinybird/tb/modules/create.py,sha256=l3Q3QG8R-CXP-gj5rIXI3uD9tPBnQmzdklgkxt_ggNY,22106
 tinybird/tb/modules/datasource.py,sha256=jpe5-C-rZ5Dnitwo_t84OPqS_bV44Sz1y1u85-2djnQ,39362
 tinybird/tb/modules/deployment.py,sha256=ByXIgEvwxB49pJEKKj0EJIfORWyflCYr04k8961nBkA,28391
 tinybird/tb/modules/deprecations.py,sha256=rrszC1f_JJeJ8mUxGoCxckQTJFBCR8wREf4XXXN-PRc,4507
@@ -42,7 +42,7 @@ tinybird/tb/modules/infra.py,sha256=fve30Gj3mG9zbquGxS2e4ipcOYOxviWQCpNFfEzJN_Q,
 tinybird/tb/modules/job.py,sha256=AsUCRNzy7HG5oJ4fyk9NpIm5NtNJgBZSy8MtJdXBe5A,3167
 tinybird/tb/modules/llm.py,sha256=KfsCYmKeW1VQz0iDZhGKCRkQv_Y3kTHh6JuxvofOguE,1076
 tinybird/tb/modules/llm_utils.py,sha256=nS9r4FAElJw8yXtmdYrx-rtI2zXR8qXfi1QqUDCfxvg,3469
-tinybird/tb/modules/local.py,sha256=mLSgMMP3H1MdanVLsFZieeqOANSnctPLey3pJ_L1ZBI,5807
+tinybird/tb/modules/local.py,sha256=TWT7pGXQ3cOy0M_piyw7WhrzoxZE18PmfOLzHD5CoEc,6096
 tinybird/tb/modules/local_common.py,sha256=8CSEVygFi0fIISatYxCStcHizugXCA9WNTLO_zDKmXw,17195
 tinybird/tb/modules/login.py,sha256=qfY17J3FryTPl8A0ucQgxiyJ7jLy81qHdlHXgqohi0c,10170
 tinybird/tb/modules/logout.py,sha256=sniI4JNxpTrVeRCp0oGJuQ3yRerG4hH5uz6oBmjv724,1009
@@ -60,7 +60,7 @@ tinybird/tb/modules/telemetry.py,sha256=T9gtsQffWqG_4hRBaUJPzOfMkPwz7mH-R6Bn1XRY
 tinybird/tb/modules/test.py,sha256=XakpYi0Q2gGKItpPdtRVLKzQldkvCPqzPhwwbUxyrmc,13292
 tinybird/tb/modules/token.py,sha256=2fmKwu10_M0pqs6YmJVeILR9ZQB0ejRAET86agASbKM,13488
 tinybird/tb/modules/watch.py,sha256=HhruZoUrehlxL_nFIK3BlpHp2uyzKAM9cmNXBCa4Zgs,8965
-tinybird/tb/modules/workspace.py,sha256=WDi3Vu9t60b4Ht5vbPsakUErFmsECtFRcfXb1l300xc,11057
+tinybird/tb/modules/workspace.py,sha256=ngn5yGG9K9sFaUzm0W42j_vQnm3pQS2Jh38GNgbMtP0,11607
 tinybird/tb/modules/workspace_members.py,sha256=RYLpyPM1ECCasHRg3uvpckzXplX0_KgNFsSPZn_i6qk,8744
 tinybird/tb/modules/datafile/build.py,sha256=SinuhM61FKdEt0MTV_4qfJFQ78dYndcmWHf_LMGe7Z8,51351
 tinybird/tb/modules/datafile/build_common.py,sha256=LU24kAQmxDJIyoIapDaYG-SU3P4FrMG9UBf8m9PgVSI,4565
@@ -82,8 +82,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.dev216.dist-info/METADATA,sha256=OFw1ggbnDCkrP-xifq_bE75sbm4GxpPP5CEK0KjDAG0,1682
-tinybird-0.0.1.dev216.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev216.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev216.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev216.dist-info/RECORD,,
+tinybird-0.0.1.dev220.dist-info/METADATA,sha256=2cTr-wmJ-MMHiCt8oqOc45VR0WMwEDu5HE0kotkXWaQ,1682
+tinybird-0.0.1.dev220.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev220.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev220.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev220.dist-info/RECORD,,