tinybird 0.0.1.dev321__tar.gz → 0.0.1.dev323__tar.gz

{tinybird-0.0.1.dev321 → tinybird-0.0.1.dev323}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev321
+Version: 0.0.1.dev323
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird

{tinybird-0.0.1.dev321 → tinybird-0.0.1.dev323}/tinybird/service_datasources.py

@@ -536,7 +536,7 @@ def get_tinybird_service_datasources() -> List[Dict[str, Any]]:
             "dateColumn": "run_validation",
             "engine": {
                 "engine": "MergeTree",
-                "sorting_key": "database, host, run_validation",
+                "sorting_key": "database, host, run_validation, query_hash",
                 "partition_key": "toYYYYMM(run_validation)",
             },
             "columns": [
@@ -545,6 +545,7 @@ def get_tinybird_service_datasources() -> List[Dict[str, Any]]:
                 {"name": "stable_version", "type": "LowCardinality(String)"},
                 {"name": "query_hash", "type": "UInt64"},
                 {"name": "query_last_execution", "type": "DateTime"},
+                {"name": "region", "type": "String"},
                 {"name": "workspace", "type": "String"},
                 {"name": "database", "type": "String"},
                 {"name": "pipe_name", "type": "String"},

{tinybird-0.0.1.dev321 → tinybird-0.0.1.dev323}/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.dev321'
-__revision__ = 'ad40437'
+__version__ = '0.0.1.dev323'
+__revision__ = 'a70ee1d'

{tinybird-0.0.1.dev321 → tinybird-0.0.1.dev323}/tinybird/tb/client.py

@@ -300,33 +300,33 @@ class TinyB:
         response = self._req(f"/v0/connectors?{urlencode(params)}")
         return response["connectors"]
 
-    def connections(self, connector: Optional[str] = None):
+    def connections(self, connector: Optional[str] = None, datasources: Optional[List[Dict[str, Any]]] = None):
         response = self._req("/v0/connectors")
         connectors = response["connectors"]
+        connectors_to_return = []
+        for c in connectors:
+            if connector and c["service"] != connector:
+                continue
+            if connector == "gcscheduler":
+                continue
+            if datasources and len(datasources) > 0:
+                datasource_ids = [linker["datasource_id"] for linker in c["linkers"]]
+                datasource_names = [ds["name"] for ds in datasources if ds["id"] in datasource_ids]
+                connected_datasources = ", ".join(datasource_names) if len(datasource_names) > 0 else ""
+            else:
+                connected_datasources = str(len(c["linkers"]))
 
-        if connector:
-            return [
+            connectors_to_return.append(
                 {
                     "id": c["id"],
                     "service": c["service"],
                     "name": c["name"],
-                    "connected_datasources": len(c["linkers"]),
+                    "connected_datasources": connected_datasources,
                     **c["settings"],
                 }
-                for c in connectors
-                if c["service"] == connector
-            ]
-        return [
-            {
-                "id": c["id"],
-                "service": c["service"],
-                "name": c["name"],
-                "connected_datasources": len(c["linkers"]),
-                **c["settings"],
-            }
-            for c in connectors
-            if c["service"] != "gcscheduler"
-        ]
+            )
+
+        return connectors_to_return
 
     def get_datasource(self, ds_name: str, used_by: bool = False) -> Dict[str, Any]:
         params = {

{tinybird-0.0.1.dev321 → tinybird-0.0.1.dev323}/tinybird/tb/modules/connection.py

@@ -121,7 +121,8 @@ def connection_ls(ctx: Context, service: Optional[DataConnectorType] = None) ->
     obj: Dict[str, Any] = ctx.ensure_object(dict)
     client: TinyB = obj["client"]
 
-    connections = client.connections(connector=service)
+    datasources = client.datasources()
+    connections = client.connections(connector=service, datasources=datasources)
     columns = []
     table = []
 

{tinybird-0.0.1.dev321 → tinybird-0.0.1.dev323}/tinybird/tb/modules/dev_server.py

@@ -153,7 +153,10 @@ class DevHandler(http.server.SimpleHTTPRequestHandler):
                 self.wfile.write(
                     json.dumps(
                         {
-                            "files": [f.replace(f"{project.folder}/", "") for f in project_files],
+                            "files": [
+                                {"path": f.replace(f"{project.folder}/", ""), "content": Path(f).read_text()}
+                                for f in project_files
+                            ],
                             "root": project.folder,
                             "workspace_name": project.workspace_name,
                         }

{tinybird-0.0.1.dev321 → tinybird-0.0.1.dev323}/tinybird.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tinybird
-Version: 0.0.1.dev321
+Version: 0.0.1.dev323
 Summary: Tinybird Command Line Tool
 Home-page: https://www.tinybird.co/docs/forward/commands
 Author: Tinybird