yeref 0.24.59__tar.gz → 0.24.61__tar.gz

{yeref-0.24.59 → yeref-0.24.61}/PKG-INFO

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

{yeref-0.24.59 → yeref-0.24.61}/setup.py

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

{yeref-0.24.59 → yeref-0.24.61}/yeref/yeref.py

@@ -16124,18 +16124,15 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
 
 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,
+            "new_users": 0,
             "sum_amount": 0.0,
             "payments_count": 0,
             "churn_count": 0
         })
-        # набор пользователей, чтобы не дважды считать N в одном месяце
         seen_new = set()
 
         months = ["2025-06", "2025-07", "2025-08", "2025-09"]
@@ -16203,72 +16200,65 @@ async def return_unit_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         print(f"gen {data_users=}")
 
         for USER_TID, USER_VARS, USER_LSTS in data_users:
-            USER_VARS = json.loads(USER_VARS or USER_VARS_)
-            USER_LSTS = json.loads(USER_LSTS or USER_LSTS_)
+            USER_VARS = json.loads(USER_VARS or "{}")
+            USER_LSTS = json.loads(USER_LSTS or "{}")
             USER_DT = USER_VARS.get("USER_DT", "")
             USER_PAYMENTS = USER_LSTS.get("USER_PAYMENTS", [])
             USER_STATUSES = USER_LSTS.get("USER_STATUSES", [])
 
             if USER_DT:
-                dt_obj = datetime.strptime(USER_DT, "%d-%m-%Y_%H-%M-%S")
-                mo = dt_obj.strftime("%Y-%m")
+                mo = datetime.strptime(USER_DT, "%d-%m-%Y_%H-%M-%S").strftime("%Y-%m")
                 if (USER_TID, mo) not in seen_new:
                     seen_new.add((USER_TID, mo))
-                    metrics[mo]["N"] += 1
+                    metrics[mo]["new_users"] += 1
 
-            # платежи этого пользователя
             for pay in USER_PAYMENTS:
-                start = pay.get("DT_START", "")
-                amt = pay.get("AMOUNT", 0)
-
-                dt_p = datetime.strptime(start, "%d-%m-%Y_%H-%M-%S")
+                dt_p = datetime.strptime(pay.get("DT_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
+                amt = float(pay.get("AMOUNT", 0)) * 0.013
+                metrics[mo_p]["sum_amount"] += amt
                 metrics[mo_p]["payments_count"] += 1
 
-            # статусы (отток)
             for status in 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")
+                    mo_s = datetime.strptime(ts, "%d-%m-%Y_%H-%M-%S").strftime("%Y-%m")
                     metrics[mo_s]["churn_count"] += 1
                     break
 
         all_months = sorted(metrics.keys())
+        cumulative_users = 0
         results = []
-        first_mrr = None
+
         for idx, mo in enumerate(all_months):
             data = metrics[mo]
-            N = data["N"]
-            MRR = data["sum_amount"]
+            new_u = data["new_users"]
+            cumulative_users += new_u
 
+            MRR = data["sum_amount"]
             def fmt(x):
-                return (f"{x:.2f}".rstrip("0").rstrip(".")) if x is not None else ""
-            mrr_fmt = fmt(MRR)
+                return f"{x:.2f}".rstrip("0").rstrip(".") if x is not None else ""
 
+            mrr_fmt = fmt(MRR)
+            N = cumulative_users
             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
 
-            # LTV1 = LTV2
-            # CMGR: от первого месяца до текущего
-            if idx == 0 or first_mrr is None or first_mrr == 0:
+            if idx == 0:
                 CMGR = None
-                if idx == 0:
-                    first_mrr = MRR
+                first_mrr = MRR
             else:
-                CMGR = ((MRR / first_mrr) ** (1 / idx)) - 1
+                CMGR = ((MRR / first_mrr) ** (1 / idx)) - 1 if first_mrr and MRR is not None else None
 
             results.append({
                 "MO": mo,
@@ -16293,14 +16283,102 @@ async def return_unit_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
                     row["ChurnR"], row["LTV1"], row["LTV2"], row["CMGR"], row["CAC"]
                 ])
 
-            cmgr = [float(r["CMGR"]) for r in results if r["CMGR"] != ""]
-            if cmgr:
-                factors = [1 + v for v in cmgr]
+            cmgr_vals = [float(r["CMGR"]) for r in results if r["CMGR"] != ""]
+            if cmgr_vals:
+                factors = [1 + v for v in cmgr_vals]
                 avg = math.prod(factors) ** (1 / len(factors))
                 writer.writerow([])
                 writer.writerow([f"Rev ~ ×{round(avg, 2)} monthly"])
 
-        # отправить файл
+        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))
+
+
+async def return_cohort_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)
+
+        # Собираем для каждого пользователя: месяц входа и набор месяцев активности
+        cohorts = defaultdict(set)        # cohort_month -> set(USER_TID)
+        activity_months = defaultdict(set)  # USER_TID -> set месяцов, в которые был DAU
+
+        for USER_TID, USER_VARS, USER_LSTS in data_users:
+            USER_VARS = json.loads(USER_VARS or "{}")
+            USER_LSTS = json.loads(USER_LSTS or "{}")
+            USER_DT = USER_VARS.get("USER_DT", "")
+            USER_DAU = USER_LSTS.get("USER_DAU", [])
+
+            # вычисляем месяц входа
+            entry_mo = datetime.strptime(USER_DT, "%d-%m-%Y_%H-%M-%S").strftime("%Y-%m")
+            cohorts[entry_mo].add(USER_TID)
+
+            # сохраняем месяцы активности
+            for day_str in USER_DAU:
+                try:
+                    mo = datetime.strptime(day_str, "%Y-%m-%d").strftime("%Y-%m")
+                    activity_months[USER_TID].add(mo)
+                except:
+                    pass
+
+        # Список уникальных месяцев cohort, отсортированный
+        cohort_months = sorted(cohorts.keys())
+
+        # Функция для прибавления месяцев
+        def add_months(mo_str, n):
+            y, m = map(int, mo_str.split("-"))
+            total = m + n
+            new_y = y + (total - 1) // 12
+            new_m = (total - 1) % 12 + 1
+            return f"{new_y:04d}-{new_m:02d}"
+
+        num_cohorts = len(cohort_months)
+
+        # Формируем таблицу: строки M1..M{num_cohorts}
+        table = []
+        header = ["Месяц/Когорта"]
+        # Добавляем в заголовок каждый cohort + его размер
+        for mo in cohort_months:
+            header.append(f"{mo} ({len(cohorts[mo])})")
+        header.append("∑")
+        table.append(header)
+
+        # Для каждой строки-месяца кортаций
+        for i in range(num_cohorts):
+            row = [f"M{i+1}"]
+            row_sum = 0
+            for j, cohort_mo in enumerate(cohort_months):
+                # вычисляем целевой месяц = cohort_mo + i месяцев
+                target_mo = add_months(cohort_mo, i)
+                if i == 0:
+                    # M1 = размер когорты
+                    val = len(cohorts[cohort_mo])
+                else:
+                    # считаем, сколько пользователей из когорты были активны в target_mo
+                    cnt = 0
+                    for uid in cohorts[cohort_mo]:
+                        if target_mo in activity_months.get(uid, set()):
+                            cnt += 1
+                    val = cnt
+                if val:
+                    row.append(str(val))
+                    row_sum += val
+                else:
+                    row.append("")
+            row.append(str(row_sum))
+            table.append(row)
+
+        # Записываем CSV
+        path = os.path.join(EXTRA_D, "3_cohort_metrics.csv")
+        with open(path, "w", newline="", encoding="utf-8") as f:
+            writer = csv.writer(f)
+            for r in table:
+                writer.writerow(r)
+
         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:

{yeref-0.24.59 → yeref-0.24.61}/yeref.egg-info/PKG-INFO

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