pytrilogy 0.0.3.107__tar.gz → 0.0.3.108__tar.gz

{pytrilogy-0.0.3.107/pytrilogy.egg-info → pytrilogy-0.0.3.108}/PKG-INFO

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

{pytrilogy-0.0.3.107 → pytrilogy-0.0.3.108/pytrilogy.egg-info}/PKG-INFO

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

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

{pytrilogy-0.0.3.107 → pytrilogy-0.0.3.108}/trilogy/core/processing/node_generators/select_merge_node.py

@@ -416,17 +416,22 @@ def create_datasource_node(
 ) -> tuple[StrategyNode, bool]:
 
     target_grain = BuildGrain.from_concepts(all_concepts, environment=environment)
+    # datasource grain may have changed since reference graph creation
+    datasource_grain = BuildGrain.from_concepts(
+        datasource.grain.components, environment=environment
+    )
+    # datasource_grain = datasource.grain
     force_group = False
-    if not datasource.grain.issubset(target_grain):
+    if not datasource_grain.issubset(target_grain):
         logger.info(
-            f"{padding(depth)}{LOGGER_PREFIX}_DS_NODE Select node must be wrapped in group, {datasource.grain} not subset of target grain {target_grain}"
+            f"{padding(depth)}{LOGGER_PREFIX}_DS_NODE Select node must be wrapped in group, {datasource_grain} not subset of target grain {target_grain} from {all_concepts}"
         )
         force_group = True
     else:
         logger.info(
-            f"{padding(depth)}{LOGGER_PREFIX}_DS_NODE Select node grain {datasource.grain} is subset of target grain {target_grain}, no group required"
+            f"{padding(depth)}{LOGGER_PREFIX}_DS_NODE Select node grain {datasource_grain} is subset of target grain {target_grain}, no group required"
         )
-    if not datasource.grain.components:
+    if not datasource_grain.components:
         force_group = True
     partial_concepts = [
         c.concept

pytrilogy-0.0.3.108/trilogy/std/display.preql

@@ -0,0 +1,18 @@
+
+
+type percent float; # Percentage value
+
+def calc_percent(a, b, digits=-1) -> 
+    case 
+        when digits =-1 then 
+            case 
+                when b = 0 then 0.0::numeric
+                else (a/b)::numeric
+            end
+        else round((
+            case 
+                when b = 0 then 0.0::float
+                else (a/b)::float
+            end
+            )::numeric, digits) 
+    end::numeric::percent;

pytrilogy-0.0.3.107/trilogy/std/display.preql

@@ -1,9 +0,0 @@
-
-
-type percent float; # Percentage value
-
-def calc_percent(a, b, digits=-1) -> case when digits =-1 then 
-case when b = 0 then 0.0::numeric::percent else
-(a/b)::numeric::percent end
-else round((case when b = 0 then 0.0::float::percent else
-(a/b)::float::percent end):: numeric::percent, digits) end;