Skip to content

Commit 6d16ae5

Browse files
committed
refactor: Removed additional templating step for business rule messages as now handled elsewhere
Also tweaked how reference_data existance being checked for as truthy evaluation False where expected to be True
1 parent e06f75f commit 6d16ae5

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

src/dve/core_engine/backends/base/core.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def __init__(
7676
raise ValueError(f"Entity name cannot start with 'refdata_', got {entity_name!r}")
7777
self.entities[entity_name] = entity
7878

79-
self.reference_data = reference_data or {}
79+
self.reference_data = reference_data if reference_data is not None else {}
8080
"""The reference data mapping."""
8181

8282
@staticmethod

src/dve/core_engine/message.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from pydantic.dataclasses import dataclass
1313

1414
from dve.core_engine.constants import CONTRACT_ERROR_VALUE_FIELD_NAME, ROWID_COLUMN_NAME
15-
from dve.core_engine.templating import ENVIRONMENT, template_object
15+
from dve.core_engine.templating import template_object
1616
from dve.core_engine.type_hints import (
1717
EntityName,
1818
ErrorCategory,
@@ -270,12 +270,7 @@ def to_row(
270270
if isinstance(reporting_field, list):
271271
reporting_field = ", ".join(reporting_field)
272272

273-
if self.record and self.error_message:
274-
error_message: Optional[str] = ENVIRONMENT.from_string(self.error_message).render(
275-
**self.__dict__
276-
)
277-
else:
278-
error_message = self.error_message
273+
error_message = self.error_message
279274

280275
return (
281276
self.entity,

src/dve/pipeline/pipeline.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ def apply_business_rules(self, submission_info: SubmissionInfo, failed: bool):
509509
)
510510
reference_data.entity_cache["dve_submission_info"] = sub_info_entity
511511

512-
entity_manager = EntityManager(entities, reference_data)
512+
entity_manager = EntityManager(entities=entities, reference_data=reference_data)
513513

514514
rule_messages = self.step_implementations.apply_rules(entity_manager, rules) # type: ignore
515515
key_fields = {model: conf.reporting_fields for model, conf in model_config.items()}

0 commit comments

Comments
 (0)