From 99f163d1b4455a89611c230235d84e08f7d10694 Mon Sep 17 00:00:00 2001 From: Herman Schaaf Date: Mon, 14 Aug 2023 11:28:13 +0100 Subject: [PATCH 1/2] Flatten tables in plugin server getTables call --- cloudquery/sdk/internal/servers/plugin_v3/plugin.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cloudquery/sdk/internal/servers/plugin_v3/plugin.py b/cloudquery/sdk/internal/servers/plugin_v3/plugin.py index 419bdd3..2551932 100644 --- a/cloudquery/sdk/internal/servers/plugin_v3/plugin.py +++ b/cloudquery/sdk/internal/servers/plugin_v3/plugin.py @@ -14,6 +14,7 @@ ) from cloudquery.sdk.plugin.plugin import Plugin, SyncOptions, TableOptions from cloudquery.sdk.schema import tables_to_arrow_schemas, Table +from cloudquery.sdk.schema.table import flatten_tables class PluginServicer(plugin_pb2_grpc.PluginServicer): @@ -39,7 +40,8 @@ def GetTables(self, request: plugin_pb2.GetTables.Request, context): skip_dependent_tables=request.skip_dependent_tables, ) ) - schema = tables_to_arrow_schemas(tables) + flattened_tables = flatten_tables(tables) + schema = tables_to_arrow_schemas(flattened_tables) tablesBytes = [] for s in schema: sink = pa.BufferOutputStream() @@ -78,7 +80,7 @@ def Read(self, request, context): raise NotImplementedError() def Write( - self, request_iterator: Generator[plugin_pb2.Write.Request, None, None], context + self, request_iterator: Generator[plugin_pb2.Write.Request, None, None], context ): def msg_iterator() -> Generator[WriteMessage, None, None]: for msg in request_iterator: From bf302849936b09778852b81834872c48c0e0d0b4 Mon Sep 17 00:00:00 2001 From: Herman Schaaf Date: Mon, 14 Aug 2023 11:29:15 +0100 Subject: [PATCH 2/2] Fmt --- cloudquery/sdk/internal/servers/plugin_v3/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudquery/sdk/internal/servers/plugin_v3/plugin.py b/cloudquery/sdk/internal/servers/plugin_v3/plugin.py index 2551932..8bc561f 100644 --- a/cloudquery/sdk/internal/servers/plugin_v3/plugin.py +++ b/cloudquery/sdk/internal/servers/plugin_v3/plugin.py @@ -80,7 +80,7 @@ def Read(self, request, context): raise NotImplementedError() def Write( - self, request_iterator: Generator[plugin_pb2.Write.Request, None, None], context + self, request_iterator: Generator[plugin_pb2.Write.Request, None, None], context ): def msg_iterator() -> Generator[WriteMessage, None, None]: for msg in request_iterator: