Mistake in regex string of ion_or_solid_comp_object leads to example string formula "Na[+]" failing

[IsaacGentle]

Python version

Python 3.12.3

Pymatgen version

2024.11.13

Operating system version

Windows 10

Current behavior

The following code leads to an error (ValueError: + is an invalid formula!)

from pymatgen.analysis.pourbaix_diagram import ion_or_solid_comp_object
fails = ion_or_solid_comp_object('Na[+]')

Even though the definition of ion_or_solid_comp_object states that the argument string should be formatted as 'Na[+]'

def ion_or_solid_comp_object(formula):
    """Get an Ion or Composition object given a formula.

    Args:
        formula: String formula. Eg. of ion: NaOH(aq), Na[+];
            Eg. of solid: Fe2O3(s), Fe(s), Na2O

    Returns:
        Composition/Ion object
    """
    if re.match(r"\[([^\[\]]+)\]|\(aq\)", formula):
        comp_obj = Ion.from_formula(formula)
    elif re.search(r"\(s\)", formula):
        comp_obj = Composition(formula[:-3])
    else:
        comp_obj = Composition(formula)
    return comp_obj

In it's current form, the string needs to be '[+]Na' in order for it to work:

from pymatgen.analysis.pourbaix_diagram import ion_or_solid_comp_object
works = ion_or_solid_comp_object('[+]Na')

Expected Behavior

If 'Na[+]' is the desired string format, the definition of ion_or_solid_comp_object should be modified

L398 of pourbaix_diagram.py is currently:

if re.match(r"\[([^\[\]]+)\]|\(aq\)", formula):

https://github.com/materialsproject/pymatgen/blob/da607e86f9ce8aec942067c6c1a4fda6e04915dd/src/pymatgen/analysis/pourbaix_diagram.py#L398C18-L398C19

I suggest replacement with

if re.match(r".*\[([^\[\]]+)\]|\(aq\)", formula):

I am not super familiar with git workflows and pull requests so I have sent this as an issue. Please advise if you think this is something that should be fixed and if you wish me to do a pull request :)

Minimal example

from pymatgen.analysis.pourbaix_diagram import ion_or_solid_comp_object

works = ion_or_solid_comp_object('[+]Na')
fails = ion_or_solid_comp_object('Na[+]')

Relevant files to reproduce this bug

No response