Ports the leaf data-layer modules and validates them: - mschema/ (models, eligibility, merge, render), db/ (connection, sampling, introspect, fetch_ca), rest/client.py -- renamed psdwp3->nsp, verbatim. - L0 (testcontainers, real Postgres): db connection read-only enforcement (psd_ro cannot CREATE/INSERT), introspect against a known schema (tables, columns, types, comments, FKs, enum, composite PK), sampling most-frequent values + truncation reporting. 15 tests, ~4s. - L1 (fake data): rest/client RPC contract (mocked transport -- X-API-Key header, payloads, base_url slash handling, HTTP/network error surfacing), mschema/render 3 formats (markdown, mschema-text, schema-dict) + eligibility rules (wide_text excluded, short_text/numeric/enum/temporal/ boolean eligible, annotation override wins). 25 tests. pyproject registers l0/l2 markers + addopts '-m not l2' (L2 opt-in). Deferred to their dependency-porting tasks: test_rrf.py (search needs vectorstore, B3) and the 11 CLI contract tests (need _guards/session, wired when each command lands). 'Not assumed reliable' now has real teeth for the data layer; CLI/search contracts follow.
161 lines
6.6 KiB
Python
161 lines
6.6 KiB
Python
import logging
|
|
from dataclasses import dataclass
|
|
|
|
from sqlalchemy import Engine, text
|
|
|
|
from nsp.config import ExamplesConfig, LshConfig
|
|
from nsp.mschema.models import Annotations, PhysicalSchema
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
TEXT_TYPE_PREFIXES = ("text", "varchar", "character", "char")
|
|
|
|
|
|
def is_text_type(pg_type: str) -> bool:
|
|
return pg_type.lower().startswith(TEXT_TYPE_PREFIXES)
|
|
|
|
|
|
def add_examples(engine: Engine, physical: PhysicalSchema, cfg: ExamplesConfig) -> None:
|
|
"""Campiona i valori distinti piu' frequenti delle colonne testuali (in-place)."""
|
|
schema = physical.db_schema
|
|
with engine.connect() as conn:
|
|
for table_name, table in physical.tables.items():
|
|
for column_name, column in table.columns.items():
|
|
if not is_text_type(column.type):
|
|
continue
|
|
q = text(f'''
|
|
SELECT "{column_name}" FROM (
|
|
SELECT "{column_name}", count(*) AS _freq
|
|
FROM "{schema}"."{table_name}"
|
|
WHERE "{column_name}" IS NOT NULL AND length("{column_name}") > 0
|
|
GROUP BY "{column_name}"
|
|
ORDER BY _freq DESC
|
|
LIMIT :lim
|
|
) AS sub
|
|
''')
|
|
try:
|
|
rows = conn.execute(q, {"lim": cfg.max_per_column}).fetchall()
|
|
except Exception as e: # colonna non leggibile: si salta, non si interrompe
|
|
logger.warning("Campionamento saltato per %s.%s: %s", table_name, column_name, e)
|
|
continue
|
|
column.examples = [str(r[0]) for r in rows]
|
|
|
|
|
|
def add_examples_rest(client, physical: PhysicalSchema, cfg: ExamplesConfig) -> None:
|
|
"""Variante REST di add_examples: valori più frequenti via rpc `top_values`."""
|
|
schema = physical.db_schema
|
|
for table_name, table in physical.tables.items():
|
|
for column_name, column in table.columns.items():
|
|
if not is_text_type(column.type):
|
|
continue
|
|
rows = client.top_values(schema, table_name, column_name, cfg.max_per_column)
|
|
column.examples = [str(r["value"]) for r in rows if r["value"] not in (None, "")]
|
|
|
|
|
|
@dataclass
|
|
class SkippedColumn:
|
|
table: str
|
|
column: str
|
|
reason: str
|
|
|
|
|
|
@dataclass
|
|
class TruncatedColumn:
|
|
table: str
|
|
column: str
|
|
indexed: int # quanti valori (i più frequenti) sono stati indicizzati
|
|
|
|
|
|
def unique_values_for_lsh(
|
|
engine: Engine,
|
|
physical: PhysicalSchema,
|
|
cfg: LshConfig,
|
|
annotations: Annotations | None = None,
|
|
) -> tuple[dict[str, dict[str, list[str]]], list[SkippedColumn], list[TruncatedColumn]]:
|
|
"""Valori delle colonne testuali *eligible* per l'indice LSH.
|
|
|
|
Indicizza solo colonne con eligibilità effettiva True (le `wide_text` sono escluse:
|
|
vedi principio di column eligibility). Estrae i valori distinti *più frequenti*
|
|
(ORDER BY frequenza); se superano `max_values_per_column` la colonna è troncata e
|
|
segnalata (mai tagliata in silenzio).
|
|
"""
|
|
from nsp.mschema.eligibility import effective_eligibility
|
|
|
|
annotations = annotations or Annotations()
|
|
schema = physical.db_schema
|
|
values: dict[str, dict[str, list[str]]] = {}
|
|
skipped: list[SkippedColumn] = []
|
|
truncated: list[TruncatedColumn] = []
|
|
with engine.connect() as conn:
|
|
for table_name, table in physical.tables.items():
|
|
table_ann = annotations.tables.get(table_name)
|
|
for column_name, column in table.columns.items():
|
|
if not is_text_type(column.type):
|
|
continue
|
|
ann_col = table_ann.columns.get(column_name) if table_ann else None
|
|
if not effective_eligibility(column, ann_col)[0]:
|
|
continue
|
|
q = text(f'''
|
|
SELECT "{column_name}" FROM (
|
|
SELECT "{column_name}", count(*) AS _freq
|
|
FROM "{schema}"."{table_name}"
|
|
WHERE "{column_name}" IS NOT NULL AND length("{column_name}") > 0
|
|
GROUP BY "{column_name}"
|
|
ORDER BY _freq DESC, "{column_name}"
|
|
LIMIT :lim
|
|
) AS sub
|
|
''')
|
|
try:
|
|
rows = conn.execute(q, {"lim": cfg.max_values_per_column}).fetchall()
|
|
except Exception as e:
|
|
skipped.append(SkippedColumn(table_name, column_name, f"errore: {e}"))
|
|
continue
|
|
vals = [str(r[0]) for r in rows]
|
|
if not vals:
|
|
continue
|
|
values.setdefault(table_name, {})[column_name] = vals
|
|
if len(vals) >= cfg.max_values_per_column:
|
|
truncated.append(TruncatedColumn(table_name, column_name, len(vals)))
|
|
return values, skipped, truncated
|
|
|
|
|
|
def unique_values_for_lsh_rest(
|
|
client,
|
|
physical: PhysicalSchema,
|
|
cfg: LshConfig,
|
|
annotations: Annotations | None = None,
|
|
) -> tuple[dict[str, dict[str, list[str]]], list[SkippedColumn], list[TruncatedColumn]]:
|
|
"""Variante REST di unique_values_for_lsh: valori più frequenti via rpc `top_values`.
|
|
|
|
Stessa logica di eligibility e di segnalazione del troncamento del transport diretto.
|
|
"""
|
|
from nsp.mschema.eligibility import effective_eligibility
|
|
|
|
annotations = annotations or Annotations()
|
|
schema = physical.db_schema
|
|
values: dict[str, dict[str, list[str]]] = {}
|
|
skipped: list[SkippedColumn] = []
|
|
truncated: list[TruncatedColumn] = []
|
|
for table_name, table in physical.tables.items():
|
|
table_ann = annotations.tables.get(table_name)
|
|
for column_name, column in table.columns.items():
|
|
if not is_text_type(column.type):
|
|
continue
|
|
ann_col = table_ann.columns.get(column_name) if table_ann else None
|
|
if not effective_eligibility(column, ann_col)[0]:
|
|
continue
|
|
try:
|
|
rows = client.top_values(
|
|
schema, table_name, column_name, cfg.max_values_per_column
|
|
)
|
|
except Exception as e:
|
|
skipped.append(SkippedColumn(table_name, column_name, f"errore: {e}"))
|
|
continue
|
|
vals = [str(r["value"]) for r in rows if r["value"] not in (None, "")]
|
|
if not vals:
|
|
continue
|
|
values.setdefault(table_name, {})[column_name] = vals
|
|
if len(vals) >= cfg.max_values_per_column:
|
|
truncated.append(TruncatedColumn(table_name, column_name, len(vals)))
|
|
return values, skipped, truncated
|