tinybird 0.0.1.dev19__py3-none-any.whl → 0.0.1.dev21__py3-none-any.whl

tinybird/tb/modules/common.py

@@ -37,7 +37,6 @@ from packaging.version import Version
 from tinybird.client import (
     AuthException,
     AuthNoTokenException,
-    ConnectorNothingToLoad,
     DoesNotExistException,
     JobException,
     OperationCanNotBePerformed,
@@ -46,8 +45,6 @@ from tinybird.client import (
 from tinybird.config import (
     DEFAULT_API_HOST,
     DEFAULT_UI_HOST,
-    DEPRECATED_PROJECT_PATHS,
-    PROJECT_PATHS,
     SUPPORTED_CONNECTORS,
     VERSION,
     FeatureFlags,
@@ -60,7 +57,6 @@ from tinybird.tb.modules.table import format_table
 if TYPE_CHECKING:
     from tinybird.connectors import Connector
 
-from tinybird.feedback_manager import FeedbackManager, warning_message
 from tinybird.syncasync import async_to_sync, sync_to_async
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.exceptions import (
@@ -70,6 +66,7 @@ from tinybird.tb.modules.exceptions import (
     CLIReleaseException,
     CLIWorkspaceException,
 )
+from tinybird.tb.modules.feedback_manager import FeedbackManager, warning_message
 from tinybird.tb.modules.regions import Region
 from tinybird.tb.modules.telemetry import (
     add_telemetry_event,
@@ -347,29 +344,6 @@ async def _generate_datafile(
     return generate_datafile(datafile, filename, data, force, _format=format)
 
 
-async def folder_init(
-    client: TinyB,
-    folder: str,
-    generate_datasources: Optional[bool] = False,
-    force: Optional[bool] = False,
-    generate_releases: Optional[bool] = False,
-):
-    for x in filter(lambda x: x not in DEPRECATED_PROJECT_PATHS, PROJECT_PATHS):
-        try:
-            f = Path(folder) / x
-            f.mkdir()
-            click.echo(FeedbackManager.info_path_created(path=x))
-        except FileExistsError:
-            if not force:
-                click.echo(FeedbackManager.info_path_already_exists(path=x))
-            pass
-
-    if generate_datasources:
-        for format in SUPPORTED_FORMATS:
-            for path in Path(folder).glob(f"*.{format}"):
-                await _generate_datafile(str(path), client, format=format, force=force)
-
-
 async def configure_connector(connector):
     if connector not in SUPPORTED_CONNECTORS:
         raise CLIException(FeedbackManager.error_invalid_connector(connectors=", ".join(SUPPORTED_CONNECTORS)))
@@ -876,39 +850,18 @@ def get_format_from_filename_or_url(filename_or_url: str) -> str:
 
 
 async def push_data(
-    ctx: Context,
     client: TinyB,
     datasource_name: str,
     url,
-    connector: Optional[str],
-    sql: Optional[str],
     mode: str = "append",
     sql_condition: Optional[str] = None,
     replace_options=None,
-    ignore_empty: bool = False,
     concurrency: int = 1,
     silent: bool = False,
 ):
     if url and type(url) is tuple:
         url = url[0]
 
-    if connector and sql:
-        load_connector_config(ctx, connector, False, check_uninstalled=False)
-        if connector not in ctx.obj:
-            raise CLIException(FeedbackManager.error_connector_not_configured(connector=connector))
-        else:
-            _connector: "Connector" = ctx.obj[connector]
-            if not silent:
-                click.echo(FeedbackManager.info_starting_export_process(connector=connector))
-            try:
-                url = _connector.export_to_gcs(sql, datasource_name, mode)
-            except ConnectorNothingToLoad as e:
-                if ignore_empty:
-                    click.echo(str(e))
-                    return
-                else:
-                    raise e
-
     def cb(res):
         if cb.First:  # type: ignore[attr-defined]
             blocks_to_process = len([x for x in res["block_log"] if x["status"] == "idle"])
@@ -1008,13 +961,6 @@ async def push_data(
 
             click.echo(FeedbackManager.success_progress_blocks())
 
-    finally:
-        try:
-            for url in urls:
-                _connector.clean(urlparse(url).path.split("/")[-1])
-        except Exception:
-            pass
-
 
 async def sync_data(ctx, datasource_name: str, yes: bool):
     client: TinyB = ctx.obj["client"]

tinybird/tb/modules/connection.py

@@ -13,7 +13,6 @@ import click
 from click import Context
 
 from tinybird.client import DoesNotExistException, TinyB
-from tinybird.feedback_manager import FeedbackManager
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import (
     ConnectionReplacements,
@@ -34,6 +33,7 @@ from tinybird.tb.modules.common import (
     validate_string_connector_param,
 )
 from tinybird.tb.modules.exceptions import CLIConnectionException
+from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.telemetry import is_ci_environment
 
 DATA_CONNECTOR_SETTINGS: Dict[DataConnectorType, List[str]] = {

tinybird/tb/modules/create.py

@@ -7,13 +7,13 @@ import click
 import requests
 
 from tinybird.client import TinyB
-from tinybird.feedback_manager import FeedbackManager
 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, coro, generate_datafile
 from tinybird.tb.modules.config import CLIConfig
 from tinybird.tb.modules.datafile.fixture import build_fixture_name, persist_fixture
 from tinybird.tb.modules.exceptions import CLIException
+from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.llm import LLM
 
 
@@ -56,10 +56,13 @@ async def create(
     folder = folder or getcwd()
     try:
         config = CLIConfig.get_project_config(folder)
+        user_token: Optional[str] = None
 
         if prompt:
-            user_token = config.get_user_token()
             try:
+                user_token = config.get_user_token()
+                if not user_token:
+                    raise CLIException("No user token found")
                 await check_user_token(ctx, token=user_token)
             except Exception:
                 click.echo(FeedbackManager.error(message="This action requires authentication. Run 'tb login' first."))
@@ -67,7 +70,7 @@ async def create(
 
         tb_client = config.get_client()
         click.echo(FeedbackManager.gray(message="Creating new project structure..."))
-        await project_create(tb_client, data, prompt, folder)
+        await project_create(tb_client, user_token, data, prompt, folder)
         click.echo(FeedbackManager.success(message="✓ Scaffolding completed!\n"))
 
         click.echo(FeedbackManager.gray(message="\nCreating CI/CD files for GitHub and GitLab..."))
@@ -91,7 +94,9 @@ async def create(
             fixture_content = fetch_gist_content(
                 "https://gist.githubusercontent.com/gnzjgo/8e8f66a39d7576ce3a2529bf773334a8/raw/9cab636767990e97d44a141867e5f226e992de8c/users.ndjson"
             )
-            fixture_name = build_fixture_name(datasource_path.absolute(), ds_name, datasource_path.read_text())
+            fixture_name = build_fixture_name(
+                datasource_path.absolute().as_posix(), ds_name, datasource_path.read_text()
+            )
             persist_fixture(fixture_name, fixture_content)
             click.echo(FeedbackManager.info(message=f"✓ /fixtures/{ds_name}"))
 
@@ -108,7 +113,9 @@ async def create(
             fixture_content = fetch_gist_content(
                 "https://gist.githubusercontent.com/gnzjgo/859ab9439c17e77241d0c14a5a532809/raw/251f2f3f00a968f8759ec4068cebde915256b054/events.ndjson"
             )
-            fixture_name = build_fixture_name(datasource_path.absolute(), ds_name, datasource_path.read_text())
+            fixture_name = build_fixture_name(
+                datasource_path.absolute().as_posix(), ds_name, datasource_path.read_text()
+            )
             persist_fixture(fixture_name, fixture_content)
             click.echo(FeedbackManager.info(message=f"✓ /fixtures/{ds_name}"))
 
@@ -134,14 +141,16 @@ async def create(
             ds_name = os.path.basename(data.split(".")[0])
             data_content = Path(data).read_text()
             datasource_path = Path(folder) / "datasources" / f"{ds_name}.datasource"
-            fixture_name = build_fixture_name(datasource_path.absolute(), ds_name, datasource_path.read_text())
+            fixture_name = build_fixture_name(
+                datasource_path.absolute().as_posix(), ds_name, datasource_path.read_text()
+            )
             click.echo(FeedbackManager.info(message=f"✓ /fixtures/{ds_name}"))
             persist_fixture(fixture_name, data_content)
-        elif prompt:
+        elif prompt and user_token:
             datasource_files = [f for f in os.listdir(Path(folder) / "datasources") if f.endswith(".datasource")]
             for datasource_file in datasource_files:
                 datasource_path = Path(folder) / "datasources" / datasource_file
-                llm = LLM(client=tb_client)
+                llm = LLM(user_token=user_token, client=tb_client)
                 datasource_name = datasource_path.stem
                 datasource_content = datasource_path.read_text()
                 has_json_path = "`json:" in datasource_content
@@ -149,9 +158,12 @@ async def create(
                     sql = await llm.generate_sql_sample_data(schema=datasource_content, rows=rows, prompt=prompt)
                     result = await tb_client.query(f"{sql} FORMAT JSON")
                     data = result.get("data", [])
-                    fixture_name = build_fixture_name(datasource_path.absolute(), datasource_name, datasource_content)
-                    persist_fixture(fixture_name, data)
-                    click.echo(FeedbackManager.info(message=f"✓ /fixtures/{datasource_name}"))
+                    fixture_name = build_fixture_name(
+                        datasource_path.absolute().as_posix(), datasource_name, datasource_content
+                    )
+                    if data:
+                        persist_fixture(fixture_name, data)
+                        click.echo(FeedbackManager.info(message=f"✓ /fixtures/{datasource_name}"))
 
         click.echo(FeedbackManager.success(message="✓ Done!\n"))
     except Exception as e:
@@ -160,6 +172,7 @@ async def create(
 
 async def project_create(
     client: TinyB,
+    user_token: Optional[str],
     data: Optional[str],
     prompt: Optional[str],
     folder: str,
@@ -192,9 +205,9 @@ TYPE ENDPOINT
             """,
             folder,
         )
-    elif prompt:
+    elif prompt and user_token:
         try:
-            llm = LLM(client=client)
+            llm = LLM(user_token=user_token, client=client)
             result = await llm.create_project(prompt)
             for ds in result.datasources:
                 content = ds.content.replace("```", "")