feat(api): insights active users

api/chalicelib/blueprints/subs/bp_insights.py

@@ -26,7 +26,7 @@ def get_insights_journey(projectId, context):
     params = app.current_request.query_params
     args = dashboard.dashboard_args(params)
 
-    return {"data": insights.get_journey(project_id=projectId, **{**data, **args})}
+    return {"data": insights.journey(project_id=projectId, **{**data, **args})}
 
 
 @app.route('/{projectId}/insights/users_acquisition', methods=['GET', 'POST'])
@@ -37,7 +37,7 @@ def get_users_acquisition(projectId, context):
     params = app.current_request.query_params
     args = dashboard.dashboard_args(params)
 
-    return {"data": insights.get_users_acquisition(project_id=projectId, **{**data, **args})}
+    return {"data": insights.users_acquisition(project_id=projectId, **{**data, **args})}
 
 
 @app.route('/{projectId}/insights/users_retention', methods=['GET', 'POST'])
@@ -48,7 +48,7 @@ def get_users_retention(projectId, context):
     params = app.current_request.query_params
     args = dashboard.dashboard_args(params)
 
-    return {"data": insights.get_users_retention(project_id=projectId, **{**data, **args})}
+    return {"data": insights.users_retention(project_id=projectId, **{**data, **args})}
 
 
 @app.route('/{projectId}/insights/feature_retention', methods=['GET', 'POST'])
@@ -59,7 +59,8 @@ def get_feature_rentention(projectId, context):
     params = app.current_request.query_params
     args = dashboard.dashboard_args(params)
 
-    return {"data": insights.get_feature_retention(project_id=projectId, **{**data, **args})}
+    return {"data": insights.feature_retention(project_id=projectId, **{**data, **args})}
+
 
 @app.route('/{projectId}/insights/feature_acquisition', methods=['GET', 'POST'])
 def get_feature_acquisition(projectId, context):
@@ -69,7 +70,7 @@ def get_feature_acquisition(projectId, context):
     params = app.current_request.query_params
     args = dashboard.dashboard_args(params)
 
-    return {"data": insights.get_feature_acquisition(project_id=projectId, **{**data, **args})}
+    return {"data": insights.feature_acquisition(project_id=projectId, **{**data, **args})}
 
 
 @app.route('/{projectId}/insights/feature_popularity_frequency', methods=['GET', 'POST'])
@@ -82,6 +83,17 @@ def get_feature_popularity_frequency(projectId, context):
 
     return {"data": insights.feature_popularity_frequency(project_id=projectId, **{**data, **args})}
 
+
+@app.route('/{projectId}/insights/users_active', methods=['GET', 'POST'])
+def get_users_active(projectId, context):
+    data = app.current_request.json_body
+    if data is None:
+        data = {}
+    params = app.current_request.query_params
+    args = dashboard.dashboard_args(params)
+
+    return {"data": insights.users_active(project_id=projectId, **{**data, **args})}
+
 #
 #
 # @app.route('/{projectId}/dashboard/{widget}/search', methods=['GET'])

api/chalicelib/core/insights.py

@@ -1,5 +1,4 @@
 from chalicelib.core import sessions_metas
-from chalicelib.utils import args_transformer
 from chalicelib.utils import helper, dev
 from chalicelib.utils import pg_client
 from chalicelib.utils.TimeUTC import TimeUTC
@@ -32,7 +31,7 @@ JOURNEY_TYPES = {
 
 
 @dev.timed
-def get_journey(project_id, startTimestamp=TimeUTC.now(delta_days=-1), endTimestamp=TimeUTC.now(), filters=[], **args):
+def journey(project_id, startTimestamp=TimeUTC.now(delta_days=-1), endTimestamp=TimeUTC.now(), filters=[], **args):
     pg_sub_query_subset = __get_constraints(project_id=project_id, data=args, duration=True, main_table="sessions",
                                             time_constraint=True)
     event_start = None
@@ -189,8 +188,8 @@ def __complete_acquisition(rows, start_date, end_date=None):
 
 
 @dev.timed
-def get_users_retention(project_id, startTimestamp=TimeUTC.now(delta_days=-70), endTimestamp=TimeUTC.now(), filters=[],
+def users_retention(project_id, startTimestamp=TimeUTC.now(delta_days=-70), endTimestamp=TimeUTC.now(), filters=[],
-                        **args):
+                    **args):
     startTimestamp = TimeUTC.trunc_week(startTimestamp)
     endTimestamp = startTimestamp + 10 * TimeUTC.MS_WEEK
     pg_sub_query = __get_constraints(project_id=project_id, data=args, duration=True, main_table="sessions",
@@ -237,9 +236,9 @@ def get_users_retention(project_id, startTimestamp=TimeUTC.now(delta_days=-70),
 
 
 @dev.timed
-def get_users_acquisition(project_id, startTimestamp=TimeUTC.now(delta_days=-70), endTimestamp=TimeUTC.now(),
+def users_acquisition(project_id, startTimestamp=TimeUTC.now(delta_days=-70), endTimestamp=TimeUTC.now(),
-                          filters=[],
+                      filters=[],
-                          **args):
+                      **args):
     startTimestamp = TimeUTC.trunc_week(startTimestamp)
     endTimestamp = startTimestamp + 10 * TimeUTC.MS_WEEK
     pg_sub_query = __get_constraints(project_id=project_id, data=args, duration=True, main_table="sessions",
@@ -285,9 +284,9 @@ def get_users_acquisition(project_id, startTimestamp=TimeUTC.now(delta_days=-70)
 
 
 @dev.timed
-def get_feature_retention(project_id, startTimestamp=TimeUTC.now(delta_days=-70), endTimestamp=TimeUTC.now(),
+def feature_retention(project_id, startTimestamp=TimeUTC.now(delta_days=-70), endTimestamp=TimeUTC.now(),
-                          filters=[],
+                      filters=[],
-                          **args):
+                      **args):
     startTimestamp = TimeUTC.trunc_week(startTimestamp)
     endTimestamp = startTimestamp + 10 * TimeUTC.MS_WEEK
     pg_sub_query = __get_constraints(project_id=project_id, data=args, duration=True, main_table="sessions",
@@ -302,12 +301,12 @@ def get_feature_retention(project_id, startTimestamp=TimeUTC.now(delta_days=-70)
     for f in filters:
         if f["type"] == "EVENT_TYPE" and JOURNEY_TYPES.get(f["value"]):
             event_type = f["value"]
-        elif f["type"] == "EVENT_VALUE" and JOURNEY_TYPES.get(f["value"]):
+        elif f["type"] == "EVENT_VALUE":
             event_value = f["value"]
+            default = False
         elif f["type"] in [sessions_metas.meta_type.USERID, sessions_metas.meta_type.USERID_IOS]:
             pg_sub_query.append(f"sessions.user_id = %(user_id)s")
             extra_values["user_id"] = f["value"]
-        default = False
     event_table = JOURNEY_TYPES[event_type]["table"]
     event_column = JOURNEY_TYPES[event_type]["column"]
     pg_sub_query.append(f"feature.{event_column} = %(value)s")
@@ -375,9 +374,9 @@ def get_feature_retention(project_id, startTimestamp=TimeUTC.now(delta_days=-70)
 
 
 @dev.timed
-def get_feature_acquisition(project_id, startTimestamp=TimeUTC.now(delta_days=-70), endTimestamp=TimeUTC.now(),
+def feature_acquisition(project_id, startTimestamp=TimeUTC.now(delta_days=-70), endTimestamp=TimeUTC.now(),
-                            filters=[],
+                        filters=[],
-                            **args):
+                        **args):
     startTimestamp = TimeUTC.trunc_week(startTimestamp)
     endTimestamp = startTimestamp + 10 * TimeUTC.MS_WEEK
     pg_sub_query = __get_constraints(project_id=project_id, data=args, duration=True, main_table="sessions",
@@ -392,12 +391,12 @@ def get_feature_acquisition(project_id, startTimestamp=TimeUTC.now(delta_days=-7
     for f in filters:
         if f["type"] == "EVENT_TYPE" and JOURNEY_TYPES.get(f["value"]):
             event_type = f["value"]
-        elif f["type"] == "EVENT_VALUE" and JOURNEY_TYPES.get(f["value"]):
+        elif f["type"] == "EVENT_VALUE":
             event_value = f["value"]
+            default = False
         elif f["type"] in [sessions_metas.meta_type.USERID, sessions_metas.meta_type.USERID_IOS]:
             pg_sub_query.append(f"sessions.user_id = %(user_id)s")
             extra_values["user_id"] = f["value"]
-        default = False
     event_table = JOURNEY_TYPES[event_type]["table"]
     event_column = JOURNEY_TYPES[event_type]["column"]
 
@@ -525,3 +524,41 @@ def feature_popularity_frequency(project_id, startTimestamp=TimeUTC.now(delta_da
             p["frequency"] = frequencies[p["value"]] / total_usage
 
     return popularity
+
+
+@dev.timed
+def users_active(project_id, startTimestamp=TimeUTC.now(delta_days=-70), endTimestamp=TimeUTC.now(),
+                 filters=[],
+                 **args):
+    pg_sub_query_chart = __get_constraints(project_id=project_id, time_constraint=True,
+                                           chart=True, data=args)
+
+    period = "DAY"
+    for f in filters:
+        if f["type"] == "PERIOD" and f["value"] in ["DAY", "WEEK"]:
+            period = f["value"]
+        elif f["type"] in [sessions_metas.meta_type.USERID, sessions_metas.meta_type.USERID_IOS]:
+            pg_sub_query_chart.append(f"sessions.user_id = %(user_id)s")
+
+    with pg_client.PostgresClient() as cur:
+        pg_query = f"""SELECT AVG(count) AS avg, JSONB_AGG(chart) AS chart
+                        FROM (SELECT generated_timestamp       AS timestamp,
+                                     COALESCE(COUNT(users), 0) AS count
+                              FROM generate_series(%(startTimestamp)s, %(endTimestamp)s, %(step_size)s) AS generated_timestamp
+                                       LEFT JOIN LATERAL ( SELECT DISTINCT user_id
+                                                           FROM public.sessions
+                                                           WHERE {" AND ".join(pg_sub_query_chart)}
+                                  ) AS users ON (TRUE)
+                              GROUP BY generated_timestamp
+                              ORDER BY generated_timestamp) AS chart;"""
+        params = {"step_size": TimeUTC.MS_DAY if period == "DAY" else TimeUTC.MS_WEEK,
+                  "project_id": project_id,
+                  "startTimestamp": TimeUTC.trunc_day(startTimestamp) if period == "DAY" else TimeUTC.trunc_week(
+                      startTimestamp),
+                  "endTimestamp": endTimestamp, **__get_constraint_values(args)}
+        # print(cur.mogrify(pg_query, params))
+        # print("---------------------")
+        cur.execute(cur.mogrify(pg_query, params))
+        row_users = cur.fetchone()
+
+    return row_users

api/chalicelib/utils/TimeUTC.py

@@ -115,6 +115,13 @@ class TimeUTC:
     def get_utc_offset():
         return int((datetime.now(pytz.utc).now() - datetime.now(pytz.utc).replace(tzinfo=None)).total_seconds() * 1000)
 
+    @staticmethod
+    def trunc_day(timestamp):
+        dt = TimeUTC.from_ms_timestamp(timestamp)
+        return TimeUTC.datetime_to_timestamp(dt
+                                             .replace(hour=0, minute=0, second=0, microsecond=0)
+                                             .astimezone(pytz.utc))
+
     @staticmethod
     def trunc_week(timestamp):
         dt = TimeUTC.from_ms_timestamp(timestamp)