yeref 0.24.45__tar.gz → 0.24.47__tar.gz

{yeref-0.24.45 → yeref-0.24.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yeref
-Version: 0.24.45
+Version: 0.24.47
 Summary: desc-f
 Author: john smith
 Dynamic: author

{yeref-0.24.45 → yeref-0.24.47}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup
 
 setup(
     name='yeref',
-    version='0.24.45',
+    version='0.24.47',
     description='desc-f',
     author='john smith',
     packages=['yeref'],

{yeref-0.24.45 → yeref-0.24.47}/yeref/yeref.py

@@ -15955,7 +15955,7 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         users_set = set()
         pay_set = set()
 
-        def process_user_rows(rows, schema_name=""):
+        def process_user_rows(rows):
             # months = ["2025-06", "2025-07", "2025-08", "2025-09"]
             # data_users = []
             # for _ in range(3):
@@ -16044,7 +16044,6 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
                     last_key = list(last_status.keys())[0]
                     if last_key not in ['left', 'kicked']:
                         users_set.add(USER_TID)
-                        pay_set.add(USER_TID)
                 else:
                     users_set.add(USER_TID)
 
@@ -16076,7 +16075,7 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
                     amount = int(it.get("AMOUNT", "0"))
                     dt_tx = datetime.strptime(dt_start, "%d-%m-%Y_%H-%M-%S")
                     month_key = dt_tx.strftime("%Y-%m")
-                    metrics_by_month[month_key]["tx"] += 1
+                    metrics_by_month[month_key]["pay"] += 1
 
                 # metrics_by_month[month_key]["tx"] += len(USER_TXS)
                 # metrics_by_month[month_key]["pay"] += len(USER_PAYMENTS)
@@ -16092,7 +16091,7 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             sql = f'SELECT USER_TID, USER_VARS, USER_LSTS FROM {schema_name}_{ENT_TID}.USER'
             data_users = await db_select_pg(sql, (), BASE_P)
             print(f"schema_name {data_users=}")
-            process_user_rows(data_users, schema_name)
+            process_user_rows(data_users)
 
         sql = f"SELECT USER_TID, USER_VARS, USER_LSTS FROM \"USER\""
         data_users = await db_select_pg(sql, (), BASE_P)
@@ -16100,7 +16099,7 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         process_user_rows(data_users)
 
         all_months = sorted(metrics_by_month.keys())
-        f_name = os.path.join(EXTRA_D, "1_metrics.csv")
+        f_name = os.path.join(EXTRA_D, "1_activity_metrics.csv")
         with open(f_name, mode="w", encoding="utf-8", newline="") as csvfile:
             writer = csv.writer(csvfile, delimiter=',')
             writer.writerow(["MO", "/start", "/startapp", "DAU", "MAU", "Wallets", "TX Count", "PAY Count", "TVL"])
@@ -16126,6 +16125,121 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
     except Exception as e:
         logger.info(log_ % str(e))
         await asyncio.sleep(round(random.uniform(0, 1), 2))
+
+
+async def return_unit_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
+    try:
+        # собрать всех пользователей
+        sql = 'SELECT USER_TID, USER_VARS, USER_LSTS FROM "USER"'
+        data_users = await db_select_pg(sql, (), BASE_P)
+
+        # структура: метрики по месяцу
+        metrics = defaultdict(lambda: {
+            "N": 0,
+            "sum_amount": 0.0,
+            "payments_count": 0,
+            "churn_count": 0
+        })
+        # набор пользователей, чтобы не дважды считать N в одном месяце
+        seen_new = set()
+
+        for USER_TID, USER_VARS, USER_LSTS in data_users:
+            vars_ = json.loads(USER_VARS or "{}")
+            lsts = json.loads(USER_LSTS or "{}")
+            dt_str = vars_.get("USER_DT", "")
+            # месяц регистрации
+            if dt_str:
+                dt_obj = datetime.strptime(dt_str, "%d-%m-%Y_%H-%M-%S")
+                mo = dt_obj.strftime("%Y-%m")
+                if (USER_TID, mo) not in seen_new:
+                    seen_new.add((USER_TID, mo))
+                    metrics[mo]["N"] += 1
+
+            # платежи этого пользователя
+            for pay in lsts.get("USER_PAYMENTS", []):
+                start = pay.get("DT_START", "")
+                amt = pay.get("AMOUNT", 0)
+                if start and amt:
+                    dt_p = datetime.strptime(start, "%d-%m-%Y_%H-%M-%S")
+                    mo_p = dt_p.strftime("%Y-%m")
+                    val = float(amt) * 0.013
+                    metrics[mo_p]["sum_amount"] += val
+                    metrics[mo_p]["payments_count"] += 1
+
+            # статусы (отток)
+            for status in lsts.get("USER_STATUSES", []):
+                key, ts = next(iter(status.items()))
+                if key in ("left", "kicked"):
+                    dt_s = datetime.strptime(ts, "%d-%m-%Y_%H-%M-%S")
+                    mo_s = dt_s.strftime("%Y-%m")
+                    metrics[mo_s]["churn_count"] += 1
+                    break
+
+        # список месяцев в порядке
+        all_months = sorted(metrics.keys())
+        # посчитать доп. метрики
+        results = []
+        first_mrr = None
+        for idx, mo in enumerate(all_months):
+            data = metrics[mo]
+            N = data["N"]
+            MRR = data["sum_amount"]
+            # округлить до 2х знаков без лишних нулей
+            def fmt(x):
+                return (f"{x:.2f}".rstrip("0").rstrip(".")) if x is not None else ""
+            mrr_fmt = fmt(MRR)
+
+            ARPU = MRR / N if N else None
+            ARR = MRR * 12 if N else None
+            churn = data["churn_count"]
+            ChurnR = churn / N if N else None
+            LTV1 = (ARPU / ChurnR) if (ARPU is not None and ChurnR and ChurnR > 0) else None
+
+            pay_cnt = data["payments_count"]
+            # LTV2 = (payments_count/N) * (sum_amount/payments_count)
+            if N and pay_cnt:
+                LTV2 = (pay_cnt / N) * (MRR / pay_cnt)
+            else:
+                LTV2 = None
+
+            # CMGR: от первого месяца до текущего
+            if idx == 0 or first_mrr is None or first_mrr == 0:
+                CMGR = None
+                if idx == 0:
+                    first_mrr = MRR
+            else:
+                CMGR = ( (MRR / first_mrr) ** (1 / idx) ) - 1
+
+            results.append({
+                "MO": mo,
+                "N": str(N),
+                "MRR": mrr_fmt,
+                "ARPU": fmt(ARPU),
+                "ARR": fmt(ARR),
+                "ChurnR": fmt(ChurnR),
+                "LTV1": fmt(LTV1),
+                "LTV2": fmt(LTV2),
+                "CMGR": fmt(CMGR),
+                "CAC": ""
+            })
+
+        # записать CSV
+        path = os.path.join(EXTRA_D, "2_unit_metrics.csv")
+        with open(path, "w", newline="", encoding="utf-8") as f:
+            writer = csv.writer(f)
+            writer.writerow(["MO", "N", "MRR", "ARPU", "ARR", "ChurnR", "LTV1", "LTV2", "CMGR", "CAC"])
+            for row in results:
+                writer.writerow([
+                    row["MO"], row["N"], row["MRR"], row["ARPU"], row["ARR"],
+                    row["ChurnR"], row["LTV1"], row["LTV2"], row["CMGR"], row["CAC"]
+                ])
+
+        # отправить файл
+        thumb = types.FSInputFile(os.path.join(EXTRA_D, "parse.jpg"))
+        await bot.send_document(chat_id=my_tid, document=types.FSInputFile(path), thumbnail=thumb)
+    except Exception as e:
+        logger.info(log_ % str(e))
+        await asyncio.sleep(round(random.uniform(0, 1), 2))
 # endregion
 
 

{yeref-0.24.45 → yeref-0.24.47}/yeref.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yeref
-Version: 0.24.45
+Version: 0.24.47
 Summary: desc-f
 Author: john smith
 Dynamic: author