Skip to content

fix type error #137

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.

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
88 changes: 58 additions & 30 deletions odoo_module_migrate/migration_scripts/migrate_160_170.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,40 +57,68 @@
class VisitorInverseGroupbyFields(AbstractVisitor):
def visit_Call(self, node: ast.Call) -> Any:
if isinstance(node.func, ast.Attribute) and node.func.attr == "_read_group":
# Should have the same number of args/keywords
# Inverse fields/groupby order
# Map keywords by their argument names
keywords_by_key = {keyword.arg: keyword.value for keyword in node.keywords}
key_i_by_key = {keyword.arg: i for i, keyword in enumerate(node.keywords)}
if len(node.args) >= 3:
self.add_change(node.args[2], node.args[1])
self.add_change(node.args[1], node.args[2])
elif len(node.args) == 2:
new_args_value = keywords_by_key.get("groupby", empty_list)
if "groupby" in keywords_by_key:
fields_args = ast.keyword("fields", node.args[1])
self.add_change(node.args[1], new_args_value)
self.add_change(node.keywords[key_i_by_key["groupby"]], fields_args)

# Handle cases where node.args is empty
if not node.args:
# Ensure both 'groupby' and 'fields' exist in keywords
groupby_keyword = keywords_by_key.get("groupby", empty_list)
fields_keyword = keywords_by_key.get("fields", empty_list)

if "groupby" in key_i_by_key and "fields" in key_i_by_key:
groupby_keyword_node = node.keywords[key_i_by_key["groupby"]]
fields_keyword_node = node.keywords[key_i_by_key["fields"]]
self.add_change(groupby_keyword_node, fields_keyword_node)
self.add_change(fields_keyword_node, groupby_keyword_node)
else:
self.add_change(
node.args[1],
f"{ast.unparse(new_args_value)}, {ast.unparse(node.args[1])}",
)
else: # len(node.args) <= 2
if (
"groupby" in key_i_by_key
and "fields" in key_i_by_key
and key_i_by_key["groupby"] > key_i_by_key["fields"]
):
self.add_change(
node.keywords[key_i_by_key["groupby"]],
node.keywords[key_i_by_key["fields"]],
# Log missing keywords and skip processing
missing_keys = []
if "groupby" not in keywords_by_key:
missing_keys.append("groupby")
if "fields" not in keywords_by_key:
missing_keys.append("fields")

Check warning on line 81 in odoo_module_migrate/migration_scripts/migrate_160_170.py

View check run for this annotation

Codecov / codecov/patch

odoo_module_migrate/migration_scripts/migrate_160_170.py#L77-L81

Added lines #L77 - L81 were not covered by tests
# Skip processing if required keywords are missing
print(

Check warning on line 83 in odoo_module_migrate/migration_scripts/migrate_160_170.py

View check run for this annotation

Codecov / codecov/patch

odoo_module_migrate/migration_scripts/migrate_160_170.py#L83

Added line #L83 was not covered by tests
f"Skipping _read_group call due to missing keywords: {missing_keys}"
)
self.add_change(
node.keywords[key_i_by_key["fields"]],
node.keywords[key_i_by_key["groupby"]],
)
else:
raise ValueError(f"{key_i_by_key}, {keywords_by_key}, {node.args}")
return

Check warning on line 86 in odoo_module_migrate/migration_scripts/migrate_160_170.py

View check run for this annotation

Codecov / codecov/patch

odoo_module_migrate/migration_scripts/migrate_160_170.py#L86

Added line #L86 was not covered by tests
else:
# Handle cases with positional arguments
if len(node.args) >= 3:
self.add_change(node.args[2], node.args[1])
self.add_change(node.args[1], node.args[2])
elif len(node.args) == 2:
new_args_value = keywords_by_key.get("groupby", empty_list)
if "groupby" in keywords_by_key:
fields_args = ast.keyword("fields", node.args[1])
self.add_change(node.args[1], new_args_value)
self.add_change(node.keywords[key_i_by_key["groupby"]], fields_args)

Check warning on line 97 in odoo_module_migrate/migration_scripts/migrate_160_170.py

View check run for this annotation

Codecov / codecov/patch

odoo_module_migrate/migration_scripts/migrate_160_170.py#L92-L97

Added lines #L92 - L97 were not covered by tests
else:
self.add_change(
node.args[1],
f"{ast.unparse(new_args_value)}, {ast.unparse(node.args[1])}",

Check warning on line 101 in odoo_module_migrate/migration_scripts/migrate_160_170.py

View check run for this annotation

Codecov / codecov/patch

odoo_module_migrate/migration_scripts/migrate_160_170.py#L101

Added line #L101 was not covered by tests
)
else: # len(node.args) <= 2
if (
"groupby" in key_i_by_key
and "fields" in key_i_by_key

Check warning on line 106 in odoo_module_migrate/migration_scripts/migrate_160_170.py

View check run for this annotation

Codecov / codecov/patch

odoo_module_migrate/migration_scripts/migrate_160_170.py#L106

Added line #L106 was not covered by tests
and key_i_by_key["groupby"] > key_i_by_key["fields"]
):
self.add_change(
node.keywords[key_i_by_key["groupby"]],
node.keywords[key_i_by_key["fields"]],

Check warning on line 111 in odoo_module_migrate/migration_scripts/migrate_160_170.py

View check run for this annotation

Codecov / codecov/patch

odoo_module_migrate/migration_scripts/migrate_160_170.py#L111

Added line #L111 was not covered by tests
)
self.add_change(
node.keywords[key_i_by_key["fields"]],
node.keywords[key_i_by_key["groupby"]],

Check warning on line 115 in odoo_module_migrate/migration_scripts/migrate_160_170.py

View check run for this annotation

Codecov / codecov/patch

odoo_module_migrate/migration_scripts/migrate_160_170.py#L115

Added line #L115 was not covered by tests
)
else:
print(
f"Skipping _read_group call due to insufficient arguments: {key_i_by_key}, {keywords_by_key}, {node.args}"
)

Check warning on line 120 in odoo_module_migrate/migration_scripts/migrate_160_170.py

View check run for this annotation

Codecov / codecov/patch

odoo_module_migrate/migration_scripts/migrate_160_170.py#L120

Added line #L120 was not covered by tests
return
self.generic_visit(node)


Expand Down
Loading