tinybird 0.0.1.dev101__py3-none-any.whl → 0.0.1.dev102__py3-none-any.whl

tinybird/prompts.py

@@ -448,16 +448,13 @@ Use the following format to generate the response and do not wrap it in any othe
     )
 
 
-def mock_prompt(rows: int, feedback: str = "", history: str = "") -> str:
-    feedback_history = ""
-    if feedback and history:
-        feedback_history = f"""In case the <feedback> and <history> tags are present and not empty, 
-it means there was a previous attempt to generate the resources and the user provided feedback and history about previous responses.
-Use the following feedback and history to regenerate the response:
-Feedback to improve the response:
-{feedback}
-History of previous results:
-{history}"""
+def mock_prompt(rows: int, feedback: str = "") -> str:
+    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.
+Use the following feedback to regenerate the response:
+<feedback>{feedback}</feedback>
+"""
 
     return f"""
 Given the schema for a Tinybird datasource, return a can you create a clickhouse sql query to generate some random data that matches that schema.
@@ -600,7 +597,7 @@ Follow the instructions and generate the following response with no additional t
     <sql>[raw sql query here]</sql>
 </response>
 
-{feedback_history}
+{feedback}
 
 """
 

tinybird/tb/__cli__.py

@@ -4,5 +4,5 @@ __description__ = 'Tinybird Command Line Tool'
 __url__ = 'https://www.tinybird.co/docs/cli/introduction.html'
 __author__ = 'Tinybird'
 __author_email__ = 'support@tinybird.co'
-__version__ = '0.0.1.dev101'
-__revision__ = '5dc0d4b'
+__version__ = '0.0.1.dev102'
+__revision__ = '627c8ef'

tinybird/tb/modules/mock.py

@@ -70,15 +70,31 @@ async def mock(ctx: click.Context, datasource: str, rows: int, prompt: str) -> N
         llm = LLM(user_token=user_token, host=user_client.host)
         prompt = f"<datasource_schema>{datasource_content}</datasource_schema>\n<user_input>{prompt}</user_input>"
         sql = ""
-        response = llm.ask(system_prompt=mock_prompt(rows), prompt=prompt)
-        sql = extract_xml(response, "sql")
-        result = await tb_client.query(f"{sql} FORMAT JSON")
-        data = result.get("data", [])[:rows]
-        if env in ("build", "local"):
-            persist_fixture_sql(datasource_name, sql, folder)
+        attempts = 0
+        data = []
+        error = ""
+        sql_path = None
+        while True:
+            try:
+                response = llm.ask(system_prompt=mock_prompt(rows, error), prompt=prompt)
+                sql = extract_xml(response, "sql")
+                sql_path = persist_fixture_sql(datasource_name, sql, folder)
+                result = await tb_client.query(f"{sql} FORMAT JSON")
+                data = result.get("data", [])[:rows]
+                error_response = result.get("error", None)
+                if error_response:
+                    raise CLIException(error_response)
+                else:
+                    break
+            except Exception as e:
+                error = str(e)
+                attempts += 1
+                if attempts > 5:
+                    raise Exception(f"Failed to generate a valid solution. Check {str(sql_path)} and try again.")
+                else:
+                    continue
 
         fixture_path = persist_fixture(datasource_name, data, folder)
-
         click.echo(FeedbackManager.info(message=f"✓ /fixtures/{datasource_name}.ndjson created"))
         if env == "cloud":
             await append_fixture(tb_client, datasource_name, str(fixture_path))

tinybird/tb/modules/shell.py

@@ -357,7 +357,7 @@ def print_table_formatted(res: dict, name: str):
         bytes_read = humanfriendly.format_size(stats.get("bytes_read", 0))
         elapsed = humanfriendly.format_timespan(elapsed) if elapsed >= 1 else f"{elapsed * 1000:.2f}ms"
         stats_message = f"» {bytes_read} ({rows_read} rows x {cols} cols) in {elapsed}"
-        rows_message = f"» Showing {limit} first rows" if row_count > limit else "» Showing all rows"
+        rows_message = f"» Showing first {limit} rows" if row_count > limit else "» Showing all rows"
         click.echo(FeedbackManager.success(message=stats_message))
         click.echo(FeedbackManager.gray(message=rows_message))
     except ValueError as exc:

{tinybird-0.0.1.dev101.dist-info → tinybird-0.0.1.dev102.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev101
+Version: 0.0.1.dev102
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird

{tinybird-0.0.1.dev101.dist-info → tinybird-0.0.1.dev102.dist-info}/RECORD

@@ -6,7 +6,7 @@ tinybird/context.py,sha256=FfqYfrGX_I7PKGTQo93utaKPDNVYWelg4Hsp3evX5wM,1291
 tinybird/datatypes.py,sha256=XNypumfqNjsvLJ5iNXnbVHRvAJe0aQwI3lS6Cxox-e0,10979
 tinybird/feedback_manager.py,sha256=YSjtFDJvc8y66j2J0iIkb3SVzDdYAJbzFL-JPQ26pak,68761
 tinybird/git_settings.py,sha256=Sw_8rGmribEFJ4Z_6idrVytxpFYk7ez8ei0qHULzs3E,3934
-tinybird/prompts.py,sha256=syxUvbdkzxIrIK8pkS-Y7nzBx7DMS2Z9HaiXx7AjvnQ,33912
+tinybird/prompts.py,sha256=RgV1B7-b6-1xXStNlhKikYSCG1WNaddDVeSp8hSgBlE,33753
 tinybird/sql.py,sha256=J35bhdpuu84HW2tiLp-cs_nzkRwPhiy1yPcFhcWMCR4,46248
 tinybird/sql_template.py,sha256=VH8io4n5eP2z6TEw111d8hcA9FKQerFjprKKCW2MODw,99127
 tinybird/sql_template_fmt.py,sha256=KUHdj5rYCYm_rKKdXYSJAE9vIyXUQLB0YSZnUXHeBlY,10196
@@ -15,7 +15,7 @@ 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/engine.py,sha256=BZuPM7MFS7vaEKK5tOMR2bwSAgJudPrJt27uVEwZmTY,40512
-tinybird/tb/__cli__.py,sha256=9fN3V2hgGADGGvafwXcIrRciQG80C2cmQs_OlsP8u-A,252
+tinybird/tb/__cli__.py,sha256=wj1R7TGTdVnIOEJgofqjYqrfWRx9JGWFQnBLQy53RqQ,252
 tinybird/tb/cli.py,sha256=H_HaZhkimKgkryYXpBjHfY9Qtg-ZORiONU3psDNpzDk,1135
 tinybird/tb/modules/auth.py,sha256=L1IatO2arRSzys3t8px8xVt8uPWUL5EVD0sFzAV_uVU,9022
 tinybird/tb/modules/build.py,sha256=h5drdmDFX8NHts9dA2Zepao7KSgMAl3DZGyFufVZP78,11085
@@ -41,14 +41,14 @@ tinybird/tb/modules/local_common.py,sha256=RN5OEncHdq7ua4AZ--WgKtaFuEsLvIhq_ROHJ
 tinybird/tb/modules/login.py,sha256=dAaBBn_ZIQRm9BFl6Uw_HgZa2qoLuAO6mBOxob_17ms,6253
 tinybird/tb/modules/logout.py,sha256=ULooy1cDBD02-r7voZmhV7udA0ML5tVuflJyShrh56Y,1022
 tinybird/tb/modules/materialization.py,sha256=r8Q9HXcYEmfrEzP4WpiasCKDJdSkTPaAKJtZMoJKhi8,5749
-tinybird/tb/modules/mock.py,sha256=9VKlp2bO2NsRgqF03SrFv_8OvAoHeRcOU89TiBRFfqY,3891
+tinybird/tb/modules/mock.py,sha256=2E26N8TMK1sP7eRc9N1nODdc_vU1jBeGRs8e-fbQ5Dc,4516
 tinybird/tb/modules/open.py,sha256=s3eJLFtF6OnXX5OLZzBz58dYaG-TGDCYFSJHttm919g,1317
 tinybird/tb/modules/pipe.py,sha256=gcLz0qHgwKDLsWFY3yFLO9a0ETAV1dFbI8YeLHi9460,2429
 tinybird/tb/modules/playground.py,sha256=bN0whphoSO6p1_u3b6OAUoc3ieG5Cl3qNXwt2HcUOp8,4834
 tinybird/tb/modules/project.py,sha256=Jpoi-3ybIixN8bHCqOMnuaKByXjrdN_Gvlpa24L-e4U,3124
 tinybird/tb/modules/regions.py,sha256=QjsL5H6Kg-qr0aYVLrvb1STeJ5Sx_sjvbOYO0LrEGMk,166
 tinybird/tb/modules/secret.py,sha256=xxzfKxfFN7GORib1WslCaFDHt_dgnjmfOewyptPU_VM,2820
-tinybird/tb/modules/shell.py,sha256=a98W4L4gfrmxEyybtu6S4ENXrBYtgNASB5e_evuXQvI,13936
+tinybird/tb/modules/shell.py,sha256=7BX9fhqq2tAvdhd1Ig1e35ePYcPH3Eh7ivZDAVwrQCk,13936
 tinybird/tb/modules/table.py,sha256=4XrtjM-N0zfNtxVkbvLDQQazno1EPXnxTyo7llivfXk,11035
 tinybird/tb/modules/tag.py,sha256=anPmMUBc-TbFovlpFi8GPkKA18y7Y0GczMsMms5TZsU,3502
 tinybird/tb/modules/telemetry.py,sha256=Hh2Io8ZPROSunbOLuMvuIFU4TqwWPmQTqal4WS09K1A,10449
@@ -81,8 +81,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.dev101.dist-info/METADATA,sha256=73sj_cIfixFVZVrtmkn_MwEYvtkMLO4GYeJCjJQ1KA0,2586
-tinybird-0.0.1.dev101.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tinybird-0.0.1.dev101.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
-tinybird-0.0.1.dev101.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
-tinybird-0.0.1.dev101.dist-info/RECORD,,
+tinybird-0.0.1.dev102.dist-info/METADATA,sha256=b33GgOxL3oZcglnCCC5gDCW-o6CQY67vZ1NalxV2QvQ,2586
+tinybird-0.0.1.dev102.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev102.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev102.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev102.dist-info/RECORD,,