tinybird 0.0.1.dev199__tar.gz → 0.0.1.dev201__tar.gz

{tinybird-0.0.1.dev199 → tinybird-0.0.1.dev201}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev199
+Version: 0.0.1.dev201
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -34,6 +34,7 @@ Requires-Dist: wheel
 Requires-Dist: packaging<24,>=23.1
 Requires-Dist: llm>=0.19
 Requires-Dist: thefuzz==0.22.1
+Requires-Dist: python-dotenv==1.1.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{tinybird-0.0.1.dev199 → tinybird-0.0.1.dev201}/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.dev199'
-__revision__ = '191261b'
+__version__ = '0.0.1.dev201'
+__revision__ = '8d22235'

{tinybird-0.0.1.dev199 → tinybird-0.0.1.dev201}/tinybird/tb/modules/build.py

@@ -25,6 +25,7 @@ from tinybird.tb.modules.datafile.playground import folder_playground
 from tinybird.tb.modules.dev_server import BuildStatus, start_server
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.project import Project
+from tinybird.tb.modules.secret import load_secrets
 from tinybird.tb.modules.shell import Shell, print_table_formatted
 from tinybird.tb.modules.watch import watch_files, watch_project
 
@@ -47,6 +48,7 @@ def build(ctx: click.Context, watch: bool) -> None:
             )
         )
 
+    load_secrets(project, tb_client)
     click.echo(FeedbackManager.highlight_building_project())
     process(project=project, tb_client=tb_client, watch=False)
     if watch:
@@ -74,6 +76,8 @@ def dev(ctx: click.Context, data_origin: str, ui: bool) -> None:
         server_thread.start()
         # Wait for the server to start
         time.sleep(0.5)
+
+    load_secrets(project, tb_client)
     click.echo(FeedbackManager.highlight_building_project())
     process(project=project, tb_client=tb_client, watch=True, build_status=build_status)
     run_watch(
@@ -302,8 +306,19 @@ def process(
             build_status.building = True
     if file_changed and (file_changed.endswith(FixtureExtension.NDJSON) or file_changed.endswith(FixtureExtension.CSV)):
         rebuild_fixture(project, tb_client, file_changed)
+        if build_status:
+            build_status.building = False
+            build_status.error = None
     elif file_changed and file_changed.endswith(".sql"):
         rebuild_fixture_sql(project, tb_client, file_changed)
+        if build_status:
+            build_status.building = False
+            build_status.error = None
+    elif file_changed and (file_changed.endswith(".env.local") or file_changed.endswith(".env")):
+        load_secrets(project, tb_client)
+        if build_status:
+            build_status.building = False
+            build_status.error = None
     else:
         try:
             build_result = build_project(project, tb_client, silent)

{tinybird-0.0.1.dev199 → tinybird-0.0.1.dev201}/tinybird/tb/modules/connection.py

@@ -38,6 +38,7 @@ from tinybird.tb.modules.create import (
 from tinybird.tb.modules.exceptions import CLIConnectionException
 from tinybird.tb.modules.feedback_manager import FeedbackManager
 from tinybird.tb.modules.project import Project
+from tinybird.tb.modules.secret import save_secret_to_env_file
 
 DATA_CONNECTOR_SETTINGS: Dict[DataConnectorType, List[str]] = {
     DataConnectorType.KAFKA: [
@@ -356,7 +357,6 @@ async def connection_create_kafka(
     security_protocol="SASL_SSL",
     skip_secrets=False,
 ) -> Tuple[str, str, str, str, str, str, str, str, List[str]]:
-    client: TinyB = ctx.ensure_object(dict)["client"]
     obj: Dict[str, Any] = ctx.ensure_object(dict)
     click.echo(FeedbackManager.gray(message="\n» Creating Kafka connection..."))
     project: Project = ctx.ensure_object(dict)["project"]
@@ -374,7 +374,7 @@ async def connection_create_kafka(
 
     validate_kafka_bootstrap_servers(bootstrap_servers)
     secret_required = not skip_secrets and click.confirm(
-        FeedbackManager.highlight(message="  ? Do you want to store the bootstrap server in a Tinybird Secret? [Y/n]"),
+        FeedbackManager.highlight(message="  ? Do you want to store the bootstrap server in a .env.local file? [Y/n]"),
         default=True,
         show_default=False,
     )
@@ -385,7 +385,7 @@ async def connection_create_kafka(
     if secret_required:
         tb_secret_bootstrap_servers = str(click.prompt(FeedbackManager.highlight(message="    ? Secret name")))
         try:
-            await client.create_secret(name=tb_secret_bootstrap_servers, value=bootstrap_servers)
+            save_secret_to_env_file(project=project, name=tb_secret_bootstrap_servers, value=bootstrap_servers)
         except Exception as e:
             raise CLIConnectionException(FeedbackManager.error(message=str(e)))
 
@@ -395,7 +395,7 @@ async def connection_create_kafka(
     validate_kafka_key(key)
 
     secret_required = not skip_secrets and click.confirm(
-        FeedbackManager.highlight(message="  ? Do you want to store the Kafka key in a Tinybird Secret? [Y/n]"),
+        FeedbackManager.highlight(message="  ? Do you want to store the Kafka key in a .env.local file? [Y/n]"),
         default=True,
         show_default=False,
     )
@@ -403,7 +403,7 @@ async def connection_create_kafka(
     if secret_required:
         tb_secret_key = str(click.prompt(FeedbackManager.highlight(message="    ? Secret name")))
         try:
-            await client.create_secret(name=tb_secret_key, value=key)
+            save_secret_to_env_file(project=project, name=tb_secret_key, value=key)
         except Exception as e:
             raise CLIConnectionException(FeedbackManager.error(message=str(e)))
 
@@ -413,7 +413,7 @@ async def connection_create_kafka(
     validate_kafka_secret(secret)
 
     secret_required = not skip_secrets and click.confirm(
-        FeedbackManager.highlight(message="  ? Do you want to store the Kafka secret in a Tinybird Secret? [Y/n]"),
+        FeedbackManager.highlight(message="  ? Do you want to store the Kafka secret in a .env.local file? [Y/n]"),
         default=True,
         show_default=False,
     )
@@ -421,7 +421,7 @@ async def connection_create_kafka(
     if secret_required:
         tb_secret_secret = str(click.prompt(FeedbackManager.highlight(message="    ? Secret name")))
         try:
-            await client.create_secret(name=tb_secret_secret, value=secret)
+            save_secret_to_env_file(project=project, name=tb_secret_secret, value=secret)
         except Exception as e:
             raise CLIConnectionException(FeedbackManager.error(message=str(e)))
 

{tinybird-0.0.1.dev199 → tinybird-0.0.1.dev201}/tinybird/tb/modules/create.py

@@ -124,6 +124,12 @@ async def create(
         if data or prompt:
             click.echo(FeedbackManager.success(message="✓ Resources created!\n"))
 
+        if not already_has_env_file(root_folder):
+            click.echo(FeedbackManager.highlight(message="\n» Creating .env.local file..."))
+            create_env_file(root_folder)
+            click.echo(FeedbackManager.success(message="✓ Done!\n"))
+            created_something = True
+
         if not already_has_cicd(root_folder):
             click.echo(FeedbackManager.highlight(message="\n» Creating CI/CD files for GitHub and GitLab..."))
             init_git(root_folder)
@@ -230,6 +236,11 @@ def already_has_cursor_rules(folder: str) -> bool:
     return any((Path(folder) / path).exists() for path in cursor_rules_paths)
 
 
+def already_has_env_file(folder: str) -> bool:
+    env_file_pattern = ".env.*"
+    return any((Path(folder) / path).exists() for path in glob.glob(env_file_pattern))
+
+
 def create_project_structure(folder: str):
     folder_path = Path(folder)
     PROJECT_PATHS_DESCRIPTIONS = {
@@ -433,6 +444,11 @@ GCS_SERVICE_ACCOUNT_CREDENTIALS_JSON {{{{ tb_secret("{svc_account_creds}") }}}}
     return file_path
 
 
+def create_env_file(folder: str):
+    env_file = Path(folder) / ".env.local"
+    env_file.write_text("")
+
+
 def create_rules(folder: str, source: str, agent: str):
     if agent == "cursor":
         extension = ".cursorrules"

{tinybird-0.0.1.dev199 → tinybird-0.0.1.dev201}/tinybird/tb/modules/secret.py

@@ -1,12 +1,15 @@
 import re
-from typing import Optional
+from typing import Dict, Optional
 
 import click
+from dotenv import dotenv_values, set_key
 
+from tinybird.syncasync import async_to_sync
 from tinybird.tb.client import TinyB
 from tinybird.tb.modules.cli import cli
 from tinybird.tb.modules.common import coro, echo_safe_humanfriendly_tables_format_smart_table
 from tinybird.tb.modules.feedback_manager import FeedbackManager
+from tinybird.tb.modules.project import Project
 
 
 @cli.group()
@@ -86,3 +89,60 @@ async def secret_rm(ctx: click.Context, name: str):
         click.echo(FeedbackManager.success(message=f"\n✓ Secret '{name}' deleted"))
     except Exception as e:
         click.echo(FeedbackManager.error(message=f"✗ Error: {e}"))
+
+
+def load_secrets(project: Project, client: TinyB):
+    try:
+        env_vars: Dict[str, str] = {}
+
+        # Load secrets from .env file
+        env_file = ".env"
+        env_path = project.path / env_file
+
+        if env_path.exists():
+            env_values = dotenv_values(env_path)
+            if env_values:
+                env_vars.update({k: v for k, v in env_values.items() if v is not None})
+
+        # Load secrets from .env.local file
+        env_file = ".env.local"
+        env_path = project.path / env_file
+
+        if env_path.exists():
+            env_values = dotenv_values(env_path)
+            if env_values:
+                env_vars.update({k: v for k, v in env_values.items() if v is not None})
+
+        if len(env_vars.keys()) == 0:
+            return
+
+        click.echo(FeedbackManager.highlight(message="\n» Loading secrets from .env files..."))
+
+        for name, value in env_vars.items():
+            if not value:
+                continue
+
+            try:
+                existing_secret = async_to_sync(client.get_secret)(name)
+            except Exception:
+                existing_secret = None
+            try:
+                if existing_secret:
+                    async_to_sync(client.update_secret)(name, value)
+                else:
+                    async_to_sync(client.create_secret)(name, value)
+            except Exception as e:
+                click.echo(FeedbackManager.error(message=f"✗ Error setting secret '{name}': {e}"))
+
+        click.echo(FeedbackManager.success(message="✓ Secrets loaded!"))
+    except Exception as e:
+        click.echo(FeedbackManager.error(message=f"✗ Error: {e}"))
+
+
+def save_secret_to_env_file(project: Project, name: str, value: str):
+    env_path = project.path / ".env.local"
+
+    if not env_path.exists():
+        env_path.touch()
+
+    set_key(env_path, key_to_set=name, value_to_set=value)

{tinybird-0.0.1.dev199 → tinybird-0.0.1.dev201}/tinybird/tb/modules/test.py

@@ -27,6 +27,7 @@ from tinybird.tb.modules.llm import LLM
 from tinybird.tb.modules.llm_utils import extract_xml, parse_xml
 from tinybird.tb.modules.local_common import get_local_tokens, get_test_workspace_name
 from tinybird.tb.modules.project import Project
+from tinybird.tb.modules.secret import load_secrets
 
 yaml.SafeDumper.org_represent_str = yaml.SafeDumper.represent_str  # type: ignore[attr-defined]
 
@@ -78,6 +79,7 @@ def test_create(ctx: click.Context, name_or_filename: str, prompt: str) -> None:
     try:
         project: Project = ctx.ensure_object(dict)["project"]
         client: TinyB = ctx.ensure_object(dict)["client"]
+        load_secrets(project=project, client=client)
         click.echo(FeedbackManager.highlight(message="\n» Building project"))
         build_project(project=project, tb_client=client, watch=False, silent=True)
         click.echo(FeedbackManager.info(message="✓ Done!\n"))
@@ -156,6 +158,7 @@ def test_update(ctx: click.Context, pipe: str) -> None:
         client: TinyB = ctx.ensure_object(dict)["client"]
         project: Project = ctx.ensure_object(dict)["project"]
         folder = project.folder
+        load_secrets(project=project, client=client)
         click.echo(FeedbackManager.highlight(message="\n» Building project"))
         build_project(project=project, tb_client=client, watch=False, silent=True)
         click.echo(FeedbackManager.info(message="✓ Done!"))
@@ -208,6 +211,7 @@ def run_tests(ctx: click.Context, name: Tuple[str, ...]) -> None:
     try:
         client: TinyB = ctx.ensure_object(dict)["client"]
         project: Project = ctx.ensure_object(dict)["project"]
+        load_secrets(project=project, client=client)
         click.echo(FeedbackManager.highlight(message="\n» Building project"))
         build_project(project=project, tb_client=client, watch=False, silent=True)
         click.echo(FeedbackManager.info(message="✓ Done!"))

{tinybird-0.0.1.dev199 → tinybird-0.0.1.dev201}/tinybird/tb/modules/watch.py

@@ -23,7 +23,16 @@ from tinybird.tb.modules.shell import Shell
 
 
 class WatchProjectHandler(PatternMatchingEventHandler):
-    valid_extensions = [".datasource", ".pipe", "connection", FixtureExtension.CSV, FixtureExtension.NDJSON, ".sql"]
+    valid_extensions = [
+        ".datasource",
+        ".pipe",
+        "connection",
+        FixtureExtension.CSV,
+        FixtureExtension.NDJSON,
+        ".sql",
+        ".env",
+        ".env.local",
+    ]
 
     def __init__(self, shell: Shell, project: Project, process: Callable):
         self.shell = shell

{tinybird-0.0.1.dev199 → tinybird-0.0.1.dev201}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev199
+Version: 0.0.1.dev201
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird
@@ -34,6 +34,7 @@ Requires-Dist: wheel
 Requires-Dist: packaging<24,>=23.1
 Requires-Dist: llm>=0.19
 Requires-Dist: thefuzz==0.22.1
+Requires-Dist: python-dotenv==1.1.0
 Dynamic: author
 Dynamic: author-email
 Dynamic: description

{tinybird-0.0.1.dev199 → tinybird-0.0.1.dev201}/tinybird.egg-info/requires.txt

@@ -25,3 +25,4 @@ wheel
 packaging<24,>=23.1
 llm>=0.19
 thefuzz==0.22.1
+python-dotenv==1.1.0