[DSW-2069] Fix detection of PDF output format

ds-wizard · Sep 20, 2023 · afab0aa · afab0aa
1 parent 20d4072
commit afab0aa
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/packages/dsw-document-worker/dsw/document_worker/templates/formats.py b/packages/dsw-document-worker/dsw/document_worker/templates/formats.py
@@ -3,7 +3,7 @@
 from ..consts import FormatField, StepField
 from ..documents import DocumentFile
 from ..templates.steps import create_step, Step, \
-    FormatStepException, WkHtmlToPdfStep
+    FormatStepException
 
 
 LOG = logging.getLogger(__name__)
@@ -59,8 +59,7 @@ def _create_steps(self, metadata: dict) -> list[Step]:
 
     @property
     def is_pdf(self) -> bool:
-        # TODO: refactor to check output FileFormat for step (instead of specific step)
-        return isinstance(self.steps[-1], WkHtmlToPdfStep)
+        return self.steps[-1].produces_only_pdf
 
     def requires_via_extras(self, requirement: str) -> bool:
         return any(step.requires_via_extras(requirement)

diff --git a/packages/dsw-document-worker/dsw/document_worker/templates/steps/base.py b/packages/dsw-document-worker/dsw/document_worker/templates/steps/base.py
@@ -37,6 +37,10 @@ def execute_follow(self, document: DocumentFile, context: dict) -> DocumentFile:
     def raise_exc(self, message: str):
         raise FormatStepException(message)
 
+    @property
+    def produces_only_pdf(self):
+        return False
+
 
 STEPS = dict()
 

diff --git a/packages/dsw-document-worker/dsw/document_worker/templates/steps/conversion.py b/packages/dsw-document-worker/dsw/document_worker/templates/steps/conversion.py
@@ -29,6 +29,10 @@ def execute_follow(self, document: DocumentFile, context: dict) -> DocumentFile:
         )
         return DocumentFile(self.OUTPUT_FORMAT, data)
 
+    @property
+    def produces_only_pdf(self):
+        return True
+
 
 class WeasyPrintStep(Step):
     NAME = 'weasyprint'
@@ -76,6 +80,10 @@ def execute_follow(self, document: DocumentFile, context: dict) -> DocumentFile:
         )
         return DocumentFile(self.OUTPUT_FORMAT, data)
 
+    @property
+    def produces_only_pdf(self):
+        return True
+
 
 class PandocStep(Step):
     NAME = 'pandoc'