tinybird 0.0.1.dev234__py3-none-any.whl → 0.0.1.dev235__py3-none-any.whl

tinybird/tb/config.py

@@ -3,7 +3,6 @@ from os import environ, getcwd
 from pathlib import Path
 from typing import Any, Dict, Optional
 
-import aiofiles
 import click
 
 from tinybird.tb import __cli__
@@ -43,7 +42,7 @@ CLOUD_HOSTS = {
 
 
 def get_config(
-    host: str, token: Optional[str], semver: Optional[str] = None, config_file: Optional[str] = None
+    host: Optional[str], token: Optional[str], semver: Optional[str] = None, config_file: Optional[str] = None
 ) -> Dict[str, Any]:
     if host:
         host = host.rstrip("/")
@@ -72,10 +71,10 @@ def get_config(
     return config
 
 
-async def write_config(config: Dict[str, Any], dest_file: str = ".tinyb"):
+def write_config(config: Dict[str, Any], dest_file: str = ".tinyb") -> None:
     config_file = Path(getcwd()) / dest_file
-    async with aiofiles.open(config_file, "w") as file:
-        await file.write(json.dumps(config, indent=4, sort_keys=True))
+    with open(config_file, "w") as file:
+        file.write(json.dumps(config, indent=4, sort_keys=True))
 
 
 def get_display_cloud_host(api_host: str) -> str:

tinybird/tb/modules/build.py

@@ -1,4 +1,3 @@
-import asyncio
 import json
 import logging
 import threading
@@ -222,19 +221,17 @@ def append_fixture(
     url: str,
 ):
     # Append fixtures only if the datasource is empty
-    data = asyncio.run(tb_client._req(f"/v0/datasources/{datasource_name}"))
+    data = tb_client._req(f"/v0/datasources/{datasource_name}")
     if data.get("statistics", {}).get("row_count", 0) > 0:
         return
 
-    asyncio.run(
-        push_data(
-            tb_client,
-            datasource_name,
-            url,
-            mode="append",
-            concurrency=1,
-            silent=True,
-        )
+    push_data(
+        tb_client,
+        datasource_name,
+        url,
+        mode="append",
+        concurrency=1,
+        silent=True,
     )
 
 
@@ -253,7 +250,7 @@ def rebuild_fixture(project: Project, tb_client: TinyB, fixture: str) -> None:
         ds_path = datasources_path / f"{ds_name}.datasource"
 
         if ds_path.exists():
-            asyncio.run(tb_client.datasource_truncate(ds_name))
+            tb_client.datasource_truncate(ds_name)
             append_fixture(tb_client, ds_name, str(fixture_path))
     except Exception as e:
         click.echo(FeedbackManager.error_exception(error=e))
@@ -271,7 +268,7 @@ def show_data(tb_client: TinyB, filename: str, diff: Optional[str] = None):
 
     sql = f"SELECT * FROM {table_name} FORMAT JSON"
 
-    res = asyncio.run(tb_client.query(sql, pipeline=pipeline))
+    res = tb_client.query(sql, pipeline=pipeline)
     print_table_formatted(res, table_name)
     if Project.get_pipe_type(filename) == "endpoint":
         example_params = {
@@ -280,7 +277,7 @@ def show_data(tb_client: TinyB, filename: str, diff: Optional[str] = None):
             "q": "",
             "token": tb_client.token,
         }
-        endpoint_url = asyncio.run(tb_client._req(f"/examples/query.http?{urlencode(example_params)}"))
+        endpoint_url = tb_client._req(f"/examples/query.http?{urlencode(example_params)}")
         if endpoint_url:
             endpoint_url = endpoint_url.replace("http://localhost:8001", tb_client.host)
             click.echo(FeedbackManager.gray(message="\nTest endpoint at ") + FeedbackManager.info(message=endpoint_url))
@@ -387,7 +384,7 @@ def rebuild_fixture_sql(project: Project, tb_client: TinyB, sql_file: str) -> Pa
     fixture_format = current_fixture_path.suffix.lstrip(".") if current_fixture_path else "ndjson"
     sql = sql_path.read_text()
     sql_format = "CSV" if fixture_format == "csv" else "JSON"
-    result = asyncio.run(tb_client.query(f"{sql} FORMAT {sql_format}"))
+    result = tb_client.query(f"{sql} FORMAT {sql_format}")
     data = result.get("data", [])
     return persist_fixture(datasource_name, data, project.folder, format=fixture_format)
 
@@ -432,26 +429,26 @@ def dev_cloud(
     tb_client: TinyB = config.get_client()
     context.disable_template_security_validation.set(True)
 
-    async def process(filenames: List[str], watch: bool = False):
+    def process(filenames: List[str], watch: bool = False):
         datafiles = [f for f in filenames if f.endswith(".datasource") or f.endswith(".pipe")]
         if len(datafiles) > 0:
             check_filenames(filenames=datafiles)
-            await folder_playground(
+            folder_playground(
                 project, config, tb_client, filenames=datafiles, is_internal=False, current_ws=None, local_ws=None
             )
         if len(filenames) > 0 and watch:
             filename = filenames[0]
-            await build_and_print_resource(config, tb_client, filename)
+            build_and_print_resource(config, tb_client, filename)
 
     datafiles = project.get_project_files()
     filenames = datafiles
 
-    async def build_once(filenames: List[str]):
+    def build_once(filenames: List[str]):
         ok = False
         try:
             click.echo(FeedbackManager.highlight(message="» Building project...\n"))
             time_start = time.time()
-            await process(filenames=filenames, watch=False)
+            process(filenames=filenames, watch=False)
             time_end = time.time()
             elapsed_time = time_end - time_start
 
@@ -469,7 +466,7 @@ def dev_cloud(
             ok = False
         return ok
 
-    build_ok = asyncio.run(build_once(filenames))
+    build_ok = build_once(filenames)
 
     shell = Shell(project=project, tb_client=tb_client, playground=True)
     click.echo(FeedbackManager.gray(message="\nWatching for changes..."))
@@ -480,7 +477,7 @@ def dev_cloud(
     shell.run()
 
 
-async def build_and_print_resource(config: CLIConfig, tb_client: TinyB, filename: str):
+def build_and_print_resource(config: CLIConfig, tb_client: TinyB, filename: str):
     resource_path = Path(filename)
     name = resource_path.stem
     playground_name = name if filename.endswith(".pipe") else None
@@ -488,7 +485,7 @@ async def build_and_print_resource(config: CLIConfig, tb_client: TinyB, filename
     user_client.token = config.get_user_token() or ""
     cli_params = {}
     cli_params["workspace_id"] = config.get("id", None)
-    data = await user_client._req(f"/v0/playgrounds?{urlencode(cli_params)}")
+    data = user_client._req(f"/v0/playgrounds?{urlencode(cli_params)}")
     playgrounds = data["playgrounds"]
     playground = next((p for p in playgrounds if p["name"] == (f"{playground_name}" + "__tb__playground")), None)
     if not playground:
@@ -498,7 +495,7 @@ async def build_and_print_resource(config: CLIConfig, tb_client: TinyB, filename
     if not last_node:
         return
     node_sql = last_node["sql"]
-    res = await tb_client.query(f"{node_sql} FORMAT JSON", playground=playground_id)
+    res = tb_client.query(f"{node_sql} FORMAT JSON", playground=playground_id)
     print_table_formatted(res, name)
 
 

tinybird/tb/modules/cicd.py

@@ -233,7 +233,7 @@ class GitLabCICDGenerator(CICDGeneratorBase):
     ]
 
 
-async def init_cicd(
+def init_cicd(
     path: Optional[str] = None,
     data_project_dir: Optional[str] = None,
 ):
@@ -250,7 +250,7 @@ async def init_cicd(
             click.echo(warning_message)
 
 
-async def check_cicd_exists(path: Optional[str] = None) -> Optional[Provider]:
+def check_cicd_exists(path: Optional[str] = None) -> Optional[Provider]:
     path = path if path else getcwd()
     for provider in Provider:
         generator = CICDGeneratorBase.build_generator(provider.name)

tinybird/tb/modules/cli.py

@@ -12,7 +12,6 @@ from os import environ, getcwd
 from pathlib import Path
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
-import aiofiles
 import click
 import humanfriendly
 from click import Context
@@ -27,7 +26,6 @@ from tinybird.tb.modules.common import (
     CatchAuthExceptions,
     CLIException,
     _get_tb_client,
-    coro,
     echo_json,
     echo_safe_format_table,
     force_echo,
@@ -79,8 +77,7 @@ VERSION = f"{__cli__.__version__} (rev {__cli__.__revision__})"
 @click.option("--max-depth", type=int, default=3, help="Maximum depth of the project files.")
 @click.version_option(version=VERSION)
 @click.pass_context
-@coro
-async def cli(
+def cli(
     ctx: Context,
     debug: bool,
     token: str,
@@ -109,7 +106,7 @@ async def cli(
         click.echo(FeedbackManager.warning_disabled_ssl_checks())
 
     if not environ.get("PYTEST", None) and version_warning and not token:
-        latest_version = await CheckPypi().get_latest_version()
+        latest_version = CheckPypi().get_latest_version()
         if latest_version:
             if "x.y.z" in CURRENT_VERSION:
                 click.echo(FeedbackManager.warning_development_cli())
@@ -136,7 +133,7 @@ async def cli(
     if user_token:
         config_temp.set_user_token(user_token)
     if token or host or user_token:
-        await try_update_config_with_remote(config_temp, auto_persist=False, raise_on_errors=False)
+        try_update_config_with_remote(config_temp, auto_persist=False, raise_on_errors=False)
 
     # Overwrite token and host with env vars manually, without resorting to click.
     #
@@ -150,7 +147,7 @@ async def cli(
     if not user_token and "TB_USER_TOKEN" in os.environ:
         user_token = os.environ.get("TB_USER_TOKEN", "")
 
-    config = await get_config(host, token, user_token=user_token, config_file=config_temp._path)
+    config = get_config(host, token, user_token=user_token, config_file=config_temp._path)
     client = _get_tb_client(config.get("token", None), config["host"])
 
     # Calculate project folder path properly
@@ -169,10 +166,9 @@ async def cli(
     # If they have passed a token or host as parameter and it's different that record in .tinyb, refresh the workspace id
     if token or host:
         try:
-            workspace = await client.workspace_info(version="v1")
+            workspace = client.workspace_info(version="v1")
             config["id"] = workspace.get("id", "")
             config["name"] = workspace.get("name", "")
-        # If we can not get this info, we continue with the id on the file
         except (AuthNoTokenException, AuthException):
             pass
 
@@ -183,7 +179,7 @@ async def cli(
     if "--help" in sys.argv or "-h" in sys.argv:
         return
 
-    client = await create_ctx_client(ctx, config, cloud, staging)
+    client = create_ctx_client(ctx, config, cloud, staging)
 
     if client:
         ctx.ensure_object(dict)["client"] = client
@@ -197,14 +193,13 @@ async def cli(
 @click.option("-f", "--force", is_flag=True, default=False, help="Override existing files")
 @click.option("--fmt", is_flag=True, default=False, help="Format files before saving")
 @click.pass_context
-@coro
-async def pull(ctx: Context, force: bool, fmt: bool) -> None:
+def pull(ctx: Context, force: bool, fmt: bool) -> None:
     """Retrieve latest versions for project files from Tinybird."""
 
     client = ctx.ensure_object(dict)["client"]
     project = ctx.ensure_object(dict)["project"]
 
-    return await folder_pull(client, project.path, force, fmt=fmt)
+    return folder_pull(client, project.path, force, fmt=fmt)
 
 
 @cli.command()
@@ -215,8 +210,7 @@ async def pull(ctx: Context, force: bool, fmt: bool) -> None:
 @click.option("--node", default=None, help="The NODE name")
 @click.option("--stats/--no-stats", default=False, help="Show query stats")
 @click.pass_context
-@coro
-async def sql(
+def sql(
     ctx: Context,
     query: str,
     rows_limit: int,
@@ -244,15 +238,13 @@ async def sql(
                 raise CLIException(FeedbackManager.error_invalid_query())
             if q.startswith("delete"):
                 raise CLIException(FeedbackManager.error_invalid_query())
-            res = await client.query(
-                f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT {req_format}", pipeline=pipeline
-            )
+            res = client.query(f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT {req_format}", pipeline=pipeline)
         elif pipe and node:
             filenames = [pipe]
 
             # build graph to get new versions for all the files involved in the query
             # dependencies need to be processed always to get the versions
-            dependencies_graph = await build_graph(
+            dependencies_graph = build_graph(
                 filenames,
                 client,
                 dir_path=".",
@@ -266,9 +258,7 @@ async def sql(
                     if _node["params"]["name"].lower() == node.lower():
                         query = "".join(_node["sql"])
             pipeline = pipe.split("/")[-1].split(".pipe")[0]
-            res = await client.query(
-                f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT {req_format}", pipeline=pipeline
-            )
+            res = client.query(f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT {req_format}", pipeline=pipeline)
 
     except AuthNoTokenException:
         raise
@@ -280,7 +270,7 @@ async def sql(
 
     if stats:
         stats_query = f"SELECT * FROM ({query}) LIMIT {rows_limit} FORMAT JSON"
-        stats_res = await client.query(stats_query, pipeline=pipeline)
+        stats_res = client.query(stats_query, pipeline=pipeline)
         stats_dict = stats_res["statistics"]
         seconds = stats_dict["elapsed"]
         rows_read = humanfriendly.format_number(stats_dict["rows_read"])
@@ -356,7 +346,7 @@ def __hide_click_output() -> None:
     click.secho = silent_secho  # type: ignore
 
 
-async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, staging: bool):
+def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, staging: bool):
     commands_without_ctx_client = [
         "auth",
         "check",
@@ -404,7 +394,7 @@ async def create_ctx_client(ctx: Context, config: Dict[str, Any], cloud: bool, s
     test = command in command_always_test
     if not local and command not in commands_always_local and command:
         click.echo(FeedbackManager.gray(message="Running against Tinybird Local"))
-    return await get_tinybird_local_client(config, test=test, staging=staging)
+    return get_tinybird_local_client(config, test=test, staging=staging)
 
 
 def get_target_env(cloud: bool) -> str:
@@ -413,7 +403,7 @@ def get_target_env(cloud: bool) -> str:
     return "local"
 
 
-async def get_config(
+def get_config(
     host: str,
     token: Optional[str],
     user_token: Optional[str],
@@ -425,8 +415,8 @@ async def get_config(
 
     config = {}
     try:
-        async with aiofiles.open(config_file or Path(getcwd()) / ".tinyb") as file:
-            res = await file.read()
+        with open(config_file or Path(getcwd()) / ".tinyb") as file:
+            res = file.read()
             config = json.loads(res)
     except OSError:
         pass