Skip to content

Commit 35f6a14

Browse files
committed
Remove now redundant is_public vs public validation error
1 parent bf81a47 commit 35f6a14

File tree

3 files changed

+1
-19
lines changed

3 files changed

+1
-19
lines changed

ingestion/data_transfer_models/headline.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
from metrics.api.settings.auth import ALLOW_MISSING_IS_PUBLIC_FIELD, AUTH_ENABLED
1111
from validation.data_transfer_models.base import (
1212
IncomingBaseDataModel,
13-
NonPublicDataSentToPublicIngestionError,
1413
)
1514

1615

@@ -134,14 +133,6 @@ def validate_confidence_intervals(self) -> Self:
134133
)
135134
return self
136135

137-
@model_validator(mode="after")
138-
def invalidate_non_public_data_for_public_ingestion(self) -> Self:
139-
"""Checks that if this is a public instance of the product then `is_public=False` data is invalidated."""
140-
if not AUTH_ENABLED and not self.is_public:
141-
raise NonPublicDataSentToPublicIngestionError
142-
143-
return self
144-
145136

146137
class HeadlineDTO(IncomingBaseDataModel):
147138
data: list[InboundHeadlineSpecificFields]

ingestion/data_transfer_models/time_series.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
from metrics.api.settings.auth import ALLOW_MISSING_IS_PUBLIC_FIELD, AUTH_ENABLED
1010
from validation.data_transfer_models.base import (
1111
IncomingBaseDataModel,
12-
NonPublicDataSentToPublicIngestionError,
1312
)
1413

1514

@@ -43,14 +42,6 @@ def cast_embargo_to_uk_timezone(
4342
"""
4443
return validation.cast_date_to_uk_timezone(date_value=embargo)
4544

46-
@model_validator(mode="after")
47-
def invalidate_non_public_data_for_public_ingestion(self) -> Self:
48-
"""Checks that if this is a public instance of the product then `is_public=False` data is invalidated."""
49-
if not AUTH_ENABLED and not self.is_public:
50-
raise NonPublicDataSentToPublicIngestionError
51-
52-
return self
53-
5445

5546
class TimeSeriesDTO(IncomingBaseDataModel):
5647
metric_frequency: str

ingestion/operations/truncated_dataset.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121

2222
def _gather_test_data_source_file_paths() -> list[Path]:
23-
path_to_test_source_data = f"{ROOT_LEVEL_BASE_DIR}/source_data"
23+
path_to_test_source_data = f"{ROOT_LEVEL_BASE_DIR}/kathryn_source_data"
2424
source_file_names = next(os.walk(path_to_test_source_data))[2]
2525
return [
2626
Path(f"{path_to_test_source_data}/{source_file_name}")

0 commit comments

Comments
 (0)