pytrilogy 0.0.3.119__tar.gz → 0.0.3.121__tar.gz

{pytrilogy-0.0.3.119/pytrilogy.egg-info → pytrilogy-0.0.3.121}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.119
+Version: 0.0.3.121
 Summary: Declarative, typed query language that compiles to SQL.
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pytrilogy-0.0.3.119 → pytrilogy-0.0.3.121/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.119
+Version: 0.0.3.121
 Summary: Declarative, typed query language that compiles to SQL.
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pytrilogy-0.0.3.119 → pytrilogy-0.0.3.121}/tests/test_user_functions.py

@@ -312,3 +312,38 @@ auto random <- @plus_two(@weekday_sales(10));
     results = results.fetchall()
     assert results[0].test2 == 10
     assert results[1].test2 == 17
+
+
+def test_user_function_aggregate_two():
+    x = Dialects.DUCK_DB.default_executor()
+
+    results = x.execute_query(
+        """import std.geography;
+import std.display;
+
+key state string::us_state;
+key year int;
+property state.val string;
+
+datasource states
+(
+    state,
+    year,
+    val
+)
+grain (state, year)
+query '''
+select 'Vermont' as state, 2000 as year, 10 as val union all select 'Florida' as state, 2000, 5 as val
+union all select 'Vermont', 2001, 16 union all select 'Florida' as state, 2001, 7
+'''
+;
+
+def avg_year_percent_of_all_avg_year(field, dim)->round((avg(sum(field) by year, dim)/ avg(sum(field) by year )),2)::float::percent;
+
+select @avg_year_percent_of_all_avg_year(val, state) as p_of_whole, state
+order by p_of_whole desc;
+"""
+    )
+
+    results = results.fetchall()
+    assert int(results[0].p_of_whole * 100) == 68

{pytrilogy-0.0.3.119 → pytrilogy-0.0.3.121}/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.119"
+__version__ = "0.0.3.121"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.119 → pytrilogy-0.0.3.121}/trilogy/ai/conversation.py

@@ -61,7 +61,7 @@ class Conversation:
         if "```" in content:
             parts = content.split("```")
             if len(parts) >= 3:
-                return parts[1].strip()
+                return parts[-2].strip()
         return content
 
     def generate_query(
@@ -78,7 +78,7 @@ class Conversation:
             if not response.strip()[-1] == ";":
                 response += ";"
             try:
-                env, raw = environment.parse(response)
+                _, raw = environment.parse(response)
                 process_query(statement=raw[-1], environment=environment)
                 return response
             except (
@@ -90,10 +90,9 @@ class Conversation:
             ) as e2:
                 e = e2
                 self.add_message(
-                    f"The previous response could not be parsed due to the error: {str(e)}. Please generate a new query with the issues fixed. Use the same response format.",
+                    f"Your extracted response - {response} - could not be parsed due to the error: {str(e)}. Please generate a new query with the issues fixed. Use the same response format.",
                     role="user",
                 )
-
         raise Exception(
             f"Failed to generate a valid query after {attempts} attempts. Last error: {str(e)}. Full conversation: {self.messages}"
         )

{pytrilogy-0.0.3.119 → pytrilogy-0.0.3.121}/trilogy/core/models/author.py

@@ -162,14 +162,13 @@ class ConceptRef(Addressable, Namespaced, DataTyped, Mergeable, BaseModel):
         )
 
     def with_reference_replacement(self, source: str, target: Expr | ArgBinding):
-        if self.address == source:
-            return target
-
         # a reference might be to an attribute of a struct that is bound late
         # if the replacement is a parent in the access path; replace reference
         # with an attribute access call
-        candidates = [f"local.{self.address}", self.address]
+        candidates = [f"{DEFAULT_NAMESPACE}.{self.address}", self.address]
         for candidate in candidates:
+            if candidate == source:
+                return target
             if not candidate.startswith(f"{source}."):
                 continue
             attribute = self.address.rsplit(".", 1)[1]
@@ -2535,11 +2534,7 @@ class CustomFunctionFactory:
                     target = f"{DEFAULT_NAMESPACE}.{self.function_arguments[idx].name}"
                 else:
                     target = self.function_arguments[idx].name
-                nout = (
-                    nout.with_reference_replacement(target, x)
-                    if isinstance(nout, Mergeable)
-                    else nout
-                )
+                nout = nout.with_reference_replacement(target, x)
         return nout
 
 

{pytrilogy-0.0.3.119 → pytrilogy-0.0.3.121}/trilogy/core/models/environment.py

@@ -215,7 +215,7 @@ class Environment(BaseModel):
     functions: Dict[str, CustomFunctionFactory] = Field(default_factory=dict)
     data_types: Dict[str, CustomType] = Field(default_factory=dict)
     named_statements: Dict[str, SelectLineage] = Field(default_factory=dict)
-    imports: Dict[str, list[Import]] = Field(
+    imports: defaultdict[str, list[Import]] = Field(
         default_factory=lambda: defaultdict(list)  # type: ignore
     )
     namespace: str = DEFAULT_NAMESPACE
@@ -252,7 +252,7 @@ class Environment(BaseModel):
             concepts=self.concepts.duplicate(),
             functions=dict(self.functions),
             data_types=dict(self.data_types),
-            imports=dict(self.imports),
+            imports=defaultdict(list, self.imports),
             namespace=self.namespace,
             working_path=self.working_path,
             environment_config=self.config.model_copy(deep=True),
@@ -262,6 +262,7 @@ class Environment(BaseModel):
             alias_origin_lookup={
                 k: v.duplicate() for k, v in self.alias_origin_lookup.items()
             },
+            env_file_path=self.env_file_path,
         )
 
     def _add_path_concepts(self):

{pytrilogy-0.0.3.119 → pytrilogy-0.0.3.121}/trilogy/core/processing/discovery_utility.py

@@ -40,15 +40,15 @@ def calculate_effective_parent_grain(
             pairs = join.concept_pairs or []
             for key in pairs:
                 left = key.existing_datasource
-                logger.info(f"adding left grain {left.grain} for join key {key.left}")
+                logger.debug(f"adding left grain {left.grain} for join key {key.left}")
                 grain += left.grain
                 seen.add(left.name)
             keys = [key.right for key in pairs]
             join_grain = BuildGrain.from_concepts(keys)
             if join_grain == join.right_datasource.grain:
-                logger.info(f"irrelevant right join {join}, does not change grain")
+                logger.debug(f"irrelevant right join {join}, does not change grain")
             else:
-                logger.info(
+                logger.debug(
                     f"join changes grain, adding {join.right_datasource.grain} to {grain}"
                 )
                 grain += join.right_datasource.grain
@@ -68,7 +68,7 @@ def calculate_effective_parent_grain(
                     ]
                 )
             ):
-                logger.info(f"adding unjoined grain {x.grain} for datasource {x.name}")
+                logger.debug(f"adding unjoined grain {x.grain} for datasource {x.name}")
                 grain += x.grain
         return grain
     else:

{pytrilogy-0.0.3.119 → pytrilogy-0.0.3.121}/trilogy/core/processing/nodes/base_node.py

@@ -258,10 +258,14 @@ class StrategyNode:
         self.partial_lcl = LooseBuildConceptList(concepts=partials)
         return partials
 
-    def add_output_concepts(self, concepts: List[BuildConcept], rebuild: bool = True):
+    def add_output_concepts(
+        self, concepts: List[BuildConcept], rebuild: bool = True, unhide: bool = True
+    ):
         for concept in concepts:
             if concept.address not in self.output_lcl.addresses:
                 self.output_concepts.append(concept)
+            if unhide and concept.address in self.hidden_concepts:
+                self.hidden_concepts.remove(concept.address)
         self.output_lcl = LooseBuildConceptList(concepts=self.output_concepts)
         if rebuild:
             self.rebuild_cache()

{pytrilogy-0.0.3.119 → pytrilogy-0.0.3.121}/trilogy/dialect/duckdb.py

@@ -104,6 +104,7 @@ FUNCTION_MAP = {
     FunctionType.CONCAT: lambda x: f"({' || '.join(x)})",
     FunctionType.DATE_LITERAL: lambda x: f"date '{x}'",
     FunctionType.DATETIME_LITERAL: lambda x: f"datetime '{x}'",
+    FunctionType.DAY_OF_WEEK: lambda x: f"dayofweek({x[0]})",
     # string
     FunctionType.CONTAINS: lambda x: f"CONTAINS(LOWER({x[0]}), LOWER({x[1]}))",
     # regexp

{pytrilogy-0.0.3.119 → pytrilogy-0.0.3.121}/trilogy/parsing/parse_engine.py

@@ -1516,6 +1516,7 @@ class ParseToObjects(Transformer):
         remapped = FunctionCallWrapper(
             content=self.environment.functions[name](*args), name=name, args=args
         )
+
         return remapped
 
     @v_args(meta=True)