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

astreum/machine/__init__.py

@@ -1,254 +1,352 @@
-import threading
-from typing import Dict, Optional
-import uuid
-
-from astreum.lispeum.special.definition import handle_definition
-from astreum.lispeum.special.list.all import handle_list_all
-from astreum.lispeum.special.list.any import handle_list_any
-from astreum.lispeum.special.list.fold import handle_list_fold
-from astreum.lispeum.special.list.get import handle_list_get
-from astreum.lispeum.special.list.insert import handle_list_insert
-from astreum.lispeum.special.list.map import handle_list_map
-from astreum.lispeum.special.list.position import handle_list_position
-from astreum.lispeum.special.list.remove import handle_list_remove
-from astreum.machine.environment import Environment
-from astreum.lispeum.expression import Expr
-from astreum.lispeum.tokenizer import tokenize
-from astreum.lispeum.parser import parse
-
-class AstreumMachine:
-    def __init__(self, node: 'Node' = None):
-        self.global_env = Environment(node=node)
-        self.sessions: Dict[str, Environment] = {}
-        self.lock = threading.Lock()
-         
-    
-    def create_session(self) -> str:
-        session_id = str(uuid.uuid4())
-        with self.lock:
-            self.sessions[session_id] = Environment(parent=self.global_env)
-        return session_id
-    
-    def terminate_session(self, session_id: str) -> bool:
-        with self.lock:
-            if session_id in self.sessions:
-                del self.sessions[session_id]
-                return True
-            else:
-                return False
-    
-    def get_session_env(self, session_id: str) -> Optional[Environment]:
-        with self.lock:
-            return self.sessions.get(session_id, None)
-    
-    def evaluate_code(self, code: str, session_id: str) -> Expr:
-        session_env = self.get_session_env(session_id)
-        if session_env is None:
-            raise ValueError(f"Session ID {session_id} not found.")
-        
-        try:
-            tkns = tokenize(input=code)
-            expr, _ = parse(tokens=tkns)
-            result = self.evaluate_expression(expr, session_env)
-            return result
-        
-        except Exception as e:
-            raise ValueError(e)
-    
-    def evaluate_expression(self, expr: Expr, env: Environment) -> Expr:
-        if isinstance(expr, Expr.Boolean) or isinstance(expr, Expr.Integer) or isinstance(expr, Expr.String) or isinstance(expr, Expr.Error):
-            return expr
-        
-        elif isinstance(expr, Expr.Symbol):
-            value = env.get(expr.value)
-            
-            if value:
-                return value
-            else:
-                return Expr.Error(
-                    category="NameError",
-                    message=f"Variable '{expr.value}' not found in environments."
-                )
-        
-        elif isinstance(expr, Expr.ListExpr):
-            
-            if len(expr.elements) == 0:
-                return expr 
-            
-            if len(expr.elements) == 1:
-                return self.evaluate_expression(expr=expr.elements[0], env=env)
-            
-            first = expr.elements[0]
-
-            if isinstance(first, Expr.Symbol):
-                
-                first_symbol_value = env.get(first.value)
-
-                if first_symbol_value and not isinstance(first_symbol_value, Expr.Function):
-                    evaluated_elements = [self.evaluate_expression(e, env) for e in expr.elements]
-                    return Expr.ListExpr(evaluated_elements)
-                
-                elif first.value == "def":
-                    return handle_definition(
-                        machine=self,
-                        args=expr.elements[1:],
-                        env=env
-                    )
-
-                # List
-                elif first.value == "list.new":
-                    return Expr.ListExpr([self.evaluate_expression(arg, env) for arg in expr.elements[1:]])
-
-                elif first.value == "list.get":
-                    args = expr.elements[1:]
-                    if len(args) != 2:
-                        return Expr.Error(
-                            category="SyntaxError",
-                            message="list.get expects exactly two arguments: a list and an index"
-                        )
-                    list_obj = self.evaluate_expression(args[0], env)
-                    index = self.evaluate_expression(args[1], env)
-                    return handle_list_get(self, list_obj, index, env)
-
-                elif first.value == "list.insert":
-                    args = expr.elements[1:]
-                    if len(args) != 3:
-                        return Expr.ListExpr([
-                            Expr.ListExpr([]),
-                            Expr.String("list.insert expects exactly three arguments: a list, an index, and a value")
-                        ])
-                    
-                    return handle_list_insert(
-                        list=self.evaluate_expression(args[0], env),
-                        index=self.evaluate_expression(args[1], env),
-                        value=self.evaluate_expression(args[2], env),
-                    )
-
-                elif first.value == "list.remove":
-                    args = expr.elements[1:]
-                    if len(args) != 2:
-                        return Expr.ListExpr([
-                            Expr.ListExpr([]),
-                            Expr.String("list.remove expects exactly two arguments: a list and an index")
-                        ])
-                    
-                    return handle_list_remove(
-                        list=self.evaluate_expression(args[0], env),
-                        index=self.evaluate_expression(args[1], env),
-                    )
-
-                elif first.value == "list.length":
-                    args = expr.elements[1:]
-                    if len(args) != 1:
-                        return Expr.ListExpr([
-                            Expr.ListExpr([]),
-                            Expr.String("list.length expects exactly one argument: a list")
-                        ])
-                    
-                    list_obj = self.evaluate_expression(args[0], env)
-                    if not isinstance(list_obj, Expr.ListExpr):
-                        return Expr.ListExpr([
-                            Expr.ListExpr([]),
-                            Expr.String("Argument must be a list")
-                        ])
-                    
-                    return Expr.ListExpr([
-                        Expr.Integer(len(list_obj.elements)),
-                        Expr.ListExpr([]) 
-                    ])
-
-                elif first.value == "list.fold":
-                    if len(args) != 3:
-                        return Expr.ListExpr([
-                            Expr.ListExpr([]),
-                            Expr.String("list.fold expects exactly three arguments: a list, an initial value, and a function")
-                        ])
-                    
-                    return handle_list_fold(
-                        machine=self,
-                        list=self.evaluate_expression(args[0], env),
-                        initial=self.evaluate_expression(args[1], env),
-                        func=self.evaluate_expression(args[2], env),
-                        env=env,
-                    )
-
-                elif first.value == "list.map":
-                    if len(args) != 2:
-                        return Expr.ListExpr([
-                            Expr.ListExpr([]),
-                            Expr.String("list.map expects exactly two arguments: a list and a function")
-                        ])
-                    
-                    return handle_list_map(
-                        machine=self,
-                        list=self.evaluate_expression(args[0], env),
-                        func=self.evaluate_expression(args[1], env),
-                        env=env,
-                    )
-
-                elif first.value == "list.position":
-                    if len(args) != 2:
-                        return Expr.ListExpr([
-                            Expr.ListExpr([]),
-                            Expr.String("list.position expects exactly two arguments: a list and a function")
-                        ])
-                    
-                    return handle_list_position(
-                        machine=self,
-                        list=self.evaluate_expression(args[0], env),
-                        predicate=self.evaluate_expression(args[1], env),
-                        env=env,
-                    )
-
-                elif first.value == "list.any":
-                    if len(args) != 2:
-                        return Expr.ListExpr([
-                            Expr.ListExpr([]),
-                            Expr.String("list.any expects exactly two arguments: a list and a function")
-                        ])
-                    
-                    return handle_list_any(
-                        machine=self,
-                        list=self.evaluate_expression(args[0], env),
-                        predicate=self.evaluate_expression(args[1], env),
-                        env=env,
-                    )
-
-                elif first.value == "list.all":
-                    if len(args) != 2:
-                        return Expr.ListExpr([
-                            Expr.ListExpr([]),
-                            Expr.String("list.all expects exactly two arguments: a list and a function")
-                        ])
-                    
-                    return handle_list_all(
-                        machine=self,
-                        list=self.evaluate_expression(args[0], env),
-                        predicate=self.evaluate_expression(args[1], env),
-                        env=env,
-                    )
-
-                # Number
-                elif first.value == "+":
-                    evaluated_args = [self.evaluate_expression(arg, env) for arg in expr.elements[1:]]
-
-                    # Check for non-integer arguments
-                    if not all(isinstance(arg, Expr.Integer) for arg in evaluated_args):
-                        return Expr.Error(
-                            category="TypeError",
-                            message="All arguments to + must be integers"
-                        )
-                    
-                    # Sum up the integer values
-                    result = sum(arg.value for arg in evaluated_args)
-                    return Expr.Integer(result)
-
-            else:
-                evaluated_elements = [self.evaluate_expression(e, env) for e in expr.elements]
-                return Expr.ListExpr(evaluated_elements)
-            
-        elif isinstance(expr, Expr.Function):
-            return expr
-        
-        else:
-            raise ValueError(f"Unknown expression type: {type(expr)}")
+import threading
+from typing import Dict, Optional
+import uuid
+
+from astreum.lispeum.special.definition import handle_definition
+from astreum.lispeum.special.list.all import handle_list_all
+from astreum.lispeum.special.list.any import handle_list_any
+from astreum.lispeum.special.list.fold import handle_list_fold
+from astreum.lispeum.special.list.get import handle_list_get
+from astreum.lispeum.special.list.insert import handle_list_insert
+from astreum.lispeum.special.list.map import handle_list_map
+from astreum.lispeum.special.list.position import handle_list_position
+from astreum.lispeum.special.list.remove import handle_list_remove
+from astreum.machine.environment import Environment
+from astreum.lispeum.expression import Expr
+from astreum.lispeum.tokenizer import tokenize
+from astreum.lispeum.parser import parse
+
+class AstreumMachine:
+    def __init__(self, node: 'Node' = None):
+        self.global_env = Environment(node=node)
+        self.sessions: Dict[str, Environment] = {}
+        self.lock = threading.Lock()
+         
+    
+    def create_session(self) -> str:
+        session_id = str(uuid.uuid4())
+        with self.lock:
+            self.sessions[session_id] = Environment(parent=self.global_env)
+        return session_id
+    
+    def terminate_session(self, session_id: str) -> bool:
+        with self.lock:
+            if session_id in self.sessions:
+                del self.sessions[session_id]
+                return True
+            else:
+                return False
+    
+    def get_session_env(self, session_id: str) -> Optional[Environment]:
+        with self.lock:
+            return self.sessions.get(session_id, None)
+    
+    def evaluate_code(self, code: str, session_id: str) -> Expr:
+        session_env = self.get_session_env(session_id)
+        if session_env is None:
+            raise ValueError(f"Session ID {session_id} not found.")
+        
+        try:
+            tkns = tokenize(input=code)
+            expr, _ = parse(tokens=tkns)
+            result = self.evaluate_expression(expr, session_env)
+            return result
+        
+        except Exception as e:
+            raise ValueError(e)
+    
+    def evaluate_expression(self, expr: Expr, env: Environment) -> Expr:
+        if isinstance(expr, Expr.Boolean) or isinstance(expr, Expr.Integer) or isinstance(expr, Expr.String) or isinstance(expr, Expr.Error):
+            return expr
+        
+        elif isinstance(expr, Expr.Symbol):
+            value = env.get(expr.value)
+            
+            if value:
+                return value
+            else:
+                return Expr.Error(
+                    category="NameError",
+                    message=f"Variable '{expr.value}' not found in environments."
+                )
+        
+        elif isinstance(expr, Expr.ListExpr):
+            
+            if len(expr.elements) == 0:
+                return expr 
+            
+            if len(expr.elements) == 1:
+                return self.evaluate_expression(expr=expr.elements[0], env=env)
+            
+            first = expr.elements[0]
+
+            if isinstance(first, Expr.Symbol):
+                
+                first_symbol_value = env.get(first.value)
+
+                if first_symbol_value and not isinstance(first_symbol_value, Expr.Function):
+                    evaluated_elements = [self.evaluate_expression(e, env) for e in expr.elements]
+                    return Expr.ListExpr(evaluated_elements)
+                
+                elif first.value == "def":
+                    return handle_definition(
+                        machine=self,
+                        args=expr.elements[1:],
+                        env=env
+                    )
+
+                # List
+                elif first.value == "list.new":
+                    return Expr.ListExpr([self.evaluate_expression(arg, env) for arg in expr.elements[1:]])
+
+                elif first.value == "list.get":
+                    args = expr.elements[1:]
+                    if len(args) != 2:
+                        return Expr.Error(
+                            category="SyntaxError",
+                            message="list.get expects exactly two arguments: a list and an index"
+                        )
+                    list_obj = self.evaluate_expression(args[0], env)
+                    index = self.evaluate_expression(args[1], env)
+                    return handle_list_get(self, list_obj, index, env)
+
+                elif first.value == "list.insert":
+                    args = expr.elements[1:]
+                    if len(args) != 3:
+                        return Expr.ListExpr([
+                            Expr.ListExpr([]),
+                            Expr.String("list.insert expects exactly three arguments: a list, an index, and a value")
+                        ])
+                    
+                    return handle_list_insert(
+                        list=self.evaluate_expression(args[0], env),
+                        index=self.evaluate_expression(args[1], env),
+                        value=self.evaluate_expression(args[2], env),
+                    )
+
+                elif first.value == "list.remove":
+                    args = expr.elements[1:]
+                    if len(args) != 2:
+                        return Expr.ListExpr([
+                            Expr.ListExpr([]),
+                            Expr.String("list.remove expects exactly two arguments: a list and an index")
+                        ])
+                    
+                    return handle_list_remove(
+                        list=self.evaluate_expression(args[0], env),
+                        index=self.evaluate_expression(args[1], env),
+                    )
+
+                elif first.value == "list.length":
+                    args = expr.elements[1:]
+                    if len(args) != 1:
+                        return Expr.ListExpr([
+                            Expr.ListExpr([]),
+                            Expr.String("list.length expects exactly one argument: a list")
+                        ])
+                    
+                    list_obj = self.evaluate_expression(args[0], env)
+                    if not isinstance(list_obj, Expr.ListExpr):
+                        return Expr.ListExpr([
+                            Expr.ListExpr([]),
+                            Expr.String("Argument must be a list")
+                        ])
+                    
+                    return Expr.ListExpr([
+                        Expr.Integer(len(list_obj.elements)),
+                        Expr.ListExpr([]) 
+                    ])
+
+                elif first.value == "list.fold":
+                    if len(args) != 3:
+                        return Expr.ListExpr([
+                            Expr.ListExpr([]),
+                            Expr.String("list.fold expects exactly three arguments: a list, an initial value, and a function")
+                        ])
+                    
+                    return handle_list_fold(
+                        machine=self,
+                        list=self.evaluate_expression(args[0], env),
+                        initial=self.evaluate_expression(args[1], env),
+                        func=self.evaluate_expression(args[2], env),
+                        env=env,
+                    )
+
+                elif first.value == "list.map":
+                    if len(args) != 2:
+                        return Expr.ListExpr([
+                            Expr.ListExpr([]),
+                            Expr.String("list.map expects exactly two arguments: a list and a function")
+                        ])
+                    
+                    return handle_list_map(
+                        machine=self,
+                        list=self.evaluate_expression(args[0], env),
+                        func=self.evaluate_expression(args[1], env),
+                        env=env,
+                    )
+
+                elif first.value == "list.position":
+                    if len(args) != 2:
+                        return Expr.ListExpr([
+                            Expr.ListExpr([]),
+                            Expr.String("list.position expects exactly two arguments: a list and a function")
+                        ])
+                    
+                    return handle_list_position(
+                        machine=self,
+                        list=self.evaluate_expression(args[0], env),
+                        predicate=self.evaluate_expression(args[1], env),
+                        env=env,
+                    )
+
+                elif first.value == "list.any":
+                    if len(args) != 2:
+                        return Expr.ListExpr([
+                            Expr.ListExpr([]),
+                            Expr.String("list.any expects exactly two arguments: a list and a function")
+                        ])
+                    
+                    return handle_list_any(
+                        machine=self,
+                        list=self.evaluate_expression(args[0], env),
+                        predicate=self.evaluate_expression(args[1], env),
+                        env=env,
+                    )
+
+                elif first.value == "list.all":
+                    if len(args) != 2:
+                        return Expr.ListExpr([
+                            Expr.ListExpr([]),
+                            Expr.String("list.all expects exactly two arguments: a list and a function")
+                        ])
+                    
+                    return handle_list_all(
+                        machine=self,
+                        list=self.evaluate_expression(args[0], env),
+                        predicate=self.evaluate_expression(args[1], env),
+                        env=env,
+                    )
+
+                # Number
+                elif first.value == "+":
+                    evaluated_args = [self.evaluate_expression(arg, env) for arg in expr.elements[1:]]
+
+                    # Check for non-integer arguments
+                    if not all(isinstance(arg, Expr.Integer) for arg in evaluated_args):
+                        return Expr.Error(
+                            category="TypeError",
+                            message="All arguments to + must be integers"
+                        )
+                    
+                    # Sum up the integer values
+                    result = sum(arg.value for arg in evaluated_args)
+                    return Expr.Integer(result)
+                
+                # Subtraction
+                elif first.value == "-":
+                    evaluated_args = [self.evaluate_expression(arg, env) for arg in expr.elements[1:]]
+
+                    # Check for non-integer arguments
+                    if not all(isinstance(arg, Expr.Integer) for arg in evaluated_args):
+                        return Expr.Error(
+                            category="TypeError",
+                            message="All arguments to - must be integers"
+                        )
+                    
+                    # With only one argument, negate it
+                    if len(evaluated_args) == 1:
+                        return Expr.Integer(-evaluated_args[0].value)
+                    
+                    # With multiple arguments, subtract all from the first
+                    result = evaluated_args[0].value
+                    for arg in evaluated_args[1:]:
+                        result -= arg.value
+                    
+                    return Expr.Integer(result)
+                
+                # Multiplication
+                elif first.value == "*":
+                    evaluated_args = [self.evaluate_expression(arg, env) for arg in expr.elements[1:]]
+
+                    # Check for non-integer arguments
+                    if not all(isinstance(arg, Expr.Integer) for arg in evaluated_args):
+                        return Expr.Error(
+                            category="TypeError",
+                            message="All arguments to * must be integers"
+                        )
+                    
+                    # Multiply all values
+                    result = 1
+                    for arg in evaluated_args:
+                        result *= arg.value
+                    
+                    return Expr.Integer(result)
+                
+                # Division (integer division)
+                elif first.value == "/":
+                    evaluated_args = [self.evaluate_expression(arg, env) for arg in expr.elements[1:]]
+
+                    # Check for non-integer arguments
+                    if not all(isinstance(arg, Expr.Integer) for arg in evaluated_args):
+                        return Expr.Error(
+                            category="TypeError",
+                            message="All arguments to / must be integers"
+                        )
+                    
+                    # Need exactly two arguments
+                    if len(evaluated_args) != 2:
+                        return Expr.Error(
+                            category="ArgumentError",
+                            message="The / operation requires exactly two arguments"
+                        )
+                    
+                    dividend = evaluated_args[0].value
+                    divisor = evaluated_args[1].value
+                    
+                    if divisor == 0:
+                        return Expr.Error(
+                            category="DivisionError",
+                            message="Division by zero"
+                        )
+                    
+                    return Expr.Integer(dividend // divisor)  # Integer division
+                
+                # Remainder (modulo)
+                elif first.value == "%":
+                    evaluated_args = [self.evaluate_expression(arg, env) for arg in expr.elements[1:]]
+
+                    # Check for non-integer arguments
+                    if not all(isinstance(arg, Expr.Integer) for arg in evaluated_args):
+                        return Expr.Error(
+                            category="TypeError",
+                            message="All arguments to % must be integers"
+                        )
+                    
+                    # Need exactly two arguments
+                    if len(evaluated_args) != 2:
+                        return Expr.Error(
+                            category="ArgumentError",
+                            message="The % operation requires exactly two arguments"
+                        )
+                    
+                    dividend = evaluated_args[0].value
+                    divisor = evaluated_args[1].value
+                    
+                    if divisor == 0:
+                        return Expr.Error(
+                            category="DivisionError",
+                            message="Modulo by zero"
+                        )
+                    
+                    return Expr.Integer(dividend % divisor)
+
+            else:
+                evaluated_elements = [self.evaluate_expression(e, env) for e in expr.elements]
+                return Expr.ListExpr(evaluated_elements)
+            
+        elif isinstance(expr, Expr.Function):
+            return expr
+        
+        else:
+            raise ValueError(f"Unknown expression type: {type(expr)}")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: astreum
-Version: 0.1.9
+Version: 0.1.10
 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
@@ -11,8 +11,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pycryptodomex<4.0.0,>=3.14.1
-Requires-Dist: cryptography<40.0.0,>=39.0.0
+Requires-Dist: pycryptodomex==3.21.0
+Requires-Dist: cryptography==44.0.2
 
 # lib
 

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

@@ -17,7 +17,7 @@ astreum/lispeum/special/list/position.py,sha256=1EcD5fzfjUCUhHCk8iotFoWdeE9Z2Rjj
 astreum/lispeum/special/list/remove.py,sha256=EPhkWFwyKG8HyWPheVvtxCvMaEGvODFUbx7h1fli_hg,690
 astreum/lispeum/special/number/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 astreum/lispeum/special/number/addition.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-astreum/machine/__init__.py,sha256=5Sx-_MEYFG-089q2G8JtLp9_ELiPYnYIXhagjy6C4w0,11048
+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
@@ -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.9.dist-info/LICENSE,sha256=gYBvRDP-cPLmTyJhvZ346QkrYW_eleke4Z2Yyyu43eQ,1089
-astreum-0.1.9.dist-info/METADATA,sha256=giKzIaeLdFUp_6AKqh1YxeS3epMjYpzlT8Dya6Gg3uY,2956
-astreum-0.1.9.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-astreum-0.1.9.dist-info/top_level.txt,sha256=1EG1GmkOk3NPmUA98FZNdKouhRyget-KiFiMk0i2Uz0,8
-astreum-0.1.9.dist-info/RECORD,,
+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,,