Skip to content

Deduplicate block setattr logging helpers - #100

Closed
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup
Closed

Deduplicate block setattr logging helpers#100
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup

Conversation

@wshlavacek

Copy link
Copy Markdown
Contributor

Summary

  • factor repeated block __setattr__ logging paths into shared helpers in the model and network block modules
  • unify logger-backed warnings for invalid non-coercible assignments across the remaining block subclasses
  • route duplicate action-argument warnings through BNGLogger and fold the duplicate OrderedDict import-guard cleanup into the same refactor
  • add focused upstream-safe regression tests for the setattr/logging paths

Testing

  • uv run pytest tests/test_block_setattr_logging.py -q
  • uv run pytest tests/test_bionetgen.py::test_bionetgen_model tests/test_bionetgen.py::test_action_loading tests/test_bng_parsing.py::test_network_parse -q
  • uvx black --check bionetgen/modelapi/blocks.py bionetgen/network/blocks.py bionetgen/modelapi/structs.py tests/test_block_setattr_logging.py

@jrfaeder

Copy link
Copy Markdown
Contributor

@wshlavacek Please check the conficts

@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

@jrfaeder conflicts resolved and the branch has been rebased onto current main. The focused block setattr logging tests pass locally, so it should be ready for another look.

@wshlavacek
wshlavacekforce-pushed the block-setattr-logging-dedup branch from bf84943 to 319d926CompareMay 12, 2026 18:45
@wshlavacek
wshlavacek marked this pull request as draft May 12, 2026 21:32
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

CI root cause looks narrower than the PR UI suggests: I do not currently see a live merge conflict, but I do see a reproducible warning-message regression causing the full deploy matrix to fail.

The helper dedup changed parameter and compartment warning text from the existing field-specific wording ("keeping existing value" / "keeping existing size") to generic wording ("keeping existing parameter" / "keeping existing compartment"). Upstream tests in tests/test_block_warning_paths.py still assert the older wording, so we now fail the same four assertions across every platform. I reproduced those four failures locally as well.

Tentative fix plan:

  1. Preserve the existing field-specific warning wording for parameter and compartment numeric-assignment failures in both model and network block helpers.
  2. Update tests/test_block_setattr_logging.py so the new focused tests match the established upstream warning contract instead of the regressed generic wording.
  3. Re-run the focused warning-path and block-setattr tests locally, then force-push the repair branch.

I am keeping this PR in draft until that repair is in.

@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 05:23
@wshlavacek
wshlavacek marked this pull request as draft May 13, 2026 05:25
…edup
The deduplicated `_set_item_attribute` helper rewrote the numeric-coercion
failure warning to "keeping existing {kind}", which regressed the
"keeping existing value"/"keeping existing size" wording that PR RuleWorld#97 (now
in main) standardized on. The merged `tests/test_block_warning_paths.py`
asserts the original wording, so all CI matrix jobs failed after rebase.
Restore "keeping existing {num_field} <existing>" (informative trailer
from PR RuleWorld#97 included) and align the new `test_block_setattr_logging.py`
parameter/compartment fixtures with the canonical messages.
@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 13:17
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

These edits have grown stale.

@wshlavacek
wshlavacek deleted the block-setattr-logging-dedup branch June 10, 2026 16:49
jrfaeder pushed a commit that referenced this pull request Jul 20, 2026
…rsing rules (#100)
* fix: Handle zero arguments in pyparsing rules
Wrapped `pp.delimitedList` inside `pp.Optional()` for `arg_type_curly`, `list_arg`, and `arg_type_list` in `bionetgen/core/utils/utils.py`. This ensures zero-argument scenarios such as `{}` and `[]` are parsed properly and resolves the TODO statements around zero arguments.
Co-authored-by: akutuva21 <44119804+akutuva21@users.noreply.github.com>
* chore: PR #100 remove forbidden artifacts and run black
---------
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wshlavacek@jrfaeder
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Deduplicate block setattr logging helpers by wshlavacek · Pull Request #100 · RuleWorld/PyBioNetGen · GitHub
Skip to content

Deduplicate block setattr logging helpers - #100

Closed
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup
Closed

Deduplicate block setattr logging helpers#100
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup

Conversation

@wshlavacek

Copy link
Copy Markdown
Contributor

Summary

  • factor repeated block __setattr__ logging paths into shared helpers in the model and network block modules
  • unify logger-backed warnings for invalid non-coercible assignments across the remaining block subclasses
  • route duplicate action-argument warnings through BNGLogger and fold the duplicate OrderedDict import-guard cleanup into the same refactor
  • add focused upstream-safe regression tests for the setattr/logging paths

Testing

  • uv run pytest tests/test_block_setattr_logging.py -q
  • uv run pytest tests/test_bionetgen.py::test_bionetgen_model tests/test_bionetgen.py::test_action_loading tests/test_bng_parsing.py::test_network_parse -q
  • uvx black --check bionetgen/modelapi/blocks.py bionetgen/network/blocks.py bionetgen/modelapi/structs.py tests/test_block_setattr_logging.py

@jrfaeder

Copy link
Copy Markdown
Contributor

@wshlavacek Please check the conficts

@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

@jrfaeder conflicts resolved and the branch has been rebased onto current main. The focused block setattr logging tests pass locally, so it should be ready for another look.

@wshlavacek
wshlavacekforce-pushed the block-setattr-logging-dedup branch from bf84943 to 319d926CompareMay 12, 2026 18:45
@wshlavacek
wshlavacek marked this pull request as draft May 12, 2026 21:32
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

CI root cause looks narrower than the PR UI suggests: I do not currently see a live merge conflict, but I do see a reproducible warning-message regression causing the full deploy matrix to fail.

The helper dedup changed parameter and compartment warning text from the existing field-specific wording ("keeping existing value" / "keeping existing size") to generic wording ("keeping existing parameter" / "keeping existing compartment"). Upstream tests in tests/test_block_warning_paths.py still assert the older wording, so we now fail the same four assertions across every platform. I reproduced those four failures locally as well.

Tentative fix plan:

  1. Preserve the existing field-specific warning wording for parameter and compartment numeric-assignment failures in both model and network block helpers.
  2. Update tests/test_block_setattr_logging.py so the new focused tests match the established upstream warning contract instead of the regressed generic wording.
  3. Re-run the focused warning-path and block-setattr tests locally, then force-push the repair branch.

I am keeping this PR in draft until that repair is in.

@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 05:23
@wshlavacek
wshlavacek marked this pull request as draft May 13, 2026 05:25
…edup
The deduplicated `_set_item_attribute` helper rewrote the numeric-coercion
failure warning to "keeping existing {kind}", which regressed the
"keeping existing value"/"keeping existing size" wording that PR RuleWorld#97 (now
in main) standardized on. The merged `tests/test_block_warning_paths.py`
asserts the original wording, so all CI matrix jobs failed after rebase.
Restore "keeping existing {num_field} <existing>" (informative trailer
from PR RuleWorld#97 included) and align the new `test_block_setattr_logging.py`
parameter/compartment fixtures with the canonical messages.
@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 13:17
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

These edits have grown stale.

@wshlavacek
wshlavacek deleted the block-setattr-logging-dedup branch June 10, 2026 16:49
jrfaeder pushed a commit that referenced this pull request Jul 20, 2026
…rsing rules (#100)
* fix: Handle zero arguments in pyparsing rules
Wrapped `pp.delimitedList` inside `pp.Optional()` for `arg_type_curly`, `list_arg`, and `arg_type_list` in `bionetgen/core/utils/utils.py`. This ensures zero-argument scenarios such as `{}` and `[]` are parsed properly and resolves the TODO statements around zero arguments.
Co-authored-by: akutuva21 <44119804+akutuva21@users.noreply.github.com>
* chore: PR #100 remove forbidden artifacts and run black
---------
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wshlavacek@jrfaeder
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Deduplicate block setattr logging helpers by wshlavacek · Pull Request #100 · RuleWorld/PyBioNetGen · GitHub
Skip to content

Deduplicate block setattr logging helpers - #100

Closed
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup
Closed

Deduplicate block setattr logging helpers#100
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup

Conversation

@wshlavacek

Copy link
Copy Markdown
Contributor

Summary

  • factor repeated block __setattr__ logging paths into shared helpers in the model and network block modules
  • unify logger-backed warnings for invalid non-coercible assignments across the remaining block subclasses
  • route duplicate action-argument warnings through BNGLogger and fold the duplicate OrderedDict import-guard cleanup into the same refactor
  • add focused upstream-safe regression tests for the setattr/logging paths

Testing

  • uv run pytest tests/test_block_setattr_logging.py -q
  • uv run pytest tests/test_bionetgen.py::test_bionetgen_model tests/test_bionetgen.py::test_action_loading tests/test_bng_parsing.py::test_network_parse -q
  • uvx black --check bionetgen/modelapi/blocks.py bionetgen/network/blocks.py bionetgen/modelapi/structs.py tests/test_block_setattr_logging.py

@jrfaeder

Copy link
Copy Markdown
Contributor

@wshlavacek Please check the conficts

@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

@jrfaeder conflicts resolved and the branch has been rebased onto current main. The focused block setattr logging tests pass locally, so it should be ready for another look.

@wshlavacek
wshlavacekforce-pushed the block-setattr-logging-dedup branch from bf84943 to 319d926CompareMay 12, 2026 18:45
@wshlavacek
wshlavacek marked this pull request as draft May 12, 2026 21:32
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

CI root cause looks narrower than the PR UI suggests: I do not currently see a live merge conflict, but I do see a reproducible warning-message regression causing the full deploy matrix to fail.

The helper dedup changed parameter and compartment warning text from the existing field-specific wording ("keeping existing value" / "keeping existing size") to generic wording ("keeping existing parameter" / "keeping existing compartment"). Upstream tests in tests/test_block_warning_paths.py still assert the older wording, so we now fail the same four assertions across every platform. I reproduced those four failures locally as well.

Tentative fix plan:

  1. Preserve the existing field-specific warning wording for parameter and compartment numeric-assignment failures in both model and network block helpers.
  2. Update tests/test_block_setattr_logging.py so the new focused tests match the established upstream warning contract instead of the regressed generic wording.
  3. Re-run the focused warning-path and block-setattr tests locally, then force-push the repair branch.

I am keeping this PR in draft until that repair is in.

@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 05:23
@wshlavacek
wshlavacek marked this pull request as draft May 13, 2026 05:25
…edup
The deduplicated `_set_item_attribute` helper rewrote the numeric-coercion
failure warning to "keeping existing {kind}", which regressed the
"keeping existing value"/"keeping existing size" wording that PR RuleWorld#97 (now
in main) standardized on. The merged `tests/test_block_warning_paths.py`
asserts the original wording, so all CI matrix jobs failed after rebase.
Restore "keeping existing {num_field} <existing>" (informative trailer
from PR RuleWorld#97 included) and align the new `test_block_setattr_logging.py`
parameter/compartment fixtures with the canonical messages.
@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 13:17
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

These edits have grown stale.

@wshlavacek
wshlavacek deleted the block-setattr-logging-dedup branch June 10, 2026 16:49
jrfaeder pushed a commit that referenced this pull request Jul 20, 2026
…rsing rules (#100)
* fix: Handle zero arguments in pyparsing rules
Wrapped `pp.delimitedList` inside `pp.Optional()` for `arg_type_curly`, `list_arg`, and `arg_type_list` in `bionetgen/core/utils/utils.py`. This ensures zero-argument scenarios such as `{}` and `[]` are parsed properly and resolves the TODO statements around zero arguments.
Co-authored-by: akutuva21 <44119804+akutuva21@users.noreply.github.com>
* chore: PR #100 remove forbidden artifacts and run black
---------
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wshlavacek@jrfaeder
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Deduplicate block setattr logging helpers by wshlavacek · Pull Request #100 · RuleWorld/PyBioNetGen · GitHub
Skip to content

Deduplicate block setattr logging helpers - #100

Closed
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup
Closed

Deduplicate block setattr logging helpers#100
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup

Conversation

@wshlavacek

Copy link
Copy Markdown
Contributor

Summary

  • factor repeated block __setattr__ logging paths into shared helpers in the model and network block modules
  • unify logger-backed warnings for invalid non-coercible assignments across the remaining block subclasses
  • route duplicate action-argument warnings through BNGLogger and fold the duplicate OrderedDict import-guard cleanup into the same refactor
  • add focused upstream-safe regression tests for the setattr/logging paths

Testing

  • uv run pytest tests/test_block_setattr_logging.py -q
  • uv run pytest tests/test_bionetgen.py::test_bionetgen_model tests/test_bionetgen.py::test_action_loading tests/test_bng_parsing.py::test_network_parse -q
  • uvx black --check bionetgen/modelapi/blocks.py bionetgen/network/blocks.py bionetgen/modelapi/structs.py tests/test_block_setattr_logging.py

@jrfaeder

Copy link
Copy Markdown
Contributor

@wshlavacek Please check the conficts

@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

@jrfaeder conflicts resolved and the branch has been rebased onto current main. The focused block setattr logging tests pass locally, so it should be ready for another look.

@wshlavacek
wshlavacekforce-pushed the block-setattr-logging-dedup branch from bf84943 to 319d926CompareMay 12, 2026 18:45
@wshlavacek
wshlavacek marked this pull request as draft May 12, 2026 21:32
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

CI root cause looks narrower than the PR UI suggests: I do not currently see a live merge conflict, but I do see a reproducible warning-message regression causing the full deploy matrix to fail.

The helper dedup changed parameter and compartment warning text from the existing field-specific wording ("keeping existing value" / "keeping existing size") to generic wording ("keeping existing parameter" / "keeping existing compartment"). Upstream tests in tests/test_block_warning_paths.py still assert the older wording, so we now fail the same four assertions across every platform. I reproduced those four failures locally as well.

Tentative fix plan:

  1. Preserve the existing field-specific warning wording for parameter and compartment numeric-assignment failures in both model and network block helpers.
  2. Update tests/test_block_setattr_logging.py so the new focused tests match the established upstream warning contract instead of the regressed generic wording.
  3. Re-run the focused warning-path and block-setattr tests locally, then force-push the repair branch.

I am keeping this PR in draft until that repair is in.

@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 05:23
@wshlavacek
wshlavacek marked this pull request as draft May 13, 2026 05:25
…edup
The deduplicated `_set_item_attribute` helper rewrote the numeric-coercion
failure warning to "keeping existing {kind}", which regressed the
"keeping existing value"/"keeping existing size" wording that PR RuleWorld#97 (now
in main) standardized on. The merged `tests/test_block_warning_paths.py`
asserts the original wording, so all CI matrix jobs failed after rebase.
Restore "keeping existing {num_field} <existing>" (informative trailer
from PR RuleWorld#97 included) and align the new `test_block_setattr_logging.py`
parameter/compartment fixtures with the canonical messages.
@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 13:17
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

These edits have grown stale.

@wshlavacek
wshlavacek deleted the block-setattr-logging-dedup branch June 10, 2026 16:49
jrfaeder pushed a commit that referenced this pull request Jul 20, 2026
…rsing rules (#100)
* fix: Handle zero arguments in pyparsing rules
Wrapped `pp.delimitedList` inside `pp.Optional()` for `arg_type_curly`, `list_arg`, and `arg_type_list` in `bionetgen/core/utils/utils.py`. This ensures zero-argument scenarios such as `{}` and `[]` are parsed properly and resolves the TODO statements around zero arguments.
Co-authored-by: akutuva21 <44119804+akutuva21@users.noreply.github.com>
* chore: PR #100 remove forbidden artifacts and run black
---------
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wshlavacek@jrfaeder
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Deduplicate block setattr logging helpers by wshlavacek · Pull Request #100 · RuleWorld/PyBioNetGen · GitHub
Skip to content

Deduplicate block setattr logging helpers - #100

Closed
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup
Closed

Deduplicate block setattr logging helpers#100
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup

Conversation

@wshlavacek

Copy link
Copy Markdown
Contributor

Summary

  • factor repeated block __setattr__ logging paths into shared helpers in the model and network block modules
  • unify logger-backed warnings for invalid non-coercible assignments across the remaining block subclasses
  • route duplicate action-argument warnings through BNGLogger and fold the duplicate OrderedDict import-guard cleanup into the same refactor
  • add focused upstream-safe regression tests for the setattr/logging paths

Testing

  • uv run pytest tests/test_block_setattr_logging.py -q
  • uv run pytest tests/test_bionetgen.py::test_bionetgen_model tests/test_bionetgen.py::test_action_loading tests/test_bng_parsing.py::test_network_parse -q
  • uvx black --check bionetgen/modelapi/blocks.py bionetgen/network/blocks.py bionetgen/modelapi/structs.py tests/test_block_setattr_logging.py

@jrfaeder

Copy link
Copy Markdown
Contributor

@wshlavacek Please check the conficts

@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

@jrfaeder conflicts resolved and the branch has been rebased onto current main. The focused block setattr logging tests pass locally, so it should be ready for another look.

@wshlavacek
wshlavacekforce-pushed the block-setattr-logging-dedup branch from bf84943 to 319d926CompareMay 12, 2026 18:45
@wshlavacek
wshlavacek marked this pull request as draft May 12, 2026 21:32
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

CI root cause looks narrower than the PR UI suggests: I do not currently see a live merge conflict, but I do see a reproducible warning-message regression causing the full deploy matrix to fail.

The helper dedup changed parameter and compartment warning text from the existing field-specific wording ("keeping existing value" / "keeping existing size") to generic wording ("keeping existing parameter" / "keeping existing compartment"). Upstream tests in tests/test_block_warning_paths.py still assert the older wording, so we now fail the same four assertions across every platform. I reproduced those four failures locally as well.

Tentative fix plan:

  1. Preserve the existing field-specific warning wording for parameter and compartment numeric-assignment failures in both model and network block helpers.
  2. Update tests/test_block_setattr_logging.py so the new focused tests match the established upstream warning contract instead of the regressed generic wording.
  3. Re-run the focused warning-path and block-setattr tests locally, then force-push the repair branch.

I am keeping this PR in draft until that repair is in.

@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 05:23
@wshlavacek
wshlavacek marked this pull request as draft May 13, 2026 05:25
…edup
The deduplicated `_set_item_attribute` helper rewrote the numeric-coercion
failure warning to "keeping existing {kind}", which regressed the
"keeping existing value"/"keeping existing size" wording that PR RuleWorld#97 (now
in main) standardized on. The merged `tests/test_block_warning_paths.py`
asserts the original wording, so all CI matrix jobs failed after rebase.
Restore "keeping existing {num_field} <existing>" (informative trailer
from PR RuleWorld#97 included) and align the new `test_block_setattr_logging.py`
parameter/compartment fixtures with the canonical messages.
@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 13:17
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

These edits have grown stale.

@wshlavacek
wshlavacek deleted the block-setattr-logging-dedup branch June 10, 2026 16:49
jrfaeder pushed a commit that referenced this pull request Jul 20, 2026
…rsing rules (#100)
* fix: Handle zero arguments in pyparsing rules
Wrapped `pp.delimitedList` inside `pp.Optional()` for `arg_type_curly`, `list_arg`, and `arg_type_list` in `bionetgen/core/utils/utils.py`. This ensures zero-argument scenarios such as `{}` and `[]` are parsed properly and resolves the TODO statements around zero arguments.
Co-authored-by: akutuva21 <44119804+akutuva21@users.noreply.github.com>
* chore: PR #100 remove forbidden artifacts and run black
---------
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wshlavacek@jrfaeder
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Deduplicate block setattr logging helpers by wshlavacek · Pull Request #100 · RuleWorld/PyBioNetGen · GitHub
Skip to content

Deduplicate block setattr logging helpers - #100

Closed
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup
Closed

Deduplicate block setattr logging helpers#100
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup

Conversation

@wshlavacek

Copy link
Copy Markdown
Contributor

Summary

  • factor repeated block __setattr__ logging paths into shared helpers in the model and network block modules
  • unify logger-backed warnings for invalid non-coercible assignments across the remaining block subclasses
  • route duplicate action-argument warnings through BNGLogger and fold the duplicate OrderedDict import-guard cleanup into the same refactor
  • add focused upstream-safe regression tests for the setattr/logging paths

Testing

  • uv run pytest tests/test_block_setattr_logging.py -q
  • uv run pytest tests/test_bionetgen.py::test_bionetgen_model tests/test_bionetgen.py::test_action_loading tests/test_bng_parsing.py::test_network_parse -q
  • uvx black --check bionetgen/modelapi/blocks.py bionetgen/network/blocks.py bionetgen/modelapi/structs.py tests/test_block_setattr_logging.py

@jrfaeder

Copy link
Copy Markdown
Contributor

@wshlavacek Please check the conficts

@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

@jrfaeder conflicts resolved and the branch has been rebased onto current main. The focused block setattr logging tests pass locally, so it should be ready for another look.

@wshlavacek
wshlavacekforce-pushed the block-setattr-logging-dedup branch from bf84943 to 319d926CompareMay 12, 2026 18:45
@wshlavacek
wshlavacek marked this pull request as draft May 12, 2026 21:32
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

CI root cause looks narrower than the PR UI suggests: I do not currently see a live merge conflict, but I do see a reproducible warning-message regression causing the full deploy matrix to fail.

The helper dedup changed parameter and compartment warning text from the existing field-specific wording ("keeping existing value" / "keeping existing size") to generic wording ("keeping existing parameter" / "keeping existing compartment"). Upstream tests in tests/test_block_warning_paths.py still assert the older wording, so we now fail the same four assertions across every platform. I reproduced those four failures locally as well.

Tentative fix plan:

  1. Preserve the existing field-specific warning wording for parameter and compartment numeric-assignment failures in both model and network block helpers.
  2. Update tests/test_block_setattr_logging.py so the new focused tests match the established upstream warning contract instead of the regressed generic wording.
  3. Re-run the focused warning-path and block-setattr tests locally, then force-push the repair branch.

I am keeping this PR in draft until that repair is in.

@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 05:23
@wshlavacek
wshlavacek marked this pull request as draft May 13, 2026 05:25
…edup
The deduplicated `_set_item_attribute` helper rewrote the numeric-coercion
failure warning to "keeping existing {kind}", which regressed the
"keeping existing value"/"keeping existing size" wording that PR RuleWorld#97 (now
in main) standardized on. The merged `tests/test_block_warning_paths.py`
asserts the original wording, so all CI matrix jobs failed after rebase.
Restore "keeping existing {num_field} <existing>" (informative trailer
from PR RuleWorld#97 included) and align the new `test_block_setattr_logging.py`
parameter/compartment fixtures with the canonical messages.
@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 13:17
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

These edits have grown stale.

@wshlavacek
wshlavacek deleted the block-setattr-logging-dedup branch June 10, 2026 16:49
jrfaeder pushed a commit that referenced this pull request Jul 20, 2026
…rsing rules (#100)
* fix: Handle zero arguments in pyparsing rules
Wrapped `pp.delimitedList` inside `pp.Optional()` for `arg_type_curly`, `list_arg`, and `arg_type_list` in `bionetgen/core/utils/utils.py`. This ensures zero-argument scenarios such as `{}` and `[]` are parsed properly and resolves the TODO statements around zero arguments.
Co-authored-by: akutuva21 <44119804+akutuva21@users.noreply.github.com>
* chore: PR #100 remove forbidden artifacts and run black
---------
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wshlavacek@jrfaeder
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Deduplicate block setattr logging helpers by wshlavacek · Pull Request #100 · RuleWorld/PyBioNetGen · GitHub
Skip to content

Deduplicate block setattr logging helpers - #100

Closed
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup
Closed

Deduplicate block setattr logging helpers#100
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup

Conversation

@wshlavacek

Copy link
Copy Markdown
Contributor

Summary

  • factor repeated block __setattr__ logging paths into shared helpers in the model and network block modules
  • unify logger-backed warnings for invalid non-coercible assignments across the remaining block subclasses
  • route duplicate action-argument warnings through BNGLogger and fold the duplicate OrderedDict import-guard cleanup into the same refactor
  • add focused upstream-safe regression tests for the setattr/logging paths

Testing

  • uv run pytest tests/test_block_setattr_logging.py -q
  • uv run pytest tests/test_bionetgen.py::test_bionetgen_model tests/test_bionetgen.py::test_action_loading tests/test_bng_parsing.py::test_network_parse -q
  • uvx black --check bionetgen/modelapi/blocks.py bionetgen/network/blocks.py bionetgen/modelapi/structs.py tests/test_block_setattr_logging.py

@jrfaeder

Copy link
Copy Markdown
Contributor

@wshlavacek Please check the conficts

@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

@jrfaeder conflicts resolved and the branch has been rebased onto current main. The focused block setattr logging tests pass locally, so it should be ready for another look.

@wshlavacek
wshlavacekforce-pushed the block-setattr-logging-dedup branch from bf84943 to 319d926CompareMay 12, 2026 18:45
@wshlavacek
wshlavacek marked this pull request as draft May 12, 2026 21:32
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

CI root cause looks narrower than the PR UI suggests: I do not currently see a live merge conflict, but I do see a reproducible warning-message regression causing the full deploy matrix to fail.

The helper dedup changed parameter and compartment warning text from the existing field-specific wording ("keeping existing value" / "keeping existing size") to generic wording ("keeping existing parameter" / "keeping existing compartment"). Upstream tests in tests/test_block_warning_paths.py still assert the older wording, so we now fail the same four assertions across every platform. I reproduced those four failures locally as well.

Tentative fix plan:

  1. Preserve the existing field-specific warning wording for parameter and compartment numeric-assignment failures in both model and network block helpers.
  2. Update tests/test_block_setattr_logging.py so the new focused tests match the established upstream warning contract instead of the regressed generic wording.
  3. Re-run the focused warning-path and block-setattr tests locally, then force-push the repair branch.

I am keeping this PR in draft until that repair is in.

@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 05:23
@wshlavacek
wshlavacek marked this pull request as draft May 13, 2026 05:25
…edup
The deduplicated `_set_item_attribute` helper rewrote the numeric-coercion
failure warning to "keeping existing {kind}", which regressed the
"keeping existing value"/"keeping existing size" wording that PR RuleWorld#97 (now
in main) standardized on. The merged `tests/test_block_warning_paths.py`
asserts the original wording, so all CI matrix jobs failed after rebase.
Restore "keeping existing {num_field} <existing>" (informative trailer
from PR RuleWorld#97 included) and align the new `test_block_setattr_logging.py`
parameter/compartment fixtures with the canonical messages.
@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 13:17
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

These edits have grown stale.

@wshlavacek
wshlavacek deleted the block-setattr-logging-dedup branch June 10, 2026 16:49
jrfaeder pushed a commit that referenced this pull request Jul 20, 2026
…rsing rules (#100)
* fix: Handle zero arguments in pyparsing rules
Wrapped `pp.delimitedList` inside `pp.Optional()` for `arg_type_curly`, `list_arg`, and `arg_type_list` in `bionetgen/core/utils/utils.py`. This ensures zero-argument scenarios such as `{}` and `[]` are parsed properly and resolves the TODO statements around zero arguments.
Co-authored-by: akutuva21 <44119804+akutuva21@users.noreply.github.com>
* chore: PR #100 remove forbidden artifacts and run black
---------
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wshlavacek@jrfaeder
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Deduplicate block setattr logging helpers by wshlavacek · Pull Request #100 · RuleWorld/PyBioNetGen · GitHub
Skip to content

Deduplicate block setattr logging helpers - #100

Closed
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup
Closed

Deduplicate block setattr logging helpers#100
wshlavacek wants to merge 2 commits into
RuleWorld:mainfrom
wshlavacek:block-setattr-logging-dedup

Conversation

@wshlavacek

Copy link
Copy Markdown
Contributor

Summary

  • factor repeated block __setattr__ logging paths into shared helpers in the model and network block modules
  • unify logger-backed warnings for invalid non-coercible assignments across the remaining block subclasses
  • route duplicate action-argument warnings through BNGLogger and fold the duplicate OrderedDict import-guard cleanup into the same refactor
  • add focused upstream-safe regression tests for the setattr/logging paths

Testing

  • uv run pytest tests/test_block_setattr_logging.py -q
  • uv run pytest tests/test_bionetgen.py::test_bionetgen_model tests/test_bionetgen.py::test_action_loading tests/test_bng_parsing.py::test_network_parse -q
  • uvx black --check bionetgen/modelapi/blocks.py bionetgen/network/blocks.py bionetgen/modelapi/structs.py tests/test_block_setattr_logging.py

@jrfaeder

Copy link
Copy Markdown
Contributor

@wshlavacek Please check the conficts

@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

@jrfaeder conflicts resolved and the branch has been rebased onto current main. The focused block setattr logging tests pass locally, so it should be ready for another look.

@wshlavacek
wshlavacekforce-pushed the block-setattr-logging-dedup branch from bf84943 to 319d926CompareMay 12, 2026 18:45
@wshlavacek
wshlavacek marked this pull request as draft May 12, 2026 21:32
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

CI root cause looks narrower than the PR UI suggests: I do not currently see a live merge conflict, but I do see a reproducible warning-message regression causing the full deploy matrix to fail.

The helper dedup changed parameter and compartment warning text from the existing field-specific wording ("keeping existing value" / "keeping existing size") to generic wording ("keeping existing parameter" / "keeping existing compartment"). Upstream tests in tests/test_block_warning_paths.py still assert the older wording, so we now fail the same four assertions across every platform. I reproduced those four failures locally as well.

Tentative fix plan:

  1. Preserve the existing field-specific warning wording for parameter and compartment numeric-assignment failures in both model and network block helpers.
  2. Update tests/test_block_setattr_logging.py so the new focused tests match the established upstream warning contract instead of the regressed generic wording.
  3. Re-run the focused warning-path and block-setattr tests locally, then force-push the repair branch.

I am keeping this PR in draft until that repair is in.

@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 05:23
@wshlavacek
wshlavacek marked this pull request as draft May 13, 2026 05:25
…edup
The deduplicated `_set_item_attribute` helper rewrote the numeric-coercion
failure warning to "keeping existing {kind}", which regressed the
"keeping existing value"/"keeping existing size" wording that PR RuleWorld#97 (now
in main) standardized on. The merged `tests/test_block_warning_paths.py`
asserts the original wording, so all CI matrix jobs failed after rebase.
Restore "keeping existing {num_field} <existing>" (informative trailer
from PR RuleWorld#97 included) and align the new `test_block_setattr_logging.py`
parameter/compartment fixtures with the canonical messages.
@wshlavacek
wshlavacek marked this pull request as ready for review May 13, 2026 13:17
@wshlavacek

Copy link
Copy Markdown
ContributorAuthor

These edits have grown stale.

@wshlavacek
wshlavacek deleted the block-setattr-logging-dedup branch June 10, 2026 16:49
jrfaeder pushed a commit that referenced this pull request Jul 20, 2026
…rsing rules (#100)
* fix: Handle zero arguments in pyparsing rules
Wrapped `pp.delimitedList` inside `pp.Optional()` for `arg_type_curly`, `list_arg`, and `arg_type_list` in `bionetgen/core/utils/utils.py`. This ensures zero-argument scenarios such as `{}` and `[]` are parsed properly and resolves the TODO statements around zero arguments.
Co-authored-by: akutuva21 <44119804+akutuva21@users.noreply.github.com>
* chore: PR #100 remove forbidden artifacts and run black
---------
Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@wshlavacek@jrfaeder