syncraft 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

syncraft/constraint.py

@@ -5,6 +5,7 @@ from dataclasses import dataclass, field, replace
 import collections.abc
 from collections import defaultdict
 from itertools import product
+from inspect import Signature
 import inspect
 
 K = TypeVar('K')
@@ -122,9 +123,9 @@ class Constraint:
     def predicate(cls, 
                   f: Callable[..., bool],
                   *, 
-                  name: Optional[str] = None, 
-                  quant: Quantifier = Quantifier.FORALL)->Constraint:
-        sig = inspect.signature(f)
+                  sig: Signature,
+                  name: str, 
+                  quant: Quantifier)->Constraint:
         pos_params = []
         kw_params = []
         for pname, param in sig.parameters.items():
@@ -160,12 +161,31 @@ class Constraint:
             else:
                 return ConstraintResult(result = all(eval_combo(c) for c in all_combos), unbound=frozenset())
 
-        return cls(run_f=run_f, name=name or f.__name__)
+        return cls(run_f=run_f, name=name)
+
+
+def predicate(f: Callable[..., bool], 
+              *, 
+              name: Optional[str] = None, 
+              quant: Quantifier = Quantifier.FORALL, 
+              bimap: bool = True) -> Constraint:
+    name = name or f.__name__
+    sig = inspect.signature(f)
+    if bimap:
+        def wrapper(*args: Any, **kwargs:Any) -> bool:
+            mapped_args = [a.bimap()[0] if hasattr(a, "bimap") else a for a in args]
+            mapped_kwargs = {k: (v.bimap()[0] if hasattr(v, "bimap") else v) for k,v in kwargs.items()}
+            return f(*mapped_args, **mapped_kwargs)
+        
+        return Constraint.predicate(wrapper, sig=sig, name=name, quant=quant)
+    else:
+        return Constraint.predicate(f, sig=sig, name=name, quant=quant)
 
-def forall(f: Callable[..., bool], name: Optional[str] = None) -> Constraint:
-    return Constraint.predicate(f, name=name, quant=Quantifier.FORALL)
+def forall(f: Callable[..., bool], name: Optional[str] = None, bimap: bool=True) -> Constraint:
+    return predicate(f, name=name, quant=Quantifier.FORALL, bimap=bimap)
     
-def exists(f: Callable[..., bool], name: Optional[str] = None) -> Constraint:
-    return Constraint.predicate(f, name=name, quant=Quantifier.EXISTS)
+def exists(f: Callable[..., bool], name: Optional[str] = None, bimap:bool = True) -> Constraint:
+    return predicate(f, name=name, quant=Quantifier.EXISTS, bimap=bimap)
+
 
 

syncraft/generator.py

@@ -297,7 +297,7 @@ class Generator(Algebra[ParseResult[T], GenState[T]]):
 def generate(syntax: Syntax[Any, Any], 
             data: Optional[ParseResult[Any]] = None, 
             seed: int = 0, 
-            restore_pruned: bool = False) -> Tuple[AST, FrozenDict[str, AST]] | Tuple[Any, None]:
+            restore_pruned: bool = False) -> Tuple[AST, FrozenDict[str, Tuple[AST, ...]]] | Tuple[Any, None]:
     from syncraft.syntax import run
     return run(syntax, Generator, False, ast=data, seed=seed, restore_pruned=restore_pruned)
 

syncraft/parser.py

@@ -69,9 +69,9 @@ class ParserState(Bindable, Generic[T]):
 @dataclass(frozen=True)
 class Parser(Algebra[T, ParserState[T]]):
     @classmethod
-    def state(cls, sql: str, dialect: str) -> ParserState[Token]:
+    def state(cls, sql: str, dialect: str) -> ParserState[T]:
         tokens = tuple([Token(token_type=token.token_type, text=token.text) for token in tokenize(sql, dialect=dialect)])
-        return ParserState.from_tokens(tokens) 
+        return ParserState.from_tokens(tokens)  # type: ignore
 
     @classmethod
     def token(cls, 
@@ -188,7 +188,7 @@ def sqlglot(parser: Syntax[Any, Any],
     return parser.map(lambda tokens: [e for e in gp.parse(raw_tokens=tokens) if e is not None])
 
 
-def parse(syntax: Syntax[Any, Any], sql: str, dialect: str) -> Tuple[AST, FrozenDict[str, AST]] | Tuple[Any, None]:
+def parse(syntax: Syntax[Any, Any], sql: str, dialect: str) -> Tuple[AST, FrozenDict[str, Tuple[AST, ...]]] | Tuple[Any, None]:
     from syncraft.syntax import run
     return run(syntax, Parser, True, sql=sql, dialect=dialect)
 

syncraft/syntax.py

@@ -319,7 +319,7 @@ def success(value: Any) -> Syntax[Any, Any]:
 def choice(*parsers: Syntax[Any, S]) -> Syntax[Any, S]:
     return reduce(lambda a, b: a | b, parsers) if len(parsers) > 0 else success(Nothing())
 
-def run(syntax: Syntax[A, S], alg: Type[Algebra[A, S]], use_cache:bool, *args: Any, **kwargs: Any) -> Tuple[Any, FrozenDict[str, Any]] | Tuple[Any, None]:
+def run(syntax: Syntax[A, S], alg: Type[Algebra[A, S]], use_cache:bool, *args: Any, **kwargs: Any) -> Tuple[Any, FrozenDict[str, Tuple[Any, ...]]] | Tuple[Any, None]:
     parser = syntax(alg)
     input: Optional[S] = alg.state(*args, **kwargs)
     if input:

{syncraft-0.2.1.dist-info → syncraft-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syncraft
-Version: 0.2.1
+Version: 0.2.2
 Summary: Parser combinator library
 Author-email: Michael Afmokt <michael@esacca.com>
 License-Expression: MIT

syncraft-0.2.2.dist-info/RECORD

@@ -0,0 +1,16 @@
+syncraft/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+syncraft/algebra.py,sha256=2pyxbllcRsaDS_rEXfagBenZ_etSjMNdlVYxPkoU7cQ,15849
+syncraft/ast.py,sha256=TAHj8IOgx_QtlI4zxFr2DRGZ4dwNGsb6TiH0TH9adIg,14556
+syncraft/constraint.py,sha256=4HDWXgq9ZKacKBViBxIWhbRqgZNP7cZHXOSFMyGMaaA,7274
+syncraft/diagnostic.py,sha256=cgwcQnCcgrCRX3h-oGTDb5rcJAtitPV3LfH9eLvO93E,2837
+syncraft/finder.py,sha256=Wr7wiBuO9IaXBmYBA4DNXmoeEWteRIp-UetnuRScapM,1920
+syncraft/generator.py,sha256=sa0Uyq2azFh5kW3RVsPS7aFmtR5sfBYODa5K2Fg_Jy8,13074
+syncraft/parser.py,sha256=azO1P7c2QJK_XPZtrMnK6CyTHRdlQaT9rAqfyZNtUK0,11293
+syncraft/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+syncraft/sqlite3.py,sha256=Pq09IHZOwuWg5W82l9D1flzd36QV0TOHQpTJ5U02V8g,34701
+syncraft/syntax.py,sha256=kKECtd-yIIho6DjG0fHYNpqNkJ9_zo01S7bOWUUT0VA,16294
+syncraft-0.2.2.dist-info/licenses/LICENSE,sha256=wHSV424U5csa3339dy1AZbsz2xsd0hrkMx2QK48CcUk,1062
+syncraft-0.2.2.dist-info/METADATA,sha256=VlHmCHpIuBIfamHJ6jPr6PbGCShaR0mcTE6foAtk8nI,988
+syncraft-0.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+syncraft-0.2.2.dist-info/top_level.txt,sha256=Kq3t8ESXB2xW1Xt3uPmkENFc-c4f2pamNmaURBk7zc8,9
+syncraft-0.2.2.dist-info/RECORD,,

syncraft-0.2.1.dist-info/RECORD

@@ -1,16 +0,0 @@
-syncraft/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-syncraft/algebra.py,sha256=2pyxbllcRsaDS_rEXfagBenZ_etSjMNdlVYxPkoU7cQ,15849
-syncraft/ast.py,sha256=TAHj8IOgx_QtlI4zxFr2DRGZ4dwNGsb6TiH0TH9adIg,14556
-syncraft/constraint.py,sha256=9VvnZtL3Q63qnU-j3cgTQm8cMrIXdgSgl4qIEF-YCx4,6509
-syncraft/diagnostic.py,sha256=cgwcQnCcgrCRX3h-oGTDb5rcJAtitPV3LfH9eLvO93E,2837
-syncraft/finder.py,sha256=Wr7wiBuO9IaXBmYBA4DNXmoeEWteRIp-UetnuRScapM,1920
-syncraft/generator.py,sha256=inNBE4dk1AHXCCgnBHsgVOuHRIsHXIY1BXnpy1oLq8s,13062
-syncraft/parser.py,sha256=XjLEkPnOb8YwlIJeqtn9VT6oAWLu_otD2H_o4utZP5I,11270
-syncraft/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-syncraft/sqlite3.py,sha256=Pq09IHZOwuWg5W82l9D1flzd36QV0TOHQpTJ5U02V8g,34701
-syncraft/syntax.py,sha256=qqPOxcelIwFNyzLdTKkQVtUzzz1Xkv0wEBJQ9vt8HTc,16282
-syncraft-0.2.1.dist-info/licenses/LICENSE,sha256=wHSV424U5csa3339dy1AZbsz2xsd0hrkMx2QK48CcUk,1062
-syncraft-0.2.1.dist-info/METADATA,sha256=ByoEIvwRb64_WH9MDoMJqJeEpwCqyJYi1OP9FJHNgsk,988
-syncraft-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-syncraft-0.2.1.dist-info/top_level.txt,sha256=Kq3t8ESXB2xW1Xt3uPmkENFc-c4f2pamNmaURBk7zc8,9
-syncraft-0.2.1.dist-info/RECORD,,