tinybird 0.0.1.dev102__py3-none-any.whl → 0.0.1.dev103__py3-none-any.whl

tinybird/feedback_manager.py

@@ -651,6 +651,12 @@ Ready? """
     warning_tag_remove = prompt_message(
         "Tag {tag_name} is used by {resources_len} resources. Do you want to remove it?"
     )
+    warning_bigquery_connector_deprecated = warning_message(
+        "🚨🚨🚨 [DEPRECATED] BigQuery connector is deprecated. Use ingestion from GCS instead. https://www.tinybird.co/docs/get-data-in/guides/ingest-from-bigquery-using-google-cloud-storage **"
+    )
+    warning_s3_access_key_secret_deprecated = warning_message(
+        "🚨🚨🚨 [DEPRECATED] S3 (Access Key + Secret) connector is deprecated. Use S3 IAM role instead. https://www.tinybird.co/docs/get-data-in/connectors/s3 **"
+    )
 
     info_fixtures_branch = info_message("** Data Fixtures are only pushed to Branches")
     info_materialize_push_datasource_exists = warning_message("** Data Source {name} already exists")

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.dev102'
-__revision__ = '627c8ef'
+__version__ = '0.0.1.dev103'
+__revision__ = 'e2e3b60'

tinybird/tb/modules/cicd.py

@@ -55,7 +55,7 @@ jobs:
       - name: Test project
         run: tb test run
       - name: Deployment check
-        run: tb --cloud --host ${{! TINYBIRD_HOST }} --token ${{! TINYBIRD_TOKEN }} deploy --check
+        run: tb --cloud --host ${{! env.TINYBIRD_HOST }} --token ${{! env.TINYBIRD_TOKEN }} deploy --check
 """
 
 

tinybird/tb/modules/cli.py

@@ -158,47 +158,6 @@ async def pull(ctx: Context, force: bool, fmt: bool) -> None:
     return await folder_pull(client, project.path, force, fmt=fmt)
 
 
-@cli.command(hidden=True)
-@click.option("--no-deps", is_flag=True, default=False, help="Print only data sources with no pipes using them")
-@click.option("--match", default=None, help="Retrieve any resource matching the pattern")
-@click.option("--pipe", default=None, help="Retrieve any resource used by pipe")
-@click.option("--datasource", default=None, help="Retrieve resources depending on this data source")
-@click.option(
-    "--check-for-partial-replace",
-    is_flag=True,
-    default=False,
-    help="Retrieve dependant data sources that will have their data replaced if a partial replace is executed in the data source selected",
-)
-@click.option("--recursive", is_flag=True, default=False, help="Calculate recursive dependencies")
-@click.pass_context
-@coro
-async def dependencies(
-    ctx: Context,
-    no_deps: bool,
-    match: Optional[str],
-    pipe: Optional[str],
-    datasource: Optional[str],
-    check_for_partial_replace: bool,
-    recursive: bool,
-) -> None:
-    """Print all data sources dependencies."""
-
-    client = ctx.ensure_object(dict)["client"]
-
-    response = await client.datasource_dependencies(
-        no_deps, match, pipe, datasource, check_for_partial_replace, recursive
-    )
-    for ds in response["dependencies"]:
-        click.echo(FeedbackManager.info_dependency_list(dependency=ds))
-        for pipe in response["dependencies"][ds]:
-            click.echo(FeedbackManager.info_dependency_list_item(dependency=pipe))
-    if "incompatible_datasources" in response and len(response["incompatible_datasources"]):
-        click.echo(FeedbackManager.info_no_compatible_dependencies_found())
-        for ds in response["incompatible_datasources"]:
-            click.echo(FeedbackManager.info_dependency_list(dependency=ds))
-        raise CLIException(FeedbackManager.error_partial_replace_cant_be_executed(datasource=datasource))
-
-
 @cli.command(
     name="diff",
     short_help="Diff local datafiles to the corresponding remote files in the workspace. Only diffs VERSION and SCHEMA for .datasource files.",

tinybird/tb/modules/common.py

@@ -1984,12 +1984,12 @@ async def send_batch_events(
     click.echo(FeedbackManager.highlight(message=f"» {rows} rows x {cols} cols in {elapsed_time:.1f}s"))
 
 
-async def get_organizations_by_user(config: CLIConfig, user_token: str) -> List[Dict[str, Any]]:
+async def get_organizations_by_user(config: CLIConfig, user_token: Optional[str] = None) -> List[Dict[str, str]]:
     """Fetches all organizations by user using the provided user token"""
     organizations = []
 
     try:
-        user_client = config.get_client(token=user_token)
+        user_client = config.get_client(token=user_token) if user_token else config.get_user_client()
         user_workspaces = await user_client.user_workspaces_with_organization(version="v1")
         admin_org_id = user_workspaces.get("organization_id")
         seen_org_ids = set()
@@ -2089,7 +2089,7 @@ async def ask_for_organization_name(config: CLIConfig) -> str:
             user_email.split("@")[0] if user_email else None
         )  # Example: "jane.doe@gmail.com" -> "jane.doe"
     return click.prompt(
-        "\nYou need to create an organization to continue. We will include your existing workspaces in it.\nThis operation will only happen once and then your new workspaces will be automatically included in your organization.\n\nEnter organization name",
+        "\nYou need to create an organization to continue.\nEnter organization name",
         hide_input=False,
         show_default=True,
         default=default_organization_name,
@@ -2166,3 +2166,51 @@ def get_ui_url(api_host: str) -> str:
             return f"https://cloud.tinybird.co/{cloud}/{region}"
 
     return api_host
+
+
+async def ask_for_organization(
+    organizations: Optional[List[Dict[str, Any]]],
+    organization_id: Optional[str] = None,
+    user_token: Optional[str] = None,
+) -> Tuple[Optional[str], Optional[str]]:
+    config = CLIConfig.get_project_config()
+    user_email = config.get_user_email()
+
+    if organization_id:
+        if organizations and len(organizations) > 0:
+            organization = next(
+                (org for org in organizations if org.get("id") == organization_id), None
+            )
+        if not organization:
+            raise CLIException(
+                FeedbackManager.error_organization_not_found(
+                    organization_id=organization_id
+                )
+            )
+        organization_name = organization.get("name")
+        return organization_id, organization_name
+
+    if organizations is None or len(organizations) == 0:
+        organization_name = await ask_for_organization_name(config)
+        user_token = await get_user_token(config, user_token)
+        organization = await create_organization_and_add_workspaces(
+            config, organization_name, user_token
+        )
+        organization_id = organization.get("id")
+    else:
+        if len(organizations) == 1:
+            organization_name = organizations[0]["name"]
+            organization_id = organizations[0]["id"]
+        else:
+            sorted_organizations = sort_organizations_by_user(
+                organizations, user_email=user_email
+            )
+            current_organization = await ask_for_organization_interactively(
+                sorted_organizations
+            )
+            if current_organization:
+                organization_id = current_organization.get("id")
+                organization_name = current_organization.get("name")
+            else:
+                return None, None
+    return organization_id, organization_name

tinybird/tb/modules/create.py

@@ -299,9 +299,9 @@ def init_git(folder: str):
         if gitignore_file.exists():
             content = gitignore_file.read_text()
             if ".tinyb" not in content:
-                gitignore_file.write_text(content + "\n.tinyb\n")
+                gitignore_file.write_text(content + "\n.tinyb\n.terraform\n")
         else:
-            gitignore_file.write_text(".tinyb\n")
+            gitignore_file.write_text(".tinyb\n.terraform\n")
 
         click.echo(FeedbackManager.info_file_created(file=".gitignore"))
     except Exception as e:

tinybird/tb/modules/datafile/common.py

@@ -1464,6 +1464,8 @@ def parse(
         "kafka_security_protocol": assign_var("kafka_security_protocol"),
         "kafka_sasl_mechanism": assign_var("kafka_sasl_mechanism"),
         "import_service": assign_var("import_service"),
+        "s3_region": assign_var("s3_region"),
+        "s3_arn": assign_var("s3_arn"),
         "import_connection_name": assign_var("import_connection_name"),
         "import_schedule": assign_var("import_schedule"),
         "import_strategy": assign_var("import_strategy"),