Fix some usages of event. and update exceptions, Table usages

Author: greenape

flowmachine/flowmachine/core/server/query_schemas/custom_fields.py

@@ -56,7 +56,7 @@ class EventTypes(fields.List):
     """
     A list of strings representing an event type, for example "calls", "sms", "mds", "topups".
 
-    When deserialised, will be deduped, and prefixed with "events."
+    When deserialised, will be deduped.
     """
 
     def __init__(

flowmachine/flowmachine/features/subscriber/active_subscribers.py

@@ -80,7 +80,7 @@ class ActiveSubscribers(ExposedDatetimeMixin, Query):
                 total_major_periods=4,
                 minor_period_threshold=1,
                 major_period_threshold=3,
-                tables=["events.calls"],
+                tables=["calls"],
             )
 
     Returns subscribers that were active in at least two ten minute intervals within half an hour,
@@ -94,7 +94,7 @@ class ActiveSubscribers(ExposedDatetimeMixin, Query):
                 minor_period_threshold=2,
                 major_period_threshold=3,
                 period_unit="minutes",
-                tables=["events.calls"],
+                tables=["calls"],
             )
 
 

flowmachine/flowmachine/features/utilities/event_table_subset.py

@@ -40,7 +40,7 @@ class EventTableSubset(Query):
         This will subset the query only with these hours, but
         across all specified days. Or set to 'all' to include
         all hours.
-    table : str, default 'events.calls'
+    table : str, default 'calls'
         schema qualified name of the table which the analysis is
         based upon
     subscriber_identifier : {'msisdn', 'imei'}, default 'msisdn'

flowmachine/flowmachine/features/utilities/sets.py

@@ -46,9 +46,7 @@ class UniqueSubscribers(Query):
     table : str, default 'all'
         Table on which to perform the query. By default it will look
         at ALL tables, which are any tables with subscriber information
-        in them, specified via subscriber_tables in flowmachine.yml. Otherwise
-        you need to specify a full table (with a schema) such as
-        'events.calls'.
+        in them, specified via subscriber_tables in flowmachine.yml.
     subscriber_identifier : {'msisdn', 'imei'}, default 'msisdn'
         Either msisdn, or imei, the column that identifies the subscriber.
     subscriber_subset : str, list, flowmachine.core.Query, flowmachine.core.Table, default None

flowmachine/tests/test_active_subscribers.py

@@ -19,7 +19,7 @@ def test_active_subscribers_one_day(get_dataframe):
         total_major_periods=1,
         minor_period_threshold=3,
         major_period_threshold=1,
-        tables=["events.calls"],
+        tables=["calls"],
     )
     out = get_dataframe(active_subscribers).iloc[0:5]
     print(out)
@@ -44,7 +44,7 @@ def test_active_subscribers_many_days(get_dataframe):
         total_major_periods=4,
         minor_period_threshold=1,
         major_period_threshold=3,
-        tables=["events.calls"],
+        tables=["calls"],
     )
     out = get_dataframe(active_subscribers).iloc[0:5]
     print(out)
@@ -72,7 +72,7 @@ def test_active_subscribers_custom_period(get_dataframe):
         minor_period_threshold=2,
         major_period_threshold=3,
         period_unit="minutes",
-        tables=["events.calls"],
+        tables=["calls"],
     )
     assert len(active_subscribers.major_period_queries) == 4
     assert active_subscribers.major_period_queries[2].start == "2016-01-01 21:00:00"

flowmachine/tests/test_query_union.py

@@ -44,7 +44,7 @@ def test_union_raises_with_mismatched_columns():
     """
     with pytest.raises(ValueError):
         Table(schema="events", name="calls", columns=["msisdn"]).union(
-            Table(schema="events", name="calls")
+            Table(schema="events", name="calls", columns=["id"])
         )
 
 

flowmachine/tests/test_random.py

@@ -11,6 +11,7 @@
 import pytest
 import pickle
 
+from flowmachine.core.errors.flowmachine_errors import PreFlightFailedException
 from flowmachine.core.mixins import GraphMixin
 from flowmachine.features import daily_location, Flows
 from flowmachine.features.utilities.sets import UniqueSubscribers
@@ -233,7 +234,7 @@ def test_system_rows_fail_with_inheritance():
     """
     Test whether the system row method fails if the subscriber queries for random rows on a parent table.
     """
-    with pytest.raises(ValueError):
+    with pytest.raises(PreFlightFailedException):
         df = (
             Table(name="events.calls", columns=["msisdn"])
             .random_sample(size=8, sampling_method="system_rows")