Skip to content

Commit ad837a9

Browse files
committed
Update README examples to include force_refresh parameter and modify query conditions for TransgeneExpressionHere
1 parent 241a13e commit ad837a9

3 files changed

Lines changed: 19 additions & 12 deletions

File tree

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import vfbquery as vfb
1414
```
1515
Class example:
1616
```python
17-
vfb.get_term_info('FBbt_00003748')
17+
vfb.get_term_info('FBbt_00003748', force_refresh=True)
1818
```
1919
```json
2020
{
@@ -1005,6 +1005,7 @@ vfb.get_term_info('FBbt_00003748')
10051005
"short_form": {
10061006
"$and": [
10071007
"Class",
1008+
"Nervous_system",
10081009
"Anatomy"
10091010
]
10101011
},

src/test/readme_parser.py

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,27 @@ def extract_code_blocks(readme_path):
3838
continue
3939

4040
# Check if this call uses performance test terms - skip force_refresh for those
41-
if 'FBbt_00003748' in call or 'VFB_00101567' in call:
41+
# NOTE: FBbt_00003748 (medulla) now needs force_refresh to get updated queries
42+
if 'VFB_00101567' in call:
4243
processed_python_blocks.append(call)
4344
continue
4445

4546
# Check if the call already has parameters
4647
if '(' in call and ')' in call:
47-
# Insert force_refresh=True before the closing parenthesis
48-
# Handle both cases: with and without existing parameters
49-
if call.rstrip(')').endswith('('):
50-
# No parameters: vfb.function()
51-
modified_call = call[:-1] + 'force_refresh=True)'
48+
# Check if force_refresh is already present
49+
if 'force_refresh' in call:
50+
# Already has force_refresh, use as-is
51+
processed_python_blocks.append(call)
5252
else:
53-
# Has parameters: vfb.function(param1, param2)
54-
modified_call = call[:-1] + ', force_refresh=True)'
55-
processed_python_blocks.append(modified_call)
53+
# Insert force_refresh=True before the closing parenthesis
54+
# Handle both cases: with and without existing parameters
55+
if call.rstrip(')').endswith('('):
56+
# No parameters: vfb.function()
57+
modified_call = call[:-1] + 'force_refresh=True)'
58+
else:
59+
# Has parameters: vfb.function(param1, param2)
60+
modified_call = call[:-1] + ', force_refresh=True)'
61+
processed_python_blocks.append(modified_call)
5662
else:
5763
# Shouldn't happen, but include original call if no parentheses
5864
processed_python_blocks.append(call)

src/vfbquery/vfb_queries.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ def term_info_parse_object(results, short_form):
858858
queries.append(q)
859859

860860
# Transgene expression query
861-
if termInfo["SuperTypes"] and contains_all_tags(termInfo["SuperTypes"], ["Class", "Anatomy"]):
861+
if termInfo["SuperTypes"] and contains_all_tags(termInfo["SuperTypes"], ["Class", "Nervous_system", "Anatomy"]):
862862
q = TransgeneExpressionHere_to_schema(termInfo["Name"], {"short_form": vfbTerm.term.core.short_form})
863863
queries.append(q)
864864

@@ -1581,7 +1581,7 @@ def TermsForPub_to_schema(name, take_default):
15811581

15821582
def TransgeneExpressionHere_to_schema(name, take_default):
15831583
"""Schema for TransgeneExpressionHere query."""
1584-
return Query(query="TransgeneExpressionHere", label=f"Transgene expression in {name}", function="get_transgene_expression_here", takes={"short_form": {"$and": ["Class", "Anatomy"]}, "default": take_default}, preview=5, preview_columns=["id", "name", "tags"])
1584+
return Query(query="TransgeneExpressionHere", label=f"Transgene expression in {name}", function="get_transgene_expression_here", takes={"short_form": {"$and": ["Class", "Nervous_system", "Anatomy"]}, "default": take_default}, preview=5, preview_columns=["id", "name", "tags"])
15851585

15861586

15871587
def serialize_solr_output(results):

0 commit comments

Comments
 (0)