tinybird 0.0.1.dev40__tar.gz → 0.0.1.dev42__tar.gz

{tinybird-0.0.1.dev40 → tinybird-0.0.1.dev42}/PKG-INFO

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

{tinybird-0.0.1.dev40 → tinybird-0.0.1.dev42}/tinybird/prompts.py

@@ -371,10 +371,19 @@ You are a Tinybird expert. You will be given a pipe containing different nodes w
     - The test command must be a valid Tinybird command that can be run in the terminal.
     - The test command can have as many parameters as are needed to test the pipe.
     - The parameter within Tinybird templating syntax looks like this one {{String(my_param_name, default_value)}}.
-    - If there are no parameters, you can omit parameters and generate a single test command.
+    - If there are no parameters, you can omit parameters and generate a single test.
     - The format of the parameters is the following: ?param1=value1&param2=value2&param3=value3
 </instructions>
 
+This is an example of a test with parameters:
+<example>
+    <test>
+        <name>kpis_date_range</name>
+        <description>Test specific date range with daily granularity</description>
+        <parameters>?date_from=2024-01-01&date_to=2024-01-10</parameters>
+    </test>
+</example>
+
 Follow the instructions and generate the following response with no additional text:
 
 <response>
@@ -646,6 +655,7 @@ datasource_instructions = """
     - No indentation is allowed for property names: DESCRIPTION, SCHEMA, ENGINE, ENGINE_PARTITION_KEY, ENGINE_SORTING_KEY, etc.
     - Use MergeTree engine by default.
     - Use AggregatingMergeTree engine when the datasource is the target of a materialized pipe.
+    - Use always json paths to define the schema. Example: `user_id` String `json:$.user_id`,
 </datasource_file_instructions>
 """
 
@@ -779,3 +789,24 @@ Use the following format to generate the response and do not wrap it in any othe
         copy_pipe_instructions=copy_pipe_instructions,
         materialized_pipe_instructions=materialized_pipe_instructions,
     )
+
+
+cursorrules_prompt = """
+You are an expert in SQL and Tinybird. Follow these instructions when working with .datasource and .pipe files:
+
+{datasource_instructions}
+{pipe_instructions}
+{sql_instructions}
+{datasource_example}
+{pipe_example}
+{copy_pipe_instructions}
+{materialized_pipe_instructions}
+""".format(
+    datasource_instructions=datasource_instructions,
+    pipe_instructions=pipe_instructions,
+    sql_instructions=sql_instructions,
+    datasource_example=datasource_example,
+    pipe_example=pipe_example,
+    copy_pipe_instructions=copy_pipe_instructions,
+    materialized_pipe_instructions=materialized_pipe_instructions,
+)

{tinybird-0.0.1.dev40 → tinybird-0.0.1.dev42}/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.dev40'
-__revision__ = '4f6c174'
+__version__ = '0.0.1.dev42'
+__revision__ = '14b255c'

{tinybird-0.0.1.dev40 → tinybird-0.0.1.dev42}/tinybird/tb/modules/build.py

@@ -36,13 +36,12 @@ def build(ctx: click.Context, watch: bool) -> None:
 
     def process(file_changed: Optional[str] = None) -> None:
         if file_changed and file_changed.endswith(".ndjson"):
-            rebuild_fixture(project, file_changed)
+            rebuild_fixture(project, tb_client, file_changed)
         else:
             build_project(project, tb_client)
-            new_tb_client = asyncio.run(get_tinybird_local_client(str(project.path)))
             try:
                 if file_changed:
-                    build_and_print_resource(new_tb_client, file_changed)
+                    build_and_print_resource(tb_client, file_changed)
             except Exception:
                 pass
 
@@ -52,7 +51,7 @@ def build(ctx: click.Context, watch: bool) -> None:
     click.echo(FeedbackManager.success(message=f"\n✓ Build completed in {elapsed_time:.1f}s"))
 
     if watch:
-        shell = Shell(project=project)
+        shell = Shell(project=project, tb_client=tb_client)
         click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
         watcher_thread = threading.Thread(
             target=watch_project,
@@ -88,7 +87,7 @@ def build_project(project: Project, tb_client: TinyB) -> None:
             files.append((MULTIPART_BOUNDARY_DATA_PROJECT, (relative_path, fd.read().decode("utf-8"), content_type)))
         HEADERS = {"Authorization": f"Bearer {TINYBIRD_API_KEY}"}
 
-        r = requests.post(TINYBIRD_API_URL, files=files, headers=HEADERS, data={"folder": str(project_path)})
+        r = requests.post(TINYBIRD_API_URL, files=files, headers=HEADERS)
         try:
             result = r.json()
         except Exception as e:
@@ -115,7 +114,6 @@ def build_project(project: Project, tb_client: TinyB) -> None:
                     click.echo(FeedbackManager.info(message=f"✓ {pipe_path} created"))
 
             try:
-                new_tb_client = asyncio.run(get_tinybird_local_client(str(project.path)))
                 for filename in project_files:
                     if filename.endswith(".datasource"):
                         ds_path = Path(filename)
@@ -128,7 +126,7 @@ def build_project(project: Project, tb_client: TinyB) -> None:
                             fixture_path = fixture_folder / f"{ds_name}.ndjson"
 
                         if fixture_path.exists():
-                            append_fixture(new_tb_client, ds_name, str(fixture_path))
+                            append_fixture(tb_client, ds_name, str(fixture_path))
             except Exception:
                 pass
 
@@ -166,9 +164,8 @@ def append_fixture(
     )
 
 
-def rebuild_fixture(project: Project, fixture: str) -> None:
+def rebuild_fixture(project: Project, tb_client: TinyB, fixture: str) -> None:
     try:
-        tb_client = asyncio.run(get_tinybird_local_client(str(project.path)))
         fixture_path = Path(fixture)
         datasources_path = Path(project.folder) / "datasources"
         ds_name = fixture_path.stem

{tinybird-0.0.1.dev40 → tinybird-0.0.1.dev42}/tinybird/tb/modules/create.py

@@ -7,7 +7,7 @@ from typing import Optional
 import click
 
 from tinybird.client import TinyB
-from tinybird.prompts import create_prompt, mock_prompt
+from tinybird.prompts import create_prompt, cursorrules_prompt, mock_prompt
 from tinybird.tb.modules.cicd import init_cicd
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import _generate_datafile, check_user_token_with_client, coro, generate_datafile
@@ -40,12 +40,14 @@ from tinybird.tb.modules.local_common import get_tinybird_local_client
     help="Folder where datafiles will be placed",
 )
 @click.option("--rows", type=int, default=10, help="Number of events to send")
+@click.option("--cursor", default=False, is_flag=True, help="Create .cursorrules file with Tinybird rules")
 @coro
 async def create(
     data: Optional[str],
     prompt: Optional[str],
     folder: Optional[str],
     rows: int,
+    cursor: bool,
 ) -> None:
     """Initialize a new project."""
     folder = folder or getcwd()
@@ -121,7 +123,11 @@ async def create(
                             persist_fixture(fixture_name, data, folder)
                             click.echo(FeedbackManager.info(message=f"✓ /fixtures/{datasource_name}"))
 
+        if cursor and not already_has_cursorrules(folder):
+            click.echo(FeedbackManager.highlight(message="\n» Creating .cursorrules..."))
+            create_cursorrules(folder)
             click.echo(FeedbackManager.success(message="✓ Done!\n"))
+
     except Exception as e:
         click.echo(FeedbackManager.error(message=f"Error: {str(e)}"))
 
@@ -286,3 +292,12 @@ def generate_pipe_file(name: str, content: str, folder: str):
     with open(f"{f}", "w") as file:
         file.write(content)
     click.echo(FeedbackManager.info_file_created(file=f.relative_to(folder)))
+
+
+def already_has_cursorrules(folder: str) -> bool:
+    return (Path(folder) / ".cursorrules").exists()
+
+
+def create_cursorrules(folder: str):
+    cursorrules_file = Path(folder) / ".cursorrules"
+    cursorrules_file.write_text(cursorrules_prompt)

{tinybird-0.0.1.dev40 → tinybird-0.0.1.dev42}/tinybird/tb/modules/shell.py

@@ -14,9 +14,9 @@ from prompt_toolkit.key_binding import KeyBindings
 from prompt_toolkit.shortcuts import CompleteStyle
 from prompt_toolkit.styles import Style
 
+from tinybird.client import TinyB
 from tinybird.tb.modules.exceptions import CLIException
 from tinybird.tb.modules.feedback_manager import FeedbackManager, bcolors
-from tinybird.tb.modules.local_common import get_tinybird_local_client
 from tinybird.tb.modules.project import Project
 from tinybird.tb.modules.table import format_table
 
@@ -174,9 +174,10 @@ def _(event):
 
 
 class Shell:
-    def __init__(self, project: Project):
+    def __init__(self, project: Project, tb_client: TinyB):
         self.history = self.get_history()
         self.project = project
+        self.tb_client = tb_client
         self.prompt_message = "\ntb > "
         self.commands = ["create", "mock", "test", "tb", "select"]
         self.session: PromptSession = PromptSession(
@@ -285,9 +286,8 @@ class Shell:
                 loop = asyncio.new_event_loop()
                 asyncio.set_event_loop(loop)
                 try:
-                    tb_client = asyncio.run(get_tinybird_local_client(str(self.project.path)))
                     return loop.run_until_complete(
-                        tb_client.query(f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT JSON")
+                        self.tb_client.query(f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT JSON")
                     )
                 finally:
                     loop.close()

{tinybird-0.0.1.dev40 → tinybird-0.0.1.dev42}/tinybird.egg-info/PKG-INFO

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