tinybird-cli 5.5.1.dev3__tar.gz → 5.5.1.dev5__tar.gz

{tinybird-cli-5.5.1.dev3 → tinybird-cli-5.5.1.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.5.1.dev3
+Version: 5.5.1.dev5
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -18,6 +18,16 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.5.1.dev5
+**********
+
+- `Fixed` region list for AWS and custom regions when usign `tb auth --interactive`
+
+5.5.1.dev4
+**********
+
+- `Added` Add `IMPORT_FROM_TIMESTAMP` to the list of supported directives in the CLI for S3 Data Sources, files added to the S3 bucket before that time will be ignored. [Read our docs for more information.](https://www.tinybird.co/docs/ingest/s3)
+
 5.5.1.dev3
 **********
 

{tinybird-cli-5.5.1.dev3 → tinybird-cli-5.5.1.dev5}/tinybird/__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__ = '5.5.1.dev3'
-__revision__ = '13e87e0'
+__version__ = '5.5.1.dev5'
+__revision__ = '3811426'

{tinybird-cli-5.5.1.dev3 → tinybird-cli-5.5.1.dev5}/tinybird/client.py

@@ -13,7 +13,6 @@ from urllib3 import Retry
 
 from tinybird.ch_utils.constants import COPY_ENABLED_TABLE_FUNCTIONS
 from tinybird.syncasync import sync_to_async
-from tinybird.tb_cli_modules.regions import fill_with_public_regions
 from tinybird.tb_cli_modules.telemetry import add_telemetry_event
 
 HOST = "https://api.tinybird.co"
@@ -1101,8 +1100,7 @@ class TinyB(object):
 
     async def regions(self):
         regions = await self._req("/v0/regions")
-        regions_superset = fill_with_public_regions(regions)
-        return regions_superset
+        return regions
 
     async def datasource_query_copy(self, datasource_name: str, sql_query: str):
         params = {"copy_to": datasource_name}

{tinybird-cli-5.5.1.dev3 → tinybird-cli-5.5.1.dev5}/tinybird/datafile.py

@@ -3,6 +3,7 @@ Datafile is like a Dockerfile but to describe ETL processes
 """
 
 from asyncio import Semaphore, gather
+from datetime import datetime
 
 from requests import Response
 
@@ -148,6 +149,7 @@ class ImportReplacements:
         ("import_connector", "connector", None),
         ("import_external_datasource", "external_data_source", None),
         ("import_bucket_uri", "bucket_uri", None),
+        ("import_from_timestamp", "from_time", None),
         ("import_table_arn", "dynamodb_table_arn", None),
         ("import_export_bucket", "dynamodb_export_bucket", None),
     )
@@ -1145,6 +1147,7 @@ def parse(
         "import_strategy": assign_var("import_strategy"),
         "import_external_datasource": assign_var("import_external_datasource"),
         "import_bucket_uri": assign_var("import_bucket_uri"),
+        "import_from_timestamp": assign_var("import_from_timestamp"),
         "import_query": assign_var("import_query"),
         "import_table_arn": assign_var("import_table_arn"),
         "import_export_bucket": assign_var("import_export_bucket"),
@@ -1349,6 +1352,14 @@ async def process_file(
         if service:
             params["import_service"] = service
 
+        if import_from_timestamp := params.get("import_from_timestamp", None):
+            try:
+                str(datetime.fromisoformat(import_from_timestamp).isoformat())
+            except ValueError:
+                raise click.ClickException(
+                    FeedbackManager.error_invalid_import_from_timestamp(datasource=datasource["name"])
+                )
+
         if service in PREVIEW_CONNECTOR_SERVICES:
             if not params.get("import_bucket_uri", None):
                 raise click.ClickException(FeedbackManager.error_missing_bucket_uri(datasource=datasource["name"]))

{tinybird-cli-5.5.1.dev3 → tinybird-cli-5.5.1.dev5}/tinybird/feedback_manager.py

@@ -299,6 +299,9 @@ class FeedbackManager:
     error_missing_bucket_uri = error_message(
         "Missing IMPORT_BUCKET_URI in '{datasource}'.\n** See https://www.tinybird.co/docs/ingest/s3 to learn more."
     )
+    error_invalid_import_from_timestamp = error_message(
+        "Invalid IMPORT_FROM_TIMESTAMP in '{datasource}'.\n** See https://www.tinybird.co/docs/ingest/s3 to learn more."
+    )
     error_missing_table_arn = error_message(
         "Missing IMPORT_TABLE_ARN in '{datasource}'.\n** See https://www.tinybird.co/docs/ingest/dynamodb to learn more."
     )

{tinybird-cli-5.5.1.dev3 → tinybird-cli-5.5.1.dev5}/tinybird/sql_template.py

@@ -190,11 +190,11 @@ class Comment:
 
 class Placeholder:
     def __init__(self, name=None, line=None):
-        self.name = name if name else "__placeholder__"
+        self.name = name if name else "__no_value__"
         self.line = line or "unknown"
 
     def __str__(self):
-        return "__placeholder__"
+        return "__no_value__"
 
     def __getitem__(self, i):
         if i > 2:
@@ -371,7 +371,7 @@ def array_type(types):  # noqa: C901
                     if _type and _type in types:
                         x = ",".join(map(str, [types[_type](x) for _ in range(2)]))
                     else:
-                        x = ",".join([f"__placeholder__{i}" for i in range(2)])
+                        x = ",".join([f"__no_value__{i}" for i in range(2)])
             elif x is None:
                 x = default
                 if x is None:
@@ -449,7 +449,7 @@ def string_type(x, default=None):
         if default:
             x = default
         else:
-            x = "__placeholder__"
+            x = "__no_value__"
     return x
 
 
@@ -754,7 +754,7 @@ def json_type(x, default=None):
         if default:
             x = default
         else:
-            x = "__placeholder__"
+            x = "__no_value__"
 
     try:
         if x is None:
@@ -1003,7 +1003,7 @@ def get_transform_types(placeholders=None):
         "String": transform_type(
             "String",
             str,
-            placeholder="__placeholder__",
+            placeholder="__no_value__",
             required=None,
             description=None,
             enum=None,
@@ -1212,7 +1212,7 @@ def get_transform_types(placeholders=None):
             "String": transform_type(
                 "String",
                 str,
-                placeholder="__placeholder__",
+                placeholder="__no_value__",
                 required=None,
                 description=None,
                 enum=None,
@@ -1310,7 +1310,7 @@ def expression_wrapper(x, name, escape_arrays: bool = False):
     if type(x) in (unicode_type, bytes, str):
         return "'" + sqlescape_for_string_expression(x) + "'"
     elif isinstance(x, Placeholder):
-        return "'__placeholder__'"
+        return "'__no_value__'"
     elif isinstance(x, Comment):
         return "-- {x} \n"
     if x is None:
@@ -1987,7 +1987,7 @@ def render_sql_template(
     >>> render_sql_template("select * from table where f = {{Float32(foo)}}", test_mode=True)
     ("select * from table where f = toFloat32('0.0')", {}, [])
     >>> render_sql_template("SELECT * FROM query_log__dev where a = {{test}}", test_mode=True)
-    ("SELECT * FROM query_log__dev where a = '__placeholder__'", {}, [])
+    ("SELECT * FROM query_log__dev where a = '__no_value__'", {}, [])
     >>> render_sql_template("SELECT {{test}}", {'token':'testing'})
     Traceback (most recent call last):
     ...
@@ -1997,7 +1997,7 @@ def render_sql_template(
     >>> render_sql_template('{% if Int32(test, 1) %}SELECT 1{% else %} select 2 {% end %}')
     ('SELECT 1', {}, [])
     >>> render_sql_template('{% for v in test %}SELECT {{v}} {% end %}',test_mode=True)
-    ("SELECT '__placeholder__' SELECT '__placeholder__' SELECT '__placeholder__' ", {}, [])
+    ("SELECT '__no_value__' SELECT '__no_value__' SELECT '__no_value__' ", {}, [])
     >>> render_sql_template("select {{Int32(foo, 1)}}", test_mode=True)
     ("select toInt32('1')", {}, [])
     >>> render_sql_template("SELECT count() c FROM test_table where a > {{Float32(myvar)}} {% if defined(my_condition) %} and c = Int32({{my_condition}}){% end %}", {'myvar': 1.0})
@@ -2031,11 +2031,11 @@ def render_sql_template(
     >>> render_sql_template("SELECT {{Array(foo, 'Int32')}}", test_mode=True)
     ('SELECT [0,0]', {}, [])
     >>> render_sql_template("SELECT {{Array(foo)}}", test_mode=True)
-    ("SELECT ['__placeholder__0','__placeholder__1']", {}, [])
+    ("SELECT ['__no_value__0','__no_value__1']", {}, [])
     >>> render_sql_template("{{max_threads(2)}} SELECT 1")
     ('-- max_threads 2\\n SELECT 1', {'max_threads': 2}, [])
     >>> render_sql_template("SELECT {{String(foo)}}", test_mode=True)
-    ("SELECT '__placeholder__'", {}, [])
+    ("SELECT '__no_value__'", {}, [])
     >>> render_sql_template("SELECT {{String(foo, 'test')}}", test_mode=True)
     ("SELECT 'test'", {}, [])
     >>> render_sql_template("SELECT {{String(foo, 'test')}}", {'foo': 'tt'})
@@ -2065,7 +2065,7 @@ def render_sql_template(
     >>> render_sql_template('{% if not defined(test) %}custom_error({error: "This is an error"}){% end %}', {})
     ('custom_error({error: "This is an error"})', {}, [])
     >>> render_sql_template("SELECT {{String(foo + 'abcd')}}", test_mode=True)
-    ("SELECT '__placeholder__'", {}, [])
+    ("SELECT '__no_value__'", {}, [])
     >>> render_sql_template("SELECT {{columns(agg)}}", {})
     Traceback (most recent call last):
     ...
@@ -2131,7 +2131,7 @@ def render_sql_template(
     >>> render_sql_template("% {% for kv in JSON(payload) %} department = {{kv['dp']}} {% end %}", test_mode=True)
     Traceback (most recent call last):
     ...
-    tinybird.sql_template.SQLTemplateException: Template Syntax Error: Error parsing JSON: '__placeholder__' - Expecting value: line 1 column 1 (char 0)
+    tinybird.sql_template.SQLTemplateException: Template Syntax Error: Error parsing JSON: '__no_value__' - Expecting value: line 1 column 1 (char 0)
     >>> render_sql_template("% {% for kv in JSON(payload, '') %} department = {{kv['dp']}} {% end %}")
     Traceback (most recent call last):
     ...

{tinybird-cli-5.5.1.dev3 → tinybird-cli-5.5.1.dev5}/tinybird/tb_cli_modules/common.py

@@ -1765,7 +1765,8 @@ async def get_regions_temp(config: CLIConfig) -> List[Region]:
     regions: List[Region] = []
 
     try:
-        regions = await config.get_client().regions()
+        response = await config.get_client().regions()
+        regions = response.get("regions", [])
     except Exception:
         pass
 
@@ -1782,7 +1783,7 @@ async def get_regions_temp(config: CLIConfig) -> List[Region]:
                 regions.append(
                     {
                         "api_host": format_host(key, subdomain="api"),
-                        "host": format_host(key, subdomain="ui"),
+                        "host": get_display_host(key),
                         "name": key,
                         "default_password": config["tokens"][key],
                         "provider": "",

tinybird-cli-5.5.1.dev5/tinybird/tb_cli_modules/regions.py

@@ -0,0 +1,9 @@
+from typing import Optional, TypedDict
+
+
+class Region(TypedDict):
+    name: str
+    provider: str
+    api_host: str
+    host: str
+    default_password: Optional[str]

{tinybird-cli-5.5.1.dev3 → tinybird-cli-5.5.1.dev5}/tinybird_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tinybird-cli
-Version: 5.5.1.dev3
+Version: 5.5.1.dev5
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/cli/introduction.html
 Author: Tinybird
@@ -18,6 +18,16 @@ The Tinybird command-line tool allows you to use all the Tinybird functionality
 Changelog
 ----------
 
+5.5.1.dev5
+**********
+
+- `Fixed` region list for AWS and custom regions when usign `tb auth --interactive`
+
+5.5.1.dev4
+**********
+
+- `Added` Add `IMPORT_FROM_TIMESTAMP` to the list of supported directives in the CLI for S3 Data Sources, files added to the S3 bucket before that time will be ignored. [Read our docs for more information.](https://www.tinybird.co/docs/ingest/s3)
+
 5.5.1.dev3
 **********
 

tinybird-cli-5.5.1.dev3/tinybird/tb_cli_modules/regions.py

@@ -1,79 +0,0 @@
-from typing import List, Optional, TypedDict
-
-
-class Region(TypedDict):
-    name: str
-    provider: str
-    api_host: str
-    host: str
-    default_password: Optional[str]
-
-
-# Maintain in sync with `production.ts`
-
-regions_list: List[Region] = [
-    {
-        "name": "europe-west3",
-        "provider": "gcp",
-        "api_host": "https://api.tinybird.co",
-        "host": "https://app.tinybird.co/gcp/europe-west3",
-        "default_password": "",
-    },
-    {
-        "name": "us-east4",
-        "provider": "gcp",
-        "api_host": "https://api.us-east.tinybird.co",
-        "host": "https://app.tinybird.co/gcp/us-east4",
-        "default_password": "",
-    },
-    {
-        "name": "us-east-1",
-        "provider": "aws",
-        "api_host": "https://api.us-east.aws.tinybird.co",
-        "host": "https://app.tinybird.co/aws/us-east-1",
-        "default_password": "",
-    },
-    {
-        "name": "us-west-2",
-        "provider": "aws",
-        "api_host": "https://api.us-west-2.aws.tinybird.co",
-        "host": "https://app.tinybird.co/aws/us-west-2",
-        "default_password": "",
-    },
-    {
-        "name": "eu-central-1",
-        "provider": "aws",
-        "api_host": "https://api.eu-central-1.aws.tinybird.co",
-        "host": "https://app.tinybird.co/aws/eu-central-1",
-        "default_password": "",
-    },
-]
-
-
-def regions_has_a_public_region(public_regions: List[Region], initial_regions: List[Region]) -> bool:
-    in_a_public_region = False
-
-    for region in initial_regions:
-        existing_region = next(
-            (
-                public_region
-                for public_region in public_regions
-                if region["api_host"] == public_region["api_host"] or region["host"] == public_region["host"]
-            ),
-            None,
-        )
-        if existing_region:
-            in_a_public_region = True
-            break
-
-    return in_a_public_region
-
-
-def fill_with_public_regions(regions) -> List[Region]:
-    initial_regions = regions.get("regions", [])
-    if regions_has_a_public_region(regions_list, initial_regions):
-        initial_regions += [
-            region for region in regions_list if region["api_host"] not in [r["api_host"] for r in initial_regions]
-        ]
-
-    return initial_regions