feat(0035c): web_search crea Group cuando excede umbral
Cuando un enricher web_search produce >= 50 resultados, los primeros 10
quedan sueltos colgando del source (preview Twitter/Reddit) y los
restantes entran como hijos de un nuevo nodo Group cuadrado.
Cambios:
- enrichers/web_search/run.py:
- DEFAULT_GROUP_THRESHOLD=50, GROUP_PREVIEW_K=10 (constantes globales).
- has_group_id_column(): detecta si el schema soporta agrupacion.
- insert_group_entity(): crea nodo Group con metadata
{enricher, query, count, batch_id}.
- insert_url_entity() acepta batch_id y group_id; los inyecta en
metadata/columna respectivamente. Nodos existentes mantienen su
group_id actual (no se machaca).
- Generacion de batch_id (UUID4 hex) por ejecucion, compartido por
todos los nodos creados (group + sueltos + agrupados).
- Cada hijo del grupo conserva su relacion individual SEARCH_RESULT_OF
al source original — la procedencia es la relacion real, no el
contenedor.
- El JSON de salida añade batch_id, group_id, grouped.
- tests/conftest.py: añade columna entities.group_id al SCHEMA_SQL y
expone group_id en list_entities() para que los tests lo verifiquen.
- tests/test_web_search.py: 3 tests nuevos
- below_threshold_no_group: 5 resultados → 0 Groups, comportamiento clasico.
- above_threshold_creates_group_and_preview: 100 resultados → 1 Group +
10 sueltos + 90 con group_id, todos con SEARCH_RESULT_OF al source.
- batch_id_shared_across_outputs: group + preview + hijos comparten
batch_id.
- _build_lite_html() genera HTML sintetico con N resultados sin
necesidad de fixture estatico grande.
Tests: 35 passed (32 previos + 3 nuevos) en WSL.
24 passed + 11 skipped en Windows.
Refs: issues/0035c-web-search-creates-groups.md
This commit is contained in:
+4
-3
@@ -139,6 +139,7 @@ CREATE TABLE entities (
|
||||
source TEXT NOT NULL,
|
||||
metadata TEXT NOT NULL DEFAULT '{}',
|
||||
notes TEXT NOT NULL DEFAULT '',
|
||||
group_id TEXT,
|
||||
created_at TEXT NOT NULL,
|
||||
updated_at TEXT NOT NULL
|
||||
);
|
||||
@@ -229,11 +230,11 @@ def list_entities(ops_db: Path, type_ref: str | None = None) -> list[dict]:
|
||||
try:
|
||||
if type_ref:
|
||||
cur = conn.execute(
|
||||
"SELECT id, name, type_ref, source, metadata "
|
||||
"SELECT id, name, type_ref, source, metadata, group_id "
|
||||
"FROM entities WHERE type_ref=? ORDER BY id", (type_ref,))
|
||||
else:
|
||||
cur = conn.execute(
|
||||
"SELECT id, name, type_ref, source, metadata "
|
||||
"SELECT id, name, type_ref, source, metadata, group_id "
|
||||
"FROM entities ORDER BY id")
|
||||
rows = cur.fetchall()
|
||||
finally:
|
||||
@@ -245,7 +246,7 @@ def list_entities(ops_db: Path, type_ref: str | None = None) -> list[dict]:
|
||||
except Exception:
|
||||
md = {}
|
||||
out.append({"id": r[0], "name": r[1], "type_ref": r[2],
|
||||
"source": r[3], "metadata": md})
|
||||
"source": r[3], "metadata": md, "group_id": r[5]})
|
||||
return out
|
||||
|
||||
|
||||
|
||||
@@ -95,3 +95,144 @@ def test_web_search_no_query_fails_clean(ops_db, app_dir, registry_root,
|
||||
rc, out, err = run_enricher("web_search", ctx, env=env)
|
||||
assert rc == 2
|
||||
assert "sin query" in err
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# 0035c — agrupacion automatica cuando se excede el threshold
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def _build_lite_html(n: int) -> str:
|
||||
"""Genera un HTML estilo lite.duckduckgo.com con N resultados.
|
||||
|
||||
Estructura minima que `_DDGLiteParser` consume: por cada resultado
|
||||
un anchor con `class='result-link'` y un `<td class='result-snippet'>`
|
||||
con el snippet inmediatamente despues. URLs unicas para evitar la
|
||||
deduplicacion del parser.
|
||||
"""
|
||||
rows = []
|
||||
for i in range(n):
|
||||
url = f"https://example.com/result-{i:03d}"
|
||||
rows.append(
|
||||
f"<a rel='nofollow' href='{url}' class='result-link'>"
|
||||
f"Result {i:03d}</a>"
|
||||
f"<td class='result-snippet'>snippet for result {i:03d}</td>"
|
||||
)
|
||||
return (
|
||||
"<!DOCTYPE html><html><body>"
|
||||
+ "".join(rows)
|
||||
+ "</body></html>"
|
||||
)
|
||||
|
||||
|
||||
def test_web_search_below_threshold_no_group(ops_db, app_dir, registry_root,
|
||||
tmp_path):
|
||||
"""5 resultados < threshold → ningun Group, comportamiento clasico."""
|
||||
make_node(ops_db, node_id="t1", name="tomate",
|
||||
type_ref="text", metadata={})
|
||||
plan = {
|
||||
"match": [
|
||||
{"contains": "duckduckgo.com",
|
||||
"text": _build_lite_html(5),
|
||||
"status": 200},
|
||||
],
|
||||
}
|
||||
env = stub_requests(tmp_path, plan)
|
||||
ctx = base_ctx(ops_db=ops_db, app_dir=app_dir, registry_root=registry_root,
|
||||
node_id="t1", node_name="tomate", node_type="text",
|
||||
params={"limit": 0}) # 0 = sin truncar
|
||||
rc, out, err = run_enricher("web_search", ctx, env=env)
|
||||
assert rc == 0, err
|
||||
assert out["results"] == 5
|
||||
assert out["grouped"] is False
|
||||
assert out["group_id"] == ""
|
||||
|
||||
# Sin Group creado.
|
||||
groups = list_entities(ops_db, type_ref="Group")
|
||||
assert groups == []
|
||||
# 5 Urls sueltos.
|
||||
urls = list_entities(ops_db, type_ref="Url")
|
||||
assert len(urls) == 5
|
||||
assert all(u["group_id"] is None for u in urls)
|
||||
# Todos con la misma batch_id en metadata.
|
||||
batch_ids = {u["metadata"].get("batch_id") for u in urls}
|
||||
assert len(batch_ids) == 1 and "" not in batch_ids
|
||||
|
||||
|
||||
def test_web_search_above_threshold_creates_group_and_preview(
|
||||
ops_db, app_dir, registry_root, tmp_path):
|
||||
"""100 resultados → 1 Group + 10 sueltos + 90 con group_id."""
|
||||
make_node(ops_db, node_id="t1", name="tomate",
|
||||
type_ref="text", metadata={})
|
||||
plan = {
|
||||
"match": [
|
||||
{"contains": "duckduckgo.com",
|
||||
"text": _build_lite_html(100),
|
||||
"status": 200},
|
||||
],
|
||||
}
|
||||
env = stub_requests(tmp_path, plan)
|
||||
ctx = base_ctx(ops_db=ops_db, app_dir=app_dir, registry_root=registry_root,
|
||||
node_id="t1", node_name="tomate", node_type="text",
|
||||
params={"limit": 0})
|
||||
rc, out, err = run_enricher("web_search", ctx, env=env)
|
||||
assert rc == 0, err
|
||||
assert out["results"] == 100
|
||||
assert out["grouped"] is True
|
||||
assert out["group_id"]
|
||||
|
||||
# Exactamente 1 Group.
|
||||
groups = list_entities(ops_db, type_ref="Group")
|
||||
assert len(groups) == 1
|
||||
g = groups[0]
|
||||
assert g["metadata"]["count"] == 100
|
||||
assert g["metadata"]["query"] == "tomate"
|
||||
assert g["metadata"]["enricher"] == "web_search"
|
||||
assert g["metadata"].get("batch_id")
|
||||
|
||||
# 10 Urls sin group_id (preview) + 90 con group_id.
|
||||
urls = list_entities(ops_db, type_ref="Url")
|
||||
assert len(urls) == 100
|
||||
sueltos = [u for u in urls if u["group_id"] is None]
|
||||
children = [u for u in urls if u["group_id"] == g["id"]]
|
||||
assert len(sueltos) == 10
|
||||
assert len(children) == 90
|
||||
|
||||
# Todos los Urls con relacion SEARCH_RESULT_OF al source original.
|
||||
rels = list_relations(ops_db, name="SEARCH_RESULT_OF")
|
||||
# 100 Urls + 1 Group = 101 relaciones al source.
|
||||
from_to_t1 = [r for r in rels if r["to_entity"] == "t1"]
|
||||
assert len(from_to_t1) == 101
|
||||
# Group → t1.
|
||||
assert any(r["from_entity"] == g["id"] for r in from_to_t1)
|
||||
|
||||
|
||||
def test_web_search_batch_id_shared_across_outputs(
|
||||
ops_db, app_dir, registry_root, tmp_path):
|
||||
"""Tras un run con grouping, group + preview + hijos comparten batch_id."""
|
||||
make_node(ops_db, node_id="t1", name="tomate",
|
||||
type_ref="text", metadata={})
|
||||
plan = {
|
||||
"match": [
|
||||
{"contains": "duckduckgo.com",
|
||||
"text": _build_lite_html(100),
|
||||
"status": 200},
|
||||
],
|
||||
}
|
||||
env = stub_requests(tmp_path, plan)
|
||||
ctx = base_ctx(ops_db=ops_db, app_dir=app_dir, registry_root=registry_root,
|
||||
node_id="t1", node_name="tomate", node_type="text",
|
||||
params={"limit": 0})
|
||||
rc, out, err = run_enricher("web_search", ctx, env=env)
|
||||
assert rc == 0, err
|
||||
|
||||
expected_batch = out["batch_id"]
|
||||
assert expected_batch
|
||||
|
||||
groups = list_entities(ops_db, type_ref="Group")
|
||||
urls = list_entities(ops_db, type_ref="Url")
|
||||
all_nodes = groups + urls
|
||||
assert len(all_nodes) == 101 # 1 Group + 100 Urls
|
||||
|
||||
batch_ids = {n["metadata"].get("batch_id") for n in all_nodes}
|
||||
assert batch_ids == {expected_batch}, (
|
||||
f"batch_ids inconsistentes: {batch_ids}")
|
||||
|
||||
Reference in New Issue
Block a user