Zeige die echten Produktwerte aus der Trefferliste und vermeide doppelte RAM/Speicher-Schluessel.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
33336bcb6e
commit
e6d53e0eeb
6 files changed
+142
-34
No files matched your search
@@ -9,6 +9,7 @@ from sqlalchemy import select
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.clock import now_utc
|
||||
from app.discovery.attributes import is_derived_duplicate, merge_observation_attributes
|
||||
from app.discovery.definitions import get_definition, get_definition_by_key, upsert_definition
|
||||
from app.discovery.diff import diff_run, next_lifecycle
|
||||
from app.discovery.enums import (
|
||||
@@ -1447,7 +1448,7 @@ def _attribute_map(session: Session, observation_id: UUID) -> dict[str, Any]:
|
||||
key = row.attribute_key
|
||||
if definition is not None and definition.scoring_attribute_key:
|
||||
key = definition.scoring_attribute_key
|
||||
mapped[key] = row.normalized_value
|
||||
mapped[key] = row.normalized_value if row.normalized_value is not None else row.raw_value
|
||||
return mapped
|
||||
|
||||
|
||||
@@ -1457,16 +1458,29 @@ def _dynamic_attributes(session: Session, observation_id: UUID) -> list[dict[str
|
||||
ProductObservationAttributeRecord.observation_id == observation_id
|
||||
)
|
||||
).all()
|
||||
return [
|
||||
{
|
||||
"criterion_definition_id": row.criterion_definition_id,
|
||||
"raw_name": row.raw_name or row.attribute_key,
|
||||
"raw_value": row.raw_value,
|
||||
"normalized_value": row.normalized_value,
|
||||
"unit": row.unit,
|
||||
}
|
||||
for row in rows
|
||||
]
|
||||
present = {(row.raw_name or row.attribute_key or "").casefold() for row in rows}
|
||||
items: list[dict[str, Any]] = []
|
||||
for row in rows:
|
||||
name = row.raw_name or row.attribute_key or ""
|
||||
if is_derived_duplicate(row.attribute_key or "", present) or is_derived_duplicate(name, present):
|
||||
continue
|
||||
raw = row.raw_value
|
||||
normalized = row.normalized_value
|
||||
if (raw is None or raw == "") and normalized is None:
|
||||
continue
|
||||
definition = (
|
||||
None if row.criterion_definition_id is None else session.get(CriterionDefinitionRecord, row.criterion_definition_id)
|
||||
)
|
||||
items.append(
|
||||
{
|
||||
"criterion_definition_id": row.criterion_definition_id,
|
||||
"raw_name": (definition.label if definition is not None else None) or name,
|
||||
"raw_value": raw,
|
||||
"normalized_value": normalized if normalized is not None else raw,
|
||||
"unit": row.unit,
|
||||
}
|
||||
)
|
||||
return items
|
||||
|
||||
|
||||
def _store_observation_attributes(
|
||||
@@ -1475,30 +1489,34 @@ def _store_observation_attributes(
|
||||
raw_attributes: dict[str, Any],
|
||||
normalized_attributes: dict[str, Any],
|
||||
) -> None:
|
||||
keys = set(raw_attributes) | set(normalized_attributes)
|
||||
definitions = {
|
||||
row.scoring_attribute_key or row.key: row
|
||||
for row in session.scalars(select(CriterionDefinitionRecord)).all()
|
||||
if row.scoring_attribute_key or row.key
|
||||
}
|
||||
definitions = list(session.scalars(select(CriterionDefinitionRecord)))
|
||||
by_score = {row.scoring_attribute_key: row for row in definitions if row.scoring_attribute_key}
|
||||
by_key = {row.key: row for row in definitions}
|
||||
by_label = {row.label.casefold(): row for row in definitions if row.label}
|
||||
attr_maps = {
|
||||
row.raw_name: row
|
||||
row.raw_name.casefold(): row
|
||||
for row in session.scalars(select(SourceAttributeMappingRecord)).all()
|
||||
}
|
||||
for key in keys:
|
||||
mapping = attr_maps.get(key)
|
||||
for item in merge_observation_attributes(raw_attributes, normalized_attributes):
|
||||
raw_name = str(item["raw_name"])
|
||||
attribute_key = str(item["attribute_key"])
|
||||
mapping = attr_maps.get(raw_name.casefold())
|
||||
definition = None if mapping is None else session.get(CriterionDefinitionRecord, mapping.criterion_definition_id)
|
||||
if definition is None:
|
||||
definition = definitions.get(key)
|
||||
definition = (
|
||||
by_label.get(raw_name.casefold())
|
||||
or by_score.get(attribute_key)
|
||||
or by_key.get(attribute_key)
|
||||
)
|
||||
session.add(
|
||||
ProductObservationAttributeRecord(
|
||||
id=uuid4(),
|
||||
observation_id=observation_id,
|
||||
criterion_definition_id=None if definition is None else definition.id,
|
||||
attribute_key=key,
|
||||
raw_name=key,
|
||||
raw_value=raw_attributes.get(key),
|
||||
normalized_value=normalized_attributes.get(key),
|
||||
attribute_key=attribute_key,
|
||||
raw_name=raw_name,
|
||||
raw_value=item["raw_value"],
|
||||
normalized_value=item["normalized_value"],
|
||||
unit=None if definition is None else definition.unit,
|
||||
)
|
||||
)
|
||||
|
||||
Reference in new issue
Block a user