Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions core/wren/src/wren/memory/schema_indexer.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,23 @@ def describe_schema(manifest: dict) -> str:
lines.append(f"Catalog: {catalog}, Schema: {schema}")
lines.append("")

for model in manifest.get("models", []):
_describe_model(model, lines)

for rel in manifest.get("relationships", []):
_describe_relationship(rel, lines)

for view in manifest.get("views", []):
_describe_view(view, lines)
models = manifest.get("models", []) or []
if isinstance(models, list):
for model in models:
if isinstance(model, dict) and model.get("name") is not None:
_describe_model(model, lines)

rels = manifest.get("relationships", []) or []
if isinstance(rels, list):
for rel in rels:
if isinstance(rel, dict) and rel.get("name") is not None:
_describe_relationship(rel, lines)

views = manifest.get("views", []) or []
if isinstance(views, list):
for view in views:
if isinstance(view, dict) and view.get("name") is not None:
_describe_view(view, lines)
Comment thread
coderabbitai[bot] marked this conversation as resolved.

cubes = manifest.get("cubes", []) or []
if isinstance(cubes, list):
Expand Down Expand Up @@ -87,11 +96,12 @@ def _describe_model(model: dict, lines: list[str]) -> None:
if data_scope:
lines.append(f" Data scope: {data_scope}")

cols = model.get("columns", [])
if cols:
cols = model.get("columns", []) or []
if isinstance(cols, list) and cols:
lines.append(" Columns:")
for col in cols:
_describe_column(col, lines)
if isinstance(col, dict) and col.get("name") is not None:
_describe_column(col, lines)
lines.append("")


Expand Down
18 changes: 18 additions & 0 deletions core/wren/tests/unit/test_schema_describe_nonduct.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
from wren.memory.schema_indexer import describe_schema


def test_describe_schema_skips_nonduct_entries():
text = describe_schema(
{
"models": [
{"name": "orders", "columns": [{"name": "id", "type": "int"}, "bad"]},
"not-a-model",
None,
],
"relationships": ["x", {"name": "r1", "models": ["a", "b"], "joinType": "MANY_TO_ONE"}],
"views": [None, {"name": "v1", "statement": "SELECT 1"}],
}
)
assert "orders" in text
assert "not-a-model" not in text
assert "v1" in text
Loading