astreum 0.1.10__py3-none-any.whl → 0.1.12__py3-none-any.whl

astreum/node/__init__.py

@@ -13,16 +13,17 @@ from astreum.lispeum.storage import store_expr, get_expr_from_storage
 
 class Node:
     def __init__(self, config: dict):
-        self.config = config
-        self.relay = Relay(config)
+        # Ensure config is a dictionary, but allow it to be None
+        self.config = config if config is not None else {}
+        self.relay = Relay(self.config)
         # Get the node_id from relay instead of generating our own
         self.node_id = self.relay.node_id
-        self.storage = Storage(config)
+        self.storage = Storage(self.config)
         self.storage.node = self  # Set the storage node reference to self
         
         # Latest block of the chain this node is following
         self.latest_block = None
-        self.followed_chain_id = config.get('followed_chain_id', None)
+        self.followed_chain_id = self.config.get('followed_chain_id', None)
         
         # Initialize machine
         self.machine = AstreumMachine(node=self)

astreum/node/models.py

@@ -15,8 +15,21 @@ class Storage:
     def __init__(self, config: dict):
         self.max_space = config.get('max_storage_space', 1024 * 1024 * 1024)  # Default 1GB
         self.current_space = 0
-        self.storage_path = Path(config.get('storage_path', 'storage'))
-        self.storage_path.mkdir(parents=True, exist_ok=True)
+        
+        # Check if storage_path is provided in config
+        storage_path = config.get('storage_path')
+        self.use_memory_storage = storage_path is None
+        
+        # Initialize in-memory storage if no path provided
+        self.memory_storage = {} if self.use_memory_storage else None
+        
+        # Only create storage path if not using memory storage
+        if not self.use_memory_storage:
+            self.storage_path = Path(storage_path)
+            self.storage_path.mkdir(parents=True, exist_ok=True)
+            # Calculate current space usage
+            self.current_space = sum(f.stat().st_size for f in self.storage_path.glob('*') if f.is_file())
+        
         self.max_object_recursion = config.get('max_object_recursion', 50)
         self.network_request_timeout = config.get('network_request_timeout', 5.0)  # Default 5 second timeout
         self.node = None  # Will be set by the Node after initialization
@@ -24,9 +37,6 @@ class Storage:
         # In-progress requests tracking
         self.pending_requests = {}  # hash -> (start_time, event)
         self.request_lock = threading.Lock()
-        
-        # Calculate current space usage
-        self.current_space = sum(f.stat().st_size for f in self.storage_path.glob('*') if f.is_file())
 
     def put(self, data_hash: bytes, data: bytes) -> bool:
         """Store data with its hash. Returns True if successful, False if space limit exceeded."""
@@ -34,6 +44,14 @@ class Storage:
         if self.current_space + data_size > self.max_space:
             return False
 
+        # If using memory storage, store in dictionary
+        if self.use_memory_storage:
+            if data_hash not in self.memory_storage:
+                self.memory_storage[data_hash] = data
+                self.current_space += data_size
+            return True
+
+        # Otherwise use file storage
         file_path = self.storage_path / data_hash.hex()
         
         # Don't store if already exists
@@ -54,6 +72,11 @@ class Storage:
 
     def _local_get(self, data_hash: bytes) -> Optional[bytes]:
         """Get data from local storage only, no network requests."""
+        # If using memory storage, get from dictionary
+        if self.use_memory_storage:
+            return self.memory_storage.get(data_hash)
+            
+        # Otherwise use file storage
         file_path = self.storage_path / data_hash.hex()
         if file_path.exists():
             return file_path.read_bytes()
@@ -144,6 +167,8 @@ class Storage:
 
     def contains(self, data_hash: bytes) -> bool:
         """Check if data exists in storage."""
+        if self.use_memory_storage:
+            return data_hash in self.memory_storage
         return (self.storage_path / data_hash.hex()).exists()
         
     def get_recursive(self, root_hash: bytes, max_depth: Optional[int] = None, 

{astreum-0.1.10.dist-info → astreum-0.1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: astreum
-Version: 0.1.10
+Version: 0.1.12
 Summary: Python library to interact with the Astreum blockchain and its Lispeum virtual machine.
 Author-email: "Roy R. O. Okello" <roy@stelar.xyz>
 Project-URL: Homepage, https://github.com/astreum/lib

{astreum-0.1.10.dist-info → astreum-0.1.12.dist-info}/RECORD

@@ -20,8 +20,8 @@ astreum/lispeum/special/number/addition.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 astreum/machine/__init__.py,sha256=GOdZl1tS9uIJHbq5WVcplifMDPDLQroX7CVew-K2YbA,15262
 astreum/machine/environment.py,sha256=K0084U6B7wwjrDZ9b2_7cEcbBzsB7UOy_Zpbrr7B3GY,834
 astreum/machine/error.py,sha256=MvqBaZZt33rNELNhUJ2lER3TE3aS8WVqsWF2hz2AwoA,38
-astreum/node/__init__.py,sha256=wvmMMACicwhJ-ipSLpR1rsEUXWuHaZ8fnsBCkUA_RA8,22387
-astreum/node/models.py,sha256=MScDCNEpR-SfaFsRSU567mVuZRhH1Lqc7gmlqb3j-nI,10980
+astreum/node/__init__.py,sha256=EdGMa9pargAdB7KzjKBkhuFJ3G3wZF2VeIGkYFOCLws,22497
+astreum/node/models.py,sha256=9Uf2_u55uxWG0ujjySvFJUO5Ub-EzlMnnMJWcgJHjHk,11980
 astreum/node/relay/__init__.py,sha256=gQNYDxllkjZqE6bvgPOYkKu3QHkjPFn11RvtP-BxtKI,13994
 astreum/node/relay/bucket.py,sha256=pcmollbbM-xeHlmDxLZnzvf0Ut-9v9RoN6SijYiQuu8,2893
 astreum/node/relay/envelope.py,sha256=TfkynttoPX7smvMV7xEAdtIlfz-Z-EZjuhZ826csZxA,10078
@@ -30,8 +30,8 @@ astreum/node/relay/peer.py,sha256=DlvTR9j0BZQ1dW-p_9UGgfLvQqwNdpNLMSCYEW4FhyI,58
 astreum/node/relay/route.py,sha256=fyOSsAe1mfsCVeN6LtQ_OEUEb1FiC5dobZBEJKNGU9U,5814
 astreum/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 astreum/utils/bytes_format.py,sha256=X4tG5GGPweNCE54bHYkLFiuLTbmpy5upO_s1Cef-MGA,2711
-astreum-0.1.10.dist-info/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
-astreum-0.1.10.dist-info/METADATA,sha256=50hGAAYObIlHpnh2ikWSAALUtOIwmw9O_U6c1qLCre8,2942
-astreum-0.1.10.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-astreum-0.1.10.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
-astreum-0.1.10.dist-info/RECORD,,
+astreum-0.1.12.dist-info/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
+astreum-0.1.12.dist-info/METADATA,sha256=LnGyI9YKLRNRWLolnyuHDgg0MKPSyLSwJho4FCTg1to,2942
+astreum-0.1.12.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+astreum-0.1.12.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
+astreum-0.1.12.dist-info/RECORD,,