tinybird 0.0.1.dev101__tar.gz → 0.0.1.dev102__tar.gz

{tinybird-0.0.1.dev101 → tinybird-0.0.1.dev102}/PKG-INFO

@@ -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 → tinybird-0.0.1.dev102}/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-0.0.1.dev101 → tinybird-0.0.1.dev102}/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-0.0.1.dev101 → tinybird-0.0.1.dev102}/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-0.0.1.dev101 → tinybird-0.0.1.dev102}/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 → tinybird-0.0.1.dev102}/tinybird.egg-info/PKG-INFO

@@ -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