PyPI - pytrilogy - Versions diffs - 0.0.2.1__tar.gz → 0.0.2.2__tar.gz - Mend

@@ -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:

@@ -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:

@@ -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:

@@ -41,3 +41,22 @@ datasource posts (
 ;
 """
     parse(text)
+def test_datasource_where():
+    text = """key user_id int metadata(description="the description");
+property user_id.display_name string metadata(description="The display name ");
+property user_id.about_me string metadata(description="User provided description");
+key post_id int;
+datasource x_posts (
+    user_id: user_id,
+    id: post_id
+    )
+    grain (post_id)
+    address bigquery-public-data.stackoverflow.post_history
+    where post_id = 2
+;
+"""
+    parse(text)

@@ -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"]

@@ -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:

pytrilogy 0.0.2.1tar.gz → 0.0.2.2tar.gz

@@ -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)

@@ -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"):

@@ -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 ")"