mirror of
https://github.com/NicolasBohn/NexQuant.git
synced 2026-07-27 15:37:44 +00:00
fix(auto-fixer): fix two assignment-target bugs in instrument column fixers
1. _fix_instrument_column_access: var['instrument'] = EXPR was incorrectly
converted to var.index.get_level_values(1) = EXPR, producing a SyntaxError
('cannot assign to function call'). Added (?!\s*=) negative lookahead to
skip assignment targets.
2. _fix_groupby_column_on_multiindex: groupby(['instrument','date']) on a
reset_index() variable was converted to groupby([var.index.get_level_values...])
but reset_index() produces a plain RangeIndex, not a MultiIndex, causing
AttributeError: 'RangeIndex' has no attribute 'normalize'. Added reset_vars
guard to skip variables produced by reset_index().
Adds 1 new test (test_assignment_target_not_touched) — total 29 tests, all passing.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -112,7 +112,9 @@ class FactorAutoFixer:
|
||||
self.fixes_applied.append(f"instrument_column: {var}['instrument'] → get_level_values(1)")
|
||||
return f"{var}.index.get_level_values(1)"
|
||||
|
||||
fixed_code = re.sub(r"(\w+)\['instrument'\]", _replace_instrument_access, fixed_code)
|
||||
# Exclude assignment targets: var['instrument'] = ... must not become
|
||||
# var.index.get_level_values(1) = ... (SyntaxError: cannot assign to function call)
|
||||
fixed_code = re.sub(r"(\w+)\['instrument'\](?!\s*=)", _replace_instrument_access, fixed_code)
|
||||
|
||||
return fixed_code
|
||||
|
||||
@@ -226,8 +228,14 @@ class FactorAutoFixer:
|
||||
"""
|
||||
fixed_code = code
|
||||
|
||||
# Variables created via reset_index() have a plain RangeIndex — applying
|
||||
# get_level_values() on them would raise AttributeError. Skip those.
|
||||
reset_vars = set(re.findall(r'(\w+)\s*=\s*\w[^=\n]*\.reset_index\(', fixed_code))
|
||||
|
||||
def _replace_two_col_groupby(m: re.Match, order: str) -> str:
|
||||
var = m.group(1)
|
||||
if var in reset_vars:
|
||||
return m.group(0) # leave reset_index vars alone — RangeIndex, not MultiIndex
|
||||
if order == "instrument_date":
|
||||
repl = (
|
||||
f"{var}.groupby([{var}.index.get_level_values(1), "
|
||||
@@ -253,10 +261,19 @@ class FactorAutoFixer:
|
||||
lambda m: _replace_two_col_groupby(m, "date_instrument"),
|
||||
fixed_code,
|
||||
)
|
||||
# single: groupby(['instrument']) → groupby(level=1)
|
||||
if re.search(r"\.groupby\(\['instrument'\]\)", fixed_code):
|
||||
fixed_code = re.sub(r"\.groupby\(\['instrument'\]\)", ".groupby(level=1)", fixed_code)
|
||||
# single: groupby(['instrument']) → groupby(level=1), but not on reset_index vars
|
||||
def _replace_single_instrument_groupby(m: re.Match) -> str:
|
||||
# Look backwards to find the variable name
|
||||
prefix = fixed_code[: m.start()]
|
||||
var_match = re.search(r'(\w+)\s*$', prefix)
|
||||
var = var_match.group(1) if var_match else ''
|
||||
if var in reset_vars:
|
||||
return m.group(0)
|
||||
self.fixes_applied.append("multiindex_groupby: groupby(['instrument']) → groupby(level=1)")
|
||||
return ".groupby(level=1)"
|
||||
|
||||
if re.search(r"\.groupby\(\['instrument'\]\)", fixed_code):
|
||||
fixed_code = re.sub(r"\.groupby\(\['instrument'\]\)", _replace_single_instrument_groupby, fixed_code)
|
||||
|
||||
# groupby(level=['instrument', 'date']) — uses level= keyword with string names.
|
||||
# 'date' is NOT a valid level name in our (datetime, instrument) MultiIndex;
|
||||
|
||||
@@ -121,6 +121,13 @@ class TestInstrumentColumnAccess:
|
||||
result = fixer.fix(code)
|
||||
assert "df['instrument']" not in result
|
||||
|
||||
def test_assignment_target_not_touched(self, fixer):
|
||||
# df['instrument'] = <expr> is an assignment — must NOT be converted to
|
||||
# df.index.get_level_values(1) = <expr> (SyntaxError)
|
||||
code = "df['instrument'] = df.index.get_level_values('instrument')"
|
||||
result = fixer.fix(code)
|
||||
assert "df['instrument'] =" in result
|
||||
|
||||
|
||||
class TestInstrumentLocMultiindex:
|
||||
def test_loc_replaced_with_xs(self, fixer):
|
||||
|
||||
Reference in New Issue
Block a user