Reports test durations in CI #824
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,9 @@ | |
| """ | ||
|
|
||
| from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Union | ||
| from collections import OrderedDict | ||
| import ast | ||
| import hashlib | ||
| import os | ||
| import re | ||
|
|
||
|
|
@@ -22,6 +24,13 @@ | |
|
|
||
| logger = get_logger() | ||
|
|
||
| _ENTRY_RE = re.compile(r'entry\((.*?)\)', re.DOTALL) | ||
| _ENTRY_LABEL_RE = re.compile(r'label = "(.*?)"') | ||
| _ENTRY_GROUP_RE = re.compile(r'group =(.*?)(?=\w+ =)', re.DOTALL) | ||
| _ENTRIES_CACHE_MAX = 32 | ||
| _ENTRIES_CACHE: "OrderedDict[str, Dict[str, str]]" = OrderedDict() | ||
| _REACTION_FAMILY_CACHE: Dict[Tuple[str, bool], 'ReactionFamily'] = {} | ||
|
|
||
|
Comment on lines
+27
to
+33
There was a problem hiding this comment. This PR is described as adding pytest duration reporting in CI, but this file introduces additional behavior changes (regex precompilation plus global caches and |
||
|
|
||
| def get_rmg_db_subpath(*parts: str, must_exist: bool = False) -> str: | ||
| """Return a path under the RMG database, handling both source and packaged layouts.""" | ||
|
|
@@ -481,7 +490,7 @@ def determine_possible_reaction_products_from_family(rxn: 'ARCReaction', | |
| and whether the family's template also represents its own reverse. | ||
| """ | ||
| product_dicts = list() | ||
| family = get_reaction_family(label=family_label, consider_arc_families=consider_arc_families) | ||
| products = family.generate_products(reactants=rxn.get_reactants_and_products(return_copies=True)[0]) | ||
| if products: | ||
| for group_labels, product_lists in products.items(): | ||
|
|
@@ -808,17 +817,8 @@ def get_entries(groups_as_lines: List[str], | |
| Returns: | ||
| Dict[str, str]: The extracted entries, keys are the labels, values are the groups. | ||
| """ | ||
| entries_map = _get_entries_map(groups_as_lines) | ||
| return {label: entries_map[label] for label in entry_labels if label in entries_map} | ||
|
|
||
|
|
||
| def get_group_adjlist(groups_as_lines: List[str], | ||
|
|
@@ -834,8 +834,52 @@ def get_group_adjlist(groups_as_lines: List[str], | |
| Returns: | ||
| str: The extracted group. | ||
| """ | ||
| entries_map = _get_entries_map(groups_as_lines) | ||
| return entries_map[entry_label] | ||
|
|
||
|
|
||
| def _get_entries_map(groups_as_lines: List[str]) -> Dict[str, str]: | ||
| cache_key = _fingerprint_lines(groups_as_lines) | ||
| cached = _ENTRIES_CACHE.get(cache_key) | ||
| if cached is not None: | ||
| _ENTRIES_CACHE.move_to_end(cache_key) | ||
| return cached | ||
| groups_str = ''.join(groups_as_lines) | ||
| entries_map: Dict[str, str] = {} | ||
|
Comment on lines
+841
to
+848
There was a problem hiding this comment.
|
||
| for i, match in enumerate(_ENTRY_RE.finditer(groups_str)): | ||
| entry = match.group(1) | ||
| label_match = _ENTRY_LABEL_RE.search(entry) | ||
| group_match = _ENTRY_GROUP_RE.search(entry) | ||
| if label_match is not None and group_match is not None: | ||
| entries_map[label_match.group(1)] = clean_text(group_match.group(1)) | ||
| if i > 2000: | ||
| break | ||
| _ENTRIES_CACHE[cache_key] = entries_map | ||
| _ENTRIES_CACHE.move_to_end(cache_key) | ||
| if len(_ENTRIES_CACHE) > _ENTRIES_CACHE_MAX: | ||
| _ENTRIES_CACHE.popitem(last=False) | ||
| return entries_map | ||
|
|
||
|
|
||
| def _fingerprint_lines(groups_as_lines: List[str]) -> str: | ||
| """Create a stable fingerprint for a groups file represented as lines.""" | ||
| hasher = hashlib.blake2b(digest_size=16) | ||
| for line in groups_as_lines: | ||
| hasher.update(line.encode('utf-8', errors='ignore')) | ||
| hasher.update(b'\0') | ||
| return hasher.hexdigest() | ||
|
|
||
|
|
||
| def get_reaction_family(label: str, | ||
| consider_arc_families: bool = True, | ||
| ) -> 'ReactionFamily': | ||
| key = (label, consider_arc_families) | ||
| cached = _REACTION_FAMILY_CACHE.get(key) | ||
| if cached is not None: | ||
| return cached | ||
| family = ReactionFamily(label=label, consider_arc_families=consider_arc_families) | ||
| _REACTION_FAMILY_CACHE[key] = family | ||
| return family | ||
|
Comment on lines
+876
to
+882
There was a problem hiding this comment.
|
||
|
|
||
|
|
||
| def get_isomorphic_subgraph(isomorphic_subgraph_1: dict, | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import os | ||
|
Member
There was a problem hiding this comment. maybe put this in devtools? or under .actions? |
||
|
|
||
|
|
||
| def pytest_report_teststatus(report, config): | ||
|
|
||
| inline_durations = os.getenv("PYTEST_INLINE_DURATIONS") == "1" | ||
| if report.when == "call" and inline_durations: | ||
| if report.passed: | ||
| return "passed", ".", f"PASSED [{report.duration:.3f}s]" | ||
|
Member
There was a problem hiding this comment. squash this commit into the commit that introduced this file? |
||
| if report.failed: | ||
| return "failed", "F", f"FAILED [{report.duration:.3f}s]" | ||
| if report.skipped: | ||
| return "skipped", "s", f"SKIPPED [{report.duration:.3f}s]" | ||
| return None | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cool, thanks!
do any of the copilot comments make sense?