Skip to content

🧪 test: add coverage for Function.gen_string#527

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
akutuva21 merged 2 commits into from
Jun 16, 2026
Merged

🧪 test: add coverage for Function.gen_string #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7afda54
test: add tests for Function.gen_string method
google-labs-jules[bot] Jun 15, 2026
8061e08
Merge main into branch, resolve conflicts
akutuva21 Jun 16, 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
71 changes: 71 additions & 0 deletions merge_all.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
#!/bin/bash
REPO="akutuva21/PyBioNetGen"
WORKDIR="C:\\Users\\Achyudhan\\OneDrive - University of Pittsburgh\\Desktop\\Achyudhan\\School\\PhD\\Research\\BioNetGen\\PyBioNetGen"

merge_pr() {
local PR_NUM=$1
local BRANCH=$2
local TYPE=$3

echo ""
echo "=========================================="
echo "Processing PR #$PR_NUM ($BRANCH) [$TYPE]"
echo "=========================================="

cd "$WORKDIR"

git fetch origin main 2>&1 | tail -1
git fetch origin "$BRANCH" 2>&1 | tail -1
git checkout "$BRANCH" 2>&1 | tail -1

set +e
MERGE_OUT=$(git merge origin/main 2>&1)
echo "$MERGE_OUT"

if echo "$MERGE_OUT" | grep -q "CONFLICT"; then
echo "Conflicts detected. Resolving..."
# Get list of conflicted files
CONFLICTED=$(git diff --name-only --diff-filter=U)
echo "Conflicted files: $CONFLICTED"
for cf in $CONFLICTED; do
if [[ "$cf" == *.py && "$TYPE" == "fix" ]] && [[ "$cf" != tests/* ]]; then
echo "Keeping PR changes for $cf"
git checkout --ours -- "$cf"
elif [[ "$cf" == *.py ]] || [[ "$cf" == tests/* ]]; then
echo "Resolving $cf by keeping both sides"
python resolve_conflicts.py "$cf"
else
echo "Keeping PR changes for $cf"
git checkout --ours -- "$cf"
fi
done
git add -A
git commit -m "Merge main into branch, resolve conflicts"
elif echo "$MERGE_OUT" | grep -q "Already up to date"; then
echo "Already up to date, no merge needed"
fi
set -e

git push origin "$BRANCH" 2>&1 | tail -1
gh pr merge "$PR_NUM" --repo "$REPO" --squash
echo "PR #$PR_NUM merged successfully"
}

merge_pr 527 "test-function-gen-string-14596172654307023112" "test"
merge_pr 528 "test-gen-string-moltype-7394950452375420266" "test"
merge_pr 529 "fix/remove-FIXME-double-bonds-12216291637563897193" "fix"
merge_pr 530 "test-rule-gen-string-6580954047996206196" "test"
merge_pr 531 "testing-improvement-repl-param-3756407388322308656" "test"
merge_pr 533 "test-gen-string-parameter-5218757950557121163" "test"
merge_pr 535 "testing-improvement-structs-comment-13863758712916026060" "test"
merge_pr 536 "raise-bngmodelerror-8033722994807130082" "fix"
merge_pr 537 "test-energypattern-genstring-17860189420800755178" "test"
merge_pr 538 "testing-improvement-structs-4147933409853088182" "test"
merge_pr 541 "testing-sympy-odes-repl-param-14393462678052208889" "test"
merge_pr 544 "testing-side-string-rule-5025066414790934300" "test"
merge_pr 545 "test-observable-gen-string-8174563756316453581" "test"

echo ""
echo "=========================================="
echo "ALL PRs PROCESSED"
echo "=========================================="
31 changes: 31 additions & 0 deletions resolve_conflicts.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import re, sys

filepath = sys.argv[1]
with open(filepath, "r") as f:
content = f.read()


# Pattern: <<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main
# Keep both sides separated by a blank line
def replace_conflict(m):
head = m.group(1).strip()
main = m.group(2).strip()
return head + "\n\n\n" + main


content = re.sub(
r"<<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main",
replace_conflict,
content,
flags=re.DOTALL,
)

# Clean up any remaining orphan conflict markers
content = content.replace(">>>>>>> origin/main", "")
content = content.replace("<<<<<<< HEAD", "")
content = content.replace("=======", "")

with open(filepath, "w") as f:
f.write(content)

print("Resolved conflicts in", filepath)
13 changes: 13 additions & 0 deletions tests/test_structs.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
from bionetgen.modelapi.structs import Action
import pytest
from bionetgen.modelapi.structs import ModelObj, Function


from bionetgen.modelapi.structs import ModelObj, Compartment, Observable, Action
from bionetgen.modelapi.pattern import Pattern, Molecule

Expand DownExpand Up@@ -44,6 +47,16 @@ def test_modelobj_line_label_setter():
obj.line_label = [1, 2, 3]
assert obj.line_label == "[1, 2, 3]: "

def test_function_gen_string():
f1 = Function(name="f1", expr="2 * x")
assert f1.gen_string() == "f1 = 2 * x"

f2 = Function(name="f2", expr="2 * x", args=["x"])
assert f2.gen_string() == "f2(x) = 2 * x"

f3 = Function(name="f3", expr="x * y", args=["x", "y"])
assert f3.gen_string() == "f3(x,y) = x * y"


def test_species_gen_string():
from bionetgen.modelapi.structs import Species
Expand Down
Loading
, '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" + '
🧪 test: add coverage for Function.gen_string by akutuva21 · Pull Request #527 · akutuva21/PyBioNetGen · GitHub
Skip to content
🧪 test: add coverage for Function.gen_string#527

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

akutuva21
merged 2 commits into

from

Jun 16, 2026
 Merged


🧪 test: add coverage for Function.gen_string
#527
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7afda54

test: add tests for Function.gen_string method


google-labs-jules[bot] Jun 15, 2026
8061e08

Merge main into branch, resolve conflicts


akutuva21 Jun 16, 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


71 changes: 71 additions & 0 deletions
merge_all.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
#!/bin/bash
REPO="akutuva21/PyBioNetGen"
WORKDIR="C:\\Users\\Achyudhan\\OneDrive - University of Pittsburgh\\Desktop\\Achyudhan\\School\\PhD\\Research\\BioNetGen\\PyBioNetGen"

merge_pr() {
 local PR_NUM=$1
 local BRANCH=$2
 local TYPE=$3

 echo ""
 echo "=========================================="
 echo "Processing PR #$PR_NUM ($BRANCH) [$TYPE]"
 echo "=========================================="

 cd "$WORKDIR"

 git fetch origin main 2>&1 | tail -1
 git fetch origin "$BRANCH" 2>&1 | tail -1
 git checkout "$BRANCH" 2>&1 | tail -1

 set +e
 MERGE_OUT=$(git merge origin/main 2>&1)
 echo "$MERGE_OUT"

 if echo "$MERGE_OUT" | grep -q "CONFLICT"; then
 echo "Conflicts detected. Resolving..."
 # Get list of conflicted files
 CONFLICTED=$(git diff --name-only --diff-filter=U)
 echo "Conflicted files: $CONFLICTED"
 for cf in $CONFLICTED; do
 if [[ "$cf" == *.py && "$TYPE" == "fix" ]] && [[ "$cf" != tests/* ]]; then
 echo "Keeping PR changes for $cf"
 git checkout --ours -- "$cf"
 elif [[ "$cf" == *.py ]] || [[ "$cf" == tests/* ]]; then
 echo "Resolving $cf by keeping both sides"
 python resolve_conflicts.py "$cf"
 else
 echo "Keeping PR changes for $cf"
 git checkout --ours -- "$cf"
 fi
 done
 git add -A
 git commit -m "Merge main into branch, resolve conflicts"
 elif echo "$MERGE_OUT" | grep -q "Already up to date"; then
 echo "Already up to date, no merge needed"
 fi
 set -e

 git push origin "$BRANCH" 2>&1 | tail -1
 gh pr merge "$PR_NUM" --repo "$REPO" --squash
 echo "PR #$PR_NUM merged successfully"
}

merge_pr 527 "test-function-gen-string-14596172654307023112" "test"
merge_pr 528 "test-gen-string-moltype-7394950452375420266" "test"
merge_pr 529 "fix/remove-FIXME-double-bonds-12216291637563897193" "fix"
merge_pr 530 "test-rule-gen-string-6580954047996206196" "test"
merge_pr 531 "testing-improvement-repl-param-3756407388322308656" "test"
merge_pr 533 "test-gen-string-parameter-5218757950557121163" "test"
merge_pr 535 "testing-improvement-structs-comment-13863758712916026060" "test"
merge_pr 536 "raise-bngmodelerror-8033722994807130082" "fix"
merge_pr 537 "test-energypattern-genstring-17860189420800755178" "test"
merge_pr 538 "testing-improvement-structs-4147933409853088182" "test"
merge_pr 541 "testing-sympy-odes-repl-param-14393462678052208889" "test"
merge_pr 544 "testing-side-string-rule-5025066414790934300" "test"
merge_pr 545 "test-observable-gen-string-8174563756316453581" "test"

echo ""
echo "=========================================="
echo "ALL PRs PROCESSED"
echo "=========================================="

31 changes: 31 additions & 0 deletions
resolve_conflicts.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import re, sys

filepath = sys.argv[1]
with open(filepath, "r") as f:
 content = f.read()


# Pattern: <<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main
# Keep both sides separated by a blank line
def replace_conflict(m):
 head = m.group(1).strip()
 main = m.group(2).strip()
 return head + "\n\n\n" + main


content = re.sub(
 r"<<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main",
 replace_conflict,
 content,
 flags=re.DOTALL,
)

# Clean up any remaining orphan conflict markers
content = content.replace(">>>>>>> origin/main", "")
content = content.replace("<<<<<<< HEAD", "")
content = content.replace("=======", "")

with open(filepath, "w") as f:
 f.write(content)

print("Resolved conflicts in", filepath)

13 changes: 13 additions & 0 deletions
tests/test_structs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
from bionetgen.modelapi.structs import Action
import pytest
from bionetgen.modelapi.structs import ModelObj, Function


from bionetgen.modelapi.structs import ModelObj, Compartment, Observable, Action
from bionetgen.modelapi.pattern import Pattern, Molecule

Expand DownExpand Up@@ -44,6 +47,16 @@ def test_modelobj_line_label_setter():
 obj.line_label = [1, 2, 3]
 assert obj.line_label == "[1, 2, 3]: "

def test_function_gen_string():
 f1 = Function(name="f1", expr="2 * x")
 assert f1.gen_string() == "f1 = 2 * x"

 f2 = Function(name="f2", expr="2 * x", args=["x"])
 assert f2.gen_string() == "f2(x) = 2 * x"

 f3 = Function(name="f3", expr="x * y", args=["x", "y"])
 assert f3.gen_string() == "f3(x,y) = x * y"


def test_species_gen_string():
 from bionetgen.modelapi.structs import Species
Expand Down
Loading

, '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('^' + ".*" + '
🧪 test: add coverage for Function.gen_string by akutuva21 · Pull Request #527 · akutuva21/PyBioNetGen · GitHub
Skip to content
🧪 test: add coverage for Function.gen_string#527

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

akutuva21
merged 2 commits into

from

Jun 16, 2026
 Merged


🧪 test: add coverage for Function.gen_string
#527
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7afda54

test: add tests for Function.gen_string method


google-labs-jules[bot] Jun 15, 2026
8061e08

Merge main into branch, resolve conflicts


akutuva21 Jun 16, 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


71 changes: 71 additions & 0 deletions
merge_all.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
#!/bin/bash
REPO="akutuva21/PyBioNetGen"
WORKDIR="C:\\Users\\Achyudhan\\OneDrive - University of Pittsburgh\\Desktop\\Achyudhan\\School\\PhD\\Research\\BioNetGen\\PyBioNetGen"

merge_pr() {
 local PR_NUM=$1
 local BRANCH=$2
 local TYPE=$3

 echo ""
 echo "=========================================="
 echo "Processing PR #$PR_NUM ($BRANCH) [$TYPE]"
 echo "=========================================="

 cd "$WORKDIR"

 git fetch origin main 2>&1 | tail -1
 git fetch origin "$BRANCH" 2>&1 | tail -1
 git checkout "$BRANCH" 2>&1 | tail -1

 set +e
 MERGE_OUT=$(git merge origin/main 2>&1)
 echo "$MERGE_OUT"

 if echo "$MERGE_OUT" | grep -q "CONFLICT"; then
 echo "Conflicts detected. Resolving..."
 # Get list of conflicted files
 CONFLICTED=$(git diff --name-only --diff-filter=U)
 echo "Conflicted files: $CONFLICTED"
 for cf in $CONFLICTED; do
 if [[ "$cf" == *.py && "$TYPE" == "fix" ]] && [[ "$cf" != tests/* ]]; then
 echo "Keeping PR changes for $cf"
 git checkout --ours -- "$cf"
 elif [[ "$cf" == *.py ]] || [[ "$cf" == tests/* ]]; then
 echo "Resolving $cf by keeping both sides"
 python resolve_conflicts.py "$cf"
 else
 echo "Keeping PR changes for $cf"
 git checkout --ours -- "$cf"
 fi
 done
 git add -A
 git commit -m "Merge main into branch, resolve conflicts"
 elif echo "$MERGE_OUT" | grep -q "Already up to date"; then
 echo "Already up to date, no merge needed"
 fi
 set -e

 git push origin "$BRANCH" 2>&1 | tail -1
 gh pr merge "$PR_NUM" --repo "$REPO" --squash
 echo "PR #$PR_NUM merged successfully"
}

merge_pr 527 "test-function-gen-string-14596172654307023112" "test"
merge_pr 528 "test-gen-string-moltype-7394950452375420266" "test"
merge_pr 529 "fix/remove-FIXME-double-bonds-12216291637563897193" "fix"
merge_pr 530 "test-rule-gen-string-6580954047996206196" "test"
merge_pr 531 "testing-improvement-repl-param-3756407388322308656" "test"
merge_pr 533 "test-gen-string-parameter-5218757950557121163" "test"
merge_pr 535 "testing-improvement-structs-comment-13863758712916026060" "test"
merge_pr 536 "raise-bngmodelerror-8033722994807130082" "fix"
merge_pr 537 "test-energypattern-genstring-17860189420800755178" "test"
merge_pr 538 "testing-improvement-structs-4147933409853088182" "test"
merge_pr 541 "testing-sympy-odes-repl-param-14393462678052208889" "test"
merge_pr 544 "testing-side-string-rule-5025066414790934300" "test"
merge_pr 545 "test-observable-gen-string-8174563756316453581" "test"

echo ""
echo "=========================================="
echo "ALL PRs PROCESSED"
echo "=========================================="

31 changes: 31 additions & 0 deletions
resolve_conflicts.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import re, sys

filepath = sys.argv[1]
with open(filepath, "r") as f:
 content = f.read()


# Pattern: <<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main
# Keep both sides separated by a blank line
def replace_conflict(m):
 head = m.group(1).strip()
 main = m.group(2).strip()
 return head + "\n\n\n" + main


content = re.sub(
 r"<<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main",
 replace_conflict,
 content,
 flags=re.DOTALL,
)

# Clean up any remaining orphan conflict markers
content = content.replace(">>>>>>> origin/main", "")
content = content.replace("<<<<<<< HEAD", "")
content = content.replace("=======", "")

with open(filepath, "w") as f:
 f.write(content)

print("Resolved conflicts in", filepath)

13 changes: 13 additions & 0 deletions
tests/test_structs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
from bionetgen.modelapi.structs import Action
import pytest
from bionetgen.modelapi.structs import ModelObj, Function


from bionetgen.modelapi.structs import ModelObj, Compartment, Observable, Action
from bionetgen.modelapi.pattern import Pattern, Molecule

Expand DownExpand Up@@ -44,6 +47,16 @@ def test_modelobj_line_label_setter():
 obj.line_label = [1, 2, 3]
 assert obj.line_label == "[1, 2, 3]: "

def test_function_gen_string():
 f1 = Function(name="f1", expr="2 * x")
 assert f1.gen_string() == "f1 = 2 * x"

 f2 = Function(name="f2", expr="2 * x", args=["x"])
 assert f2.gen_string() == "f2(x) = 2 * x"

 f3 = Function(name="f3", expr="x * y", args=["x", "y"])
 assert f3.gen_string() == "f3(x,y) = x * y"


def test_species_gen_string():
 from bionetgen.modelapi.structs import Species
Expand Down
Loading

, '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('^' + ".*" + '
🧪 test: add coverage for Function.gen_string by akutuva21 · Pull Request #527 · akutuva21/PyBioNetGen · GitHub
Skip to content
🧪 test: add coverage for Function.gen_string#527

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

akutuva21
merged 2 commits into

from

Jun 16, 2026
 Merged


🧪 test: add coverage for Function.gen_string
#527
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7afda54

test: add tests for Function.gen_string method


google-labs-jules[bot] Jun 15, 2026
8061e08

Merge main into branch, resolve conflicts


akutuva21 Jun 16, 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


71 changes: 71 additions & 0 deletions
merge_all.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
#!/bin/bash
REPO="akutuva21/PyBioNetGen"
WORKDIR="C:\\Users\\Achyudhan\\OneDrive - University of Pittsburgh\\Desktop\\Achyudhan\\School\\PhD\\Research\\BioNetGen\\PyBioNetGen"

merge_pr() {
 local PR_NUM=$1
 local BRANCH=$2
 local TYPE=$3

 echo ""
 echo "=========================================="
 echo "Processing PR #$PR_NUM ($BRANCH) [$TYPE]"
 echo "=========================================="

 cd "$WORKDIR"

 git fetch origin main 2>&1 | tail -1
 git fetch origin "$BRANCH" 2>&1 | tail -1
 git checkout "$BRANCH" 2>&1 | tail -1

 set +e
 MERGE_OUT=$(git merge origin/main 2>&1)
 echo "$MERGE_OUT"

 if echo "$MERGE_OUT" | grep -q "CONFLICT"; then
 echo "Conflicts detected. Resolving..."
 # Get list of conflicted files
 CONFLICTED=$(git diff --name-only --diff-filter=U)
 echo "Conflicted files: $CONFLICTED"
 for cf in $CONFLICTED; do
 if [[ "$cf" == *.py && "$TYPE" == "fix" ]] && [[ "$cf" != tests/* ]]; then
 echo "Keeping PR changes for $cf"
 git checkout --ours -- "$cf"
 elif [[ "$cf" == *.py ]] || [[ "$cf" == tests/* ]]; then
 echo "Resolving $cf by keeping both sides"
 python resolve_conflicts.py "$cf"
 else
 echo "Keeping PR changes for $cf"
 git checkout --ours -- "$cf"
 fi
 done
 git add -A
 git commit -m "Merge main into branch, resolve conflicts"
 elif echo "$MERGE_OUT" | grep -q "Already up to date"; then
 echo "Already up to date, no merge needed"
 fi
 set -e

 git push origin "$BRANCH" 2>&1 | tail -1
 gh pr merge "$PR_NUM" --repo "$REPO" --squash
 echo "PR #$PR_NUM merged successfully"
}

merge_pr 527 "test-function-gen-string-14596172654307023112" "test"
merge_pr 528 "test-gen-string-moltype-7394950452375420266" "test"
merge_pr 529 "fix/remove-FIXME-double-bonds-12216291637563897193" "fix"
merge_pr 530 "test-rule-gen-string-6580954047996206196" "test"
merge_pr 531 "testing-improvement-repl-param-3756407388322308656" "test"
merge_pr 533 "test-gen-string-parameter-5218757950557121163" "test"
merge_pr 535 "testing-improvement-structs-comment-13863758712916026060" "test"
merge_pr 536 "raise-bngmodelerror-8033722994807130082" "fix"
merge_pr 537 "test-energypattern-genstring-17860189420800755178" "test"
merge_pr 538 "testing-improvement-structs-4147933409853088182" "test"
merge_pr 541 "testing-sympy-odes-repl-param-14393462678052208889" "test"
merge_pr 544 "testing-side-string-rule-5025066414790934300" "test"
merge_pr 545 "test-observable-gen-string-8174563756316453581" "test"

echo ""
echo "=========================================="
echo "ALL PRs PROCESSED"
echo "=========================================="

31 changes: 31 additions & 0 deletions
resolve_conflicts.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import re, sys

filepath = sys.argv[1]
with open(filepath, "r") as f:
 content = f.read()


# Pattern: <<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main
# Keep both sides separated by a blank line
def replace_conflict(m):
 head = m.group(1).strip()
 main = m.group(2).strip()
 return head + "\n\n\n" + main


content = re.sub(
 r"<<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main",
 replace_conflict,
 content,
 flags=re.DOTALL,
)

# Clean up any remaining orphan conflict markers
content = content.replace(">>>>>>> origin/main", "")
content = content.replace("<<<<<<< HEAD", "")
content = content.replace("=======", "")

with open(filepath, "w") as f:
 f.write(content)

print("Resolved conflicts in", filepath)

13 changes: 13 additions & 0 deletions
tests/test_structs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
from bionetgen.modelapi.structs import Action
import pytest
from bionetgen.modelapi.structs import ModelObj, Function


from bionetgen.modelapi.structs import ModelObj, Compartment, Observable, Action
from bionetgen.modelapi.pattern import Pattern, Molecule

Expand DownExpand Up@@ -44,6 +47,16 @@ def test_modelobj_line_label_setter():
 obj.line_label = [1, 2, 3]
 assert obj.line_label == "[1, 2, 3]: "

def test_function_gen_string():
 f1 = Function(name="f1", expr="2 * x")
 assert f1.gen_string() == "f1 = 2 * x"

 f2 = Function(name="f2", expr="2 * x", args=["x"])
 assert f2.gen_string() == "f2(x) = 2 * x"

 f3 = Function(name="f3", expr="x * y", args=["x", "y"])
 assert f3.gen_string() == "f3(x,y) = x * y"


def test_species_gen_string():
 from bionetgen.modelapi.structs import Species
Expand Down
Loading

, '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" + '
🧪 test: add coverage for Function.gen_string by akutuva21 · Pull Request #527 · akutuva21/PyBioNetGen · GitHub
Skip to content
🧪 test: add coverage for Function.gen_string#527

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

akutuva21
merged 2 commits into

from

Jun 16, 2026
 Merged


🧪 test: add coverage for Function.gen_string
#527
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7afda54

test: add tests for Function.gen_string method


google-labs-jules[bot] Jun 15, 2026
8061e08

Merge main into branch, resolve conflicts


akutuva21 Jun 16, 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


71 changes: 71 additions & 0 deletions
merge_all.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
#!/bin/bash
REPO="akutuva21/PyBioNetGen"
WORKDIR="C:\\Users\\Achyudhan\\OneDrive - University of Pittsburgh\\Desktop\\Achyudhan\\School\\PhD\\Research\\BioNetGen\\PyBioNetGen"

merge_pr() {
 local PR_NUM=$1
 local BRANCH=$2
 local TYPE=$3

 echo ""
 echo "=========================================="
 echo "Processing PR #$PR_NUM ($BRANCH) [$TYPE]"
 echo "=========================================="

 cd "$WORKDIR"

 git fetch origin main 2>&1 | tail -1
 git fetch origin "$BRANCH" 2>&1 | tail -1
 git checkout "$BRANCH" 2>&1 | tail -1

 set +e
 MERGE_OUT=$(git merge origin/main 2>&1)
 echo "$MERGE_OUT"

 if echo "$MERGE_OUT" | grep -q "CONFLICT"; then
 echo "Conflicts detected. Resolving..."
 # Get list of conflicted files
 CONFLICTED=$(git diff --name-only --diff-filter=U)
 echo "Conflicted files: $CONFLICTED"
 for cf in $CONFLICTED; do
 if [[ "$cf" == *.py && "$TYPE" == "fix" ]] && [[ "$cf" != tests/* ]]; then
 echo "Keeping PR changes for $cf"
 git checkout --ours -- "$cf"
 elif [[ "$cf" == *.py ]] || [[ "$cf" == tests/* ]]; then
 echo "Resolving $cf by keeping both sides"
 python resolve_conflicts.py "$cf"
 else
 echo "Keeping PR changes for $cf"
 git checkout --ours -- "$cf"
 fi
 done
 git add -A
 git commit -m "Merge main into branch, resolve conflicts"
 elif echo "$MERGE_OUT" | grep -q "Already up to date"; then
 echo "Already up to date, no merge needed"
 fi
 set -e

 git push origin "$BRANCH" 2>&1 | tail -1
 gh pr merge "$PR_NUM" --repo "$REPO" --squash
 echo "PR #$PR_NUM merged successfully"
}

merge_pr 527 "test-function-gen-string-14596172654307023112" "test"
merge_pr 528 "test-gen-string-moltype-7394950452375420266" "test"
merge_pr 529 "fix/remove-FIXME-double-bonds-12216291637563897193" "fix"
merge_pr 530 "test-rule-gen-string-6580954047996206196" "test"
merge_pr 531 "testing-improvement-repl-param-3756407388322308656" "test"
merge_pr 533 "test-gen-string-parameter-5218757950557121163" "test"
merge_pr 535 "testing-improvement-structs-comment-13863758712916026060" "test"
merge_pr 536 "raise-bngmodelerror-8033722994807130082" "fix"
merge_pr 537 "test-energypattern-genstring-17860189420800755178" "test"
merge_pr 538 "testing-improvement-structs-4147933409853088182" "test"
merge_pr 541 "testing-sympy-odes-repl-param-14393462678052208889" "test"
merge_pr 544 "testing-side-string-rule-5025066414790934300" "test"
merge_pr 545 "test-observable-gen-string-8174563756316453581" "test"

echo ""
echo "=========================================="
echo "ALL PRs PROCESSED"
echo "=========================================="

31 changes: 31 additions & 0 deletions
resolve_conflicts.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import re, sys

filepath = sys.argv[1]
with open(filepath, "r") as f:
 content = f.read()


# Pattern: <<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main
# Keep both sides separated by a blank line
def replace_conflict(m):
 head = m.group(1).strip()
 main = m.group(2).strip()
 return head + "\n\n\n" + main


content = re.sub(
 r"<<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main",
 replace_conflict,
 content,
 flags=re.DOTALL,
)

# Clean up any remaining orphan conflict markers
content = content.replace(">>>>>>> origin/main", "")
content = content.replace("<<<<<<< HEAD", "")
content = content.replace("=======", "")

with open(filepath, "w") as f:
 f.write(content)

print("Resolved conflicts in", filepath)

13 changes: 13 additions & 0 deletions
tests/test_structs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
from bionetgen.modelapi.structs import Action
import pytest
from bionetgen.modelapi.structs import ModelObj, Function


from bionetgen.modelapi.structs import ModelObj, Compartment, Observable, Action
from bionetgen.modelapi.pattern import Pattern, Molecule

Expand DownExpand Up@@ -44,6 +47,16 @@ def test_modelobj_line_label_setter():
 obj.line_label = [1, 2, 3]
 assert obj.line_label == "[1, 2, 3]: "

def test_function_gen_string():
 f1 = Function(name="f1", expr="2 * x")
 assert f1.gen_string() == "f1 = 2 * x"

 f2 = Function(name="f2", expr="2 * x", args=["x"])
 assert f2.gen_string() == "f2(x) = 2 * x"

 f3 = Function(name="f3", expr="x * y", args=["x", "y"])
 assert f3.gen_string() == "f3(x,y) = x * y"


def test_species_gen_string():
 from bionetgen.modelapi.structs import Species
Expand Down
Loading

, '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('^' + ".*" + '
🧪 test: add coverage for Function.gen_string by akutuva21 · Pull Request #527 · akutuva21/PyBioNetGen · GitHub
Skip to content
🧪 test: add coverage for Function.gen_string#527

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

akutuva21
merged 2 commits into

from

Jun 16, 2026
 Merged


🧪 test: add coverage for Function.gen_string
#527
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7afda54

test: add tests for Function.gen_string method


google-labs-jules[bot] Jun 15, 2026
8061e08

Merge main into branch, resolve conflicts


akutuva21 Jun 16, 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


71 changes: 71 additions & 0 deletions
merge_all.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
#!/bin/bash
REPO="akutuva21/PyBioNetGen"
WORKDIR="C:\\Users\\Achyudhan\\OneDrive - University of Pittsburgh\\Desktop\\Achyudhan\\School\\PhD\\Research\\BioNetGen\\PyBioNetGen"

merge_pr() {
 local PR_NUM=$1
 local BRANCH=$2
 local TYPE=$3

 echo ""
 echo "=========================================="
 echo "Processing PR #$PR_NUM ($BRANCH) [$TYPE]"
 echo "=========================================="

 cd "$WORKDIR"

 git fetch origin main 2>&1 | tail -1
 git fetch origin "$BRANCH" 2>&1 | tail -1
 git checkout "$BRANCH" 2>&1 | tail -1

 set +e
 MERGE_OUT=$(git merge origin/main 2>&1)
 echo "$MERGE_OUT"

 if echo "$MERGE_OUT" | grep -q "CONFLICT"; then
 echo "Conflicts detected. Resolving..."
 # Get list of conflicted files
 CONFLICTED=$(git diff --name-only --diff-filter=U)
 echo "Conflicted files: $CONFLICTED"
 for cf in $CONFLICTED; do
 if [[ "$cf" == *.py && "$TYPE" == "fix" ]] && [[ "$cf" != tests/* ]]; then
 echo "Keeping PR changes for $cf"
 git checkout --ours -- "$cf"
 elif [[ "$cf" == *.py ]] || [[ "$cf" == tests/* ]]; then
 echo "Resolving $cf by keeping both sides"
 python resolve_conflicts.py "$cf"
 else
 echo "Keeping PR changes for $cf"
 git checkout --ours -- "$cf"
 fi
 done
 git add -A
 git commit -m "Merge main into branch, resolve conflicts"
 elif echo "$MERGE_OUT" | grep -q "Already up to date"; then
 echo "Already up to date, no merge needed"
 fi
 set -e

 git push origin "$BRANCH" 2>&1 | tail -1
 gh pr merge "$PR_NUM" --repo "$REPO" --squash
 echo "PR #$PR_NUM merged successfully"
}

merge_pr 527 "test-function-gen-string-14596172654307023112" "test"
merge_pr 528 "test-gen-string-moltype-7394950452375420266" "test"
merge_pr 529 "fix/remove-FIXME-double-bonds-12216291637563897193" "fix"
merge_pr 530 "test-rule-gen-string-6580954047996206196" "test"
merge_pr 531 "testing-improvement-repl-param-3756407388322308656" "test"
merge_pr 533 "test-gen-string-parameter-5218757950557121163" "test"
merge_pr 535 "testing-improvement-structs-comment-13863758712916026060" "test"
merge_pr 536 "raise-bngmodelerror-8033722994807130082" "fix"
merge_pr 537 "test-energypattern-genstring-17860189420800755178" "test"
merge_pr 538 "testing-improvement-structs-4147933409853088182" "test"
merge_pr 541 "testing-sympy-odes-repl-param-14393462678052208889" "test"
merge_pr 544 "testing-side-string-rule-5025066414790934300" "test"
merge_pr 545 "test-observable-gen-string-8174563756316453581" "test"

echo ""
echo "=========================================="
echo "ALL PRs PROCESSED"
echo "=========================================="

31 changes: 31 additions & 0 deletions
resolve_conflicts.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import re, sys

filepath = sys.argv[1]
with open(filepath, "r") as f:
 content = f.read()


# Pattern: <<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main
# Keep both sides separated by a blank line
def replace_conflict(m):
 head = m.group(1).strip()
 main = m.group(2).strip()
 return head + "\n\n\n" + main


content = re.sub(
 r"<<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main",
 replace_conflict,
 content,
 flags=re.DOTALL,
)

# Clean up any remaining orphan conflict markers
content = content.replace(">>>>>>> origin/main", "")
content = content.replace("<<<<<<< HEAD", "")
content = content.replace("=======", "")

with open(filepath, "w") as f:
 f.write(content)

print("Resolved conflicts in", filepath)

13 changes: 13 additions & 0 deletions
tests/test_structs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
from bionetgen.modelapi.structs import Action
import pytest
from bionetgen.modelapi.structs import ModelObj, Function


from bionetgen.modelapi.structs import ModelObj, Compartment, Observable, Action
from bionetgen.modelapi.pattern import Pattern, Molecule

Expand DownExpand Up@@ -44,6 +47,16 @@ def test_modelobj_line_label_setter():
 obj.line_label = [1, 2, 3]
 assert obj.line_label == "[1, 2, 3]: "

def test_function_gen_string():
 f1 = Function(name="f1", expr="2 * x")
 assert f1.gen_string() == "f1 = 2 * x"

 f2 = Function(name="f2", expr="2 * x", args=["x"])
 assert f2.gen_string() == "f2(x) = 2 * x"

 f3 = Function(name="f3", expr="x * y", args=["x", "y"])
 assert f3.gen_string() == "f3(x,y) = x * y"


def test_species_gen_string():
 from bionetgen.modelapi.structs import Species
Expand Down
Loading

, '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('^' + ".*" + '
🧪 test: add coverage for Function.gen_string by akutuva21 · Pull Request #527 · akutuva21/PyBioNetGen · GitHub
Skip to content
🧪 test: add coverage for Function.gen_string#527

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

akutuva21
merged 2 commits into

from

Jun 16, 2026
 Merged


🧪 test: add coverage for Function.gen_string
#527
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7afda54

test: add tests for Function.gen_string method


google-labs-jules[bot] Jun 15, 2026
8061e08

Merge main into branch, resolve conflicts


akutuva21 Jun 16, 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


71 changes: 71 additions & 0 deletions
merge_all.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
#!/bin/bash
REPO="akutuva21/PyBioNetGen"
WORKDIR="C:\\Users\\Achyudhan\\OneDrive - University of Pittsburgh\\Desktop\\Achyudhan\\School\\PhD\\Research\\BioNetGen\\PyBioNetGen"

merge_pr() {
 local PR_NUM=$1
 local BRANCH=$2
 local TYPE=$3

 echo ""
 echo "=========================================="
 echo "Processing PR #$PR_NUM ($BRANCH) [$TYPE]"
 echo "=========================================="

 cd "$WORKDIR"

 git fetch origin main 2>&1 | tail -1
 git fetch origin "$BRANCH" 2>&1 | tail -1
 git checkout "$BRANCH" 2>&1 | tail -1

 set +e
 MERGE_OUT=$(git merge origin/main 2>&1)
 echo "$MERGE_OUT"

 if echo "$MERGE_OUT" | grep -q "CONFLICT"; then
 echo "Conflicts detected. Resolving..."
 # Get list of conflicted files
 CONFLICTED=$(git diff --name-only --diff-filter=U)
 echo "Conflicted files: $CONFLICTED"
 for cf in $CONFLICTED; do
 if [[ "$cf" == *.py && "$TYPE" == "fix" ]] && [[ "$cf" != tests/* ]]; then
 echo "Keeping PR changes for $cf"
 git checkout --ours -- "$cf"
 elif [[ "$cf" == *.py ]] || [[ "$cf" == tests/* ]]; then
 echo "Resolving $cf by keeping both sides"
 python resolve_conflicts.py "$cf"
 else
 echo "Keeping PR changes for $cf"
 git checkout --ours -- "$cf"
 fi
 done
 git add -A
 git commit -m "Merge main into branch, resolve conflicts"
 elif echo "$MERGE_OUT" | grep -q "Already up to date"; then
 echo "Already up to date, no merge needed"
 fi
 set -e

 git push origin "$BRANCH" 2>&1 | tail -1
 gh pr merge "$PR_NUM" --repo "$REPO" --squash
 echo "PR #$PR_NUM merged successfully"
}

merge_pr 527 "test-function-gen-string-14596172654307023112" "test"
merge_pr 528 "test-gen-string-moltype-7394950452375420266" "test"
merge_pr 529 "fix/remove-FIXME-double-bonds-12216291637563897193" "fix"
merge_pr 530 "test-rule-gen-string-6580954047996206196" "test"
merge_pr 531 "testing-improvement-repl-param-3756407388322308656" "test"
merge_pr 533 "test-gen-string-parameter-5218757950557121163" "test"
merge_pr 535 "testing-improvement-structs-comment-13863758712916026060" "test"
merge_pr 536 "raise-bngmodelerror-8033722994807130082" "fix"
merge_pr 537 "test-energypattern-genstring-17860189420800755178" "test"
merge_pr 538 "testing-improvement-structs-4147933409853088182" "test"
merge_pr 541 "testing-sympy-odes-repl-param-14393462678052208889" "test"
merge_pr 544 "testing-side-string-rule-5025066414790934300" "test"
merge_pr 545 "test-observable-gen-string-8174563756316453581" "test"

echo ""
echo "=========================================="
echo "ALL PRs PROCESSED"
echo "=========================================="

31 changes: 31 additions & 0 deletions
resolve_conflicts.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import re, sys

filepath = sys.argv[1]
with open(filepath, "r") as f:
 content = f.read()


# Pattern: <<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main
# Keep both sides separated by a blank line
def replace_conflict(m):
 head = m.group(1).strip()
 main = m.group(2).strip()
 return head + "\n\n\n" + main


content = re.sub(
 r"<<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main",
 replace_conflict,
 content,
 flags=re.DOTALL,
)

# Clean up any remaining orphan conflict markers
content = content.replace(">>>>>>> origin/main", "")
content = content.replace("<<<<<<< HEAD", "")
content = content.replace("=======", "")

with open(filepath, "w") as f:
 f.write(content)

print("Resolved conflicts in", filepath)

13 changes: 13 additions & 0 deletions
tests/test_structs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
from bionetgen.modelapi.structs import Action
import pytest
from bionetgen.modelapi.structs import ModelObj, Function


from bionetgen.modelapi.structs import ModelObj, Compartment, Observable, Action
from bionetgen.modelapi.pattern import Pattern, Molecule

Expand DownExpand Up@@ -44,6 +47,16 @@ def test_modelobj_line_label_setter():
 obj.line_label = [1, 2, 3]
 assert obj.line_label == "[1, 2, 3]: "

def test_function_gen_string():
 f1 = Function(name="f1", expr="2 * x")
 assert f1.gen_string() == "f1 = 2 * x"

 f2 = Function(name="f2", expr="2 * x", args=["x"])
 assert f2.gen_string() == "f2(x) = 2 * x"

 f3 = Function(name="f3", expr="x * y", args=["x", "y"])
 assert f3.gen_string() == "f3(x,y) = x * y"


def test_species_gen_string():
 from bionetgen.modelapi.structs import Species
Expand Down
Loading

, '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); }
})();
})();
🧪 test: add coverage for Function.gen_string by akutuva21 · Pull Request #527 · akutuva21/PyBioNetGen · GitHub
Skip to content
🧪 test: add coverage for Function.gen_string#527

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

akutuva21
merged 2 commits into

from

Jun 16, 2026
 Merged


🧪 test: add coverage for Function.gen_string
#527
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7afda54

test: add tests for Function.gen_string method


google-labs-jules[bot] Jun 15, 2026
8061e08

Merge main into branch, resolve conflicts


akutuva21 Jun 16, 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


71 changes: 71 additions & 0 deletions
merge_all.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
#!/bin/bash
REPO="akutuva21/PyBioNetGen"
WORKDIR="C:\\Users\\Achyudhan\\OneDrive - University of Pittsburgh\\Desktop\\Achyudhan\\School\\PhD\\Research\\BioNetGen\\PyBioNetGen"

merge_pr() {
 local PR_NUM=$1
 local BRANCH=$2
 local TYPE=$3

 echo ""
 echo "=========================================="
 echo "Processing PR #$PR_NUM ($BRANCH) [$TYPE]"
 echo "=========================================="

 cd "$WORKDIR"

 git fetch origin main 2>&1 | tail -1
 git fetch origin "$BRANCH" 2>&1 | tail -1
 git checkout "$BRANCH" 2>&1 | tail -1

 set +e
 MERGE_OUT=$(git merge origin/main 2>&1)
 echo "$MERGE_OUT"

 if echo "$MERGE_OUT" | grep -q "CONFLICT"; then
 echo "Conflicts detected. Resolving..."
 # Get list of conflicted files
 CONFLICTED=$(git diff --name-only --diff-filter=U)
 echo "Conflicted files: $CONFLICTED"
 for cf in $CONFLICTED; do
 if [[ "$cf" == *.py && "$TYPE" == "fix" ]] && [[ "$cf" != tests/* ]]; then
 echo "Keeping PR changes for $cf"
 git checkout --ours -- "$cf"
 elif [[ "$cf" == *.py ]] || [[ "$cf" == tests/* ]]; then
 echo "Resolving $cf by keeping both sides"
 python resolve_conflicts.py "$cf"
 else
 echo "Keeping PR changes for $cf"
 git checkout --ours -- "$cf"
 fi
 done
 git add -A
 git commit -m "Merge main into branch, resolve conflicts"
 elif echo "$MERGE_OUT" | grep -q "Already up to date"; then
 echo "Already up to date, no merge needed"
 fi
 set -e

 git push origin "$BRANCH" 2>&1 | tail -1
 gh pr merge "$PR_NUM" --repo "$REPO" --squash
 echo "PR #$PR_NUM merged successfully"
}

merge_pr 527 "test-function-gen-string-14596172654307023112" "test"
merge_pr 528 "test-gen-string-moltype-7394950452375420266" "test"
merge_pr 529 "fix/remove-FIXME-double-bonds-12216291637563897193" "fix"
merge_pr 530 "test-rule-gen-string-6580954047996206196" "test"
merge_pr 531 "testing-improvement-repl-param-3756407388322308656" "test"
merge_pr 533 "test-gen-string-parameter-5218757950557121163" "test"
merge_pr 535 "testing-improvement-structs-comment-13863758712916026060" "test"
merge_pr 536 "raise-bngmodelerror-8033722994807130082" "fix"
merge_pr 537 "test-energypattern-genstring-17860189420800755178" "test"
merge_pr 538 "testing-improvement-structs-4147933409853088182" "test"
merge_pr 541 "testing-sympy-odes-repl-param-14393462678052208889" "test"
merge_pr 544 "testing-side-string-rule-5025066414790934300" "test"
merge_pr 545 "test-observable-gen-string-8174563756316453581" "test"

echo ""
echo "=========================================="
echo "ALL PRs PROCESSED"
echo "=========================================="

31 changes: 31 additions & 0 deletions
resolve_conflicts.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
import re, sys

filepath = sys.argv[1]
with open(filepath, "r") as f:
 content = f.read()


# Pattern: <<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main
# Keep both sides separated by a blank line
def replace_conflict(m):
 head = m.group(1).strip()
 main = m.group(2).strip()
 return head + "\n\n\n" + main


content = re.sub(
 r"<<<<<<< HEAD\n(.*?)\n=======\n(.*?)\n>>>>>>> origin/main",
 replace_conflict,
 content,
 flags=re.DOTALL,
)

# Clean up any remaining orphan conflict markers
content = content.replace(">>>>>>> origin/main", "")
content = content.replace("<<<<<<< HEAD", "")
content = content.replace("=======", "")

with open(filepath, "w") as f:
 f.write(content)

print("Resolved conflicts in", filepath)

13 changes: 13 additions & 0 deletions
tests/test_structs.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
from bionetgen.modelapi.structs import Action
import pytest
from bionetgen.modelapi.structs import ModelObj, Function


from bionetgen.modelapi.structs import ModelObj, Compartment, Observable, Action
from bionetgen.modelapi.pattern import Pattern, Molecule

Expand DownExpand Up@@ -44,6 +47,16 @@ def test_modelobj_line_label_setter():
 obj.line_label = [1, 2, 3]
 assert obj.line_label == "[1, 2, 3]: "

def test_function_gen_string():
 f1 = Function(name="f1", expr="2 * x")
 assert f1.gen_string() == "f1 = 2 * x"

 f2 = Function(name="f2", expr="2 * x", args=["x"])
 assert f2.gen_string() == "f2(x) = 2 * x"

 f3 = Function(name="f3", expr="x * y", args=["x", "y"])
 assert f3.gen_string() == "f3(x,y) = x * y"


def test_species_gen_string():
 from bionetgen.modelapi.structs import Species
Expand Down
Loading