pytrilogy 0.0.3.0__tar.gz → 0.0.3.1__tar.gz

{pytrilogy-0.0.3.0/pytrilogy.egg-info → pytrilogy-0.0.3.1}/PKG-INFO

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

{pytrilogy-0.0.3.0 → pytrilogy-0.0.3.1/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.0 → pytrilogy-0.0.3.1}/trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.dialect.enums import Dialects
 from trilogy.executor import Executor
 from trilogy.parser import parse
 
-__version__ = "0.0.3.0"
+__version__ = "0.0.3.1"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.0 → pytrilogy-0.0.3.1}/trilogy/core/models/build.py

@@ -242,6 +242,9 @@ class BuildGrain(BaseModel):
     components: set[str] = Field(default_factory=set)
     where_clause: Optional[BuildWhereClause] = None
 
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
     def without_condition(self):
         return BuildGrain(components=self.components)
 
@@ -1171,7 +1174,7 @@ class BuildFilterItem(BuildConceptArgs, BaseModel):
 
 class BuildRowsetLineage(BuildConceptArgs, BaseModel):
     name: str
-    derived_concepts: List[BuildConcept]
+    derived_concepts: List[str]
     select: SelectLineage | MultiSelectLineage
 
 
@@ -1222,8 +1225,8 @@ class BuildSelectLineage(BaseModel):
     limit: Optional[int] = None
     meta: Metadata = Field(default_factory=lambda: Metadata())
     grain: BuildGrain = Field(default_factory=BuildGrain)
-    where_clause: WhereClause | BuildWhereClause | None = Field(default=None)
-    having_clause: HavingClause | BuildHavingClause | None = Field(default=None)
+    where_clause: BuildWhereClause | None = Field(default=None)
+    having_clause: BuildHavingClause | None = Field(default=None)
 
     @property
     def output_components(self) -> List[BuildConcept]:
@@ -1447,7 +1450,9 @@ class Factory:
     ):
         self.grain = grain or Grain()
         self.environment = environment
-        self.local_concepts: dict[str, BuildConcept] = local_concepts or {}
+        self.local_concepts: dict[str, BuildConcept] = (
+            {} if local_concepts is None else local_concepts
+        )
 
     @singledispatchmethod
     def build(self, base):
@@ -1494,7 +1499,7 @@ class Factory:
     @build.register
     def _(self, base: Function) -> BuildFunction:
 
-        new = BuildFunction(
+        new = BuildFunction.model_construct(
             operator=base.operator,
             arguments=[self.build(c) for c in base.arguments],
             output_datatype=base.output_datatype,
@@ -1515,14 +1520,14 @@ class Factory:
 
     @build.register
     def _(self, base: CaseWhen) -> BuildCaseWhen:
-        return BuildCaseWhen(
+        return BuildCaseWhen.model_construct(
             comparison=self.build(base.comparison),
             expr=(self.build(base.expr)),
         )
 
     @build.register
     def _(self, base: CaseElse) -> BuildCaseElse:
-        return BuildCaseElse(expr=self.build(base.expr))
+        return BuildCaseElse.model_construct(expr=self.build(base.expr))
 
     @build.register
     def _(self, base: Concept) -> BuildConcept:
@@ -1537,7 +1542,7 @@ class Factory:
             derivation, final_grain, build_lineage
         )
         is_aggregate = Concept.calculate_is_aggregate(build_lineage)
-        rval = BuildConcept(
+        rval = BuildConcept.model_construct(
             name=base.name,
             datatype=base.datatype,
             purpose=base.purpose,
@@ -1565,12 +1570,12 @@ class Factory:
         else:
             by = [self.build(x) for x in base.by]
         parent = self.build(base.function)
-        return BuildAggregateWrapper(function=parent, by=by)
+        return BuildAggregateWrapper.model_construct(function=parent, by=by)
 
     @build.register
     def _(self, base: ColumnAssignment) -> BuildColumnAssignment:
 
-        return BuildColumnAssignment(
+        return BuildColumnAssignment.model_construct(
             alias=(
                 self.build(base.alias)
                 if isinstance(base.alias, Function)
@@ -1584,26 +1589,31 @@ class Factory:
 
     @build.register
     def _(self, base: OrderBy) -> BuildOrderBy:
-        return BuildOrderBy(items=[self.build(x) for x in base.items])
+        return BuildOrderBy.model_construct(items=[self.build(x) for x in base.items])
 
     @build.register
     def _(self, base: OrderItem) -> BuildOrderItem:
-        return BuildOrderItem(
+        return BuildOrderItem.model_construct(
             expr=(self.build(base.expr)),
             order=base.order,
         )
 
     @build.register
     def _(self, base: WhereClause) -> BuildWhereClause:
-        return BuildWhereClause(conditional=self.build(base.conditional))
+        return BuildWhereClause.model_construct(
+            conditional=self.build(base.conditional)
+        )
 
     @build.register
     def _(self, base: HavingClause) -> BuildHavingClause:
-        return BuildHavingClause(conditional=self.build(base.conditional))
+        return BuildHavingClause.model_construct(
+            conditional=self.build(base.conditional)
+        )
 
     @build.register
     def _(self, base: WindowItem) -> BuildWindowItem:
-        return BuildWindowItem(
+
+        return BuildWindowItem.model_construct(
             type=base.type,
             content=self.build(base.content),
             order_by=[self.build(x) for x in base.order_by],
@@ -1613,7 +1623,7 @@ class Factory:
 
     @build.register
     def _(self, base: Conditional) -> BuildConditional:
-        return BuildConditional(
+        return BuildConditional.model_construct(
             left=(self.build(base.left)),
             right=(self.build(base.right)),
             operator=base.operator,
@@ -1621,7 +1631,7 @@ class Factory:
 
     @build.register
     def _(self, base: SubselectComparison) -> BuildSubselectComparison:
-        return BuildSubselectComparison(
+        return BuildSubselectComparison.model_construct(
             left=(self.build(base.left)),
             right=(self.build(base.right)),
             operator=base.operator,
@@ -1629,7 +1639,7 @@ class Factory:
 
     @build.register
     def _(self, base: Comparison) -> BuildComparison:
-        return BuildComparison(
+        return BuildComparison.model_construct(
             left=(self.build(base.left)),
             right=(self.build(base.right)),
             operator=base.operator,
@@ -1637,7 +1647,7 @@ class Factory:
 
     @build.register
     def _(self, base: AlignItem) -> BuildAlignItem:
-        return BuildAlignItem(
+        return BuildAlignItem.model_construct(
             alias=base.alias,
             concepts=[self.build(x) for x in base.concepts],
             namespace=base.namespace,
@@ -1645,7 +1655,9 @@ class Factory:
 
     @build.register
     def _(self, base: AlignClause) -> BuildAlignClause:
-        return BuildAlignClause(items=[self.build(x) for x in base.items])
+        return BuildAlignClause.model_construct(
+            items=[self.build(x) for x in base.items]
+        )
 
     @build.register
     def _(self, base: RowsetItem):
@@ -1663,7 +1675,7 @@ class Factory:
     def _(self, base: RowsetLineage) -> BuildRowsetLineage:
         out = BuildRowsetLineage(
             name=base.name,
-            derived_concepts=[],
+            derived_concepts=[x.address for x in base.derived_concepts],
             select=base.select,
         )
         return out
@@ -1675,17 +1687,19 @@ class Factory:
             where = factory.build(base.where_clause)
         else:
             where = None
-        return BuildGrain(components=base.components, where_clause=where)
+        return BuildGrain.model_construct(
+            components=base.components, where_clause=where
+        )
 
     @build.register
     def _(self, base: FilterItem) -> BuildFilterItem:
-        return BuildFilterItem(
+        return BuildFilterItem.model_construct(
             content=self.build(base.content), where=self.build(base.where)
         )
 
     @build.register
     def _(self, base: Parenthetical) -> BuildParenthetical:
-        return BuildParenthetical(content=(self.build(base.content)))
+        return BuildParenthetical.model_construct(content=(self.build(base.content)))
 
     @build.register
     def _(self, base: SelectLineage) -> BuildSelectLineage:
@@ -1753,7 +1767,7 @@ class Factory:
         derived_base = []
         for k in base.derived_concepts:
             base_concept = self.environment.concepts[k]
-            x = BuildConcept(
+            x = BuildConcept.model_construct(
                 name=base_concept.name,
                 datatype=base_concept.datatype,
                 purpose=base_concept.purpose,
@@ -1778,7 +1792,7 @@ class Factory:
             local_concepts=local_build_cache,
         )
         where_factory = Factory(environment=self.environment)
-        lineage = BuildMultiSelectLineage(
+        lineage = BuildMultiSelectLineage.model_construct(
             # we don't build selects here; they'll be built automatically in query discovery
             selects=base.selects,
             grain=final_grain,
@@ -1831,7 +1845,7 @@ class Factory:
         factory = Factory(
             grain=base.grain, environment=self.environment, local_concepts=local_cache
         )
-        return BuildDatasource(
+        return BuildDatasource.model_construct(
             name=base.name,
             columns=[factory.build(c) for c in base.columns],
             address=base.address,

{pytrilogy-0.0.3.0 → pytrilogy-0.0.3.1}/trilogy/core/models/environment.py

@@ -39,6 +39,7 @@ from trilogy.core.models.author import (
     Concept,
     ConceptRef,
     Function,
+    SelectLineage,
     UndefinedConcept,
     UndefinedConceptFull,
     address_with_namespace,
@@ -189,6 +190,7 @@ class Environment(BaseModel):
     ] = Field(default_factory=EnvironmentDatasourceDict)
     functions: Dict[str, Function] = Field(default_factory=dict)
     data_types: Dict[str, DataType] = Field(default_factory=dict)
+    named_statements: Dict[str, SelectLineage] = Field(default_factory=dict)
     imports: Dict[str, list[Import]] = Field(
         default_factory=lambda: defaultdict(list)  # type: ignore
     )
@@ -217,6 +219,9 @@ class Environment(BaseModel):
 
         return Factory(self, local_concepts=local_concepts).build(self)
 
+    def add_rowset(self, name: str, lineage: SelectLineage):
+        self.named_statements[name] = lineage
+
     def duplicate(self):
         return Environment.model_construct(
             datasources=self.datasources.duplicate(),

{pytrilogy-0.0.3.0 → pytrilogy-0.0.3.1}/trilogy/core/processing/concept_strategies_v3.py

@@ -779,8 +779,6 @@ def _search_concepts(
     else:
 
         completion_mandatory = mandatory_list
-    if "date.month_seq" in completion_mandatory:
-        raise SyntaxError(completion_mandatory)
     attempted: set[str] = set()
 
     found: set[str] = set()

{pytrilogy-0.0.3.0 → pytrilogy-0.0.3.1}/trilogy/core/processing/node_generators/rowset_node.py

@@ -54,17 +54,15 @@ def gen_rowset_node(
     rowset_relevant: list[BuildConcept] = [
         v
         for v in environment.concepts.values()
-        if isinstance(v.lineage, BuildRowsetItem)
-        and v.lineage.rowset.name == rowset.name
+        if v.address in lineage.rowset.derived_concepts
     ]
-    # logger.info(
-    #     f"{padding(depth)}{LOGGER_PREFIX} rowset relevant nodes are {rowset_relevant}"
-    # )
+
     select_hidden = node.hidden_concepts
     rowset_hidden = [
         x
         for x in rowset_relevant
-        if isinstance(x.lineage, BuildRowsetItem)
+        if x.address in lineage.rowset.derived_concepts
+        and isinstance(x.lineage, BuildRowsetItem)
         and x.lineage.content.address in select_hidden
     ]
     additional_relevant = [

{pytrilogy-0.0.3.0 → pytrilogy-0.0.3.1}/trilogy/core/processing/node_generators/window_node.py

@@ -19,7 +19,6 @@ def resolve_window_parent_concepts(
     if not isinstance(concept.lineage, WINDOW_TYPES):
         raise ValueError
     base = []
-    logger.info(concept.lineage)
     if concept.lineage.over:
         base += concept.lineage.over
     if concept.lineage.order_by:

{pytrilogy-0.0.3.0 → pytrilogy-0.0.3.1}/trilogy/core/query_processor.py

@@ -12,6 +12,8 @@ from trilogy.core.models.build import (
     BuildConcept,
     BuildConditional,
     BuildDatasource,
+    BuildMultiSelectLineage,
+    BuildSelectLineage,
     Factory,
 )
 from trilogy.core.models.environment import Environment
@@ -373,7 +375,10 @@ def get_query_node(
         raise ValueError(f"Statement has no output components {statement}")
 
     history = history or History(base_environment=environment)
-    build_statement = Factory(environment=environment).build(statement)
+    build_statement: BuildSelectLineage | BuildMultiSelectLineage = Factory(
+        environment=environment
+    ).build(statement)
+
     # build_statement = statement
     build_environment = environment.materialize_for_select(
         build_statement.local_concepts

{pytrilogy-0.0.3.0 → pytrilogy-0.0.3.1}/trilogy/dialect/base.py

@@ -84,7 +84,9 @@ CONDITIONAL_ITEMS = (BuildConditional,)
 
 
 def INVALID_REFERENCE_STRING(x: Any, callsite: str = ""):
-    # raise SyntaxError(x)
+    # if CONFIG.validate_missing:
+    #     raise SyntaxError(f"INVALID_REFERENCE_BUG_{callsite}<{x}>")
+
     return f"INVALID_REFERENCE_BUG_{callsite}<{x}>"
 
 

pytrilogy-0.0.3.1/trilogy/hooks/__init__.py

@@ -0,0 +1,4 @@
+from trilogy.hooks.graph_hook import GraphHook
+from trilogy.hooks.query_debugger import DebuggingHook
+
+__all__ = ["DebuggingHook", "GraphHook"]

{pytrilogy-0.0.3.0 → pytrilogy-0.0.3.1}/trilogy/hooks/query_debugger.py

@@ -12,7 +12,6 @@ from trilogy.core.models.execute import (
 )
 from trilogy.core.processing.nodes import StrategyNode
 from trilogy.core.statements.author import SelectStatement
-from trilogy.dialect.bigquery import BigqueryDialect
 from trilogy.hooks.base_hook import BaseHook
 
 
@@ -22,9 +21,6 @@ class PrintMode(Enum):
     FULL = 3
 
 
-renderer = BigqueryDialect()
-
-
 class DebuggingHook(BaseHook):
     def __init__(
         self,
@@ -46,6 +42,9 @@ class DebuggingHook(BaseHook):
         self.process_other = PrintMode(process_other)
         self.messages: list[str] = []
         self.uuid = uuid4()
+        from trilogy.dialect.bigquery import BigqueryDialect
+
+        self.renderer = BigqueryDialect()
 
     def print(self, *args):
         merged = " ".join([str(x) for x in args])
@@ -123,7 +122,7 @@ class DebuggingHook(BaseHook):
         self.print(
             "  " * depth, input.name, "->", input.group_to_grain, "->", select_statement
         )
-        sql = renderer.render_cte(input).statement
+        sql = self.renderer.render_cte(input).statement
         for line in sql.split("\n"):
             logger.debug("  " * (depth) + line)
         if isinstance(input, CTE):

{pytrilogy-0.0.3.0 → pytrilogy-0.0.3.1}/trilogy/parsing/common.py

@@ -503,6 +503,11 @@ def rowset_to_concepts(rowset: RowsetDerivationStatement, environment: Environme
         if isinstance(orig_concept.lineage, FilterItem):
             if orig_concept.lineage.where == rowset.select.where_clause:
                 name = environment.concepts[orig_concept.lineage.content.address].name
+        base_namespace = (
+            f"{rowset.name}.{orig_concept.namespace}"
+            if orig_concept.namespace != rowset.namespace
+            else rowset.name
+        )
 
         new_concept = Concept(
             name=name,
@@ -512,11 +517,7 @@ def rowset_to_concepts(rowset: RowsetDerivationStatement, environment: Environme
             grain=orig_concept.grain,
             # TODO: add proper metadata
             metadata=Metadata(concept_source=ConceptSource.CTE),
-            namespace=(
-                f"{rowset.name}.{orig_concept.namespace}"
-                if orig_concept.namespace != rowset.namespace
-                else rowset.name
-            ),
+            namespace=base_namespace,
             keys=orig_concept.keys,
             derivation=Derivation.ROWSET,
             granularity=orig_concept.granularity,
@@ -538,6 +539,9 @@ def rowset_to_concepts(rowset: RowsetDerivationStatement, environment: Environme
     default_grain = Grain.from_concepts([*pre_output])
     # remap everything to the properties of the rowset
     for x in pre_output:
+        print("xxxx")
+        print(x.address)
+        print(x.grain)
         if x.keys:
             if all([k in orig for k in x.keys]):
                 x.keys = set([orig[k].address if k in orig else k for k in x.keys])

{pytrilogy-0.0.3.0 → pytrilogy-0.0.3.1}/trilogy/parsing/parse_engine.py

@@ -576,11 +576,24 @@ class ParseToObjects(Transformer):
             select=select,
             namespace=self.environment.namespace or DEFAULT_NAMESPACE,
         )
+
+        # clean up current definitions
+        # to_delete = set()
+        # if output.name in self.environment.named_statements:
+        #     for k, v in self.environment.concepts.items():
+        #         if v.derivation == Derivation.ROWSET and v.lineage.rowset.name == name:
+        #             to_delete.add(k)
+        # for k in to_delete:
+        #     self.environment.concepts.pop(k)
+
         for new_concept in rowset_to_concepts(output, self.environment):
             if new_concept.metadata:
                 new_concept.metadata.line_number = meta.line
-            # output.select.local_concepts[new_concept.address] = new_concept
-            self.environment.add_concept(new_concept)
+            self.environment.add_concept(new_concept, force=True)
+
+        self.environment.add_rowset(
+            output.name, output.select.as_lineage(self.environment)
+        )
         return output
 
     @v_args(meta=True)