tinybird 0.0.1.dev46__tar.gz → 0.0.1.dev48__tar.gz

{tinybird-0.0.1.dev46 → tinybird-0.0.1.dev48}/PKG-INFO

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

{tinybird-0.0.1.dev46 → tinybird-0.0.1.dev48}/tinybird/client.py

@@ -697,12 +697,7 @@ class TinyB:
         if local_host != self.host:
             return data
 
-        local_workspaces = [
-            x
-            for x in data["workspaces"]
-            if x["name"].startswith("Tinybird_Local_") and not x["name"].startswith("Tinybird_Local_Build_")
-        ]
-
+        local_workspaces = [x for x in data["workspaces"] if not x["name"].startswith("Tinybird_Local_")]
         return {**data, "workspaces": local_workspaces}
 
     async def user_workspaces_and_branches(self):

{tinybird-0.0.1.dev46 → tinybird-0.0.1.dev48}/tinybird/datafile.py

@@ -1218,6 +1218,8 @@ def parse(
         "kafka_store_raw_value": assign_var("kafka_store_raw_value"),
         "kafka_store_headers": assign_var("kafka_store_headers"),
         "kafka_store_binary_headers": assign_var("kafka_store_binary_headers"),
+        "kafka_key_format": assign_var("kafka_key_format"),
+        "kafka_value_format": assign_var("kafka_value_format"),
         "kafka_key_avro_deserialization": assign_var("kafka_key_avro_deserialization"),
         "kafka_ssl_ca_pem": assign_var("kafka_ssl_ca_pem"),
         "kafka_sasl_mechanism": assign_var("kafka_sasl_mechanism"),

{tinybird-0.0.1.dev46 → tinybird-0.0.1.dev48}/tinybird/prompts.py

@@ -837,7 +837,8 @@ You have commands at your disposal to develop a tinybird project:
 - {base_command} --build endpoint data <pipe_name>: to get the data of an endpoint. You can pass parameters to the endpoint like this: {base_command} --build endpoint data <pipe_name> --param1 value1 --param2 value2
 - {base_command} --build token ls: to list all the tokens
 There are other commands that you can use, but these are the most common ones. Run `{base_command} -h` to see all the commands if needed.
-When you need to check resources or data in the Tinybird environment that you updated with the build command, add always the --build flag before the command. Example: {base_command} --build datasource ls
+When you need to work with resources or data in the Tinybird environment that you updated with the build command, add always the --build flag before the command. Example: {base_command} --build datasource ls
+When you need to work with resources or data in production, add always the --prod flag before the command. Example: {base_command} --prod datasource ls
 </command_calling>
 <development_instructions>
 - When asking to create a tinybird data project, if the needed folders are not already created, use the following structure:
@@ -854,7 +855,12 @@ When you need to check resources or data in the Tinybird environment that you up
 - The format of the generated api endpoint urls is: http://localhost:80/v0/pipe/<pipe_name>.json?token=<token>
 - Before running the tests, remember to have the project built with `{base_command} build` with the latest changes.
 </development_instructions>
-
+When asking for ingesting data, adding data or appending data do the following depending on the environment you want to work with:
+<ingest_data_instructions>
+- When building locally, create a .ndjson file with the data you want to ingest and do `{base_command} build` to ingest the data in the build env.
+- When appending data in production, use `{base_command} --prod datasource append <datasource_name> <file_name>`
+- When you have a response that says “there are rows in quarantine”, do `{base_command} --build|--prod datasource data <datasource_name>_quarantine` to understand what is the problem.
+</ingest_data_instructions>
 <datasource_file_instructions>
 Follow these instructions when creating or updating .datasource files:
 {datasource_instructions}

{tinybird-0.0.1.dev46 → tinybird-0.0.1.dev48}/tinybird/sql.py

@@ -86,7 +86,7 @@ def get_format(sql: str) -> Optional[str]:
     """
     FORMAT_RE = r"\s+format\s+(\w+)\s*$"
     sql = sql.strip()
-    format = re.findall(FORMAT_RE, sql, re.I)
+    format = re.findall(FORMAT_RE, sql, re.IGNORECASE)
     return format[0] if format else None
 
 
@@ -100,7 +100,7 @@ def get_format_group(sql: str) -> str:
     """
     FORMAT_RE = r"\s+format\s+(\w+)\s*$"
     sql = sql.strip()
-    format = re.search(FORMAT_RE, sql, re.I)
+    format = re.search(FORMAT_RE, sql, re.IGNORECASE)
     return format.group() if format else ""
 
 
@@ -135,7 +135,7 @@ def remove_format(sql: str) -> str:
     """
     FORMAT_RE = r"\s+(format)\s+(\w+)\s*$"
     sql = sql.strip()
-    return re.sub(FORMAT_RE, "", sql, flags=re.I)
+    return re.sub(FORMAT_RE, "", sql, flags=re.IGNORECASE)
 
 
 def col_name(name: str, backquotes: bool = True) -> str:

{tinybird-0.0.1.dev46 → tinybird-0.0.1.dev48}/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.dev46'
-__revision__ = '7b9942e'
+__version__ = '0.0.1.dev48'
+__revision__ = '6d638e9'

{tinybird-0.0.1.dev46 → tinybird-0.0.1.dev48}/tinybird/tb/modules/cli.py

@@ -79,7 +79,7 @@ async def cli(
     """
     project = Project(folder=folder or os.getcwd())
     # We need to unpatch for our tests not to break
-    if show_tokens or not prod or ctx.invoked_subcommand == "build":
+    if show_tokens or not prod or ctx.invoked_subcommand == "build" or build:
         __unpatch_click_output()
     else:
         __patch_click_output()
@@ -425,7 +425,7 @@ def __patch_click_output():
             if isinstance(substitution, str):
                 msg = re.sub(pattern, substitution, str(msg))
             else:
-                msg = re.sub(pattern, lambda m: substitution(m.group(0)), str(msg))  # noqa
+                msg = re.sub(pattern, lambda m: substitution(m.group(0)), str(msg))  # noqa: B023
         return msg
 
     def _obfuscate_echo(msg: Any, *args: Any, **kwargs: Any) -> None:

{tinybird-0.0.1.dev46 → tinybird-0.0.1.dev48}/tinybird/tb/modules/datasource.py

@@ -358,3 +358,36 @@ async def datasource_delete_rows(ctx, datasource_name, sql_condition, yes, wait,
             raise CLIDatasourceException(FeedbackManager.error_datasource_does_not_exist(datasource=datasource_name))
         except Exception as e:
             raise CLIDatasourceException(FeedbackManager.error_exception(error=e))
+
+
+@datasource.command(
+    name="data",
+    context_settings=dict(
+        allow_extra_args=True,
+        ignore_unknown_options=True,
+    ),
+)
+@click.argument("datasource")
+@click.option("--limit", type=int, default=5, help="Limit the number of rows to return")
+@click.pass_context
+@coro
+async def datasource_data(ctx: Context, datasource: str, limit: int):
+    """Print data returned by an endpoint
+
+    Syntax: tb datasource data <datasource_name>
+    """
+
+    client: TinyB = ctx.ensure_object(dict)["client"]
+    try:
+        res = await client.query(f"SELECT * FROM {datasource} LIMIT {limit} FORMAT JSON")
+    except AuthNoTokenException:
+        raise
+    except Exception as e:
+        raise CLIDatasourceException(FeedbackManager.error_exception(error=str(e)))
+
+    if not res["data"]:
+        click.echo(FeedbackManager.info_no_rows())
+    else:
+        echo_safe_humanfriendly_tables_format_smart_table(
+            data=[d.values() for d in res["data"]], column_names=res["data"][0].keys()
+        )

{tinybird-0.0.1.dev46 → tinybird-0.0.1.dev48}/tinybird/tb/modules/local_common.py

@@ -40,20 +40,14 @@ async def get_tinybird_local_config(path: str, build: bool = False) -> CLIConfig
     if path:
         folder_hash = hashlib.sha256(path.encode()).hexdigest()
         user_client = config.get_client(host=TB_LOCAL_HOST, token=user_token)
-        ws_name = f"Tinybird_Local_Build_{folder_hash}" if build else f"Tinybird_Local_{folder_hash}"
+        ws_name = config.get("name")
+        ws_name = f"Tinybird_Local_Build_{folder_hash}" if build else ws_name
         logging.debug(f"Workspace used for build: {ws_name}")
 
         user_workspaces = requests.get(f"{TB_LOCAL_HOST}/v0/user/workspaces?token={user_token}").json()
-        local_workspaces = (
-            [ws for ws in user_workspaces["workspaces"] if ws["name"].startswith(ws_name)]
-            if user_workspaces.get("workspaces")
-            else []
-        )
-        local_workspaces = sorted(local_workspaces, key=lambda x: x["name"])
-
-        ws = None
-        if len(local_workspaces) > 0:
-            ws = local_workspaces[-1]
+        local_workspaces = user_workspaces.get("workspaces", [])
+
+        ws = next((ws for ws in local_workspaces if ws["name"] == ws_name), None)
 
         if not ws:
             await user_client.create_workspace(ws_name, template=None)

{tinybird-0.0.1.dev46 → tinybird-0.0.1.dev48}/tinybird/tb/modules/workspace.py

@@ -61,7 +61,7 @@ async def workspace_ls(ctx: Context) -> None:
                 workspace["id"],
                 workspace["role"],
                 _get_workspace_plan_name(workspace["plan"]),
-                current_main_workspace["id"] == workspace["id"],
+                current_main_workspace["name"] == workspace["name"],
             ]
         )
 

{tinybird-0.0.1.dev46 → tinybird-0.0.1.dev48}/tinybird/tb_cli_modules/cli.py

@@ -1231,7 +1231,7 @@ def __patch_click_output():
             if isinstance(substitution, str):
                 msg = re.sub(pattern, substitution, str(msg))
             else:
-                msg = re.sub(pattern, lambda m: substitution(m.group(0)), str(msg))  # noqa
+                msg = re.sub(pattern, lambda m: substitution(m.group(0)), str(msg))  # noqa: B023
         return msg
 
     def _obfuscate_echo(msg: Any, *args: Any, **kwargs: Any) -> None:

{tinybird-0.0.1.dev46 → tinybird-0.0.1.dev48}/tinybird.egg-info/PKG-INFO

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