laketower 0.6.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

laketower/__about__.py

@@ -1 +1 @@
-__version__ = "0.6.0"
+__version__ = "0.6.2"

laketower/cli.py

@@ -15,6 +15,7 @@ from laketower.tables import (
     ImportFileFormatEnum,
     ImportModeEnum,
     execute_query,
+    extract_query_parameter_names,
     generate_table_query,
     generate_table_statistics_query,
     import_file_to_table,
@@ -180,13 +181,21 @@ def view_table(
 
 
 def query_table(
-    config_path: Path, sql_query: str, output_path: Path | None = None
+    config_path: Path,
+    sql_query: str,
+    sql_params: list[list[str]] = [],
+    output_path: Path | None = None,
 ) -> None:
     out: rich.jupyter.JupyterMixin
     try:
         config = load_yaml_config(config_path)
         tables_dataset = load_datasets(config.tables)
-        results = execute_query(tables_dataset, sql_query)
+        sql_params_dict = {param[0]: param[1] for param in sql_params}
+        query_param_names = extract_query_parameter_names(sql_query)
+        query_params = {
+            name: sql_params_dict.get(name) or "" for name in query_param_names
+        }
+        results = execute_query(tables_dataset, sql_query, sql_params=query_params)
 
         out = rich.table.Table()
         for column in results.columns:
@@ -243,14 +252,23 @@ def list_queries(config_path: Path) -> None:
     console.print(tree)
 
 
-def view_query(config_path: Path, query_name: str) -> None:
+def view_query(
+    config_path: Path, query_name: str, query_params: list[list[str]] = []
+) -> None:
     out: rich.jupyter.JupyterMixin
     try:
         config = load_yaml_config(config_path)
         tables_dataset = load_datasets(config.tables)
         query_config = next(filter(lambda x: x.name == query_name, config.queries))
+        default_parameters = {k: v.default for k, v in query_config.parameters.items()}
         sql_query = query_config.sql
-        results = execute_query(tables_dataset, sql_query)
+        query_params_dict = {param[0]: param[1] for param in query_params}
+        sql_param_names = extract_query_parameter_names(sql_query)
+        sql_params = {
+            name: query_params_dict.get(name) or default_parameters.get(name) or ""
+            for name in sql_param_names
+        }
+        results = execute_query(tables_dataset, sql_query, sql_params=sql_params)
 
         out = rich.table.Table()
         for column in results.columns:
@@ -369,9 +387,17 @@ def cli() -> None:
     parser_tables_query.add_argument(
         "--output", help="Output query results to a file (default format: CSV)"
     )
+    parser_tables_query.add_argument(
+        "--param",
+        "-p",
+        nargs=2,
+        action="append",
+        default=[],
+        help="Inject query named parameters values",
+    )
     parser_tables_query.add_argument("sql", help="SQL query to execute")
     parser_tables_query.set_defaults(
-        func=lambda x: query_table(x.config, x.sql, x.output)
+        func=lambda x: query_table(x.config, x.sql, x.param, x.output)
     )
 
     parser_tables_import = subsparsers_tables.add_parser(
@@ -419,7 +445,17 @@ def cli() -> None:
         "view", help="View a given query"
     )
     parser_queries_view.add_argument("query", help="Name of the query")
-    parser_queries_view.set_defaults(func=lambda x: view_query(x.config, x.query))
+    parser_queries_view.add_argument(
+        "--param",
+        "-p",
+        nargs=2,
+        action="append",
+        default=[],
+        help="Inject query named parameters values",
+    )
+    parser_queries_view.set_defaults(
+        func=lambda x: view_query(x.config, x.query, x.param)
+    )
 
     args = parser.parse_args()
     args.func(args)

laketower/config.py

@@ -96,9 +96,15 @@ class ConfigTable(pydantic.BaseModel):
     connection: ConfigTableConnection | None = None
 
 
+class ConfigQueryParameter(pydantic.BaseModel):
+    default: str
+
+
 class ConfigQuery(pydantic.BaseModel):
     name: str
     title: str
+    description: str | None = None
+    parameters: dict[str, ConfigQueryParameter] = {}
     sql: str