Skip to content
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.

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

Performance improvements #139

Merged
merged 4 commits into from
Dec 19, 2023
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
4 changes: 3 additions & 1 deletion .github/workflows/site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: ">=3.12"
cache: "pip"
cache-dependency-path: pyproject.toml

- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -50,7 +52,7 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: ">=3.11"
python-version: ">=3.12"
cache: "pip"
cache-dependency-path: pyproject.toml

Expand Down
8 changes: 7 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,13 @@ lint = [
]
doc = []
test = []
site = ["mkdocs", "mkdocs-gen-files", "pymdown-extensions", "mkdocs-material"]
site = [
"mkdocs",
"mkdocs-gen-files",
"pymdown-extensions",
"mkdocs-material",
"py-markdown-table==0.4.0",
]
dev = ["limbo[doc,test,lint,site]", "twine", "wheel", "build"]
[project.scripts]
"limbo" = "limbo._cli:main"
Expand Down
43 changes: 21 additions & 22 deletions site/render-testcases.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from pathlib import Path

import mkdocs_gen_files
from py_markdown_table.markdown_table import markdown_table

from limbo.models import (
ActualResult,
Expand Down Expand Up @@ -120,23 +121,19 @@ def _result_emoji(expected: ExpectedResult, actual: ActualResult):
def _render_harness_results(
results: list[tuple[str, TestcaseResult]], expected: ExpectedResult
) -> str:
# This is written in a very silly way because my brain was not working.
if not results:
return ""

harnesses = []
splitters = []
tc_results = []
contexts = []
data = []
for harness, tc_result in results:
harnesses.append(f"`{harness}`")
splitters.append(" - ")
tc_results.append(_result_emoji(expected, tc_result.actual_result))
contexts.append(f"`{tc_result.context}`" if tc_result.context else "N/A")

harness_line = f"| {" | ".join(harnesses)} | "
splitter_line = f"| {" | ".join(splitters)} | "
results_line = f"| {" | ".join(tc_results)} | "
contexts_line = f"| {" | ".join(contexts)} | "
return f"{harness_line}\n{splitter_line}\n{results_line}\n{contexts_line}"
data.append(
{
"Harness": f"`{harness}`",
"Result": _result_emoji(expected, tc_result.actual_result),
"Context": f"`{tc_result.context}`" if tc_result.context else "N/A",
}
)
return markdown_table(data).set_params(quote=False, row_sep="markdown").get_markdown()


limbo = Limbo.parse_file(LIMBO_JSON)
Expand All @@ -145,17 +142,19 @@ def _render_harness_results(
else:
limbo_results = []


# Mapping: tc_id -> [(harness_id, result)]
results_by_tc_id: dict[TestCaseID, list[tuple[str, TestcaseResult]]] = defaultdict(list)
for limbo_result in limbo_results:
for result in limbo_result.results:
results_by_tc_id[result.id].append((limbo_result.harness, result))


namespaces: dict[str, list[CollatedResult]] = defaultdict(list)
for tc in limbo.testcases:
namespace, _ = tc.id.split("::", 1)

tc_results_by_harness = []
for result in limbo_results:
harness = result.harness
tc_result = next(r for r in result.results if r.id == tc.id)
tc_results_by_harness.append((harness, tc_result))

collated = CollatedResult(tc=tc, results=tc_results_by_harness)
collated = CollatedResult(tc=tc, results=results_by_tc_id[tc.id])
namespaces[namespace].append(collated)

for namespace, results in namespaces.items():
Expand Down