pythagoras 0.8.12__tar.gz → 0.8.14__tar.gz

{pythagoras-0.8.12/pythagoras.egg-info → pythagoras-0.8.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pythagoras
-Version: 0.8.12
+Version: 0.8.14
 Summary: Simple framework for planet-scale idempotent computations in Python.
 Home-page: https://github.com/vladlpavlov/pythagoras
 Author: Volodymyr (Vlad) Pavlov
@@ -23,7 +23,6 @@ License-File: LICENSE
 Requires-Dist: persidict
 Requires-Dist: lz4
 Requires-Dist: joblib
-Requires-Dist: isort
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: pandas

{pythagoras-0.8.12 → pythagoras-0.8.14}/pythagoras/_01_foundational_objects/value_addresses.py

@@ -25,13 +25,13 @@ class ValueAddress(HashAddress):
         assert len(args) == 0
         assert len(kwargs) == 0
 
-        if isinstance(data, ValueAddress):
-            self.str_chain = deepcopy(data.str_chain)
+        if hasattr(data, "get_ValueAddress"):
+            self.str_chain = deepcopy(data.get_ValueAddress().str_chain)
             return
 
         assert not isinstance(data,HashAddress), (
-            "ValueAddress is the only HashAddress which is allowed "
-            + "to be converted to ValueAddress")
+            "get_ValueAddress is the only way to "
+            + "convert HashAddress into ValueAddress")
 
         prefix = self._build_prefix(data)
         hash_value = self._build_hash_value(data)
@@ -41,6 +41,9 @@ class ValueAddress(HashAddress):
         if push_to_cloud and not (self in pth.global_value_store):
             pth.global_value_store[self] = data
 
+    def get_ValueAddress(self):
+        return self
+
     @property
     def ready(self):
         """Check if address points to a value that is ready to be retrieved."""

{pythagoras-0.8.12 → pythagoras-0.8.14}/pythagoras/_04_idempotent_functions/idempotent_func_and_address.py

@@ -167,12 +167,22 @@ class FunctionCallSignature:
         self.args_addr = ValueAddress(arguments.pack())
 
 class FuncOutputAddress(HashAddress):
+    value_prefix: str|None = None
     def __init__(self, f: IdempotentFunction, arguments:dict[str, Any]):
         assert isinstance(f, IdempotentFunction)
         arguments = SortedKwArgs(**arguments)
         signature = FunctionCallSignature(f,arguments)
         tmp = ValueAddress(signature)
-        super().__init__(tmp.prefix, tmp.hash_value)
+        self.value_prefix = tmp.prefix
+        new_prefix = f.f_name
+        if f.island_name is not None:
+            new_prefix += "_" + f.island_name
+        new_hash_value = tmp.hash_value
+        super().__init__(new_prefix, new_hash_value)
+
+    def get_ValueAddress(self):
+        return ValueAddress.from_strings(
+            prefix=self.value_prefix, hash_value=self.hash_value)
 
     @property
     def ready(self):
@@ -220,15 +230,13 @@ class FuncOutputAddress(HashAddress):
 
     @property
     def function(self) -> IdempotentFunction:
-        signature_addr = ValueAddress.from_strings(
-            prefix=self.prefix, hash_value=self.hash_value)
+        signature_addr = self.get_ValueAddress()
         signature = signature_addr.get()
         return signature.f_addr.get()
 
     @property
     def f_name(self) -> str:
-        signature_addr = ValueAddress.from_strings(
-            prefix=self.prefix, hash_value=self.hash_value)
+        signature_addr = self.get_ValueAddress()
         signature = signature_addr.get()
         return signature.f_name
 
@@ -238,8 +246,7 @@ class FuncOutputAddress(HashAddress):
 
     @property
     def arguments(self) -> SortedKwArgs:
-        signature_addr = ValueAddress.from_strings(
-            prefix=self.prefix, hash_value=self.hash_value)
+        signature_addr = self.get_ValueAddress()
         signature = signature_addr.get()
         return signature.args_addr.get()
 

{pythagoras-0.8.12 → pythagoras-0.8.14/pythagoras.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pythagoras
-Version: 0.8.12
+Version: 0.8.14
 Summary: Simple framework for planet-scale idempotent computations in Python.
 Home-page: https://github.com/vladlpavlov/pythagoras
 Author: Volodymyr (Vlad) Pavlov
@@ -23,7 +23,6 @@ License-File: LICENSE
 Requires-Dist: persidict
 Requires-Dist: lz4
 Requires-Dist: joblib
-Requires-Dist: isort
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: pandas

{pythagoras-0.8.12 → pythagoras-0.8.14}/pythagoras.egg-info/requires.txt

@@ -1,7 +1,6 @@
 persidict
 lz4
 joblib
-isort
 numpy
 scipy
 pandas

{pythagoras-0.8.12 → pythagoras-0.8.14}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as f:
 
 setuptools.setup(
     name="pythagoras"
-    ,version="0.8.12"
+    ,version="0.8.14"
     ,author="Volodymyr (Vlad) Pavlov"
     ,author_email="vlpavlov@ieee.org"
     ,description= "Simple framework for planet-scale "
@@ -42,7 +42,6 @@ setuptools.setup(
         "persidict"
         , "lz4"
         , 'joblib'
-        , 'isort'
         , 'numpy'
         , 'scipy'
         , 'pandas'