pytrilogy 0.0.3.35__tar.gz → 0.0.3.36__tar.gz

{pytrilogy-0.0.3.35/pytrilogy.egg-info → pytrilogy-0.0.3.36}/PKG-INFO

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

{pytrilogy-0.0.3.35 → pytrilogy-0.0.3.36/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.35 → pytrilogy-0.0.3.36}/tests/test_derived_concepts.py

@@ -11,6 +11,14 @@ def test_derivations(test_environment):
     )
 
 
+def test_hour_derivation(test_environment):
+    hour_derived = test_environment.concepts["order_timestamp.hour"]
+    assert "hour" in hour_derived.datatype.traits, hour_derived
+
+    year_derived = test_environment.concepts["order_timestamp.year"]
+    assert "year" in year_derived.datatype.traits, year_derived
+
+
 def test_filtering_where_on_derived_aggregate(test_environment):
     exception = False
     try:

{pytrilogy-0.0.3.35 → pytrilogy-0.0.3.36}/tests/test_metadata.py

@@ -14,16 +14,16 @@ property user_id.display_name string metadata(description="The display name");""
     assert env.concepts["display_name"].metadata.description == "The display name"
 
 
-def test_import_metadata():
-    env = Environment(working_path=Path(__file__).parent)
-    env, _ = parse(
-        """import test_env as env; # Dragon metrics
-        import test_env as env2;""",
-        environment=env,
-    )
-
-    assert "Dragon metrics" in env.concepts["env.id"].metadata.description
-
-    env2 = env.concepts["env2.id"]
-    assert env2.namespace == "env2"
-    assert env.concepts["env2.id"].metadata.description is None
+# def test_import_metadata():
+#     env = Environment(working_path=Path(__file__).parent)
+#     env, _ = parse(
+#         """import test_env as env; # Dragon metrics
+#         import test_env as env2;""",
+#         environment=env,
+#     )
+
+#     assert "Dragon metrics" in env.concepts["env.id"].metadata.description
+
+#     env2 = env.concepts["env2.id"]
+#     assert env2.namespace == "env2"
+#     assert env.concepts["env2.id"].metadata.description is None

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

{pytrilogy-0.0.3.35 → pytrilogy-0.0.3.36}/trilogy/core/environment_helpers.py

@@ -47,7 +47,7 @@ def generate_date_concepts(concept: Concept, environment: Environment):
         )
         new_concept = Concept(
             name=f"{concept.name}.{fname}",
-            datatype=DataType.INTEGER,
+            datatype=function.output_datatype,
             purpose=default_type,
             lineage=function,
             grain=concept.grain,
@@ -119,7 +119,7 @@ def generate_datetime_concepts(concept: Concept, environment: Environment):
         )
         new_concept = Concept(
             name=f"{concept.name}.{fname}",
-            datatype=DataType.INTEGER,
+            datatype=const_function.output_datatype,
             purpose=default_type,
             lineage=const_function,
             grain=concept.grain,

{pytrilogy-0.0.3.35 → pytrilogy-0.0.3.36}/trilogy/parsing/parse_engine.py

@@ -368,18 +368,21 @@ class ParseToObjects(Transformer):
                     output.concept.metadata.description
                     or args[1].text.split("#")[1].strip()
                 )
-        if isinstance(output, ImportStatement):
-            if len(args) > 1 and isinstance(args[1], Comment):
-                comment = args[1].text.split("#")[1].strip()
-                namespace = output.alias
-                for _, v in self.environment.concepts.items():
-                    if v.namespace == namespace:
-                        if v.metadata.description:
-                            v.metadata.description = (
-                                f"{comment}: {v.metadata.description}"
-                            )
-                        else:
-                            v.metadata.description = comment
+        # this is a bad plan for now;
+        # because a comment after an import statement is very common
+        # and it's not intuitive that it modifies the import description
+        # if isinstance(output, ImportStatement):
+        #     if len(args) > 1 and isinstance(args[1], Comment):
+        #         comment = args[1].text.split("#")[1].strip()
+        #         namespace = output.alias
+        #         for _, v in self.environment.concepts.items():
+        #             if v.namespace == namespace:
+        #                 if v.metadata.description:
+        #                     v.metadata.description = (
+        #                         f"{comment}: {v.metadata.description}"
+        #                     )
+        #                 else:
+        #                     v.metadata.description = comment
 
         return args[0]