Implement dunder str and repr methods in Value

Add constants for each of the 4 Value classes

Author: FancyNeuron

src/pybind/bool_values.py

@@ -2,7 +2,7 @@
 
 from abc import ABC
 
-from pybind.values import Value, DerivedValue, _S, _T
+from pybind.values import Value, DerivedValue, _S, _T, Constant
 
 
 class BoolValue(Value[bool], ABC):
@@ -16,3 +16,11 @@ def __init__(self, value: Value[bool]):
 
     def transform(self, value: bool) -> bool:
         return not value
+
+
+class BoolConstant(BoolValue, Constant[bool]):
+    pass
+
+
+TRUE = BoolConstant(True)
+FALSE = BoolConstant(False)

src/pybind/float_values.py

@@ -9,8 +9,7 @@
 from pybind.observables import Observer, ValueObserver
 
 from pybind.values import Value, CombinedMixedValues, SimpleVariable, CombinedTwoValues, _create_value_getter, \
-    DerivedValue, DerivedValueBase
-
+    DerivedValue, DerivedValueBase, Constant
 
 FloatLike = int | Value[int] | float | Value[float]
 
@@ -59,6 +58,9 @@ def __ge__(self, other: FloatLike) -> BoolValue:
     def __neg__(self) -> FloatValue:
         return NegateFloatValue(self)
 
+class FloatConstant(FloatValue, Constant[float]):
+    pass
+
 
 def _create_float_getter(value: float | Value[int] | Value[float]) -> Callable[[], float]:
     if isinstance(value, Value):

src/pybind/int_values.py

@@ -6,7 +6,7 @@
 
 from pybind.float_values import FloatValue, MultiplyFloatValues, DivideValues, SubtractFloatValues, \
     AddFloatValues, CompareNumbersValues
-from pybind.values import Value, CombinedMixedValues, SimpleVariable, CombinedTwoValues, DerivedValue
+from pybind.values import Value, CombinedMixedValues, SimpleVariable, CombinedTwoValues, DerivedValue, Constant
 from pybind.bool_values import BoolValue
 
 IntLike = int | Value[int]
@@ -108,6 +108,10 @@ def __neg__(self) -> IntValue:
         return NegateIntValue(self)
 
 
+class IntConstant(IntValue, Constant[int]):
+    pass
+
+
 class IntVariable(SimpleVariable[int], IntValue):
     pass
 

src/pybind/str_values.py

@@ -3,7 +3,7 @@
 from abc import ABC
 from typing import Any
 
-from pybind.values import Value, DerivedValue, CombinedMixedValues, SimpleVariable
+from pybind.values import Value, DerivedValue, CombinedMixedValues, SimpleVariable, Constant
 
 StringLike = str | Value[str]
 
@@ -16,6 +16,10 @@ def __radd__(self, other: StringLike) -> StrValue:
         return ConcatenateStrValues(other, self)
 
 
+class StrConstant(StrValue, Constant[str]):
+    pass
+
+
 class StrVariable(SimpleVariable[str], StrValue):
     pass
 

src/pybind/values.py

@@ -58,6 +58,12 @@ def to_str(self) -> StrValue:
         from pybind.str_values import ToStrValue
         return ToStrValue(self)
 
+    def __str__(self) -> str:
+        return str(self.value)
+
+    def __repr__(self) -> str:
+        return f"{self.__class__.__name__}({self.value!r})"
+
 
 class Variable(Value[_S], Generic[_S], ABC):
     @property

tests/str_values/test_str_values.py

@@ -0,0 +1,7 @@
+from pybind.str_values import StrConstant
+
+
+def test_str_constant_str():
+    const = StrConstant("hello")
+    assert str(const) == "hello"
+    

tests/test_boo_values.py

@@ -0,0 +1,9 @@
+from pybind.bool_values import BoolConstant
+
+
+def test_bool_constant_str():
+    const = BoolConstant(True)
+    assert str(const) == "True"
+
+    const_false = BoolConstant(False)
+    assert str(const_false) == "False"

tests/test_float_values.py

@@ -0,0 +1,6 @@
+from pybind.float_values import FloatConstant
+
+
+def test_float_constant_str():
+    const = FloatConstant(3.14)
+    assert str(const) == "3.14"

tests/test_int_values.py

@@ -0,0 +1,6 @@
+from pybind.int_values import IntConstant
+
+
+def test_int_constant_str():
+    const = IntConstant(42)
+    assert str(const) == "42"

tests/test_simple_variable.py

@@ -383,3 +383,29 @@ def test_daisy_chain_variables_weak_reference_stays():
     root_var.value = "root2"
 
     assert values == ["root1", "root2"]
+
+
+def test_simple_int_variable_str():
+    var_int = SimpleVariable(42)
+    assert str(var_int) == "42"
+
+
+def test_simple_str_variable_str():
+    var_str = SimpleVariable("hello")
+    assert str(var_str) == "hello"
+
+
+def test_simple_float_variable_str():
+    var_float = SimpleVariable(3.14)
+    assert str(var_float) == "3.14"
+
+
+def test_simple_bool_variable_str():
+    var_bool = SimpleVariable(True)
+    assert str(var_bool) == "True"
+
+
+def test_simple_none_variable_str():
+    none_bool = SimpleVariable(None)
+    assert str(none_bool) == "None"
+