pytrilogy 0.0.3.21__py3-none-any.whl → 0.0.3.22__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of pytrilogy might be problematic. Click here for more details.

Files changed (10) hide show
  1. {pytrilogy-0.0.3.21.dist-info → pytrilogy-0.0.3.22.dist-info}/METADATA +1 -1
  2. {pytrilogy-0.0.3.21.dist-info → pytrilogy-0.0.3.22.dist-info}/RECORD +9 -9
  3. {pytrilogy-0.0.3.21.dist-info → pytrilogy-0.0.3.22.dist-info}/WHEEL +1 -1
  4. pytrilogy-0.0.3.22.dist-info/entry_points.txt +2 -0
  5. trilogy/__init__.py +1 -1
  6. trilogy/core/models/execute.py +1 -1
  7. trilogy/core/processing/concept_strategies_v3.py +7 -5
  8. pytrilogy-0.0.3.21.dist-info/entry_points.txt +0 -2
  9. {pytrilogy-0.0.3.21.dist-info → pytrilogy-0.0.3.22.dist-info}/licenses/LICENSE.md +0 -0
  10. {pytrilogy-0.0.3.21.dist-info → pytrilogy-0.0.3.22.dist-info}/top_level.txt +0 -0
{pytrilogy-0.0.3.21.dist-info → pytrilogy-0.0.3.22.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pytrilogy
3
- Version: 0.0.3.21
3
+ Version: 0.0.3.22
4
4
  Summary: Declarative, typed query language that compiles to SQL.
5
5
  Home-page:
6
6
  Author:
{pytrilogy-0.0.3.21.dist-info → pytrilogy-0.0.3.22.dist-info}/RECORD RENAMED
@@ -1,5 +1,5 @@
1
- pytrilogy-0.0.3.21.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
2
- trilogy/__init__.py,sha256=n0fAEm3rOxsyfVJboGyrvMZZfBz-GUzKvCTTS1z9qwE,303
1
+ pytrilogy-0.0.3.22.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
2
+ trilogy/__init__.py,sha256=1qcH3mcGJGfd8RueLao8BkMgttF4E-nwXO82_8H_zUg,303
3
3
  trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
4
4
  trilogy/constants.py,sha256=5eQxk1A0pv-TQk3CCvgZCFA9_K-6nxrOm7E5Lxd7KIY,1652
5
5
  trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
@@ -28,14 +28,14 @@ trilogy/core/models/build_environment.py,sha256=8UggvlPU708GZWYPJMc_ou2r7M3TY2g6
28
28
  trilogy/core/models/core.py,sha256=nb4h1HHm5_qwmUkYth4zRhEttS1EtsMZCP4vT20EEAE,10326
29
29
  trilogy/core/models/datasource.py,sha256=6RjJUd2u4nYmEwFBpJlM9LbHVYDv8iHJxqiBMZqUrwI,9422
30
30
  trilogy/core/models/environment.py,sha256=RlHNrRer4p1uSQM030iwGJL82M1hMyY5p8a550XTfUI,26606
31
- trilogy/core/models/execute.py,sha256=4jbfwRt6Qv0kNzVU8b_z10Ln0Nk-CDvnbMEP1gCAbck,34204
31
+ trilogy/core/models/execute.py,sha256=SG_qXK3hrorzcXi85iie1Z5FGnrSwCE4Zs9Ntj4Q1ok,34223
32
32
  trilogy/core/optimizations/__init__.py,sha256=EBanqTXEzf1ZEYjAneIWoIcxtMDite5-n2dQ5xcfUtg,356
33
33
  trilogy/core/optimizations/base_optimization.py,sha256=gzDOKImoFn36k7XBD3ysEYDnbnb6vdVIztUfFQZsGnM,513
34
34
  trilogy/core/optimizations/inline_constant.py,sha256=lvNTIXaLNkw3HseJyXyDNk5R52doLU9sIg3pmU2_S08,1332
35
35
  trilogy/core/optimizations/inline_datasource.py,sha256=AHuTGh2x0GQ8usOe0NiFncfTFQ_KogdgDl4uucmhIbI,4241
36
36
  trilogy/core/optimizations/predicate_pushdown.py,sha256=g4AYE8Aw_iMlAh68TjNXGP754NTurrDduFECkUjoBnc,9399
37
37
  trilogy/core/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
38
- trilogy/core/processing/concept_strategies_v3.py,sha256=yZAAyrdLBhArAX87SWAqTB0E3DRt0I5XuQ3or2FHyas,40302
38
+ trilogy/core/processing/concept_strategies_v3.py,sha256=pDajPY0b3fa8qgg2jR6Qj30RMu-OBLztlsVRTgGJbeU,40500
39
39
  trilogy/core/processing/graph_utils.py,sha256=8QUVrkE9j-9C1AyrCb1nQEh8daCe0u1HuXl-Te85lag,1205
40
40
  trilogy/core/processing/utility.py,sha256=Oc5tLGeDDpzhbfo2ZcF8ex1kez-NcJDMcG2Lm5BjS4c,20548
41
41
  trilogy/core/processing/node_generators/__init__.py,sha256=o8rOFHPSo-s_59hREwXMW6gjUJCsiXumdbJNozHUf-Y,800
@@ -96,8 +96,8 @@ trilogy/parsing/render.py,sha256=o_XuQWhcwx1lD9eGVqkqZEwkmQK0HdmWWokGBtdeH4I,178
96
96
  trilogy/parsing/trilogy.lark,sha256=7libFS5HNiyHJYzr5_lEiY-Lpqit04_PgyIPHMZT7-w,12928
97
97
  trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
98
98
  trilogy/scripts/trilogy.py,sha256=1L0XrH4mVHRt1C9T1HnaDv2_kYEfbWTb5_-cBBke79w,3774
99
- pytrilogy-0.0.3.21.dist-info/METADATA,sha256=JgrwJO6p9VrP93Ccj8XjYglOZ6VfWKD3DtuXENQxGT0,9100
100
- pytrilogy-0.0.3.21.dist-info/WHEEL,sha256=tTnHoFhvKQHCh4jz3yCn0WPTYIy7wXx3CJtJ7SJGV7c,91
101
- pytrilogy-0.0.3.21.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
102
- pytrilogy-0.0.3.21.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
103
- pytrilogy-0.0.3.21.dist-info/RECORD,,
99
+ pytrilogy-0.0.3.22.dist-info/METADATA,sha256=hRYKLlss7MfsGa488K07_o93KgVoI77O7QBqJ30vR4I,9100
100
+ pytrilogy-0.0.3.22.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
101
+ pytrilogy-0.0.3.22.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
102
+ pytrilogy-0.0.3.22.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
103
+ pytrilogy-0.0.3.22.dist-info/RECORD,,
{pytrilogy-0.0.3.21.dist-info → pytrilogy-0.0.3.22.dist-info}/WHEEL RENAMED
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: setuptools (77.0.1)
2
+ Generator: setuptools (78.1.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5
 
pytrilogy-0.0.3.22.dist-info/entry_points.txt ADDED
@@ -0,0 +1,2 @@
1
+ [console_scripts]
2
+ trilogy = trilogy.scripts.trilogy:cli
trilogy/__init__.py CHANGED
@@ -4,6 +4,6 @@ from trilogy.dialect.enums import Dialects
4
4
  from trilogy.executor import Executor
5
5
  from trilogy.parser import parse
6
6
 
7
- __version__ = "0.0.3.21"
7
+ __version__ = "0.0.3.22"
8
8
 
9
9
  __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]
trilogy/core/models/execute.py CHANGED
@@ -162,7 +162,7 @@ class CTE(BaseModel):
162
162
  base += (
163
163
  f"\n-- Nullable: {', '.join([str(x) for x in self.nullable_concepts])}."
164
164
  )
165
-
165
+ base +='\n'
166
166
  return base
167
167
 
168
168
  def inline_parent_datasource(
trilogy/core/processing/concept_strategies_v3.py CHANGED
@@ -787,15 +787,17 @@ def _search_concepts(
787
787
  )
788
788
  # if anything we need to get is in the filter set and it's a computed value
789
789
  # we need to get _everything_ in this loop
790
- if any(
791
- [
792
- x.derivation not in (Derivation.ROOT, Derivation.CONSTANT)
790
+ required_filters = [
791
+ x
792
+ for x in mandatory_list if x.derivation not in (Derivation.ROOT, Derivation.CONSTANT)
793
+ and not (x.derivation == Derivation.AGGREGATE and x.granularity == Granularity.SINGLE_ROW)
793
794
  and x.address in conditions.row_arguments
794
- for x in mandatory_list
795
795
  ]
796
+ if any(
797
+ required_filters
796
798
  ):
797
799
  logger.info(
798
- f"{depth_to_prefix(depth)}{LOGGER_PREFIX} derived condition row input present in mandatory list, forcing condition evaluation at this level. "
800
+ f"{depth_to_prefix(depth)}{LOGGER_PREFIX} derived condition row inputs {[x.address for x in required_filters]} present in mandatory list, forcing condition evaluation at this level. "
799
801
  )
800
802
  mandatory_list = completion_mandatory
801
803
  must_evaluate_condition_on_this_level_not_push_down = True
pytrilogy-0.0.3.21.dist-info/entry_points.txt DELETED
@@ -1,2 +0,0 @@
1
- [console_scripts]
2
- trilogy = preql.scripts.trilogy:cli