aiida-pythonjob 0.3.2__tar.gz → 0.3.3__tar.gz

{aiida_pythonjob-0.3.2/src/aiida_pythonjob.egg-info → aiida_pythonjob-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiida-pythonjob
-Version: 0.3.2
+Version: 0.3.3
 Summary: Run Python functions on a remote computer.
 Author-email: Xing Wang <xingwang1991@gmail.com>
 License: MIT License

{aiida_pythonjob-0.3.2 → aiida_pythonjob-0.3.3}/pyproject.toml

@@ -55,6 +55,7 @@ Source = "https://github.com/aiidateam/aiida-pythonjob"
 "pythonjob.jsonable_data" = "aiida_pythonjob.data.jsonable_data:JsonableData"
 "pythonjob.pickled_data" = "aiida_pythonjob.data.pickled_data:PickledData"
 "pythonjob.ase.atoms.Atoms" = "aiida_pythonjob.data.atoms:AtomsData"
+"pythonjob.builtins.NoneType" = "aiida_pythonjob.data.common_data:NoneData"
 "pythonjob.builtins.int" = "aiida.orm.nodes.data.int:Int"
 "pythonjob.builtins.float" = "aiida.orm.nodes.data.float:Float"
 "pythonjob.builtins.str" = "aiida.orm.nodes.data.str:Str"

{aiida_pythonjob-0.3.2 → aiida_pythonjob-0.3.3}/src/aiida_pythonjob/__init__.py

@@ -1,6 +1,6 @@
 """AiiDA plugin that run Python function on remote computers."""
 
-__version__ = "0.3.2"
+__version__ = "0.3.3"
 
 from node_graph import socket_spec as spec
 

aiida_pythonjob-0.3.3/src/aiida_pythonjob/data/common_data.py

@@ -0,0 +1,26 @@
+from aiida import orm
+
+
+class NoneData(orm.Data):
+    """
+    A Data node that explicitly represents a Python `None`.
+
+    - Has no repository content and (by default) no attributes.
+    - All instances have identical content hash, which is desirable here:
+      "None" is a single value.
+    """
+
+    # Convenience aliases to mirror simple-* nodes (Int, Bool, etc.)
+    @property
+    def value(self):
+        return None
+
+    @property
+    def obj(self):
+        return None
+
+    def __repr__(self) -> str:
+        return "NoneData()"
+
+    def __str__(self) -> str:
+        return "NoneData()"

{aiida_pythonjob-0.3.2 → aiida_pythonjob-0.3.3}/src/aiida_pythonjob/data/jsonable_data.py

@@ -14,7 +14,6 @@ class JsonableData(orm.Data):
       1) Detects multiple possible "to-dict" methods (as_dict, to_dict, todict, etc.)
       2) Converts non-JSON-serializable items (e.g. NumPy arrays) into JSON-friendly formats
       3) Rebuilds the object via one of various possible "from-dict" methods.
-      4) Safely handles `None`.
     """
 
     _DICT_METHODS = ["as_dict", "to_dict", "todict", "asdict"]
@@ -24,15 +23,9 @@ class JsonableData(orm.Data):
     def __init__(self, obj: typing.Any, *args, **kwargs):
         """
         Construct the node for the to-be-wrapped object.
-        If `obj` is None, we simply store a flag indicating that.
         """
         super().__init__(*args, **kwargs)
 
-        if obj is None:
-            self.base.attributes.set("is_none", True)
-            self._obj = None
-            return
-
         dictionary = self._extract_dict(obj)
 
         dictionary.setdefault("@class", obj.__class__.__name__)
@@ -107,9 +100,6 @@ class JsonableData(orm.Data):
         Return the wrapped Python object. If not cached in `_obj`,
         we reconstruct it by calling one of the recognized 'from-dict' methods.
         """
-        if self.base.attributes.get("is_none", False):
-            self._obj = None
-            return None
 
         if hasattr(self, "_obj"):
             return self._obj
@@ -154,7 +144,7 @@ class JsonableData(orm.Data):
 
     @property
     def obj(self) -> typing.Any:
-        """Return the wrapped Python object (or None if `is_none` is set)."""
+        """Return the wrapped Python object."""
         return self._get_object()
 
     @property

{aiida_pythonjob-0.3.2 → aiida_pythonjob-0.3.3/src/aiida_pythonjob.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aiida-pythonjob
-Version: 0.3.2
+Version: 0.3.3
 Summary: Run Python functions on a remote computer.
 Author-email: Xing Wang <xingwang1991@gmail.com>
 License: MIT License

{aiida_pythonjob-0.3.2 → aiida_pythonjob-0.3.3}/src/aiida_pythonjob.egg-info/SOURCES.txt

@@ -19,6 +19,7 @@ src/aiida_pythonjob/calculations/pythonjob.py
 src/aiida_pythonjob/calculations/utils.py
 src/aiida_pythonjob/data/__init__.py
 src/aiida_pythonjob/data/atoms.py
+src/aiida_pythonjob/data/common_data.py
 src/aiida_pythonjob/data/data_wrapper.py
 src/aiida_pythonjob/data/deserializer.py
 src/aiida_pythonjob/data/jsonable_data.py

{aiida_pythonjob-0.3.2 → aiida_pythonjob-0.3.3}/src/aiida_pythonjob.egg-info/entry_points.txt

@@ -3,6 +3,7 @@ pythonjob.pythonjob = aiida_pythonjob.calculations.pythonjob:PythonJob
 
 [aiida.data]
 pythonjob.ase.atoms.Atoms = aiida_pythonjob.data.atoms:AtomsData
+pythonjob.builtins.NoneType = aiida_pythonjob.data.common_data:NoneData
 pythonjob.builtins.bool = aiida.orm.nodes.data.bool:Bool
 pythonjob.builtins.dict = aiida_pythonjob.data.data_wrapper:Dict
 pythonjob.builtins.float = aiida.orm.nodes.data.float:Float