Skip to content

[IMP] jinja_to_qweb: avoid MemoryError #288

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
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
54 changes: 33 additions & 21 deletions src/util/jinja_to_qweb.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import html
import logging
import re
from multiprocessing import Process, Queue

import babel
import lxml
Expand Down Expand Up @@ -486,35 +487,46 @@ def verify_upgraded_jinja_fields(cr):
"Jinja upgrade",
format="html",
)
# done with the global data, clear it for the rest of the upgrade
templates_to_check.clear()


def is_converted_template_valid(env, template_before, template_after, model_name, record_id, engine="inline_template"):
render_before = None
with contextlib.suppress(Exception):
render_before = _render_template_jinja(env, template_before, model_name, record_id)

render_after = None
if render_before is not None:
try:
with mute_logger("odoo.addons.mail.models.mail_render_mixin"):
render_after = env["mail.render.mixin"]._render_template(
template_after, model_name, [record_id], engine=engine
)[record_id]
except Exception:
pass

# post process qweb render to remove comments from the rendered jinja in
# order to avoid false negative because qweb never render comments.
if render_before and render_after and engine == "qweb":
element_before = lxml.html.fragment_fromstring(render_before, create_parent="div")
for comment_element in element_before.xpath("//comment()"):
comment_element.getparent().remove(comment_element)
def callback(q):
render_before = None
with contextlib.suppress(Exception):
render_before = _render_template_jinja(env, template_before, model_name, record_id)

render_after = None
if render_before is not None:
try:
with mute_logger("odoo.addons.mail.models.mail_render_mixin"):
render_after = env["mail.render.mixin"]._render_template(
template_after, model_name, [record_id], engine=engine
)[record_id]
except Exception:
pass

# post process qweb render to remove comments from the rendered jinja in
# order to avoid false negative because qweb never render comments.
if render_before and render_after and engine == "qweb":
element_before = lxml.html.fragment_fromstring(render_before, create_parent="div")
for comment_element in element_before.xpath("//comment()"):
comment_element.getparent().remove(comment_element)
render_before = lxml.html.tostring(element_before, encoding="unicode")
render_after = lxml.html.tostring(
lxml.html.fragment_fromstring(render_after, create_parent="div"), encoding="unicode"
)

return render_before is not None and render_before == render_after
q.put(render_before is not None and render_before == render_after)

queue = Queue()
proc = Process(target=callback, args=((queue,)))
proc.start()
res = queue.get(timeout=60)
if proc.is_alive():
proc.kill()
return res


# jinja render
Expand Down