Skip to content

perf(compliance-assessments): replace per-row progress walk with aggregate #4014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nas-tabchiche merged 6 commits into from
May 5, 2026
+51 −12
Merged

perf(compliance-assessments): replace per-row progress walk with aggregate #4014

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2361de9
Fix Perf for ComplianceAssessment objects Processing
tarkadia Apr 23, 2026
8887753
Remove Test for my specific changes
tarkadia Apr 23, 2026
853d3c7
Fix Comments
tarkadia Apr 24, 2026
b1454aa
Simplify Code
tarkadia Apr 24, 2026
cf14a96
Formatting
tarkadia Apr 24, 2026
cb8cb16
Merge branch 'main' into fix/perf_ComplianceAssessment_object_processing
nas-tabchiche May 4, 2026
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
63 changes: 51 additions & 12 deletions backend/core/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7841,20 +7841,59 @@ def assign_attributes(target, attributes):
)
return requirement_assessments, assessment_source_dict

@property
def progress(self) -> int:
requirement_assessments = list(
self.get_requirement_assessments(include_non_assessable=False)
def _get_progress_counts(self) -> tuple[int, int]:
"""
Return (total, assessed) counts for assessable requirements
"""
Comment thread
tarkadia marked this conversation as resolved.

requirements = RequirementAssessment.objects.filter(
Comment thread
coderabbitai[bot] marked this conversation as resolved.
compliance_assessment=self, requirement__assessable=True
)
total_cnt = len(requirement_assessments)
assessed_cnt = len(
[
r
for r in requirement_assessments
if (r.result != RequirementAssessment.Result.NOT_ASSESSED)
or r.score != None
]

if not self.selected_implementation_groups:
counts = requirements.aggregate(
total=Count("id"),
assessed=Count(
"id",
filter=~Q(result=RequirementAssessment.Result.NOT_ASSESSED)
| Q(score__isnull=False),
),
)
return counts["total"], counts["assessed"]

selected_groups = set(self.selected_implementation_groups)
total = 0
assessed = 0
lightweight_requirements = (
requirements.select_related("requirement")
.only(
"result",
"score",
"requirement_id",
"requirement__implementation_groups",
)
.iterator()
)

for requirement_assessment in lightweight_requirements:
requirement_groups = set(
requirement_assessment.requirement.implementation_groups or []
)
if selected_groups.isdisjoint(requirement_groups):
continue

total += 1
if (
requirement_assessment.result
!= RequirementAssessment.Result.NOT_ASSESSED
) or requirement_assessment.score is not None:
assessed += 1
Comment on lines +7944 to +7948
Copy link
Copy Markdown
Contributor

@monsieurswag monsieurswag Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ) or requirement_assessment.score is not None: should be replaced by ) and requirement_assessment.score is not None: At backend/core/models.py:7895:

  if (
      requirement_assessment.result
      != RequirementAssessment.Result.NOT_ASSESSED
  ) or requirement_assessment.score is not None:
      assessed += 1

With the current code a requirement with a None score OR with a NOT_ASSESSED result would still be considered as assessed (would still increment assessed).

Copy link
Copy Markdown
Contributor Author

@tarkadia tarkadia Apr 24, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be left as is, because sometimes, audits can be assessed by just giving a score to the requirement nodes without giving a specific result on them. Putting and would change the original logic. The previous version of the code was like this, with an OR :

def progress(self) -> int:
    requirement_assessments = list(
        self.get_requirement_assessments(include_non_assessable=False)
    )
    total_cnt = len(requirement_assessments)
    assessed_cnt = len(
        [
            r
            for r in requirement_assessments
            if (r.result != RequirementAssessment.Result.NOT_ASSESSED)
            or r.score != None
        ]
    )
    return int((assessed_cnt / total_cnt) * 100) if total_cnt > 0 else 0

We could've put and if the code was written like this:

if (
    requirement_assessment.result
    == RequirementAssessment.Result.NOT_ASSESSED
) and requirement_assessment.score is None:
    continue

assessed += 1

Copy link
Copy Markdown
Contributor Author

@tarkadia tarkadia Apr 28, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ab-smith can you confirm this?


return total, assessed

@property
def progress(self) -> int:
total_cnt, assessed_cnt = self._get_progress_counts()
return int((assessed_cnt / total_cnt) * 100) if total_cnt > 0 else 0

@property
Expand Down
Loading