fix: get the tenant_id from the host config

Author: joshuanapoli

examples/eav_example.py

@@ -5,74 +5,25 @@
 
 def main() -> None:
     cvec = CVec(
-        host=os.environ.get("CVEC_HOST", "your-subdomain.cvector.dev"),
+        host=os.environ.get(
+            "CVEC_HOST", "https://your-subdomain.cvector.dev"
+        ),  # Replace with your API host
         api_key=os.environ.get("CVEC_API_KEY", "your-api-key"),
     )
 
-    tenant_id = 1  # Replace with your tenant ID
-
-    # Example: List available EAV tables
-    print("\nListing EAV tables...")
-    tables = cvec.get_eav_tables(tenant_id)
-    print(f"Found {len(tables)} tables")
-    for table in tables:
-        print(f"- {table.name} (id: {table.id})")
-
-    if not tables:
-        print("No tables found. Exiting.")
-        return
-
-    # Use the first table for demonstration
-    table_name = tables[0].name
-
-    # Example: List columns for the table
-    print(f"\nListing columns for '{table_name}'...")
-    columns = cvec.get_eav_columns(tables[0].id)
-    print(f"Found {len(columns)} columns")
-    for column in columns:
-        print(f"- {column.name} ({column.type})")
-
-    # Example: Query all rows from the table
-    print(f"\nQuerying '{table_name}' (all columns, no filters)...")
-    rows = cvec.select_from_eav(
-        tenant_id=tenant_id,
-        table_name=table_name,
+    # Example: Query with numeric range filter
+    print("\nQuerying with numeric range filter...")
+    rows = cvec.select_from_eav_id(
+        table_id="00000000-0000-0000-0000-000000000000",
+        column_ids=["abcd", "defg", "hijk"],
+        filters=[
+            EAVFilter(column_id="abcd", numeric_min=45992, numeric_max=45993),
+        ],
     )
-    print(f"Found {len(rows)} rows")
-    for row in rows[:5]:  # Show first 5 rows
+    print(f"Found {len(rows)} rows with abcd in range [45992, 45993)")
+    for row in rows:
         print(f"- {row}")
 
-    # Example: Query with numeric range filter (if there's a numeric column)
-    numeric_columns = [c for c in columns if c.type == "number"]
-    if numeric_columns:
-        col_name = numeric_columns[0].name
-        print(f"\nQuerying with numeric filter on '{col_name}'...")
-        rows = cvec.select_from_eav(
-            tenant_id=tenant_id,
-            table_name=table_name,
-            filters=[
-                EAVFilter(column_name=col_name, numeric_min=0),
-            ],
-        )
-        print(f"Found {len(rows)} rows with {col_name} >= 0")
-
-    # Example: Query with string filter (if there's a string column)
-    string_columns = [c for c in columns if c.type == "string"]
-    if string_columns and rows:
-        col_name = string_columns[0].name
-        # Get a sample value from the first row
-        sample_value = rows[0].get(col_name) if rows else None
-        if sample_value:
-            print(f"\nQuerying with string filter on '{col_name}'...")
-            rows = cvec.select_from_eav(
-                tenant_id=tenant_id,
-                table_name=table_name,
-                filters=[
-                    EAVFilter(column_name=col_name, string_value=str(sample_value)),
-                ],
-            )
-            print(f"Found {len(rows)} rows with {col_name}='{sample_value}'")
-
 
 if __name__ == "__main__":
     main()

examples/show_eav_schema.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python3
+"""Show EAV tables and columns."""
+
+import os
+
+from cvec import CVec
+
+
+def main() -> None:
+    cvec = CVec(
+        host=os.environ.get("CVEC_HOST", ""),
+        api_key=os.environ.get("CVEC_API_KEY", ""),
+    )
+
+    tables = cvec.get_eav_tables()
+    print(f"Found {len(tables)} EAV tables\n")
+
+    for table in tables:
+        print(f"{table.name} (id: {table.id})")
+        columns = cvec.get_eav_columns(table.id)
+        for column in columns:
+            print(f"  - {column.name} ({column.type}, id: {column.eav_column_id})")
+        print()
+
+
+if __name__ == "__main__":
+    main()

src/cvec/cvec.py

@@ -33,6 +33,7 @@ class CVec:
     _refresh_token: Optional[str]
     _publishable_key: Optional[str]
     _api_key: Optional[str]
+    _tenant_id: int
 
     def __init__(
         self,
@@ -64,8 +65,8 @@ def __init__(
                 "CVEC_API_KEY must be set either as an argument or environment variable"
             )
 
-        # Fetch publishable key from host config
-        self._publishable_key = self._fetch_publishable_key()
+        # Fetch config (publishable key and tenant ID)
+        self._publishable_key = self._fetch_config()
 
         # Handle authentication
         email = self._construct_email_from_api_key()
@@ -485,15 +486,17 @@ def _refresh_supabase_token(self) -> None:
         self._access_token = data["access_token"]
         self._refresh_token = data["refresh_token"]
 
-    def _fetch_publishable_key(self) -> str:
+    def _fetch_config(self) -> str:
         """
-        Fetch the publishable key from the host's config endpoint.
+        Fetch configuration from the host's config endpoint.
+
+        Sets the tenant_id on the instance and returns the publishable key.
 
         Returns:
             The publishable key from the config response
 
         Raises:
-            ValueError: If the config endpoint is not accessible or doesn't contain the key
+            ValueError: If the config endpoint is not accessible or doesn't contain required fields
         """
         try:
             config_url = f"{self.host}/config"
@@ -504,10 +507,14 @@ def _fetch_publishable_key(self) -> str:
                 config_data = json.loads(response_data.decode("utf-8"))
 
             publishable_key = config_data.get("supabasePublishableKey")
+            tenant_id = config_data.get("tenantId")
 
             if not publishable_key:
                 raise ValueError(f"Configuration fetched from {config_url} is invalid")
+            if tenant_id is None:
+                raise ValueError(f"tenantId not found in config from {config_url}")
 
+            self._tenant_id = int(tenant_id)
             return str(publishable_key)
 
         except (HTTPError, URLError) as e:
@@ -646,19 +653,16 @@ def make_query_request() -> Any:
                     raise e
             raise
 
-    def get_eav_tables(self, tenant_id: int) -> List[EAVTable]:
+    def get_eav_tables(self) -> List[EAVTable]:
         """
-        Get all EAV tables for a tenant.
-
-        Args:
-            tenant_id: The tenant ID to query tables for
+        Get all EAV tables for the tenant.
 
         Returns:
             List of EAVTable objects
         """
         response_data = self._query_table(
             "eav_tables",
-            {"tenant_id": f"eq.{tenant_id}", "order": "name"},
+            {"tenant_id": f"eq.{self._tenant_id}", "order": "name"},
         )
         return [EAVTable.model_validate(table) for table in response_data]
 
@@ -680,7 +684,6 @@ def get_eav_columns(self, table_id: str) -> List[EAVColumn]:
 
     def select_from_eav_id(
         self,
-        tenant_id: int,
         table_id: str,
         column_ids: Optional[List[str]] = None,
         filters: Optional[List[EAVFilter]] = None,
@@ -692,7 +695,6 @@ def select_from_eav_id(
         interface using names, see select_from_eav().
 
         Args:
-            tenant_id: The tenant ID to query data for
             table_id: The UUID of the EAV table to query
             column_ids: Optional list of column IDs to include in the result.
                        If None, all columns are returned.
@@ -715,7 +717,6 @@ def select_from_eav_id(
             ...     EAVFilter(column_id="z09PL", string_value="ACTIVE"),
             ... ]
             >>> rows = client.select_from_eav_id(
-            ...     tenant_id=1,
             ...     table_id="550e8400-e29b-41d4-a716-446655440000",
             ...     column_ids=["MTnaC", "z09PL", "ZNAGI"],
             ...     filters=filters,
@@ -742,7 +743,7 @@ def select_from_eav_id(
                 filters_json.append(filter_dict)
 
         params: Dict[str, Any] = {
-            "tenant_id": tenant_id,
+            "tenant_id": self._tenant_id,
             "table_id": table_id,
             "column_ids": column_ids,
             "filters": filters_json,
@@ -753,7 +754,6 @@ def select_from_eav_id(
 
     def select_from_eav(
         self,
-        tenant_id: int,
         table_name: str,
         column_names: Optional[List[str]] = None,
         filters: Optional[List[EAVFilter]] = None,
@@ -765,7 +765,6 @@ def select_from_eav(
         select_from_eav_id(). For direct ID access, use select_from_eav_id().
 
         Args:
-            tenant_id: The tenant ID to query data for
             table_name: The name of the EAV table to query
             column_names: Optional list of column names to include in the result.
                          If None, all columns are returned.
@@ -788,7 +787,6 @@ def select_from_eav(
             ...     EAVFilter(column_name="Status", string_value="ACTIVE"),
             ... ]
             >>> rows = client.select_from_eav(
-            ...     tenant_id=1,
             ...     table_name="BT/Scrap Entry",
             ...     column_names=["Weight", "Status", "Is Verified"],
             ...     filters=filters,
@@ -797,10 +795,14 @@ def select_from_eav(
         # Look up the table ID from the table name
         tables_response = self._query_table(
             "eav_tables",
-            {"tenant_id": f"eq.{tenant_id}", "name": f"eq.{table_name}", "limit": "1"},
+            {
+                "tenant_id": f"eq.{self._tenant_id}",
+                "name": f"eq.{table_name}",
+                "limit": "1",
+            },
         )
         if not tables_response:
-            raise ValueError(f"Table '{table_name}' not found for tenant {tenant_id}")
+            raise ValueError(f"Table '{table_name}' not found")
         table_id = tables_response[0]["id"]
 
         # Get all columns for the table to build name <-> id mappings
@@ -846,7 +848,6 @@ def select_from_eav(
 
         # Call the ID-based method
         response_data = self.select_from_eav_id(
-            tenant_id=tenant_id,
             table_id=table_id,
             column_ids=column_ids,
             filters=id_filters,