yeref 0.24.69__tar.gz → 0.24.70__tar.gz

{yeref-0.24.69 → yeref-0.24.70}/PKG-INFO

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

{yeref-0.24.69 → yeref-0.24.70}/setup.py

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

{yeref-0.24.69 → yeref-0.24.70}/yeref/yeref.py

@@ -16240,7 +16240,7 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
 
         months = ["2025-06", "2025-07", "2025-08", "2025-09"]
         data_users = []
-        for _ in range(20):
+        for _ in range(30):
             # дата входа
             entry_month = random.choice(months)
             entry_day = random.randint(1, 28)
@@ -16302,7 +16302,6 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             ))
         print(f"gen {data_users=}")
 
-
         cohorts = defaultdict(set)
         activity_months = defaultdict(set)
 
@@ -16365,7 +16364,7 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
                     row.append(str(val))
                     row_sum += val
                 else:
-                    row.append("")
+                    row.append("0")
 
             row.append(str(row_sum))
             table.append(row)
@@ -16391,7 +16390,7 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             for r in table:
                 writer.writerow(r)
             writer.writerow([])
-            writer.writerow([f"Churn ~ ×{avg_churn:.1f} monthly"])
+            writer.writerow([f"Churn ~ ×{avg_churn:.0f} 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)
@@ -16401,7 +16400,6 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         await asyncio.sleep(round(random.uniform(0, 1), 2))
 
 
-
 async def return_retention_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
     try:
         sql = 'SELECT USER_TID, USER_VARS, USER_LSTS FROM "USER"'
@@ -16409,7 +16407,7 @@ async def return_retention_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
 
         months = ["2025-06", "2025-07", "2025-08", "2025-09"]
         data_users = []
-        for _ in range(20):
+        for _ in range(30):
             # дата входа
             entry_month = random.choice(months)
             entry_day = random.randint(1, 28)
@@ -16471,57 +16469,89 @@ async def return_retention_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             ))
         print(f"gen {data_users=}")
 
-        # собираем выручку по пользователю и месяцу
-        user_month_rev = defaultdict(lambda: defaultdict(float))
+        # Собираем платежи и дату входа для каждого пользователя
+        rev_by_cohort = defaultdict(lambda: defaultdict(float))
+        cohort_users = defaultdict(set)
+
         for USER_TID, USER_VARS, USER_LSTS in data_users:
+            USER_VARS = json.loads(USER_VARS or "{}")
             USER_LSTS = json.loads(USER_LSTS or "{}")
+            dt_entry_raw = USER_VARS.get("USER_DT", "").split("_")[0]
+            if not dt_entry_raw:
+                continue
+            cohort_mo = datetime.strptime(dt_entry_raw, "%d-%m-%Y").strftime("%Y-%m")
+            cohort_users[cohort_mo].add(USER_TID)
+
             for pay in USER_LSTS.get("USER_PAYMENTS", []):
-                dt_p = datetime.strptime(pay.get("DT_START", ""), "%d-%m-%Y_%H-%M-%S")
-                mo = dt_p.strftime("%Y-%m")
+                dt_pay = datetime.strptime(pay.get("DT_START", ""), "%d-%m-%Y_%H-%M-%S")
+                pay_mo = dt_pay.strftime("%Y-%m")
+                # вычисляем разницу в месяцах
+                y0, m0 = map(int, cohort_mo.split("-"))
+                y1, m1 = map(int, pay_mo.split("-"))
+                offset = (y1 - y0) * 12 + (m1 - m0)
+                if offset < 0:
+                    continue
                 amt = float(pay.get("AMOUNT", 0)) * 0.013
-                user_month_rev[USER_TID][mo] += amt
+                rev_by_cohort[cohort_mo][offset] += amt
 
-        # список всех месяцев с выручкой, отсортированный
-        all_months = sorted({mo for revs in user_month_rev.values() for mo in revs.keys()})
-
-        results = []
-        for idx, mo in enumerate(all_months):
-            if idx == 0:
-                results.append({"MO": mo, "NRR": ""})
-                continue
-            prev_mo = all_months[idx - 1]
-            # общая выручка в prev_mo
-            prev_total = sum(user_month_rev[u][prev_mo] for u in user_month_rev if prev_mo in user_month_rev[u])
-            if prev_total == 0:
-                results.append({"MO": mo, "NRR": ""})
-                continue
-            # выручка текущего месяца от тех же пользователей
-            curr_existing = sum(
-                user_month_rev[u][mo]
-                for u in user_month_rev
-                if prev_mo in user_month_rev[u] and mo in user_month_rev[u]
-            )
-            nrr = curr_existing / prev_total
-            results.append({"MO": mo, "NRR": f"{nrr * 100:.2f}"})
+        cohort_months = sorted(cohort_users.keys())
+        # Определяем максимальный период
+        max_offset = 0
+        for c in cohort_months:
+            if rev_by_cohort[c]:
+                max_offset = max(max_offset, max(rev_by_cohort[c].keys()))
 
-        # средний NRR (арифметическое по ненулевым)
-        vals = [float(r["NRR"]) for r in results if r["NRR"]]
-        avg_nrr = f"{(sum(vals) / len(vals)):.2f}" if vals else ""
+        # Сумма выручки M1 для каждой когорты
+        base_rev = {c: rev_by_cohort[c].get(0, 0.0) for c in cohort_months}
 
+        # Формируем CSV-таблицу
         path = os.path.join(EXTRA_D, "4_retention_metrics.csv")
         with open(path, "w", newline="", encoding="utf-8") as f:
             writer = csv.writer(f)
-            writer.writerow(["MO", "NRR (%)"])
-            for r in results:
-                writer.writerow([r["MO"], r["NRR"]])
+            # Заголовок
+            header = ["Месяц / Когорта"]
+            for c in cohort_months:
+                header.append(f"{c} ({len(cohort_users[c])})")
+            header.append("∑")
+            writer.writerow(header)
+
+            # Строки M1..M{max_offset+1}
+            for i in range(max_offset + 1):
+                row_label = f"M{i+1} ({i} мес)"
+                row = [row_label]
+                row_sum = 0.0
+                for c in cohort_months:
+                    rev = rev_by_cohort[c].get(i, 0.0)
+                    if rev > 0 and base_rev[c] > 0:
+                        pct = rev / base_rev[c] * 100
+                        cell = f"{rev:.1f} ({pct:.0f}%)"
+                        row.append(cell)
+                        row_sum += rev
+                    else:
+                        row.append("")
+                row.append(f"{row_sum:.1f}")
+                writer.writerow(row)
+
+            # Средний рост NRR
+            growths = []
+            for c in cohort_months:
+                for i in range(1, max_offset + 1):
+                    prev = rev_by_cohort[c].get(i - 1, 0.0)
+                    curr = rev_by_cohort[c].get(i, 0.0)
+                    if prev > 0:
+                        growths.append((curr - prev) / prev)
+            avg_growth = (sum(growths) / len(growths) * 100) if growths else 0.0
+
             writer.writerow([])
-            writer.writerow([f"Avg NRR (%)", avg_nrr])
+            writer.writerow([f"Avg monthly NRR growth:", f"{avg_growth:.2f}%"])
 
         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.69 → yeref-0.24.70}/yeref.egg-info/PKG-INFO

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