pytrilogy 0.0.2.1__py3-none-any.whl → 0.0.2.2__py3-none-any.whl

{pytrilogy-0.0.2.1.dist-info → pytrilogy-0.0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.2.1
+Version: 0.0.2.2
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 

{pytrilogy-0.0.2.1.dist-info → pytrilogy-0.0.2.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=f4K50J-SBruXMjFtcHLn_pB9eN7oCkbwqmtEjcxjSoM,290
+trilogy/__init__.py,sha256=mSeU_j02wb5aKd5vDcHQJdZaoG1AB96bCjUn2tIVpwk,290
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=KIvi-cgU4R9urNgDdGiCsRkCrzjAfM4xGHhZb1SVy2w,881
 trilogy/engine.py,sha256=R5ubIxYyrxRExz07aZCUfrTsoXCHQ8DKFTDsobXdWdA,1102
@@ -16,7 +16,7 @@ trilogy/core/exceptions.py,sha256=NvV_4qLOgKXbpotgRf7c8BANDEvHxlqRPaA53IThQ2o,56
 trilogy/core/functions.py,sha256=xISGHMiUR9hFyoZe2l3VLTMO6UEtyGHQcMuovzlVRqw,9492
 trilogy/core/graph_models.py,sha256=oJUMSpmYhqXlavckHLpR07GJxuQ8dZ1VbB1fB0KaS8c,2036
 trilogy/core/internal.py,sha256=jNGFHKENnbMiMCtAgsnLZYVSENDK4b5ALecXFZpTDzQ,1075
-trilogy/core/models.py,sha256=432UOrJNzdY0_2vCbeBrNBDQOG_v-WaWqYSniM1CJpE,134387
+trilogy/core/models.py,sha256=4iwlTfHzzmbDhm9vt7zgExMqY1xKyQL-fVG5Nrm-YTU,134722
 trilogy/core/optimization.py,sha256=iX8BCh2BIEPJ6cYlcn7piDKFfig47azphhyqkwkYJM4,4291
 trilogy/core/query_processor.py,sha256=PROehLEOMOuKy1EAUeIgdfGq1LrJsX0N7Z2qDED6S30,17580
 trilogy/core/optimizations/__init__.py,sha256=pxRzNzd2g8oRMy4f_ub5va6bNS2pd4hnyp9JBzTKc1E,300
@@ -37,7 +37,7 @@ trilogy/core/processing/node_generators/group_to_node.py,sha256=BzPdYwzoo8gRMH7B
 trilogy/core/processing/node_generators/multiselect_node.py,sha256=vP84dnLQy6dtypi6mUbt9sMAcmmrTgQ1Oz4GI6X1IEo,6421
 trilogy/core/processing/node_generators/node_merge_node.py,sha256=YivTVrTEUJuQbQAHFVB2lUD4mJYQ-kTVVpwY4oT9A-Y,14664
 trilogy/core/processing/node_generators/rowset_node.py,sha256=2ROd2c1_o4h5sbnDdaiL1o9UiiwyYw-B6OKyfHYNe0A,6188
-trilogy/core/processing/node_generators/select_node.py,sha256=uk02lRvSJB1gWYRcSNfRZ8aYk3fME_tgg0I6EZyuxkI,19052
+trilogy/core/processing/node_generators/select_node.py,sha256=XGcz74XsWv5POWhV2gGC_jbi7T9g7sY-VtP3sjlppFc,19057
 trilogy/core/processing/node_generators/unnest_node.py,sha256=6CH66eGwpadNX7TzUhWZ8aqIisOtQeHINbLV6X3QBUk,1779
 trilogy/core/processing/node_generators/window_node.py,sha256=9nXUXUgQrNczU1gaOqhOZPNzCUxw-lkxt0R7HORI6ss,2582
 trilogy/core/processing/nodes/__init__.py,sha256=-8ONG7Nqa6sNLpst5wNNyMigyaHRfUKGdE3xce8E3mM,3998
@@ -69,14 +69,14 @@ trilogy/parsing/common.py,sha256=8MDRPccWymtVkHVQMzESjL5tOH79flWU5jo6Ys-C5UQ,596
 trilogy/parsing/config.py,sha256=Z-DaefdKhPDmSXLgg5V4pebhSB0h590vI0_VtHnlukI,111
 trilogy/parsing/exceptions.py,sha256=92E5i2frv5hj9wxObJZsZqj5T6bglvPzvdvco_vW1Zk,38
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-trilogy/parsing/parse_engine.py,sha256=hPvPZuO_ZBjoKRMh-bKzhnt6oo8R5l4gL9bJqZoMUfs,57619
-trilogy/parsing/render.py,sha256=ym8DcgU-frNxd16ThWYGJFyChF-d0yd2gp9tEA6RFJU,12059
-trilogy/parsing/trilogy.lark,sha256=4VXqLWOdxJsfZoJIp9Ug1G3p_LrXRDm5C2yAxaRgq98,10993
+trilogy/parsing/parse_engine.py,sha256=rjTDs8AhJ6NjPCugfZCTdu7d_bUOSC9M8MAl9KmURNw,57763
+trilogy/parsing/render.py,sha256=Gy_6wVYPwYLf35Iota08sbqveuWILtUhI8MYStcvtJM,12174
+trilogy/parsing/trilogy.lark,sha256=Zn5UHqiNoVKa76r1af9KND0TNdsLIeHpyG3hJjUOOTQ,11000
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=PHxvv6f2ODv0esyyhWxlARgra8dVhqQhYl0lTrSyVNo,3729
-pytrilogy-0.0.2.1.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.1.dist-info/METADATA,sha256=YN0xCd-8tn38c-px20-D1WgFDUjn-P6J6hNtsyhUFmE,7876
-pytrilogy-0.0.2.1.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-pytrilogy-0.0.2.1.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.1.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.1.dist-info/RECORD,,
+pytrilogy-0.0.2.2.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.2.dist-info/METADATA,sha256=rjwj8b_CWxQc82n5HJfPTBYlhtVKNUwIhAkWLusfA7g,7876
+pytrilogy-0.0.2.2.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+pytrilogy-0.0.2.2.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.2.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.2.dist-info/RECORD,,

{pytrilogy-0.0.2.1.dist-info → pytrilogy-0.0.2.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (73.0.1)
+Generator: setuptools (74.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.executor import Executor
 from trilogy.parser import parse
 from trilogy.constants import CONFIG
 
-__version__ = "0.0.2.1"
+__version__ = "0.0.2.2"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/models.py

@@ -1822,6 +1822,7 @@ class Datasource(Namespaced, BaseModel):
     metadata: DatasourceMetadata = Field(
         default_factory=lambda: DatasourceMetadata(freshness_concept=None)
     )
+    where: Optional[WhereClause] = None
 
     def merge_concept(
         self, source: Concept, target: Concept, modifiers: List[Modifier]
@@ -1837,6 +1838,9 @@ class Datasource(Namespaced, BaseModel):
             for c in self.columns
         ] + original
         self.grain = self.grain.with_merge(source, target, modifiers)
+        self.where = (
+            self.where.with_merge(source, target, modifiers) if self.where else None
+        )
         del self.output_lcl
 
     @property
@@ -1929,6 +1933,7 @@ class Datasource(Namespaced, BaseModel):
             grain=self.grain.with_namespace(namespace),
             address=self.address,
             columns=[c.with_namespace(namespace) for c in self.columns],
+            where=self.where.with_namespace(namespace) if self.where else None,
         )
 
     @cached_property
@@ -2806,6 +2811,9 @@ class EnvironmentDatasourceDict(dict):
                 return self.__getitem__(key.split(".")[1])
             raise
 
+    def values(self) -> ValuesView[Datasource]:  # type: ignore
+        return super().values()
+
 
 class EnvironmentConceptDict(dict):
     def __init__(self, *args, **kwargs) -> None:

trilogy/core/processing/node_generators/select_node.py

@@ -89,6 +89,7 @@ def dm_to_strategy_node(
         accept_partial=accept_partial,
         datasource=datasource,
         grain=datasource.grain,
+        conditions=datasource.where.conditional if datasource.where else None,
     )
     # we need to nest the group node one further
     if force_group is True:
@@ -295,9 +296,6 @@ def gen_select_node_from_table(
                         g.nodes[ncandidate]
                     except KeyError:
                         raise nx.exception.NetworkXNoPath
-                        raise SyntaxError(
-                            f"Could not find node {ncandidate}, have {list(g.nodes())}"
-                        )
                 raise e
             except nx.exception.NetworkXNoPath:
                 all_found = False
@@ -372,6 +370,7 @@ def gen_select_node_from_table(
             accept_partial=accept_partial,
             datasource=datasource,
             grain=Grain(components=all_concepts),
+            conditions=datasource.where.conditional if datasource.where else None,
         )
         # we need to nest the group node one further
         if force_group is True:

trilogy/parsing/parse_engine.py

@@ -605,6 +605,7 @@ class ParseToObjects(Transformer):
         columns: List[ColumnAssignment] = args[1]
         grain: Optional[Grain] = None
         address: Optional[Address] = None
+        where: Optional[WhereClause] = None
         for val in args[1:]:
             if isinstance(val, Address):
                 address = val
@@ -612,6 +613,8 @@ class ParseToObjects(Transformer):
                 grain = val
             elif isinstance(val, Query):
                 address = Address(location=f"({val.text})", is_query=True)
+            elif isinstance(val, WhereClause):
+                where = val
         if not address:
             raise ValueError(
                 "Malformed datasource, missing address or query declaration"
@@ -624,6 +627,7 @@ class ParseToObjects(Transformer):
             grain=grain,  # type: ignore
             address=address,
             namespace=self.environment.namespace,
+            where=where,
         )
         for column in columns:
             column.concept = column.concept.with_grain(datasource.grain)

trilogy/parsing/render.py

@@ -131,11 +131,15 @@ class Renderer:
     @to_string.register
     def _(self, arg: Datasource):
         assignments = ",\n\t".join([self.to_string(x) for x in arg.columns])
-        return f"""datasource {arg.name} (
+        base = f"""datasource {arg.name} (
     {assignments}
     ) 
 {self.to_string(arg.grain)} 
-{self.to_string(arg.address)};"""
+{self.to_string(arg.address)}"""
+        if arg.where:
+            base += f"\n{self.to_string(arg.where)}"
+        base += ";"
+        return base
 
     @to_string.register
     def _(self, arg: "Grain"):
@@ -196,7 +200,7 @@ class Renderer:
 
     @to_string.register
     def _(self, arg: "ColumnAssignment"):
-        return f"{arg.alias}:{self.to_string(arg.concept)}"
+        return f"{arg.alias}: {self.to_string(arg.concept)}"
 
     @to_string.register
     def _(self, arg: "ConceptDeclarationStatement"):

trilogy/parsing/trilogy.lark

@@ -35,7 +35,7 @@
     prop_ident: "<" IDENTIFIER ("," IDENTIFIER )* ","? ">" "." IDENTIFIER
 
     // datasource concepts
-    datasource: "datasource" IDENTIFIER  "("  column_assignment_list ")"  grain_clause? (address | query)
+    datasource: "datasource" IDENTIFIER  "("  column_assignment_list ")"  grain_clause? (address | query) where?
     
     grain_clause: "grain" "(" column_list ")"