support for inline pdf and filenames

Author: apexdodge

README.md

@@ -76,8 +76,8 @@ We support both **wkhtmltopdf** and **Headless Chrome** with the endpoint to con
 - [wkhtmltopdf options](https://www.api2pdf.com/documentation/advanced-options-wkhtmltopdf/)
 - [headless chrome options](https://www.api2pdf.com/documentation/advanced-options-headless-chrome/)
 
-##### HeadlessChrome.convert_from_html(html, **options)
-##### WkHtmlToPdf.convert_from_html(html, **options)
+##### HeadlessChrome.convert_from_html(html, inline_pdf=True, file_name=None, **options)
+##### WkHtmlToPdf.convert_from_html(html, inline_pdf=True, file_name=None, **options)
 
     from api2pdf import Api2Pdf
     a2p = Api2Pdf('YOUR-API-KEY')
@@ -97,9 +97,9 @@ We support both wkhtmltopdf and Headless Chrome with the endpoint to convert url
 - [wkhtmltopdf options](https://www.api2pdf.com/documentation/advanced-options-wkhtmltopdf/)
 - [headless chrome options](https://www.api2pdf.com/documentation/advanced-options-headless-chrome/)
 
-##### HeadlessChrome.convert_from_url(url, **options)
+##### HeadlessChrome.convert_from_url(url, inline_pdf=True, file_name=None, **options)
 
-##### WkHtmlToPdf.convert_from_url(url, **options)
+##### WkHtmlToPdf.convert_from_url(url, inline_pdf=True, file_name=None, **options)
 
     from api2pdf import Api2Pdf
     a2p = Api2Pdf('YOUR-API-KEY')
@@ -120,7 +120,7 @@ We use **LibreOffice** to convert the following formats to PDF:
 
 You must provide a url to the file. Our engine will consume the file at that URL and convert it to the PDF.
 
-##### LibreOffice.convert_from_url(url)
+##### LibreOffice.convert_from_url(url, inline_pdf=True, file_name=None)
 
     from api2pdf import Api2Pdf
     a2p = Api2Pdf('YOUR-API-KEY')

api2pdf/api2pdf.py

@@ -28,18 +28,25 @@ def LibreOffice(self):
     def merge(self, list_of_urls):
         return self._make_request(API2PDF_MERGE_ENDPOINT, list_of_urls)
 
-    def _make_html_payload(self, html, **options):
+    def _make_html_payload(self, html, inline_pdf=False, file_name=None, **options):
         payload = {
             'html': html,
+            'inlinePdf': inline_pdf
         }
+        if file_name != None:
+            payload['fileName'] = file_name
+
         if options != None:
             payload['options'] = options
         return payload
 
-    def _make_url_payload(self, url, **options):
+    def _make_url_payload(self, url, inline_pdf=False, file_name=None, **options):
         payload = {
-            'url': url
+            'url': url,
+            'inlinePdf': inline_pdf
         }
+        if file_name != None:
+            payload['fileName'] = file_name
         if options != None:
             payload['options'] = options
         return payload
@@ -51,26 +58,26 @@ def _make_request(self, endpoint, payload):
         return Api2PdfResponse(headers, endpoint, payload, response)
 
 class Api2Pdf_WkHtmlToPdf(Api2Pdf):
-    def convert_from_html(self, html, **options):
-        payload = self._make_html_payload(html, **options)
+    def convert_from_html(self, html, inline_pdf=False, file_name=None, **options):
+        payload = self._make_html_payload(html, inline_pdf=inline_pdf, file_name=file_name, **options)
         return self._make_request(API2PDF_WKHTMLTOPDF_HTML, payload)
 
-    def convert_from_url(self, url, **options):
-        payload = self._make_url_payload(url, **options)
+    def convert_from_url(self, url, inline_pdf=False, file_name=None, **options):
+        payload = self._make_url_payload(url, inline_pdf=inline_pdf, file_name=file_name, **options)
         return self._make_request(API2PDF_WKHTMLTOPDF_URL, payload)
 
 class Api2Pdf_HeadlessChromeToPdf(Api2Pdf):
-    def convert_from_html(self, html, **options):
-        payload = self._make_html_payload(html, **options)
+    def convert_from_html(self, html, inline_pdf=False, file_name=None, **options):
+        payload = self._make_html_payload(html, inline_pdf=inline_pdf, file_name=file_name, **options)
         return self._make_request(API2PDF_CHROME_HTML, payload)
 
-    def convert_from_url(self, url, **options):
-        payload = self._make_url_payload(url, **options)
+    def convert_from_url(self, url, inline_pdf=False, file_name=None, **options):
+        payload = self._make_url_payload(url, inline_pdf=inline_pdf, file_name=file_name, **options)
         return self._make_request(API2PDF_CHROME_URL, payload)
 
 class Api2Pdf_LibreOffice(Api2Pdf):
-    def convert_from_url(self, url):
-        payload = self._make_url_payload(url)
+    def convert_from_url(self, url, inline_pdf=False, file_name=None):
+        payload = self._make_url_payload(url, inline_pdf=inline_pdf, file_name=file_name)
         return self._make_request(API2PDF_LIBREOFFICE_CONVERT, payload)
 
 class Api2PdfResponse(object):

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="api2pdf",
-    version="0.0.5",
+    version="0.0.6",
     author="Zack Schwartz",
     author_email="support@api2pdf.com",
     description="Wrapper for api2pdf.com library for converting html, urls, and word documents to pdf",