fixed table setup

Author: daniel-sanche

samples/utils.py

@@ -16,6 +16,7 @@
 
 
 from google.cloud import bigtable
+from google.cloud.bigtable.column_family import ColumnFamily
 from google.api_core import exceptions
 from google.api_core.retry import Retry
 from google.api_core.retry import if_exception_type
@@ -59,12 +60,18 @@ def create_table(project, instance_id, table_id, column_families={}):
     if table.exists():
         table.delete()
 
+    # convert column families to pb if needed
+    pb_families = {
+        id: ColumnFamily(id, table, rule).to_pb() if not isinstance(rule, ColumnFamily) else rule
+        for (id, rule) in column_families.items()
+    }
+
     # create table using gapic layer
     instance._client.table_admin_client.create_table(
         request={
             "parent": instance.name,
             "table_id": table_id,
-            "table": {"column_families": column_families},
+            "table": {"column_families": pb_families},
         }
     )