rebuild and retest

Author: JohnMount

coverage.txt

@@ -10,11 +10,11 @@ tests/test_nb_fns.py ........                                            [100%]
 Name                      Stmts   Miss  Cover
 ---------------------------------------------
 wvpy/__init__.py              3      0   100%
-wvpy/jtools.py              234     67    71%
+wvpy/jtools.py              262     80    69%
 wvpy/pysheet.py              99     99     0%
 wvpy/render_workbook.py      54     54     0%
 ---------------------------------------------
-TOTAL                       390    220    44%
+TOTAL                       418    233    44%
 
 
-============================== 8 passed in 17.96s ==============================
+============================== 8 passed in 17.67s ==============================

examples/param_worksheet/run_examples.py

@@ -5,6 +5,7 @@
 from wvpy.jtools import JTask, job_fn
 import imgkit
 import pdfkit
+import pprint
 
 
 if __name__ == "__main__":
@@ -25,6 +26,8 @@
             {"n": 15, "d": datetime.date(2022, 8, 20)}, 
         ]
     ]
+    print("starting tasks:")
+    pprint.pprint(tasks)
     # do the work
     with Pool(4) as p:
         p.map(job_fn, tasks)

examples/param_worksheet/run_log.txt

@@ -0,0 +1,37 @@
+starting tasks:
+[JTask(
+ sheet_name= 'ParamExample',
+ output_suffix= '_2022-08-18_5',
+ exclude_input= True,
+ init_code= "\nimport datetime\nworksheet_params = {'n': 5, 'd': datetime.date(2022, 8, 18)}\n",
+ path_prefix= None,
+),
+ JTask(
+ sheet_name= 'ParamExample',
+ output_suffix= '_2022-08-19_10',
+ exclude_input= True,
+ init_code= "\nimport datetime\nworksheet_params = {'n': 10, 'd': datetime.date(2022, 8, 19)}\n",
+ path_prefix= None,
+),
+ JTask(
+ sheet_name= 'ParamExample',
+ output_suffix= '_2022-08-20_15',
+ exclude_input= True,
+ init_code= "\nimport datetime\nworksheet_params = {'n': 15, 'd': datetime.date(2022, 8, 20)}\n",
+ path_prefix= None,
+)]
+start render_as_html "ParamExample.ipynb" "_2022-08-19_10" 2023-01-22 10:15:44.727280
+	done render_as_html "ParamExample_2022-08-19_10.html" 2023-01-22 10:15:47.581793
+start render_as_html "ParamExample.ipynb" "_2022-08-20_15" 2023-01-22 10:15:44.727305
+	done render_as_html "ParamExample_2022-08-20_15.html" 2023-01-22 10:15:47.599934
+start render_as_html "ParamExample.ipynb" "_2022-08-18_5" 2023-01-22 10:15:44.727987
+	done render_as_html "ParamExample_2022-08-18_5.html" 2023-01-22 10:15:47.740577
+Loading page (1/2)
+[>                                                           ] 0%[======>                                                     ] 10%[============================>                               ] 48%[=============================>                              ] 49%[=================================================>          ] 82%[======================================================>     ] 90%[======================================================>     ] 90%[============================================================] 100%Rendering (2/2)                                                    
+[>                                                           ] 0%[===============>                                            ] 25%[============================================================] 100%Done                                                               
+Loading page (1/2)
+[>                                                           ] 0%[======>                                                     ] 10%[============================>                               ] 48%[=============================>                              ] 49%[===================================================>        ] 85%[======================================================>     ] 90%[======================================================>     ] 90%[============================================================] 100%Rendering (2/2)                                                    
+[>                                                           ] 0%[===============>                                            ] 25%[============================================================] 100%Done                                                               
+Loading page (1/2)
+[>                                                           ] 0%[======>                                                     ] 10%[============================>                               ] 48%[=============================>                              ] 49%[===================================================>        ] 86%[======================================================>     ] 90%[======================================================>     ] 90%[============================================================] 100%Rendering (2/2)                                                    
+[>                                                           ] 0%[===============>                                            ] 25%[============================================================] 100%Done                                                               

pkg/build/lib/wvpy/jtools.py

@@ -8,6 +8,7 @@
 import nbconvert.preprocessors
 
 from typing import Optional
+from functools import total_ordering
 
 have_pdf_kit = False
 try:
@@ -355,6 +356,7 @@ def render_as_html(
         print(f'\tdone render_as_html "{html_name}" {datetime.datetime.now()}')
 
 
+@total_ordering
 class JTask:
     def __init__(
         self,
@@ -410,15 +412,43 @@ def render_as_html(self) -> None:
             init_code=self.init_code,
         )
 
+    def __getitem__(self, item):
+         return getattr(self, item)
+
+    def _is_valid_operand(self, other):
+        return isinstance(other, JTask)
+
+    def __eq__(self, other):
+        if not self._is_valid_operand(other):
+            return NotImplemented
+        if str(type(self)) != str(type(other)):
+            return False
+        for v in ["sheet_name", "output_suffix", "exclude_input", "init_code", "path_prefix"]:
+            if self[v] != other[v]:
+                return False
+        return True
+
+    def __lt__(self, other):
+        if not self._is_valid_operand(other):
+            return NotImplemented
+        if str(type(self)) < str(type(other)):
+            return True
+        for v in ["sheet_name", "output_suffix", "exclude_input", "init_code", "path_prefix"]:
+            v_self = self[v]
+            v_other = other[v]
+            # can't order compare None to None
+            if ((v_self is None) or (v_other is None)) and ((v_self is None) != (v_other is None)):
+                return v_self is None
+            if self[v] < other[v]:
+                return True
+        return False
+    
     def __str__(self) -> str:
         args_str = ",\n".join([
-            f" 'sheet_name': {repr(self.sheet_name)}",
-            f" 'output_suffix': {repr(self.output_suffix)}",
-            f" 'exclude_input': {repr(self.exclude_input)}",
-            f" 'init_code': {repr(self.init_code)}",
-            f" 'path_prefix': {repr(self.path_prefix)}",
+            f" {v}= {repr(self[v])}"
+            for v in ["sheet_name", "output_suffix", "exclude_input", "init_code", "path_prefix"]
         ])
-        return 'JTask(**{\n' + args_str + ",\n})"
+        return 'JTask(\n' + args_str + ",\n)"
 
     def __repr__(self) -> str:
         return self.__str__()