tinybird 0.0.1.dev108__tar.gz → 0.0.1.dev109__tar.gz

{tinybird-0.0.1.dev108 → tinybird-0.0.1.dev109}/PKG-INFO

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

{tinybird-0.0.1.dev108 → tinybird-0.0.1.dev109}/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.dev108'
-__revision__ = '1909c2e'
+__version__ = '0.0.1.dev109'
+__revision__ = '421d6c4'

{tinybird-0.0.1.dev108 → tinybird-0.0.1.dev109}/tinybird/tb/modules/datafile/common.py

@@ -191,6 +191,14 @@ KAFKA_PARAMS = {
 
 REQUIRED_KAFKA_PARAMS = KAFKA_PARAMS
 
+S3_PARAMS = {
+    "import_connection_name",
+    "import_schedule",
+    "import_bucket_uri",
+}
+
+REQUIRED_S3_PARAMS = S3_PARAMS
+
 
 class Datafile:
     def __init__(self) -> None:
@@ -261,6 +269,7 @@ class Datafile:
             #  [x] Engine is present
             #  [x] Token permissions are valid
             #  [x] If it's a kafka datasource, all required kafka params are present
+            #  [x] If it's an S3 datasource, all required S3 params are present
             #  [ ] ...
             if len(self.nodes) > 1:
                 # Our users are not aware of data source data files being a single-node data file, hence this error
@@ -283,6 +292,12 @@ class Datafile:
                 raise DatafileValidationError(
                     f"Some Kafka params have been provided, but the following required ones are missing: {missing}"
                 )
+            # Validate S3 params
+            if any(param in node for param in S3_PARAMS) and not all(param in node for param in REQUIRED_S3_PARAMS):
+                missing = [param for param in S3_PARAMS if param not in node]
+                raise DatafileValidationError(
+                    f"Some S3 params have been provided, but the following required ones are missing: {missing}"
+                )
         else:
             # We cannot validate a datafile whose kind is unknown
             pass

{tinybird-0.0.1.dev108 → tinybird-0.0.1.dev109}/tinybird/tb/modules/login.py

@@ -113,6 +113,9 @@ def start_server(auth_callback, auth_host):
 @coro
 async def login(host: str, auth_host: str, workspace: str):
     """Authenticate using the browser."""
+    host = host.rstrip("/")
+    auth_host = auth_host.rstrip("/")
+
     auth_event = threading.Event()
     auth_code: list[str] = []  # Using a list to store the code, as it's mutable
 
@@ -153,8 +156,8 @@ async def login(host: str, auth_host: str, workspace: str):
         cli_config.set_token(data.get("workspace_token", ""))
         cli_config.set_token_for_host(data.get("workspace_token", ""), host)
         cli_config.set_user_token(data.get("user_token", ""))
-        cli_config.set_host(host or data.get("api_host", ""))
-
+        host = data.get("api_host", host)
+        cli_config.set_host(host)
         ws = await cli_config.get_client(token=data.get("workspace_token", ""), host=host).workspace_info(version="v1")
         for k in ("id", "name", "user_email", "user_id", "scope"):
             if k in ws:

{tinybird-0.0.1.dev108 → tinybird-0.0.1.dev109}/tinybird.egg-info/PKG-INFO

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