tinybird 0.0.1.dev221__tar.gz → 0.0.1.dev223__tar.gz

{tinybird-0.0.1.dev221 → tinybird-0.0.1.dev223}/PKG-INFO

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

{tinybird-0.0.1.dev221 → tinybird-0.0.1.dev223}/tinybird/ch_utils/constants.py

@@ -254,4 +254,5 @@ VALID_QUERY_FORMATS = (
     "Parquet",
     "JSONStrings",
     "Prometheus",
+    "Native",
 )

{tinybird-0.0.1.dev221 → tinybird-0.0.1.dev223}/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.dev221'
-__revision__ = '8f74332'
+__version__ = '0.0.1.dev223'
+__revision__ = '3fd90ce'

{tinybird-0.0.1.dev221 → tinybird-0.0.1.dev223}/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-0.0.1.dev221 → tinybird-0.0.1.dev223}/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.dev221 → tinybird-0.0.1.dev223}/tinybird/tb/modules/token.py

@@ -165,22 +165,20 @@ def parse_fixed_params(fixed_params_list):
 def create(ctx: Context) -> None:
     """Token creation commands.
 
-    You can create two types of tokens: JWT or Static.
+    You can create two types of tokens: Static or JWT.
+
+    * Static Tokens do not have a TTL and can have any valid scope (ADMIN, TOKENS, or ORG_DATASOURCES:READ).
 
     * JWT tokens have a TTL and can only have the PIPES:READ scope.Their main use case is allow your users to call your endpoints without exposing your API key.
 
-    * Static Tokens do not have a TTL and can have any valid scope (DATASOURCES:READ, DATASOURCES:APPEND, DATASOURCES:CREATE, DATASOURCES:DROP, PIPES:CREATE, PIPES:READ, PIPES:DROP).
 
     Examples:
 
-    tb token create jwt my_jwt_token --ttl 1h --scope PIPES:READ --resource my_pipe
-
-    tb token create static my_static_token --scope PIPES:READ --resource my_pipe
+    tb token create static my_static_token --scope ADMIN
 
-    tb token create static my_static_token --scope DATASOURCES:READ --resource my_datasource
-
-    tb token create static my_static_token --scope DATASOURCES:READ --resource my_datasource --filters "column_name=value"
+    tb token create static my_static_token --scope TOKENS
 
+    tb token create jwt my_jwt_token --ttl 1h --scope PIPES:READ --resource my_pipe
     """
 
 
@@ -248,13 +246,9 @@ async def create_jwt_token(ctx: Context, name: str, ttl: timedelta, scope, resou
 
 # Valid scopes for Static Tokens
 valid_scopes = [
-    "DATASOURCES:READ",
-    "DATASOURCES:APPEND",
-    "DATASOURCES:CREATE",
-    "DATASOURCES:DROP",
-    "PIPES:CREATE",
-    "PIPES:READ",
-    "PIPES:DROP",
+    "ADMIN",
+    "TOKENS",
+    "ORG_DATASOURCES:READ",
 ]
 
 
@@ -271,8 +265,6 @@ class DynamicOptionsCommand(click.Command):
         # Options
         dynamic_options_help += "Options:\n"
         dynamic_options_help += f"  --scope [{','.join(valid_scopes)}]   Scope for the token [Required]\n"
-        dynamic_options_help += "  --resource TEXT    Resource you want to associate the scope with\n"
-        dynamic_options_help += "  --filter TEXT  SQL condition used to filter the values when calling with this token (eg. --filter=value > 0) \n"
         dynamic_options_help += "  -h, --help            Show this message and exit.\n"
 
         return dynamic_options_help

{tinybird-0.0.1.dev221 → tinybird-0.0.1.dev223}/tinybird.egg-info/PKG-INFO

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