Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/dve/pipeline/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -846,14 +846,18 @@ def error_report(
.agg(pl.col("Count").sum()) # type: ignore
.iter_rows(named=True)
}
submission_rejections = err_types.get(
ErrorReportCategories.FILE_REJECTION.reporting_name, 0
)
sub_stats = SubmissionStatisticsRecord(
submission_id=submission_info.submission_id,
record_count=submission_status.number_of_records,
number_submission_rejections=err_types.get(
ErrorReportCategories.FILE_REJECTION.reporting_name, 0
),
number_record_rejections=err_types.get(
ErrorReportCategories.RECORD_REJECTION.reporting_name, 0
number_submission_rejections=submission_rejections,
number_record_rejections=(
submission_status.number_of_records
if submission_rejections > 0 else err_types.get( # type: ignore
ErrorReportCategories.RECORD_REJECTION.reporting_name, 0
)
),
number_warnings=err_types.get(ErrorReportCategories.WARNING.reporting_name, 0),
)
Expand Down
20 changes: 12 additions & 8 deletions src/dve/reporting/excel_report.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,17 +153,21 @@ def _add_submission_info(self, status: str, summary: Worksheet):
), # pylint: disable=C0301
]
)
if status not in (
if status in (
ErrorReportStatus.PROCESSING_FAILED,
ErrorReportStatus.FILE_REJECTION,
):
summary.append(
[
"",
"Total Number of Records Rejected",
self.submission_status.number_of_records_rejected,
]
)
_records_rejected = self.submission_status.number_of_records
else:
_records_rejected = self.submission_status.number_of_records_rejected
summary.append(
[
"",
"Total Number of Records Rejected",
_records_rejected,
]
)

summary.append(["", ""])


Expand Down
2 changes: 1 addition & 1 deletion tests/features/animals.feature
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ Feature: Pipeline tests using the animal dataset
| parameter | value |
| record_count | 7 |
| number_submission_rejections | 1 |
| number_record_rejections | 2 |
| number_record_rejections | 7 |
| number_warnings | 1 |
4 changes: 2 additions & 2 deletions tests/features/movies.feature
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Feature: Pipeline tests using the movies dataset
| parameter | value |
| record_count | 5 |
| number_submission_rejections | 1 |
| number_record_rejections | 3 |
| number_record_rejections | 5 |
| number_warnings | 2 |
And the error aggregates are persisted

Expand Down Expand Up @@ -81,7 +81,7 @@ Feature: Pipeline tests using the movies dataset
| parameter | value |
| record_count | 5 |
| number_submission_rejections | 1 |
| number_record_rejections | 3 |
| number_record_rejections | 5 |
| number_warnings | 2 |
And the error aggregates are persisted

Loading