jobflow 0.1.10__py3-none-any.whl → 0.1.11__py3-none-any.whl

jobflow/core/flow.py

@@ -140,7 +140,7 @@ class Flow(MSONable):
         self.uuid = uuid
         self.hosts = hosts or []
 
-        self._jobs: tuple[Flow | Job, ...] = tuple()
+        self._jobs: tuple[Flow | Job, ...] = ()
         self.add_jobs(jobs)
         self.output = output
 

jobflow/core/job.py

@@ -324,7 +324,7 @@ class Job(MSONable):
 
         from jobflow.utils.find import contains_flow_or_job
 
-        function_args = tuple() if function_args is None else function_args
+        function_args = () if function_args is None else function_args
         function_kwargs = {} if function_kwargs is None else function_kwargs
         uuid = suuid() if uuid is None else uuid
         metadata = {} if metadata is None else metadata
@@ -585,12 +585,14 @@ class Job(MSONable):
                 pass_manager_config(response.replace, passed_config)
 
         try:
-            output = jsanitize(response.output, strict=True, enum_values=True)
-        except AttributeError:
+            output = jsanitize(
+                response.output, strict=True, enum_values=True, allow_bson=True
+            )
+        except AttributeError as err:
             raise RuntimeError(
                 "Job output contained an object that is not MSONable and therefore "
                 "could not be serialized."
-            )
+            ) from err
 
         save = {k: "output" if v is True else v for k, v in self._kwargs.items()}
         data = {
@@ -905,12 +907,12 @@ class Job(MSONable):
         from jobflow.utils.dict_mods import apply_mod
 
         if dynamic:
-            dict_input = dict(
-                update=update,
-                name_filter=name_filter,
-                function_filter=function_filter,
-                dict_mod=dict_mod,
-            )
+            dict_input = {
+                "update": update,
+                "name_filter": name_filter,
+                "function_filter": function_filter,
+                "dict_mod": dict_mod,
+            }
             self.metadata_updates.append(dict_input)
 
         # unwrap the functions in case the job is a decorated one
@@ -1014,12 +1016,12 @@ class Job(MSONable):
         only be set for the `test_job` and not for the generated Jobs.
         """
         if dynamic:
-            dict_input = dict(
-                config=config,
-                name_filter=name_filter,
-                function_filter=function_filter,
-                attributes=attributes,
-            )
+            dict_input = {
+                "config": config,
+                "name_filter": name_filter,
+                "function_filter": function_filter,
+                "attributes": attributes,
+            }
             self.config_updates.append(dict_input)
 
         # unwrap the functions in case the job is a decorated one

jobflow/core/reference.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import contextlib
 import typing
 from typing import Any, Sequence
 
@@ -93,7 +94,7 @@ class OutputReference(MSONable):
     def __init__(
         self,
         uuid: str,
-        attributes: tuple[tuple[str, Any], ...] = tuple(),
+        attributes: tuple[tuple[str, Any], ...] = (),
         output_schema: type[BaseModel] | None = None,
     ):
         super().__init__()
@@ -157,12 +158,10 @@ class OutputReference(MSONable):
         index = None if result is None else result["index"]
 
         if index is not None and index not in cache[self.uuid]:
-            try:
+            with contextlib.suppress(ValueError):
                 cache[self.uuid][index] = store.get_output(
                     self.uuid, which="last", load=True, on_missing=on_missing
                 )
-            except ValueError:
-                pass
 
         if on_missing == OnMissing.ERROR and index not in cache[self.uuid]:
             istr = f" ({index})" if index is not None else ""
@@ -390,9 +389,9 @@ def find_and_get_references(arg: Any) -> tuple[OutputReference, ...]:
 
     elif isinstance(arg, (float, int, str, bool)):
         # argument is a primitive, we won't find a reference here
-        return tuple()
+        return ()
 
-    arg = jsanitize(arg, strict=True, enum_values=True)
+    arg = jsanitize(arg, strict=True, enum_values=True, allow_bson=True)
 
     # recursively find any reference classes
     locations = find_key_value(arg, "@class", "OutputReference")
@@ -449,7 +448,7 @@ def find_and_resolve_references(
         return arg
 
     # serialize the argument to a dictionary
-    encoded_arg = jsanitize(arg, strict=True, enum_values=True)
+    encoded_arg = jsanitize(arg, strict=True, enum_values=True, allow_bson=True)
 
     # recursively find any reference classes
     locations = find_key_value(encoded_arg, "@class", "OutputReference")

jobflow/core/store.py

@@ -210,7 +210,7 @@ class JobStore(Store):
                         properties=["blob_uuid", "data"],
                     )
                     object_map = {o["blob_uuid"]: o["data"] for o in objects}
-                    inserts = {tuple(l): object_map[o] for o, l in object_info.items()}
+                    inserts = {tuple(v): object_map[k] for k, v in object_info.items()}
                     to_insert.update(inserts)
 
                 update_in_dictionary(doc, to_insert)
@@ -737,7 +737,7 @@ def _filter_blobs(
     from collections import defaultdict
 
     def _group_blobs(infos, locs):
-        grouped = defaultdict(lambda: (list(), list()))
+        grouped = defaultdict(lambda: ([], []))
         for info, loc in zip(infos, locs):
             grouped[info["store"]][0].append(info)
             grouped[info["store"]][1].append(loc)

{jobflow-0.1.10.dist-info → jobflow-0.1.11.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: jobflow
-Version: 0.1.10
+Version: 0.1.11
 Summary: jobflow is a library for writing computational workflows
 Author-email: Alex Ganose <alexganose@gmail.com>
 License: modified BSD
 Project-URL: homepage, https://materialsproject.github.io/jobflow/
-Project-URL: repository, https://github.com/hackingmaterials/jobflow
+Project-URL: repository, https://github.com/materialsproject/jobflow
 Project-URL: documentation, https://materialsproject.github.io/jobflow/
 Project-URL: changelog, https://github.com/materialsproject/jobflow/blob/main/CHANGELOG.md
 Keywords: high-throughput,workflow
@@ -37,7 +37,7 @@ Requires-Dist: sphinx (==6.1.3) ; extra == 'docs'
 Requires-Dist: furo (==2022.12.7) ; extra == 'docs'
 Requires-Dist: myst-parser (==1.0.0) ; extra == 'docs'
 Requires-Dist: ipython (==8.11.0) ; extra == 'docs'
-Requires-Dist: nbsphinx (==0.8.12) ; extra == 'docs'
+Requires-Dist: nbsphinx (==0.9.0) ; extra == 'docs'
 Requires-Dist: autodoc-pydantic (==1.8.0) ; extra == 'docs'
 Provides-Extra: fireworks
 Requires-Dist: FireWorks ; extra == 'fireworks'
@@ -46,7 +46,7 @@ Requires-Dist: monty (==2022.9.9) ; extra == 'strict'
 Requires-Dist: networkx (==3.0) ; extra == 'strict'
 Requires-Dist: pydash (==6.0.2) ; extra == 'strict'
 Requires-Dist: maggma (==0.50.3) ; extra == 'strict'
-Requires-Dist: pydantic (==1.10.5) ; extra == 'strict'
+Requires-Dist: pydantic (==1.10.6) ; extra == 'strict'
 Requires-Dist: PyYAML (==6.0) ; extra == 'strict'
 Requires-Dist: FireWorks (==2.0.3) ; extra == 'strict'
 Requires-Dist: matplotlib (==3.7.1) ; extra == 'strict'
@@ -137,7 +137,7 @@ the jobs is determined automatically and can be visualised using the flow graph.
 
 ## Installation
 
-The jobflow is a Python 3.7+ library and can be installed using pip.
+The jobflow is a Python 3.8+ library and can be installed using pip.
 
 ```bash
 pip install jobflow

{jobflow-0.1.10.dist-info → jobflow-0.1.11.dist-info}/RECORD

@@ -3,12 +3,12 @@ jobflow/_version.py,sha256=ERuIgO0lzbMrVMSXNAE55GxFc5JHDdf1CW7GtoXJ67Q,206
 jobflow/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jobflow/settings.py,sha256=JHyTq9AOzMjSN5ohpLeooMLM0ddO2nPMuHuOyH62X6E,4908
 jobflow/core/__init__.py,sha256=3sx5t1Gysejc4c_fPrhvCjPUg0p_384Zko8ms2c_NnY,98
-jobflow/core/flow.py,sha256=tniQlN5cCWk8-6yC7rmL85y43PVCo8JdoIGY_CYSe1Y,25113
-jobflow/core/job.py,sha256=KqAl8XqJL1rGg395DG6vbvt6vm05mOqN3qum9yvhs7Y,45417
+jobflow/core/flow.py,sha256=b2XRc8Qvf2c5eXOyi2MP0_NEb6nKuN0QuOnyiGypvSI,25108
+jobflow/core/job.py,sha256=TVbx5XRQx1axGFwUZbRODbmZoVLdbM95xAaAdpFIGbM,45491
 jobflow/core/maker.py,sha256=4y76hHopYbV5HjjhHZRkRpdv8yCOuxfIdSXG_hLcY_0,11234
-jobflow/core/reference.py,sha256=6f-nlhT77YKYG_DNuu4QNbRMKpgbCRiwSa3BV1Ar5nM,16378
+jobflow/core/reference.py,sha256=xb9AtRyZ11AkLNQCy4OlZ1xf6O84lIybrVesTrNsVCE,16401
 jobflow/core/state.py,sha256=5LWKTAiYEkUWuFEZNeLtRZ0KCR3qMwZYJRN03zOM4X0,760
-jobflow/core/store.py,sha256=b8nMme_f4WWJsGL8b4z_eScD21ncSp_rhkOV7hqFqsY,26391
+jobflow/core/store.py,sha256=YKS06FJqK4wx1F8YuJWnXC51yTaL5zD2ZqFFN9U8VSQ,26383
 jobflow/managers/__init__.py,sha256=KkA5cVDe2os2_2aTa8eiB9SnkGLZNybcci-Lo4tbaWM,55
 jobflow/managers/fireworks.py,sha256=7O6g23fnr9VBTGAy8h9OR_P9D2KvuQ7-XYTi0O0sqB4,5941
 jobflow/managers/local.py,sha256=z8Ae-a_rUKqnCLsBAM9UIz0xZfCT3AxUWTxJQEf4Er4,4372
@@ -19,8 +19,8 @@ jobflow/utils/find.py,sha256=VRqdDAnx-RavNvdVJ7TVEfvnBIkKR2HhHyOy7lh1QC8,5556
 jobflow/utils/graph.py,sha256=T7M5gOeAxK4CaAynepY11ysEp5Q6ccJ62ZJ4nCFZeVQ,4578
 jobflow/utils/log.py,sha256=dNIOvhApCtW7z1OamLlUmg6TL4mDXOQ0yFQxD8AM0Lk,725
 jobflow/utils/uuid.py,sha256=lVgo8e8gUB7HLSR0H_9uZH-OPkVBaOT39atAnNKYAaI,268
-jobflow-0.1.10.dist-info/LICENSE,sha256=jUEiENfZNQZh9RE9ixtUWgVkLRD85ScZ6iv1WREf19w,2418
-jobflow-0.1.10.dist-info/METADATA,sha256=xfUn0qP66T5Yyybv8Ty2K-wM6xY9pYGYZ5neuI00WcM,8815
-jobflow-0.1.10.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-jobflow-0.1.10.dist-info/top_level.txt,sha256=IanNooU88OupQPDrWnT0rbL3E27P2wEy7Jsfx9_j8zc,8
-jobflow-0.1.10.dist-info/RECORD,,
+jobflow-0.1.11.dist-info/LICENSE,sha256=jUEiENfZNQZh9RE9ixtUWgVkLRD85ScZ6iv1WREf19w,2418
+jobflow-0.1.11.dist-info/METADATA,sha256=P3zSomFDef_b3DmPltaNidz_NqBDK-nUr1QxsfLvXAE,8814
+jobflow-0.1.11.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+jobflow-0.1.11.dist-info/top_level.txt,sha256=IanNooU88OupQPDrWnT0rbL3E27P2wEy7Jsfx9_j8zc,8
+jobflow-0.1.11.dist-info/RECORD,,

{jobflow-0.1.10.dist-info → jobflow-0.1.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any