symbolicai 0.20.2__py3-none-any.whl → 1.0.0__py3-none-any.whl

symai/constraints.py

@@ -2,6 +2,7 @@ import json
 
 from .exceptions import ConstraintViolationException, InvalidPropertyException
 from .symbol import Symbol
+from .utils import UserMessage
 
 
 class DictFormatConstraint:
@@ -11,27 +12,29 @@ class DictFormatConstraint:
         elif isinstance(format, dict):
             self.format = format
         else:
-            raise InvalidPropertyException(f"Unsupported format type: {type(format)}")
+            UserMessage(f"Unsupported format type: {type(format)}", raise_with=InvalidPropertyException)
 
     def __call__(self, input: Symbol):
-        input = Symbol(input)
-        if input.value_type == str:
+        input_symbol = Symbol(input)
+        if input_symbol.value_type is str:
             try:
-                gen_dict = json.loads(input.value)
+                gen_dict = json.loads(input_symbol.value)
             except json.JSONDecodeError as e:
-                raise ConstraintViolationException(f"Invalid JSON: ```json\n{input.value}\n```\n{e}")
+                msg = f"Invalid JSON: ```json\n{input_symbol.value}\n```\n{e}"
+                UserMessage(msg)
+                raise ConstraintViolationException(msg) from e
             return DictFormatConstraint.check_keys(self.format, gen_dict)
-        elif input.value_type == dict:
-            return DictFormatConstraint.check_keys(self.format, input.value)
-        else:
-            raise ConstraintViolationException(f"Unsupported input type: {input.value_type}")
+        if input_symbol.value_type is dict:
+            return DictFormatConstraint.check_keys(self.format, input_symbol.value)
+        UserMessage(f"Unsupported input type: {input_symbol.value_type}", raise_with=ConstraintViolationException)
+        return False
 
     @staticmethod
     def check_keys(json_format, gen_dict):
         for key, value in json_format.items():
-            if not str(key).startswith('{') and not str(key).endswith('}') and \
-                key not in gen_dict or not isinstance(gen_dict[key], type(value)):
-                raise ConstraintViolationException(f"Key `{key}` not found or type `{type(key)}` mismatch")
+            if (not str(key).startswith('{') and not str(key).endswith('}') and \
+                key not in gen_dict) or not isinstance(gen_dict[key], type(value)):
+                UserMessage(f"Key `{key}` not found or type `{type(key)}` mismatch", raise_with=ConstraintViolationException)
             if isinstance(gen_dict[key], dict):
                 # on a dictionary, descend recursively
                 return DictFormatConstraint.check_keys(value, gen_dict[key])