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

tinybird/prompts.py

@@ -815,14 +815,17 @@ sql_instructions = """
     - Do NOT use CREATE TABLE, INSERT INTO, CREATE DATABASE, etc.
     - Use ONLY SELECT statements in the SQL section.
     - INSERT INTO is not supported in SQL section.
-    - General functions supported are: {general_functions}
-    - Character insensitive functions supported are: {general_functions_insensitive}
-    - Aggregate functions supported are: {aggregate_functions}
-    - Do not use any function that is not present in the list of general functions, character insensitive functions and aggregate functions.
-    - If the function is not present in the list, the sql query will fail, so avoid at all costs to use any function that is not present in the list.
-    - When aliasing a column, use first the column name and then the alias.
-    - General functions and aggregate functions are case sensitive.
-    - Character insensitive functions are case insensitive.
+    - ClickHouse functions supported are:
+        - General functions supported are: {general_functions}
+        - Character insensitive functions supported are: {general_functions_insensitive}
+        - Aggregate functions supported are: {aggregate_functions}
+    - How to use ClickHouse supported functions:
+        - When using functions try always ClickHouse functions first, then SQL functions.
+        - Do not use any ClickHouse function that is not present in the list of general functions, character insensitive functions and aggregate functions.
+        - If the function is not present in the list, the sql query will fail, so avoid at all costs to use any function that is not present in the list.
+        - When aliasing a column, use first the column name and then the alias.
+        - General functions and aggregate functions are case sensitive.
+        - Character insensitive functions are case insensitive.
     - Parameters are never quoted in any case.
     - Use the following syntax in the SQL section for the iceberg table function: iceberg('s3://bucket/path/to/table', {{{{tb_secret('aws_access_key_id')}}}}, {{{{tb_secret('aws_secret_access_key')}}}})
     - Use the following syntax in the SQL section for the postgres table function: postgresql('host:port', 'database', 'table', {{{{tb_secret('db_username')}}}}, {{{{tb_secret('db_password')}}}}), 'schema')

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

tinybird/tb/modules/datasource.py

@@ -687,63 +687,72 @@ async def datasource_create(
             FeedbackManager.error(message="`tb datasource create` is not available against Tinybird Cloud.")
         )
 
-    datasource_types = (
-        "Blank",
-        "Local file",
-        "Remote URL",
-        "Kafka",
-        "S3",
-        "GCS",
-    )
+    datasource_types = {
+        "blank": ("Blank", "Create an empty one"),
+        "local_file": ("Local file", "A local file"),
+        "remote_url": ("Remote URL", "A remote file"),
+        "s3": ("S3", "Files on S3"),
+        "gcs": ("GCS", "Files on GCS"),
+        "kafka": ("Kafka", "Connect a Kafka topic"),
+        "prompt": ("Prompt", "Create a datasource from a prompt"),
+    }
     datasource_type: Optional[str] = None
     connection_file: Optional[str] = None
     ds_content = """SCHEMA >
     `data` String `json:$`
 """
+    wizard_mode = True
     if file:
-        datasource_type = "Local file"
+        datasource_type = "local_file"
+        wizard_mode = False
     elif url:
-        datasource_type = "Remote URL"
+        datasource_type = "remote_url"
+        wizard_mode = False
     elif blank:
-        datasource_type = "Blank"
+        datasource_type = "blank"
+        wizard_mode = False
     elif connection:
         connection_files = project.get_connection_files()
         connection_file = next((f for f in connection_files if f.endswith(f"{connection}.connection")), None)
         if connection_file:
             connection_content = Path(connection_file).read_text()
             if project.is_kafka_connection(connection_content):
-                datasource_type = "Kafka"
+                datasource_type = "kafka"
             elif project.is_s3_connection(connection_content):
-                datasource_type = "S3"
+                datasource_type = "s3"
             elif project.is_gcs_connection(connection_content):
-                datasource_type = "GCS"
+                datasource_type = "gcs"
     elif s3:
-        datasource_type = "S3"
+        datasource_type = "s3"
+        wizard_mode = False
     elif gcs:
-        datasource_type = "GCS"
+        datasource_type = "gcs"
+        wizard_mode = False
     elif kafka:
-        datasource_type = "Kafka"
+        datasource_type = "kafka"
+        wizard_mode = False
     elif prompt:
-        click.echo(FeedbackManager.gray(message="\n» Creating .datasource file..."))
-        user_token = config.get("user_token")
-        if not user_token:
-            raise Exception("This action requires authentication. Run 'tb login' first.")
-        project_config = CLIConfig.get_project_config()
-        tb_client: TinyB = project_config.get_client(token=config.get("token"), host=config.get("host"))
-        await create_resources_from_prompt(tb_client, user_token, prompt, project)
-        click.echo(FeedbackManager.success(message="✓ .datasource created!"))
-        return
+        datasource_type = "prompt"
+        wizard_mode = False
 
     if datasource_type is None:
-        click.echo(FeedbackManager.highlight(message="? Where do you want to create your .datasource from?"))
+        click.echo(
+            FeedbackManager.highlight(
+                message="? This command will create the schema (.datasource) for your data. Choose where from:"
+            )
+        )
         datasource_type_index = -1
 
+        dt_keys = list(datasource_types.keys())
         while datasource_type_index == -1:
-            for index, datasource_type in enumerate(datasource_types):
-                click.echo(f"  [{index + 1}] {datasource_type}")
+            for index, key in enumerate(dt_keys):
+                click.echo(
+                    f"  [{index + 1}] {FeedbackManager.bold(message=datasource_types[key][0])}: {datasource_types[key][1]}"
+                )
+            click.echo(FeedbackManager.gray(message="\nFiles can be either NDJSON, CSV or Parquet."))
             click.echo(
                 FeedbackManager.gray(
-                    message="Tip: Run `tb datasource create --file | --url | --connection` to skip this step."
+                    message=("Tip: Run `tb datasource create --file | --url | --connection` to skip this step.")
                 )
             )
             datasource_type_index = click.prompt("\nSelect option", default=1)
@@ -753,7 +762,7 @@ async def datasource_create(
                 return None
 
             try:
-                datasource_type = datasource_types[int(datasource_type_index) - 1]
+                datasource_type = dt_keys[int(datasource_type_index) - 1]
             except Exception:
                 datasource_type_index = -1
 
@@ -765,19 +774,29 @@ async def datasource_create(
         )
         return
 
-    connection_required = datasource_type in ("Kafka", "S3", "GCS")
+    if datasource_type == "prompt":
+        click.echo(FeedbackManager.gray(message="\n» Creating .datasource file..."))
+        user_token = config.get("user_token")
+        if not user_token:
+            raise Exception("This action requires authentication. Run 'tb login' first.")
+        project_config = CLIConfig.get_project_config()
+        tb_client: TinyB = project_config.get_client(token=config.get("token"), host=config.get("host"))
+        await create_resources_from_prompt(tb_client, user_token, prompt, project)
+        click.echo(FeedbackManager.success(message="✓ .datasource created!"))
+        return
+
+    connection_required = datasource_type in ("kafka", "s3", "gcs")
 
     if connection_required:
-        click.echo(FeedbackManager.gray(message="\n» Creating .datasource file..."))
-        connection_type = datasource_type.lower()
+        click.echo(FeedbackManager.gray(message="\n» Creating .connection file..."))
 
         def get_connection_files():
             connection_files = []
-            if connection_type == "kafka":
+            if datasource_type == "kafka":
                 connection_files = project.get_kafka_connection_files()
-            elif connection_type == "s3":
+            elif datasource_type == "s3":
                 connection_files = project.get_s3_connection_files()
-            elif connection_type == "gcs":
+            elif datasource_type == "gcs":
                 connection_files = project.get_gcs_connection_files()
             return connection_files
 
@@ -785,21 +804,23 @@ async def datasource_create(
         connection_name = ""
         topics: List[str] = []
         if len(connection_files) == 0:
-            click.echo(FeedbackManager.error(message=f"✗ No {datasource_type} connections found."))
+            click.echo(FeedbackManager.error(message=f"✗ No {datasource_types[datasource_type][0]} connections found."))
             if click.confirm(
-                FeedbackManager.highlight(message=f"\n? Do you want to create a {datasource_type} connection? [Y/n]"),
+                FeedbackManager.highlight(
+                    message=f"\n? Do you want to create a {datasource_types[datasource_type][0]} connection? [Y/n]"
+                ),
                 show_default=False,
                 default=True,
             ):
-                if datasource_type != "Kafka":
+                if datasource_type != "kafka":
                     click.echo(FeedbackManager.gray(message="\n» Creating .connection file..."))
-                    default_connection_name = f"{datasource_type.lower()}_{generate_short_id()}"
+                    default_connection_name = f"{datasource_type}_{generate_short_id()}"
                     connection_name = click.prompt(
                         FeedbackManager.highlight(message=f"? Connection name [{default_connection_name}]"),
                         show_default=False,
                         default=default_connection_name,
                     )
-                if datasource_type == "Kafka":
+                if datasource_type == "kafka":
                     (
                         connection_name,
                         bootstrap_servers,
@@ -811,7 +832,7 @@ async def datasource_create(
                         security_protocol,
                         topics,
                     ) = await connection_create_kafka(ctx)
-                elif datasource_type == "S3":
+                elif datasource_type == "s3":
                     await generate_aws_iamrole_connection_file_with_secret(
                         connection_name,
                         service="s3",
@@ -820,21 +841,19 @@ async def datasource_create(
                         folder=project.folder,
                         with_default_secret=True,
                     )
-                elif datasource_type == "GCS":
+                elif datasource_type == "gcs":
                     await generate_gcs_connection_file_with_secrets(
                         connection_name,
                         service="gcs",
                         svc_account_creds="GCS_SERVICE_ACCOUNT_CREDENTIALS_JSON",
                         folder=project.folder,
                     )
-                if datasource_type != "Kafka":
+                if datasource_type != "kafka":
                     click.echo(FeedbackManager.info(message=f"/connections/{connection_name}.connection"))
                     click.echo(FeedbackManager.success(message="✓ .connection created!"))
                 connection_files = get_connection_files()
             else:
-                click.echo(
-                    FeedbackManager.info(message=f"→ Run `tb connection create {datasource_type.lower()}` to add one.")
-                )
+                click.echo(FeedbackManager.info(message=f"→ Run `tb connection create {datasource_type}` to add one."))
                 return
 
         if not connection_file:
@@ -842,8 +861,9 @@ async def datasource_create(
             connection_path = Path(connection_file)
             connection = connection_path.stem
 
-    if datasource_type == "Local file":
-        click.echo(FeedbackManager.gray(message="\n» Creating .datasource file..."))
+    click.echo(FeedbackManager.gray(message="\n» Creating .datasource file..."))
+
+    if datasource_type == "local_file":
         if not file:
             file = click.prompt(FeedbackManager.highlight(message="? Path"))
             if file.startswith("~"):
@@ -863,8 +883,7 @@ async def datasource_create(
             show_default=False,
         )
 
-    if datasource_type == "Remote URL":
-        click.echo(FeedbackManager.gray(message="\n» Creating .datasource file..."))
+    if datasource_type == "remote_url":
         if not url:
             url = click.prompt(FeedbackManager.highlight(message="? URL"))
         format = url.split(".")[-1]
@@ -876,10 +895,7 @@ async def datasource_create(
             show_default=False,
         )
 
-    if datasource_type == "Blank":
-        click.echo(FeedbackManager.gray(message="\n» Creating .datasource file..."))
-
-    if datasource_type not in ("Remote URL", "Local file"):
+    if datasource_type not in ("remote_url", "local_file"):
         default_name = f"ds_{generate_short_id()}"
         name = name or click.prompt(
             FeedbackManager.highlight(message=f"? Data source name [{default_name}]"),
@@ -887,13 +903,15 @@ async def datasource_create(
             show_default=False,
         )
 
-    if datasource_type == "Kafka":
+    if datasource_type == "kafka":
         connections = await client.connections("kafka")
         kafka_connection_files = project.get_kafka_connection_files()
 
         # if we have no topics from before and no connections, we need to build the project
         if len(topics) == 0 and len(kafka_connection_files) != len(connections):
-            click.echo(FeedbackManager.error(message="✗ Some Kafka connections are missing."))
+            click.echo(
+                FeedbackManager.error(message=f"✗ Some {datasource_types[datasource_type][0]} connections are missing.")
+            )
             if click.confirm(
                 FeedbackManager.highlight(message="? Do you want to build your project before continue? [Y/n]"),
                 show_default=False,
@@ -934,7 +952,7 @@ KAFKA_TOPIC {topic}
 KAFKA_GROUP_ID {group_id}
 """
 
-    if datasource_type == "S3":
+    if datasource_type == "s3":
         if not connection:
             connections = await client.connections("s3")
             connection = next((c["name"] for c in connections if c["name"] == connection), connection)
@@ -944,7 +962,7 @@ IMPORT_BUCKET_URI "s3://my-bucket/*.csv"
 IMPORT_SCHEDULE "@auto"
 """
 
-    if datasource_type == "GCS":
+    if datasource_type == "gcs":
         if not connection:
             connections = await client.connections("gcs")
             connection = next((c["name"] for c in connections if c["name"] == connection), connection)
@@ -964,6 +982,20 @@ IMPORT_SCHEDULE "@auto"
     ds_file.write_text(ds_content)
     click.echo(FeedbackManager.success(message="✓ .datasource created!"))
 
+    if wizard_mode:
+        last_tip_message = "\nTip: To skip the interactive prompts, pass flags to this command, e.g."
+        last_tip_command = ""
+        if datasource_type == "local_file":
+            last_tip_command = f"`tb datasource create --file {file} --name {name}`."
+        elif datasource_type == "remote_url":
+            last_tip_command = f"`tb datasource create --url {url} --name {name}`."
+        elif datasource_type == "blank":
+            last_tip_command = f"`tb datasource create --blank --name {name}`."
+        elif datasource_type in ("s3", "gcs", "kafka"):
+            last_tip_command = f"`tb datasource create --{datasource_type} --name {name} --connection {connection}`."
+
+        click.echo(FeedbackManager.gray(message=(f"{last_tip_message} {last_tip_command}")))
+
 
 def generate_short_id():
     return str(uuid.uuid4())[:4]

tinybird/tb/modules/feedback_manager.py

@@ -69,6 +69,10 @@ def gray_message(message: str) -> Callable[..., str]:
     return print_message(message, bcolors.CGREY)
 
 
+def bold_message(message: str) -> Callable[..., str]:
+    return print_message(message, bcolors.BOLD)
+
+
 class FeedbackManager:
     error_exception = error_exception("{error}")
     simple_error_exception = simple_error_message("{error}")
@@ -1204,3 +1208,4 @@ STEP 3: ADD KEY TO SERVICE ACCOUNT
     gray = gray_message("{message}")
     warning = warning_message("{message}")
     build_result_error_title = print_message("\033[91m{message}", bcolors.BOLD)
+    bold = bold_message("{message}")

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

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

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

@@ -3,7 +3,7 @@ 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=6lr5EaSUzdh7dqOg2BFba8q8HKy3rfFG5SNw1rnAdtA,38656
+tinybird/prompts.py,sha256=XScvI-IUOJ1gdXBdENUUCu13dHSepSnCliGXlvsKS4Q,38880
 tinybird/sql.py,sha256=BufnOgclQokDyihtuXesOwHBsebN6wRXIxO5wKRkOwE,48299
 tinybird/sql_template.py,sha256=WjsTBjpQLVBHGZbY2dZuhZUurFR-rbJ_KRRy5vx4Y5E,99967
 tinybird/sql_template_fmt.py,sha256=KUHdj5rYCYm_rKKdXYSJAE9vIyXUQLB0YSZnUXHeBlY,10196
@@ -17,7 +17,7 @@ tinybird/datafile/exceptions.py,sha256=8rw2umdZjtby85QbuRKFO5ETz_eRHwUY5l7eHsy1w
 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=Tub058Oz-n2aVt35P5GpJu4UOrSf1cvZsXjKxAWsm10,247
+tinybird/tb/__cli__.py,sha256=WyFlnks0sjbhifmcA4TRyMG2ASeWEJUqQhD97AfFN0g,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
@@ -30,13 +30,13 @@ tinybird/tb/modules/config.py,sha256=VnzYVUo4q1RBEEMMce4_OCrKp4erhgkRPHElydVlKj0
 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=l3Q3QG8R-CXP-gj5rIXI3uD9tPBnQmzdklgkxt_ggNY,22106
-tinybird/tb/modules/datasource.py,sha256=jpe5-C-rZ5Dnitwo_t84OPqS_bV44Sz1y1u85-2djnQ,39362
+tinybird/tb/modules/datasource.py,sha256=4a50A_qwB-3FUEUeB3ps6tUCJvn02rMUUwW-vHaMjTw,40846
 tinybird/tb/modules/deployment.py,sha256=ByXIgEvwxB49pJEKKj0EJIfORWyflCYr04k8961nBkA,28391
 tinybird/tb/modules/deprecations.py,sha256=rrszC1f_JJeJ8mUxGoCxckQTJFBCR8wREf4XXXN-PRc,4507
 tinybird/tb/modules/dev_server.py,sha256=57FCKuWpErwYUYgHspYDkLWEm9F4pbvVOtMrFXX1fVU,10129
 tinybird/tb/modules/endpoint.py,sha256=rC1CZiEZDMb5chByf4xZhv5PsfkoLeIVDScHQ-QcBsE,12072
 tinybird/tb/modules/exceptions.py,sha256=5jK91w1LPmtqIUfDpHe_Op5OxGz8-p1BPgtLREMIni0,5217
-tinybird/tb/modules/feedback_manager.py,sha256=DL_nRFO6akpApNdbGnTmqikEM-gI_eUkyX_nJOGEOo8,77292
+tinybird/tb/modules/feedback_manager.py,sha256=Bw4xudrpVEb5x70JxtsxmvWkQfnWx_eKD2rTAOgjJvs,77433
 tinybird/tb/modules/info.py,sha256=NqSsoyzFqbtUEGH_tSowNOI_jSsNuixibln6-plsfOY,6810
 tinybird/tb/modules/infra.py,sha256=fve30Gj3mG9zbquGxS2e4ipcOYOxviWQCpNFfEzJN_Q,33195
 tinybird/tb/modules/job.py,sha256=AsUCRNzy7HG5oJ4fyk9NpIm5NtNJgBZSy8MtJdXBe5A,3167
@@ -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.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,,
+tinybird-0.0.1.dev222.dist-info/METADATA,sha256=1kqEFMibxdfCNMu3CwE3QqoxtzhctpD7EvnRaC3b-rA,1682
+tinybird-0.0.1.dev222.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+tinybird-0.0.1.dev222.dist-info/entry_points.txt,sha256=LwdHU6TfKx4Qs7BqqtaczEZbImgU7Abe9Lp920zb_fo,43
+tinybird-0.0.1.dev222.dist-info/top_level.txt,sha256=VqqqEmkAy7UNaD8-V51FCoMMWXjLUlR0IstvK7tJYVY,54
+tinybird-0.0.1.dev222.dist-info/RECORD,,