From f007ebdb1d8f0e59a9ae23619f088bccf19ae419 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Sun, 17 Dec 2017 16:01:44 +0100 Subject: [PATCH 1/4] [RFR] split off the fusion server to its own module use libreoffice for conversions in the base version. Fixes #179 --- report_py3o/README.rst | 123 +++++------------ report_py3o/__manifest__.py | 3 +- report_py3o/demo/report_py3o.xml | 2 - report_py3o/models/__init__.py | 1 - report_py3o/models/ir_actions_report_xml.py | 22 --- report_py3o/models/py3o_report.py | 90 ++++++------- report_py3o/models/py3o_template.py | 4 + report_py3o/security/ir.model.access.csv | 2 - report_py3o/static/description/icon.png | Bin 0 -> 9455 bytes report_py3o/tests/test_report_py3o.py | 112 +++------------ report_py3o/views/ir_report.xml | 2 - report_py3o/views/py3o_template.xml | 2 +- report_py3o_fusion_server/README.rst | 127 ++++++++++++++++++ report_py3o_fusion_server/__init__.py | 4 + report_py3o_fusion_server/__manifest__.py | 30 +++++ .../demo/report_py3o.xml | 6 + report_py3o_fusion_server/models/__init__.py | 6 + .../models/ir_actions_report_xml.py | 41 ++++++ .../models/py3o_report.py | 85 ++++++++++++ .../models/py3o_server.py | 0 .../security/ir.model.access.csv | 3 + .../static/description/icon.png | Bin 0 -> 9455 bytes report_py3o_fusion_server/tests/__init__.py | 4 + .../tests/test_report_py3o_fusion_server.py | 38 ++++++ report_py3o_fusion_server/views/ir_report.xml | 13 ++ .../views/py3o_server.xml | 2 +- 26 files changed, 466 insertions(+), 256 deletions(-) create mode 100644 report_py3o/static/description/icon.png create mode 100644 report_py3o_fusion_server/README.rst create mode 100644 report_py3o_fusion_server/__init__.py create mode 100644 report_py3o_fusion_server/__manifest__.py create mode 100644 report_py3o_fusion_server/demo/report_py3o.xml create mode 100644 report_py3o_fusion_server/models/__init__.py create mode 100644 report_py3o_fusion_server/models/ir_actions_report_xml.py create mode 100644 report_py3o_fusion_server/models/py3o_report.py rename {report_py3o => report_py3o_fusion_server}/models/py3o_server.py (100%) create mode 100644 report_py3o_fusion_server/security/ir.model.access.csv create mode 100644 report_py3o_fusion_server/static/description/icon.png create mode 100644 report_py3o_fusion_server/tests/__init__.py create mode 100644 report_py3o_fusion_server/tests/test_report_py3o_fusion_server.py create mode 100644 report_py3o_fusion_server/views/ir_report.xml rename {report_py3o => report_py3o_fusion_server}/views/py3o_server.xml (96%) diff --git a/report_py3o/README.rst b/report_py3o/README.rst index aeefa0aa..fe8e1cf8 100644 --- a/report_py3o/README.rst +++ b/report_py3o/README.rst @@ -12,99 +12,30 @@ The py3o reporting engine is a reporting engine for Odoo based on `Libreoffice < * the report is stored on the server in OpenDocument format (.odt or .ods file) * the report is sent to the user in OpenDocument format or in any output format supported by Libreoffice (PDF, HTML, DOC, DOCX, Docbook, XLS, etc.) -The key advantages of a Libreoffice-based reporting engine are: - -* no need to be a developper to create or modify a report: the report is created and modified with Libreoffice. So this reporting engine has a fully WYSIWYG report developpment tool! - -* For a PDF report in A4/Letter format, it's easier to develop it with a tool such as Libreoffice that is designed to create A4/Letter documents than to develop it in HTML/CSS. +The key advantages of a Libreoffice based reporting engine are: +* no need to be a developer to create or modify a report: the report is created and modified with Libreoffice. So this reporting engine has a full WYSIWYG report development tool! +* For a PDF report in A4/Letter format, it's easier to develop it with a tool such as Libreoffice that is designed to create A4/Letter documents than to develop it in HTML/CSS, also some print peculiarities (backgrounds, margin boxes) are not very well supported by the HTML/CSS based solutions. * If you want your users to be able to modify the document after its generation by Odoo, just configure the document with ODT output (or DOC or DOCX) and the user will be able to modify the document with Libreoffice (or Word) after its generation by Odoo. - * Easy development of spreadsheet reports in ODS format (XLS output possible). -This reporting engine is an alternative to `Aeroo `_: these 2 reporting engines have similar features but their codes are completely different. +This reporting engine is an alternative to `Aeroo `_: these two reporting engines have similar features but their implementation is entirely different. You cannot use aeroo templates as drop in replacement though, you'll have to change a few details. Installation ============ -You must install 2 additionnal python libs: +Install the required python libs: .. code:: pip install py3o.template pip install py3o.formats -To allow the conversion of ODT or ODS reports to other formats (PDF, DOC, DOCX, etc.), you must install several additionnal components and Python libs: - -* `Py3o Fusion server `_, -* `Py3o render server `_, -* a Java Runtime Environment (JRE), which can be OpenJDK, -* Libreoffice started in the background in headless mode, -* the Java driver for Libreoffice (Juno). - -It is also possible to use the Python driver for Libreoffice (PyUNO), but it is recommended to use the Java driver because it is more stable. - -The installation procedure below uses the Java driver. It has been successfully tested on Ubuntu 16.04 LTS ; if you use another OS, you may have to change a few details. - -Installation of py3o.fusion: - -.. code:: - - pip install py3o.fusion - pip install service-identity - -Installation of py3o.renderserver: - -.. code:: - - pip install py3o.renderserver - -Installation of Libreoffice and JRE on Debian/Ubuntu: - -.. code:: - - sudo apt-get install default-jre ure libreoffice-java-common libreoffice-writer - -You may have to install additionnal fonts. For example, to have the special unicode symbols for phone/fax/email in the PDF reports generated by Py3o, you should install the following package: - -.. code:: - - sudo apt-get install fonts-symbola - -At the end, with the dependencies, you should have the following py3o python libs: - -.. code:: - - % pip freeze | grep py3o - py3o.formats==0.3 - py3o.fusion==0.8.6 - py3o.renderclient==0.2 - py3o.renderers.juno==0.8 - py3o.renderserver==0.5.1 - py3o.template==0.9.11 - py3o.types==0.1.1 - -Start the Py3o Fusion server: - -.. code:: - - start-py3o-fusion --debug -s localhost - -Start the Py3o render server: - -.. code:: - - start-py3o-renderserver --java=/usr/lib/jvm/default-java/jre/lib/amd64/server/libjvm.so --ure=/usr/share --office=/usr/lib/libreoffice --driver=juno --sofficeport=8997 - -On the output of the Py3o render server, the first line looks like: +To allow the conversion of ODT or ODS reports to other formats (PDF, DOC, DOCX, etc.), install libreoffice: .. code:: - DEBUG:root:Starting JVM: /usr/lib/jvm/default-java/jre/lib/amd64/server/libjvm.so with options: -Djava.class.path=/usr/local/lib/python2.7/dist-packages/py3o/renderers/juno/py3oconverter.jar:/usr/share/java/juh.jar:/usr/share/java/jurt.jar:/usr/share/java/ridl.jar:/usr/share/java/unoloader.jar:/usr/share/java/java_uno.jar:/usr/lib/libreoffice/program/classes/unoil.jar -Xmx150M - -After **-Djava.class.path**, there is a list of Java libs with *.jar* extension ; check that each JAR file is really present on your filesystem. If one of the jar files is present in another directory, create a symlink that points to the real location of the file. If all the jar files are present on another directory, adapt the *--ure=* argument on the command line of Py3o render server. - -To check that the Py3o Fusion server is running fine, visit the URL http://:8765/form. On this web page, under the section *Target format*, make sure that you have a line *This server currently supports these formats: ods, odt, docx, doc, html, docbook, pdf, xls.*. + apt-get --no-install-recommends install libreoffice Configuration ============= @@ -139,7 +70,6 @@ the path to the template as *py3o_template_fallback*. py3o odt - /field> /odoo/templates/py3o/report/account_invoice.odt @@ -164,14 +94,9 @@ If you want an invoice in PDF format instead of ODT format, the XML file should - - http://localhost:8765/form - - py3o pdf - my_custom_module_base report/account_invoice.odt @@ -185,17 +110,12 @@ If you want to add a new py3o PDF report (and not replace a native report), the - - http://localhost:8765/form - - Partner Summary res.partner res.partner.summary py3o pdf - my_custom_module_base report/partner_summary.odt @@ -210,6 +130,12 @@ If you want to add a new py3o PDF report (and not replace a native report), the +Configuration parameters +------------------------ + +py3o.conversion_command + The command to be used to run the conversion, ``libreoffice`` by default. If you change this, whatever you set here must accept the parameters ``--headless --convert-to $ext $file`` and put the resulting file into ``$file``'s directory with extension ``$ext``. The command will be started in ``$file``'s directory. + Usage ===== @@ -217,10 +143,32 @@ Usage :alt: Try me on Runbot :target: https://runbot.odoo-community.org/runbot/143/10.0 +The templating language is `extensively documented `_, the records are exposed in libreoffice as ``objects``, on which you can also call functions. + +Available functions and objects +------------------------------- + +user + Browse record of current user +lang + The user's company's language as string (ISO code) +b64decode + ``base64.b64decode`` +format_multiline_value(string) + Generate the ODF equivalent of ``
`` and `` `` for multiline fields (ODF is XML internally, so those would be skipped otherwise) +html_sanitize(string) + Sanitize HTML string +time + Python's ``time`` module +display_address(partner) + Return a formatted string of the partner's address + Known issues / Roadmap ====================== * generate barcode ? +* add more detailed example in demo file to showcase features +* add migration guide aeroo -> py3o Bug Tracker =========== @@ -241,6 +189,7 @@ Contributors * Alexis de Lattre , * Guewen Baconnier * Omar Castiñeira +* Holger Brunn Maintainer diff --git a/report_py3o/__manifest__.py b/report_py3o/__manifest__.py index 81e7fcd5..5b03d46d 100644 --- a/report_py3o/__manifest__.py +++ b/report_py3o/__manifest__.py @@ -5,7 +5,7 @@ 'name': 'Py3o Report Engine', 'summary': 'Reporting engine based on Libreoffice (ODT -> ODT, ' 'ODT -> PDF, ODT -> DOC, ODT -> DOCX, ODS -> ODS, etc.)', - 'version': '10.0.1.2.0', + 'version': '10.0.2.0.0', 'category': 'Reporting', 'license': 'AGPL-3', 'author': 'XCG Consulting,' @@ -21,7 +21,6 @@ 'security/ir.model.access.csv', 'views/menu.xml', 'views/py3o_template.xml', - 'views/py3o_server.xml', 'views/ir_report.xml', 'views/report_py3o.xml', 'demo/report_py3o.xml', diff --git a/report_py3o/demo/report_py3o.xml b/report_py3o/demo/report_py3o.xml index b57342f1..4a47c38a 100644 --- a/report_py3o/demo/report_py3o.xml +++ b/report_py3o/demo/report_py3o.xml @@ -11,8 +11,6 @@ py3o_user_info py3o odt - - odt report_py3o demo/res_user.odt diff --git a/report_py3o/models/__init__.py b/report_py3o/models/__init__.py index 863d037d..e050d2c7 100644 --- a/report_py3o/models/__init__.py +++ b/report_py3o/models/__init__.py @@ -1,5 +1,4 @@ from . import ir_actions_report_xml from . import py3o_template -from . import py3o_server from . import report from . import py3o_report diff --git a/report_py3o/models/ir_actions_report_xml.py b/report_py3o/models/ir_actions_report_xml.py index 7298486e..0b6a16d3 100644 --- a/report_py3o/models/ir_actions_report_xml.py +++ b/report_py3o/models/ir_actions_report_xml.py @@ -31,19 +31,6 @@ class IrActionsReportXml(models.Model): raise ValidationError(_( "Field 'Output Format' is required for Py3O report")) - @api.multi - @api.constrains("py3o_is_local_fusion", "py3o_server_id", - "py3o_filetype") - def _check_py3o_server_id(self): - for report in self: - if report.report_type == "py3o": - is_native = Formats().get_format(report.py3o_filetype).native - if ((not is_native or not report.py3o_is_local_fusion) and - not report.py3o_server_id): - raise ValidationError(_( - "Can not use not native format in local fusion. " - "Please specify a Fusion Server")) - @api.model def _get_py3o_filetypes(self): formats = Formats() @@ -62,15 +49,6 @@ class IrActionsReportXml(models.Model): py3o_template_id = fields.Many2one( 'py3o.template', "Template") - py3o_is_local_fusion = fields.Boolean( - "Local Fusion", - help="Native formats will be processed without a server. " - "You must use this mode if you call methods on your model into " - "the template.", - default=True) - py3o_server_id = fields.Many2one( - "py3o.server", - "Fusion Server") module = fields.Char( "Module", help="The implementer module that provides this report") diff --git a/report_py3o/models/py3o_report.py b/report_py3o/models/py3o_report.py index 13f95c3a..66198f20 100644 --- a/report_py3o/models/py3o_report.py +++ b/report_py3o/models/py3o_report.py @@ -5,26 +5,23 @@ import base64 from base64 import b64decode from cStringIO import StringIO -import json import logging import os from contextlib import closing +import subprocess import pkg_resources -import requests import sys import tempfile from zipfile import ZipFile, ZIP_DEFLATED from odoo.exceptions import AccessError -from odoo.exceptions import UserError from odoo.report.report_sxw import rml_parse from odoo import api, fields, models, tools, _ logger = logging.getLogger(__name__) try: - from py3o.template.helpers import Py3oConvertor from py3o.template import Template from py3o import formats from genshi.core import Markup @@ -244,60 +241,63 @@ class Py3oReport(models.TransientModel): """ This function to generate our py3o report """ self.ensure_one() - report_xml = self.ir_actions_report_xml_id - filetype = report_xml.py3o_filetype result_fd, result_path = tempfile.mkstemp( - suffix='.' + filetype, prefix='p3o.report.tmp.') + suffix='.ods', prefix='p3o.report.tmp.') tmpl_data = self.get_template(model_instance) in_stream = StringIO(tmpl_data) with closing(os.fdopen(result_fd, 'w+')) as out_stream: template = Template(in_stream, out_stream, escape_false=True) localcontext = self._get_parser_context(model_instance, data) - is_native = Formats().get_format(filetype).native - if report_xml.py3o_is_local_fusion: - template.render(localcontext) - out_stream.seek(0) - tmpl_data = out_stream.read() - datadict = {} - else: - expressions = template.get_all_user_python_expression() - py_expression = template.convert_py3o_to_python_ast( - expressions) - convertor = Py3oConvertor() - data_struct = convertor(py_expression) - datadict = data_struct.render(localcontext) - - if not is_native or not report_xml.py3o_is_local_fusion: - # Call py3o.server to render the template in the desired format - files = { - 'tmpl_file': tmpl_data, - } - fields = { - "targetformat": filetype, - "datadict": json.dumps(datadict), - "image_mapping": "{}", - "escape_false": "on", - } - if report_xml.py3o_is_local_fusion: - fields['skipfusion'] = '1' - r = requests.post( - report_xml.py3o_server_id.url, data=fields, files=files) - if r.status_code != 200: - # server says we have an issue... let's tell that to enduser - raise UserError( - _('Fusion server error %s') % r.text, - ) + template.render(localcontext) + out_stream.seek(0) + tmpl_data = out_stream.read() + + result_path = self._convert_single_report( + result_path, model_instance, data + ) - chunk_size = 1024 - with open(result_path, 'w+') as fd: - for chunk in r.iter_content(chunk_size): - fd.write(chunk) if len(model_instance) == 1: self._postprocess_report( result_path, model_instance.id, save_in_attachment) + + return result_path + + @api.multi + def _convert_single_report(self, result_path, model_instance, data): + """Run a command to convert to our target format""" + filetype = self.ir_actions_report_xml_id.py3o_filetype + if not Formats().get_format(filetype).native: + command = self._convert_single_report_cmd( + result_path, model_instance, data, + ) + logger.debug('Running command %s', command) + output = subprocess.check_output( + command, cwd=os.path.dirname(result_path), + ) + logger.debug('Output was %s', output) + self._cleanup_tempfiles([result_path]) + result_path, result_filename = os.path.split(result_path) + result_path = os.path.join( + result_path, '%s.%s' % ( + os.path.splitext(result_filename)[0], filetype + ) + ) return result_path + @api.multi + def _convert_single_report_cmd(self, result_path, model_instance, data): + """Return a command list suitable for use in subprocess.call""" + return [ + self.env['ir.config_parameter'].get_param( + 'py3o.conversion_command', 'libreoffice', + ), + '--headless', + '--convert-to', + self.ir_actions_report_xml_id.py3o_filetype, + result_path, + ] + @api.multi def _get_or_create_single_report(self, model_instance, data, save_in_attachment): diff --git a/report_py3o/models/py3o_template.py b/report_py3o/models/py3o_template.py index 93cab419..0cce01b4 100644 --- a/report_py3o/models/py3o_template.py +++ b/report_py3o/models/py3o_template.py @@ -13,6 +13,10 @@ class Py3oTemplate(models.Model): selection=[ ('odt', "ODF Text Document"), ('ods', "ODF Spreadsheet"), + ('odp', "ODF Presentation"), + ('fodt', "ODF Text Document (Flat)"), + ('fods', "ODF Spreadsheet (Flat)"), + ('fodp', "ODF Presentation (Flat)"), ], string="LibreOffice Template File Type", required=True, diff --git a/report_py3o/security/ir.model.access.csv b/report_py3o/security/ir.model.access.csv index f43cac06..6d45c8de 100644 --- a/report_py3o/security/ir.model.access.csv +++ b/report_py3o/security/ir.model.access.csv @@ -1,5 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_py3o_template_admin,access_py3o_template_admin,model_py3o_template,base.group_no_one,1,1,1,1 access_py3o_template_user,access_py3o_template_user,model_py3o_template,base.group_user,1,0,0,0 -access_py3o_server_admin,access_py3o_server_admin,model_py3o_server,base.group_no_one,1,1,1,1 -access_py3o_server_user,access_py3o_server_user,model_py3o_server,base.group_user,1,0,0,0 diff --git a/report_py3o/static/description/icon.png b/report_py3o/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/report_py3o/tests/test_report_py3o.py b/report_py3o/tests/test_report_py3o.py index f53ed058..0d85dff7 100644 --- a/report_py3o/tests/test_report_py3o.py +++ b/report_py3o/tests/test_report_py3o.py @@ -11,8 +11,6 @@ import shutil import tempfile from contextlib import contextmanager -from py3o.formats import Formats - from odoo import tools from odoo.tests.common import TransactionCase from odoo.exceptions import ValidationError @@ -40,34 +38,6 @@ class TestReportPy3o(TransactionCase): self.py3o_report = self.env['py3o.report'].create({ 'ir_actions_report_xml_id': self.report.id}) - def test_no_local_fusion_without_fusion_server(self): - self.assertTrue(self.report.py3o_is_local_fusion) - with self.assertRaises(ValidationError) as e: - self.report.py3o_is_local_fusion = False - self.assertEqual( - e.exception.name, - "Can not use not native format in local fusion. " - "Please specify a Fusion Server") - - def test_no_native_format_without_fusion_server(self): - report = self.env.ref("report_py3o.res_users_report_py3o") - formats = Formats() - is_native = formats.get_format(report.py3o_filetype).native - self.assertTrue(is_native) - new_format = None - for name in formats.get_known_format_names(): - format = formats.get_format(name) - if not format.native: - new_format = name - break - self.assertTrue(new_format) - with self.assertRaises(ValidationError) as e: - report.py3o_filetype = new_format - self.assertEqual( - e.exception.name, - "Can not use not native format in local fusion. " - "Please specify a Fusion Server") - def test_required_py3_filetype(self): self.assertEqual(self.report.report_type, "py3o") with self.assertRaises(ValidationError) as e: @@ -76,70 +46,40 @@ class TestReportPy3o(TransactionCase): e.exception.name, "Field 'Output Format' is required for Py3O report") - def test_reports(self): + def _render_patched(self, result_text='test result', call_count=1): py3o_report = self.env['py3o.report'] with mock.patch.object( py3o_report.__class__, '_create_single_report') as patched_pdf: result = tempfile.mktemp('.txt') with open(result, 'w') as fp: - fp.write('dummy') + fp.write(result_text) patched_pdf.return_value = result + patched_pdf.side_effect = lambda record, data, save_attachments:\ + py3o_report._postprocess_report( + result, record.id, save_attachments, + ) or result # test the call the the create method inside our custom parser self.report.render_report(self.env.user.ids, self.report.report_name, {}) - self.assertEqual(1, patched_pdf.call_count) + self.assertEqual(call_count, patched_pdf.call_count) # generated files no more exists self.assertFalse(os.path.exists(result)) + + def test_reports(self): res = self.report.render_report( self.env.user.ids, self.report.report_name, {}) self.assertTrue(res) - py3o_server = self.env['py3o.server'].create({"url": "http://dummy"}) - # check the call to the fusion server - self.report.write({"py3o_filetype": "pdf", - "py3o_server_id": py3o_server.id}) - with mock.patch('requests.post') as patched_post: - magick_response = mock.MagicMock() - magick_response.status_code = 200 - patched_post.return_value = magick_response - magick_response.iter_content.return_value = "test result" - res = self.report.render_report( - self.env.user.ids, self.report.report_name, {}) - self.assertEqual(('test result', 'pdf'), res) - - def test_report_load_from_attachment(self): - py3o_report = self.env['py3o.report'] - with mock.patch.object( - py3o_report.__class__, '_create_single_report') as patched_pdf: - result = tempfile.mktemp('.txt') - with open(result, 'w') as fp: - fp.write('dummy') - patched_pdf.return_value = result - # test the call the the create method inside our custom parser - self.report.render_report(self.env.user.ids, - self.report.report_name, - {}) - self.assertEqual(1, patched_pdf.call_count) - # generated files no more exists - self.assertFalse(os.path.exists(result)) + self.report.py3o_filetype = 'pdf' res = self.report.render_report( self.env.user.ids, self.report.report_name, {}) self.assertTrue(res) - py3o_server = self.env['py3o.server'].create({"url": "http://dummy"}) - # check the call to the fusion server - self.report.write({"py3o_filetype": "pdf", - "py3o_server_id": py3o_server.id, - "attachment_use": True, + + def test_report_load_from_attachment(self): + self.report.write({"attachment_use": True, "attachment": "'my_saved_report'"}) attachments = self.env['ir.attachment'].search([]) - with mock.patch('requests.post') as patched_post: - magick_response = mock.MagicMock() - magick_response.status_code = 200 - patched_post.return_value = magick_response - magick_response.iter_content.return_value = "test result" - res = self.report.render_report( - self.env.user.ids, self.report.report_name, {}) - self.assertEqual(('test result', 'pdf'), res) + self._render_patched() new_attachments = self.env['ir.attachment'].search([]) created_attachement = new_attachments - attachments self.assertEqual(1, len(created_attachement)) @@ -151,29 +91,17 @@ class TestReportPy3o(TransactionCase): created_attachement.datas = base64.encodestring("new content") res = self.report.render_report( self.env.user.ids, self.report.report_name, {}) - self.assertEqual(('new content', 'pdf'), res) + self.assertEqual(('new content', self.report.py3o_filetype), res) def test_report_post_process(self): """ By default the post_process method is in charge to save the generated report into an ir.attachment if requested. """ - report = self.env.ref("report_py3o.res_users_report_py3o") - report.attachment = "object.name + '.txt'" - py3o_server = self.env['py3o.server'].create({"url": "http://dummy"}) - # check the call to the fusion server - report.write({"py3o_filetype": "pdf", - "py3o_server_id": py3o_server.id}) + self.report.attachment = "object.name + '.txt'" ir_attachment = self.env['ir.attachment'] attachements = ir_attachment.search([(1, '=', 1)]) - with mock.patch('requests.post') as patched_post: - magick_response = mock.MagicMock() - magick_response.status_code = 200 - patched_post.return_value = magick_response - magick_response.iter_content.return_value = "test result" - res = report.render_report( - self.env.user.ids, report.report_name, {}) - self.assertEqual(('test result', 'pdf'), res) + self._render_patched() attachements = ir_attachment.search([(1, '=', 1)]) - attachements self.assertEqual(1, len(attachements.ids)) self.assertEqual(self.env.user.name + '.txt', attachements.name) @@ -181,6 +109,7 @@ class TestReportPy3o(TransactionCase): self.assertEqual(self.env.user.id, attachements.res_id) self.assertEqual('test result', b64decode(attachements.datas)) + @tools.misc.mute_logger('odoo.addons.report_py3o.models.py3o_report') def test_report_template_configs(self): # the demo template is specified with a relative path in in the module # path @@ -192,7 +121,7 @@ class TestReportPy3o(TransactionCase): res = self.report.render_report( self.env.user.ids, self.report.report_name, {}) self.assertTrue(res) - # The generation fails if the tempalte is not found + # The generation fails if the template is not found self.report.module = False with self.assertRaises(TemplateNotFound), self.env.cr.savepoint(): self.report.render_report( @@ -212,7 +141,7 @@ class TestReportPy3o(TransactionCase): self.env.user.ids, self.report.report_name, {}) self.assertTrue(res) - # the tempalte can also be provided as a binay field + # the tempalte can also be provided as a binary field self.report.py3o_template_fallback = False with open(flbk_filename) as tmpl_file: @@ -227,6 +156,7 @@ class TestReportPy3o(TransactionCase): self.env.user.ids, self.report.report_name, {}) self.assertTrue(res) + @tools.misc.mute_logger('odoo.addons.report_py3o.models.py3o_report') def test_report_template_fallback_validity(self): tmpl_name = self.report.py3o_template_fallback flbk_filename = pkg_resources.resource_filename( diff --git a/report_py3o/views/ir_report.xml b/report_py3o/views/ir_report.xml index 19f51f72..b0468231 100644 --- a/report_py3o/views/ir_report.xml +++ b/report_py3o/views/ir_report.xml @@ -16,8 +16,6 @@ - - diff --git a/report_py3o/views/py3o_template.xml b/report_py3o/views/py3o_template.xml index 320376f8..95f752d8 100644 --- a/report_py3o/views/py3o_template.xml +++ b/report_py3o/views/py3o_template.xml @@ -24,7 +24,7 @@ - + diff --git a/report_py3o_fusion_server/README.rst b/report_py3o_fusion_server/README.rst new file mode 100644 index 00000000..90f5841e --- /dev/null +++ b/report_py3o_fusion_server/README.rst @@ -0,0 +1,127 @@ +.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 + +========================================== +Py3o Report Engine - Fusion server support +========================================== + +This addons was written to let a fusion server handle format conversion instead of local libreoffice. + +Installation +============ + +Install several additional components and Python libs: + +* `Py3o Fusion server `_, +* `Py3o render server `_, +* a Java Runtime Environment (JRE), which can be OpenJDK, +* Libreoffice started in the background in headless mode, +* the Java driver for Libreoffice (Juno). + +It is also possible to use the Python driver for Libreoffice (PyUNO), but it is recommended to use the Java driver because it is more stable. + +The installation procedure below uses the Java driver. It has been successfully tested on Ubuntu 16.04 LTS ; if you use another OS, you may have to change a few details. + +Installation of py3o.fusion: + +.. code:: + + pip install py3o.fusion + pip install service-identity + +Installation of py3o.renderserver: + +.. code:: + + pip install py3o.renderserver + +Installation of Libreoffice and JRE on Debian/Ubuntu: + +.. code:: + + sudo apt-get install default-jre ure libreoffice-java-common libreoffice-writer + +You may have to install additionnal fonts. For example, to have the special unicode symbols for phone/fax/email in the PDF reports generated by Py3o, you should install the following package: + +.. code:: + + sudo apt-get install fonts-symbola + +At the end, with the dependencies, you should have the following py3o python libs: + +.. code:: + + % pip freeze | grep py3o + py3o.formats==0.3 + py3o.fusion==0.8.6 + py3o.renderclient==0.2 + py3o.renderers.juno==0.8 + py3o.renderserver==0.5.1 + py3o.template==0.9.11 + py3o.types==0.1.1 + +Start the Py3o Fusion server: + +.. code:: + + start-py3o-fusion --debug -s localhost + +Start the Py3o render server: + +.. code:: + + start-py3o-renderserver --java=/usr/lib/jvm/default-java/jre/lib/amd64/server/libjvm.so --ure=/usr/share --office=/usr/lib/libreoffice --driver=juno --sofficeport=8997 + +On the output of the Py3o render server, the first line looks like: + +.. code:: + + DEBUG:root:Starting JVM: /usr/lib/jvm/default-java/jre/lib/amd64/server/libjvm.so with options: -Djava.class.path=/usr/local/lib/python2.7/dist-packages/py3o/renderers/juno/py3oconverter.jar:/usr/share/java/juh.jar:/usr/share/java/jurt.jar:/usr/share/java/ridl.jar:/usr/share/java/unoloader.jar:/usr/share/java/java_uno.jar:/usr/lib/libreoffice/program/classes/unoil.jar -Xmx150M + +After **-Djava.class.path**, there is a list of Java libs with *.jar* extension ; check that each JAR file is really present on your filesystem. If one of the jar files is present in another directory, create a symlink that points to the real location of the file. If all the jar files are present on another directory, adapt the *--ure=* argument on the command line of Py3o render server. + +To check that the Py3o Fusion server is running fine, visit the URL http://:8765/form. On this web page, under the section *Target format*, make sure that you have a line *This server currently supports these formats: ods, odt, docx, doc, html, docbook, pdf, xls.*. + +Known issues / Roadmap +====================== + +* none yet + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smashing it by providing a detailed and welcomed feedback. + +Credits +======= + +Contributors +------------ + +* Florent Aide (`XCG Consulting `_) +* Laurent Mignon , +* Alexis de Lattre , +* Guewen Baconnier +* Omar Castiñeira +* Holger Brunn + +Do not contact contributors directly about help with questions or problems concerning this addon, but use the `community mailing list `_ or the `appropriate specialized mailinglist `_ for help, and the bug tracker linked in `Bug Tracker`_ above for technical issues. + +Maintainer +---------- + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +This module is maintained by the OCA. + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +To contribute to this module, please visit https://odoo-community.org. diff --git a/report_py3o_fusion_server/__init__.py b/report_py3o_fusion_server/__init__.py new file mode 100644 index 00000000..a3e818a4 --- /dev/null +++ b/report_py3o_fusion_server/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import models diff --git a/report_py3o_fusion_server/__manifest__.py b/report_py3o_fusion_server/__manifest__.py new file mode 100644 index 00000000..ba9a78b8 --- /dev/null +++ b/report_py3o_fusion_server/__manifest__.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +{ + 'name': 'Py3o Report Engine - Fusion server support', + 'summary': 'Let the fusion server handle format conversion.', + 'version': '10.0.1.0.0', + 'category': 'Reporting', + 'license': 'AGPL-3', + 'author': 'XCG Consulting,' + 'ACSONE SA/NV,' + 'Odoo Community Association (OCA)', + 'website': 'https://github.com/OCA/reporting-engine', + 'depends': ['report_py3o'], + 'external_dependencies': { + 'python': [ + 'py3o.template', + 'py3o.formats', + ], + }, + 'demo': [ + "demo/report_py3o.xml", + ], + 'data': [ + "views/ir_report.xml", + 'security/ir.model.access.csv', + 'views/py3o_server.xml', + ], + 'installable': True, +} diff --git a/report_py3o_fusion_server/demo/report_py3o.xml b/report_py3o_fusion_server/demo/report_py3o.xml new file mode 100644 index 00000000..ac4f194c --- /dev/null +++ b/report_py3o_fusion_server/demo/report_py3o.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/report_py3o_fusion_server/models/__init__.py b/report_py3o_fusion_server/models/__init__.py new file mode 100644 index 00000000..78c726c4 --- /dev/null +++ b/report_py3o_fusion_server/models/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import ir_actions_report_xml +from . import py3o_report +from . import py3o_server diff --git a/report_py3o_fusion_server/models/ir_actions_report_xml.py b/report_py3o_fusion_server/models/ir_actions_report_xml.py new file mode 100644 index 00000000..d4fa0db6 --- /dev/null +++ b/report_py3o_fusion_server/models/ir_actions_report_xml.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +# © 2013 XCG Consulting +# © 2017 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +import logging +from openerp import _, api, fields, models +from odoo.exceptions import ValidationError + +logger = logging.getLogger(__name__) + +try: + from py3o.formats import Formats +except ImportError: + logger.debug('Cannot import py3o.formats') + + +class IrActionsReportXml(models.Model): + _inherit = 'ir.actions.report.xml' + + @api.multi + @api.constrains("py3o_is_local_fusion", "py3o_server_id", "py3o_filetype") + def _check_py3o_server_id(self): + for report in self: + if report.report_type != "py3o": + continue + is_native = Formats().get_format(report.py3o_filetype).native + if ((not is_native or not report.py3o_is_local_fusion) and + not report.py3o_server_id): + raise ValidationError(_( + "Can not use not native format in local fusion. " + "Please specify a Fusion Server")) + + py3o_is_local_fusion = fields.Boolean( + "Local Fusion", + help="Native formats will be processed without a server. " + "You must use this mode if you call methods on your model into " + "the template.", + default=True) + py3o_server_id = fields.Many2one( + "py3o.server", + "Fusion Server") diff --git a/report_py3o_fusion_server/models/py3o_report.py b/report_py3o_fusion_server/models/py3o_report.py new file mode 100644 index 00000000..dd0381f0 --- /dev/null +++ b/report_py3o_fusion_server/models/py3o_report.py @@ -0,0 +1,85 @@ +# -*- coding: utf-8 -*- +# © 2013 XCG Consulting +# © 2016 ACSONE SA/NV +# © 2017 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +import json +import logging +import os +import requests +import tempfile +from contextlib import closing +from openerp import _, api, models +from openerp.exceptions import UserError +from StringIO import StringIO + +logger = logging.getLogger(__name__) + +try: + from py3o.template import Template + from py3o.template.helpers import Py3oConvertor +except ImportError: + logger.debug('Cannot import py3o.template') + + +class Py3oReport(models.TransientModel): + _inherit = 'py3o.report' + + @api.multi + def _create_single_report(self, model_instance, data, save_in_attachment): + """ This function to generate our py3o report + """ + self.ensure_one() + report_xml = self.ir_actions_report_xml_id + filetype = report_xml.py3o_filetype + if report_xml.py3o_is_local_fusion: + result_path = super(Py3oReport, self)._create_single_report( + model_instance, data, save_in_attachment, + ) + with closing(open(result_path, 'r')) as out_stream: + tmpl_data = out_stream.read() + datadict = {} + else: + result_fd, result_path = tempfile.mkstemp( + suffix='.' + filetype, prefix='p3o.report.tmp.') + tmpl_data = self.get_template(model_instance) + + in_stream = StringIO(tmpl_data) + with closing(os.fdopen(result_fd, 'w+')) as out_stream: + template = Template(in_stream, out_stream, escape_false=True) + localcontext = self._get_parser_context(model_instance, data) + expressions = template.get_all_user_python_expression() + py_expression = template.convert_py3o_to_python_ast( + expressions) + convertor = Py3oConvertor() + data_struct = convertor(py_expression) + datadict = data_struct.render(localcontext) + + # Call py3o.server to render the template in the desired format + files = { + 'tmpl_file': tmpl_data, + } + fields = { + "targetformat": filetype, + "datadict": json.dumps(datadict), + "image_mapping": "{}", + "escape_false": "on", + } + if report_xml.py3o_is_local_fusion: + fields['skipfusion'] = '1' + r = requests.post( + report_xml.py3o_server_id.url, data=fields, files=files) + if r.status_code != 200: + # server says we have an issue... let's tell that to enduser + raise UserError( + _('Fusion server error %s') % r.text, + ) + + chunk_size = 1024 + with open(result_path, 'w+') as fd: + for chunk in r.iter_content(chunk_size): + fd.write(chunk) + if len(model_instance) == 1: + self._postprocess_report( + result_path, model_instance.id, save_in_attachment) + return result_path diff --git a/report_py3o/models/py3o_server.py b/report_py3o_fusion_server/models/py3o_server.py similarity index 100% rename from report_py3o/models/py3o_server.py rename to report_py3o_fusion_server/models/py3o_server.py diff --git a/report_py3o_fusion_server/security/ir.model.access.csv b/report_py3o_fusion_server/security/ir.model.access.csv new file mode 100644 index 00000000..8015edc9 --- /dev/null +++ b/report_py3o_fusion_server/security/ir.model.access.csv @@ -0,0 +1,3 @@ +"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" +access_py3o_server_admin,access_py3o_server_admin,model_py3o_server,base.group_no_one,1,1,1,1 +access_py3o_server_user,access_py3o_server_user,model_py3o_server,base.group_user,1,0,0,0 diff --git a/report_py3o_fusion_server/static/description/icon.png b/report_py3o_fusion_server/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/report_py3o_fusion_server/tests/__init__.py b/report_py3o_fusion_server/tests/__init__.py new file mode 100644 index 00000000..06cc0dee --- /dev/null +++ b/report_py3o_fusion_server/tests/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +from . import test_report_py3o_fusion_server diff --git a/report_py3o_fusion_server/tests/test_report_py3o_fusion_server.py b/report_py3o_fusion_server/tests/test_report_py3o_fusion_server.py new file mode 100644 index 00000000..ebe1a92d --- /dev/null +++ b/report_py3o_fusion_server/tests/test_report_py3o_fusion_server.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +# Copyright 2017 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). +import mock +from odoo.exceptions import ValidationError +from odoo.addons.report_py3o.tests import test_report_py3o + + +@mock.patch( + 'requests.post', mock.Mock( + return_value=mock.Mock( + status_code=200, + iter_content=mock.Mock(return_value=['test_result']), + ) + ) +) +class TestReportPy3oFusionServer(test_report_py3o.TestReportPy3o): + def setUp(self): + super(TestReportPy3oFusionServer, self).setUp() + py3o_server = self.env['py3o.server'].create({"url": "http://dummy"}) + # check the call to the fusion server + self.report.write({ + "py3o_server_id": py3o_server.id, + "py3o_filetype": 'pdf', + }) + + def test_no_local_fusion_without_fusion_server(self): + self.assertTrue(self.report.py3o_is_local_fusion) + with self.assertRaises(ValidationError) as e: + self.report.write({"py3o_server_id": None}) + self.assertEqual( + e.exception.name, + "Can not use not native format in local fusion. " + "Please specify a Fusion Server") + + def test_reports_no_local_fusion(self): + self.report.py3o_is_local_fusion = False + self.test_reports() diff --git a/report_py3o_fusion_server/views/ir_report.xml b/report_py3o_fusion_server/views/ir_report.xml new file mode 100644 index 00000000..35cba84f --- /dev/null +++ b/report_py3o_fusion_server/views/ir_report.xml @@ -0,0 +1,13 @@ + + + + ir.actions.report.xml + + + + + + + + + diff --git a/report_py3o/views/py3o_server.xml b/report_py3o_fusion_server/views/py3o_server.xml similarity index 96% rename from report_py3o/views/py3o_server.xml rename to report_py3o_fusion_server/views/py3o_server.xml index 7712305d..810e5918 100644 --- a/report_py3o/views/py3o_server.xml +++ b/report_py3o_fusion_server/views/py3o_server.xml @@ -32,7 +32,7 @@ From aa50a002a3c6f7ff5f2d0d8106340f96e3b38cb0 Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Sun, 17 Dec 2017 16:14:12 +0100 Subject: [PATCH 2/4] [ADD] install libreoffice on travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5beaf65f..a816b00d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ addons: packages: - expect-dev # provides unbuffer utility - python-lxml # because pip installation is slow + - libreoffice language: python From ec6c15905a9f46a764217bc81c55858a78c45d6e Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 10 Jan 2018 21:11:10 +0100 Subject: [PATCH 3/4] Improve README.rst for report_py3o* modules --- report_py3o/README.rst | 9 +++++++-- report_py3o_fusion_server/README.rst | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/report_py3o/README.rst b/report_py3o/README.rst index fe8e1cf8..13c7bc4c 100644 --- a/report_py3o/README.rst +++ b/report_py3o/README.rst @@ -19,7 +19,7 @@ The key advantages of a Libreoffice based reporting engine are: * If you want your users to be able to modify the document after its generation by Odoo, just configure the document with ODT output (or DOC or DOCX) and the user will be able to modify the document with Libreoffice (or Word) after its generation by Odoo. * Easy development of spreadsheet reports in ODS format (XLS output possible). -This reporting engine is an alternative to `Aeroo `_: these two reporting engines have similar features but their implementation is entirely different. You cannot use aeroo templates as drop in replacement though, you'll have to change a few details. +This reporting engine is an alternative to `Aeroo `_: these two reporting engines have similar features but their implementation is entirely different. You cannot use aeroo templates as drop in replacement though, you'll have to change a few details. Installation ============ @@ -75,7 +75,7 @@ the path to the template as *py3o_template_fallback*. -Moreover you must also modify the odoo server configuration file to declare +Moreover, you must also modify the Odoo server configuration file to declare the allowed root directory for your py3o templates. Only templates located into this directory can be loaded by py3o report. @@ -163,6 +163,11 @@ time display_address(partner) Return a formatted string of the partner's address +Sample report templates +----------------------- + +Sample py3o report templates for the main Odoo native reports (invoice, sale order, purchase order, picking, ...) are available on the Github project `odoo-py3o-report-templates `_. + Known issues / Roadmap ====================== diff --git a/report_py3o_fusion_server/README.rst b/report_py3o_fusion_server/README.rst index 90f5841e..7c5f3013 100644 --- a/report_py3o_fusion_server/README.rst +++ b/report_py3o_fusion_server/README.rst @@ -6,7 +6,7 @@ Py3o Report Engine - Fusion server support ========================================== -This addons was written to let a fusion server handle format conversion instead of local libreoffice. +This module was written to let a py3o fusion server handle format conversion instead of local libreoffice. Installation ============ @@ -54,7 +54,7 @@ At the end, with the dependencies, you should have the following py3o python lib % pip freeze | grep py3o py3o.formats==0.3 - py3o.fusion==0.8.6 + py3o.fusion==0.8.7 py3o.renderclient==0.2 py3o.renderers.juno==0.8 py3o.renderserver==0.5.1 From da4ff7bd74fbce58344ab7fe97f7b4a628170e5c Mon Sep 17 00:00:00 2001 From: Holger Brunn Date: Thu, 11 Jan 2018 12:38:06 +0100 Subject: [PATCH 4/4] [ADD] migration script to install report_py3o_fusion_server on upgrades --- report_py3o/migrations/10.0.2.0.0/pre-migration.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 report_py3o/migrations/10.0.2.0.0/pre-migration.py diff --git a/report_py3o/migrations/10.0.2.0.0/pre-migration.py b/report_py3o/migrations/10.0.2.0.0/pre-migration.py new file mode 100644 index 00000000..e697ceec --- /dev/null +++ b/report_py3o/migrations/10.0.2.0.0/pre-migration.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# © 2018 Therp BV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + + +def migrate(cr, version=None): + # when migrating from a pre-split version of the module, pull the fusion + # server module too to have no loss of features + cr.execute( + "update ir_module_module set state='to install' " + "where name='report_py3o_fusion_server' and state='uninstalled'" + )