0.5.1 - find() fix w/ extra pytest added. (#94)

* working

* Revert "working"

This reverts commit 6810de1.

* find_method fix

---------

Co-authored-by: Curtis Stallings <curtis.stallings@rockwellautomation.com>

Author: Curts0

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python_tabular"
-version = "0.5.0"
+version = "0.5.1"
 authors = [
   { name="Curtis Stallings", email="curtisrstallings@gmail.com" },
 ]

pytabular/column.py

@@ -155,6 +155,6 @@ def query_all(self, query_function: str = "COUNTROWS(VALUES(_))") -> pd.DataFram
                 dax_identifier = f"'{table_name}'[{column_name}]"
                 query_str += f"ROW(\"Table\",\"{table_name}\",\
                     \"Column\",\"{column_name}\",\"{query_function}\",\
-                    {query_function.replace('_',dax_identifier)}),\n" # noqa: E231, E261
+                    {query_function.replace('_',dax_identifier)}),\n"  # noqa: E231, E261
         query_str = f"{query_str[:-2]})"
         return self[0].Table.Model.query(query_str)

pytabular/measure.py

@@ -60,15 +60,17 @@ class PyMeasures(PyObjects):
     `model.Measures.find('ratio')`.
     """
 
-    def __init__(self, objects, parent) -> None:
+    def __init__(self, objects, parent=None) -> None:
         """Extends init from `PyObjects`."""
         super().__init__(objects, parent)
 
     def __call__(self, *args, **kwargs):
         """Made `PyMeasures` just sends args through to `add_measure`."""
         return self.add_measure(*args, **kwargs)
 
-    def add_measure(self, name: str, expression: str, **kwargs) -> PyMeasure:
+    def add_measure(
+        self, name: str, expression: str, auto_save: bool = True, **kwargs
+    ) -> PyMeasure:
         """Add or replace measures from `PyMeasures` class.
 
         Required is just `name` and `expression`.
@@ -98,6 +100,8 @@ def add_measure(self, name: str, expression: str, **kwargs) -> PyMeasure:
         Args:
             name (str): Name of the measure. Brackets ARE NOT required.
             expression (str): DAX expression for the measure.
+            auto_save (bool, optional): Automatically save changes after measure creations.
+                Defaults to `True`
         """
         if isinstance(self.parent._object, Table):
             table = self.parent
@@ -128,6 +132,8 @@ def add_measure(self, name: str, expression: str, **kwargs) -> PyMeasure:
         if new:
             measures = table.get_Measures()
             measures.Add(new_measure)
-
-        model.save_changes()
-        return model.Measures[new_measure.Name]
+        if auto_save:
+            model.save_changes()
+            return model.Measures[new_measure.Name]
+        else:
+            return True

pytabular/table.py

@@ -181,7 +181,7 @@ def query_all(self, query_function: str = "COUNTROWS(_)") -> pd.DataFrame:
             table_name = table.get_Name()
             dax_table_identifier = f"'{table_name}'"
             query_str += f"ROW(\"Table\",\"{table_name}\",\"{query_function}\",\
-                {query_function.replace('_',dax_table_identifier)}),\n" # noqa: E231, E261
+                {query_function.replace('_',dax_table_identifier)}),\n"  # noqa: E231, E261
         query_str = f"{query_str[:-2]})"
         return self[0].Model.query(query_str)
 

test/test_2object.py

@@ -107,3 +107,11 @@ def test_iadd_table(model):
     b = model.Tables.find("Date")[0]
     a += b
     assert len(a.find("Date")) > 0
+
+
+@pytest.mark.parametrize("model", testing_parameters)
+def test_find_measure(model):
+    """Tests `find()` with a `PyMeasure()`."""
+    a = model.Measures[0].Name
+    b = model.Measures.find(a)
+    assert len(b) > 0

test/test_4measure.py

@@ -0,0 +1,18 @@
+"""Bulk of pytests for `PyMeasure()` class."""
+import pytest
+from test.config import testing_parameters
+
+
+@pytest.mark.parametrize("model", testing_parameters)
+def test_create_measure(model):
+    """Test Creating Measure."""
+    name = "Test Measure"
+    expression = "1 + 4"
+    folder = "Testing"
+    model.Measures(name, expression, DisplayFolder=folder)
+    query = model.query(f"EVALUATE {{[{name}]}}")
+    ans = 5
+    new_measure = model.Measures[name]._object
+    new_measure.Parent.Measures.Remove(new_measure)
+    model.save_changes()
+    assert query == ans