diff --git a/api/utils/bar_utils.py b/api/utils/bar_utils.py index 9cff5fd..71228f2 100644 --- a/api/utils/bar_utils.py +++ b/api/utils/bar_utils.py @@ -133,7 +133,7 @@ def is_soybean_gene_valid(gene): :param gene: :return: True if valid """ - if gene and re.search(r"^((Glyma\d{1,3}g\d{1,6}\.?\d?)|(Glyma\.\d{1,3}g\d{1,8}))$", gene, re.I): + if gene and re.search(r"^(Glyma\d{1,3}g\d{1,6}\.?\d?)$|^(Glyma\.\d{1,3}g\d{1,8})$", gene, re.I): return True else: return False @@ -145,7 +145,7 @@ def is_maize_gene_valid(gene): :return: True if valid """ if gene and re.search( - r"^(AC[0-9]{6}\.[0-9]{1}_FG[0-9]{3})|(AC[0-9]{6}\.[0-9]{1}_FGT[0-9]{3})|(GRMZM(2|5)G[0-9]{6})|(GRMZM(2|5)G[0-9]{6}_T[0-9]{2})|(Zm\d+d\d+)$", + r"^(AC[0-9]{6}\.[0-9]{1}_FG[0-9]{3})$|^(AC[0-9]{6}\.[0-9]{1}_FGT[0-9]{3})$|^(GRMZM(2|5)G[0-9]{6})$|^(GRMZM(2|5)G[0-9]{6}_T[0-9]{2})$|^(Zm\d+d\d+)$|^(Zm\d{1,8}\D{1,3}\d{1,8})$", gene, re.I, ): @@ -159,7 +159,7 @@ def is_sorghum_gene_valid(gene): :param gene: :return: """ - if re.search(r"^(Sobic.\d{0,5}G\d{0,10}|Sobic.K\d{0,10})$", gene, re.I): + if re.search(r"^(Sobic.\d{0,5}G\d{0,10})$|^(Sobic.K\d{0,10})$", gene, re.I): return True else: return False diff --git a/requirements.txt b/requirements.txt index d5fa61f..1048f48 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,61 +1,61 @@ aniso8601==10.0.1 async-timeout==5.0.1 attrs==26.1.0 -black==26.3.1 +black==26.5.1 blinker==1.9.0 -cachelib==0.13.0 -certifi==2026.2.25 +cachelib==0.14.0 +certifi==2026.5.20 charset-normalizer==3.4.7 -click==8.3.1 -coverage==7.13.5 +click==8.4.1 +coverage==7.14.1 Deprecated==1.3.1 flake8==7.3.0 Flask==3.1.3 -Flask-Caching==2.3.1 +Flask-Caching==2.4.0 flask-cors==6.0.2 Flask-Limiter==4.1.1 -flask-marshmallow==1.4.0 +flask-marshmallow==1.5.0 flask-restx==1.3.2 Flask-SQLAlchemy==3.1.1 -greenlet==3.3.2 -idna==3.11 -importlib_resources==6.5.2 +greenlet==3.5.1 +idna==3.18 +importlib_resources==7.1.0 iniconfig==2.3.0 itsdangerous==2.2.0 Jinja2==3.1.6 jsonschema==4.26.0 jsonschema-specifications==2025.9.1 limits==5.8.0 -markdown-it-py==4.0.0 +markdown-it-py==4.2.0 MarkupSafe==3.0.3 -marshmallow==4.2.4 +marshmallow==4.3.0 mccabe==0.7.0 mdurl==0.1.2 mypy_extensions==1.1.0 mysqlclient==2.2.8 ordered-set==4.1.0 -packaging==26.0 -pathspec==1.0.4 -platformdirs==4.9.4 +packaging==26.2 +pathspec==1.1.1 +platformdirs==4.10.0 pluggy==1.6.0 pycodestyle==2.14.0 pyflakes==3.4.0 Pygments==2.20.0 pyrsistent==0.20.0 -pytest==9.0.2 +pytest==9.0.3 python-dateutil==2.9.0.post0 pytokens==0.4.1 -pytz==2026.1.post1 -redis==7.4.0 +pytz==2026.2 +redis==8.0.0 referencing==0.37.0 -requests==2.33.1 -rich==14.3.3 -rpds-py==0.30.0 +requests==2.34.2 +rich==15.0.0 +rpds-py==2026.5.1 setuptools==82.0.1 six==1.17.0 -SQLAlchemy==2.0.48 +SQLAlchemy==2.0.50 typing_extensions==4.15.0 -urllib3==2.6.3 +urllib3==2.7.0 Werkzeug==3.1.8 -wheel==0.46.3 -wrapt==2.1.2 +wheel==0.47.0 +wrapt==2.2.1