Add schema/table config

Introduce INFLUX_SCHEMA and INFLUX_TABLE and extend connect_influxdb3 to accept schema/table so IOx schema.table naming can be configured. Add quote_table utility to centralize safe quoting of schema/table references and update discovery and fetcher to use it when building FROM clauses. Adjust scanner default table logic to use the new schema/table config while preserving existing quoting behavior for legacy table inputs. Small docstring and import/refactor changes included.

Handle empty INFLUX_TABLE and fallback defaults

Author: haoruizhou

src/slicks/config.py

@@ -12,11 +12,18 @@
 INFLUX_ORG: str = os.getenv("INFLUX_ORG", "Docs") 
 INFLUX_DB: str = os.getenv("INFLUX_DB", "WFR25")
 
+# Schema and Table Configuration (defaulting to iox.INFLUX_DB pattern)
+INFLUX_SCHEMA: str = os.getenv("INFLUX_SCHEMA", "iox")
+# If env var is not set or empty, default to INFLUX_DB
+INFLUX_TABLE: str = os.getenv("INFLUX_TABLE") or INFLUX_DB
+
 def connect_influxdb3(
     url: Optional[str] = None,
     token: Optional[str] = None,
     org: Optional[str] = None,
     db: Optional[str] = None,
+    schema: Optional[str] = None,
+    table: Optional[str] = None,
 ) -> None:
     """
     Update the global configuration settings for InfluxDB connection.
@@ -28,20 +35,34 @@ def connect_influxdb3(
         token: Your InfluxDB API token
         org: Organization name (optional for InfluxDB 3.x)
         db: Database/bucket name (e.g., "WFR25")
+        schema: IOx schema name (default: "iox")
+        table: IOx table name (default: same as db)
     
     Example:
         >>> import slicks
         >>> slicks.connect_influxdb3(
         ...     url="https://us-east-1-1.aws.cloud2.influxdata.com",
         ...     token="your-api-token",
-        ...     db="WFR25"
+        ...     db="WFR25",
+        ...     table="my_custom_table"
         ... )
     """
-    global INFLUX_URL, INFLUX_TOKEN, INFLUX_ORG, INFLUX_DB
+    global INFLUX_URL, INFLUX_TOKEN, INFLUX_ORG, INFLUX_DB, INFLUX_SCHEMA, INFLUX_TABLE
     if url: INFLUX_URL = url
     if token: INFLUX_TOKEN = token
     if org: INFLUX_ORG = org
-    if db: INFLUX_DB = db
+    
+    # If DB is updated, we might need to update the default table name if it wasn't overridden
+    if db: 
+        INFLUX_DB = db
+        # Only update table if it wasn't explicitly set to something else in this call
+        # and if it currently matches the OLD db name or is unset
+        if not table and (not INFLUX_TABLE or INFLUX_TABLE == db):
+            INFLUX_TABLE = db
+
+    if schema: INFLUX_SCHEMA = schema
+    if table: INFLUX_TABLE = table
+
 
 # Default Sensor Registry
 # In an open-source context, this serves as an "Example Configuration"

src/slicks/discovery.py

@@ -15,7 +15,7 @@
 from tqdm.auto import tqdm
 
 from . import config
-from .query_utils import adaptive_query, run_chunks_parallel, PermanentQueryError
+from .query_utils import adaptive_query, run_chunks_parallel, PermanentQueryError, quote_table
 
 
 def discover_sensors(
@@ -52,9 +52,14 @@ def _make_client() -> InfluxDBClient3:
     def _query_distinct(
         client: InfluxDBClient3, t0: datetime, t1: datetime,
     ) -> List[str]:
+        # Ensure safe defaults if config vars are missing or empty
+        schema = config.INFLUX_SCHEMA or "iox"
+        table = config.INFLUX_TABLE or config.INFLUX_DB
+        table_ref = quote_table(schema, table)
+        
         sql = f"""
         SELECT DISTINCT "signalName"
-        FROM "iox"."{config.INFLUX_DB}"
+        FROM {table_ref}
         WHERE time >= '{t0.isoformat()}Z'
         AND time < '{t1.isoformat()}Z'
         """

src/slicks/fetcher.py

@@ -3,8 +3,10 @@
 import pandas as pd
 from influxdb_client_3 import InfluxDBClient3
 from . import config
+from .query_utils import quote_table
 from .movement_detector import filter_data_in_movement
 
+
 def get_influx_client(url=None, token=None, org=None, db=None):
     """
     Returns an InfluxDB Client.
@@ -18,12 +20,14 @@ def get_influx_client(url=None, token=None, org=None, db=None):
         database=db or config.INFLUX_DB
     )
 
+
 def list_target_sensors():
     """
     Returns the list of DEFAULT sensors configured in config.py.
     """
     return config.SIGNALS
 
+
 def fetch_telemetry(start_time, end_time, signals=None, client=None, filter_movement=True, resample="1s"):
     """
     Fetch telemetry data for specified signals within a time range.
@@ -54,12 +58,18 @@ def fetch_telemetry(start_time, end_time, signals=None, client=None, filter_move
 
     # Construct query
     signal_list = "', '".join(signals)
+    
+    # Ensure safe defaults if config vars are missing or empty
+    schema = config.INFLUX_SCHEMA or "iox"
+    table = config.INFLUX_TABLE or config.INFLUX_DB
+    table_ref = quote_table(schema, table)
+    
     query = f"""
     SELECT 
         time, 
         "signalName", 
         "sensorReading" 
-    FROM "iox"."{config.INFLUX_DB}"
+    FROM {table_ref}
     WHERE 
         "signalName" IN ('{signal_list}')
         AND time >= '{start_time.isoformat()}Z'

src/slicks/query_utils.py

@@ -35,6 +35,13 @@
 )
 
 
+def quote_table(schema: str, table: str) -> str:
+    """Quote table name for SQL, handling schema.table format."""
+    # If the table already contains a dot (and isn't just the schema), assume it might differ?
+    # Actually, InfluxDB 3 usually expects "schema"."table"
+    return f'"{schema}"."{table}"'
+
+
 class PermanentQueryError(Exception):
     """An error that will not resolve by splitting the time range."""
 

src/slicks/scanner.py

@@ -366,10 +366,16 @@ def scan_data_availability(
     # Setup timezone
     tz = ZoneInfo(timezone)
 
-    # Default table
-    if table is None:
-        table = f"iox.{config.INFLUX_DB}"
+    # Default table if not provided
+    if not table:
+        schema = config.INFLUX_SCHEMA or "iox"
+        table_name = config.INFLUX_TABLE or config.INFLUX_DB
+        table = f"{schema}.{table_name}"
 
+    # We still use _quote_table here because `table` might be passed in as "schema.table"
+    # or just "table" (legacy). But to be consistent with other modules, we should
+    # probably try to use the configured schema if the passed table doesn't have one?
+    # For now, let's keep the existing logic but respect the global config default above.
     table_ref = _quote_table(table)
 
     # Determine bin settings