yeref 0.24.69__py3-none-any.whl → 0.24.71__py3-none-any.whl

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,127 +16400,81 @@ 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"'
         data_users = await db_select_pg(sql, (), BASE_P)
 
-        months = ["2025-06", "2025-07", "2025-08", "2025-09"]
-        data_users = []
-        for _ in range(20):
-            # дата входа
-            entry_month = random.choice(months)
-            entry_day = random.randint(1, 28)
-            entry_date = f"{entry_month}-{entry_day:02}"
-            entry_dt_obj = datetime.strptime(entry_date, '%Y-%m-%d')
-            entry_dt = f"{entry_dt_obj.strftime('%d-%m-%Y')}_{datetime.now().strftime('%H-%M-%S')}"
-            utm = random.choice(["/start", "/startapp"])
-
-            # месяцы от входа и дальше
-            valid_months = [m for m in months if datetime.strptime(m + "-01", "%Y-%m-%d") >= entry_dt_obj.replace(day=1)]
-            if not valid_months:
-                valid_months = [entry_month]
-
-            user_mau = sorted(random.sample(valid_months, k=random.randint(1, len(valid_months))))
-            user_dau_dates = set()
-            txs, payments = [], []
-
-            # платеж
-            if user_mau:
-                pay_month = random.choice(user_mau)
-                pay_day = random.randint(1, 28)
-                pay_date = f"{pay_month}-{pay_day:02}"
-                dt_pay = datetime.strptime(pay_date, "%Y-%m-%d")
-                # if dt_pay >= entry_dt_obj:
-                payments = [{
-                    "TYPE": random.choice(["don", "sub", "pst"]),
-                    "DT_START": f"{dt_pay.strftime('%d-%m-%Y')}_14-00-00",
-                    "DT_END": "0",
-                    "AMOUNT": str(random.randint(1, 10))
-                }]
-                user_dau_dates.add(pay_date)
+        rev_by_cohort = defaultdict(lambda: defaultdict(float))
+        cohort_users = defaultdict(set)
 
-            # вход в приложение
-            user_dau_dates.add(entry_date)
-            for m in user_mau:
-                day = random.randint(1, 28)
-                visit = f"{m}-{day:02}"
-                dt_visit = datetime.strptime(visit, "%Y-%m-%d")
-                if dt_visit >= entry_dt_obj and random.random() < 0.7:
-                    user_dau_dates.add(visit)
-
-            # статусы (отток) с низкой вероятностью
-            USER_STATUSES = []
-            if random.random() < 0.2:  # 10% шанс оттока
-                churn_month = random.choice(valid_months)
-                churn_day = random.randint(1, 28)
-                churn_date = f"{churn_month}-{churn_day:02}"
-                churn_ts = datetime.strptime(churn_date, "%Y-%m-%d").strftime("%d-%m-%Y") + "_23-59-59"
-                USER_STATUSES = [{random.choice(["left", "kicked"]): churn_ts}]
-
-            user_dau = sorted(user_dau_dates)
-            wallet = f"wallet{random.randint(1, 100)}" if txs else random.choice([f"wallet{random.randint(1, 100)}", ""])
-
-            data_users.append((
-                random.randint(100000, 999999),
-                json.dumps({"USER_WALLET": wallet, "USER_UTM": utm, "USER_DT": entry_dt}),
-                json.dumps({"USER_DAU": user_dau, "USER_MAU": user_mau, "USER_TXS": txs,
-                            "USER_PAYMENTS": payments, "USER_STATUSES": USER_STATUSES})
-            ))
-        print(f"gen {data_users=}")
-
-        # собираем выручку по пользователю и месяцу
-        user_month_rev = defaultdict(lambda: defaultdict(float))
         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()})
+        cohort_months = sorted(cohort_users.keys())
+        if not cohort_months:
+            return
 
-        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}"})
+        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 ""
+        base_rev = {c: rev_by_cohort[c].get(0, 0.0) for c in cohort_months}
 
         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"]])
-            writer.writerow([])
-            writer.writerow([f"Avg NRR (%)", avg_nrr])
+            header = ["Месяц / Когорта"] + [
+                f"{c} ({len(cohort_users[c])})" for c in cohort_months
+            ] + ["∑"]
+            writer.writerow(header)
+
+            for i in range(max_offset + 1):
+                row = [f"M{i+1} ({i} мес)"]
+                row_sum = 0.0
+                for c in cohort_months:
+                    rev = rev_by_cohort[c].get(i, 0.0)
+                    if i == 0:
+                        pct = 100
+                        cell = f"{rev:.1f} ({pct}%)"
+                        row.append(cell)
+                        row_sum += rev
+                    else:
+                        if base_rev[c] > 0 and rev > 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)
 
         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.dist-info → yeref-0.24.71.dist-info}/METADATA

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

yeref-0.24.71.dist-info/RECORD

@@ -0,0 +1,8 @@
+yeref/__init__.py,sha256=Qpv3o6Xa78VdLcsSRmctGtpnYE9btpAkCekgGhgJyXM,49
+yeref/l_.py,sha256=LMX_olmJwq-tgoALJCnhV_fGrL_i_43yBLkLIcEVqGo,1176743
+yeref/tonweb.js,sha256=Jf6aFOQ1OIY4q7fINYz-m5LsI3seMus124M5SYYZmtE,443659
+yeref/yeref.py,sha256=mrSmu7Lp9EB_o7Xh47tbZJxZamujZfBXlLtTrAEKUsU,1050482
+yeref-0.24.71.dist-info/METADATA,sha256=nqpY31UqBjgapTkhgjx3PBXVkF5ApMcWmugeYGUSYVI,119
+yeref-0.24.71.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+yeref-0.24.71.dist-info/top_level.txt,sha256=yCQKchWHbfV-3OuQPYRdi2loypD-nmbDJbtt3OuKKkY,6
+yeref-0.24.71.dist-info/RECORD,,

yeref-0.24.69.dist-info/RECORD

@@ -1,8 +0,0 @@
-yeref/__init__.py,sha256=Qpv3o6Xa78VdLcsSRmctGtpnYE9btpAkCekgGhgJyXM,49
-yeref/l_.py,sha256=LMX_olmJwq-tgoALJCnhV_fGrL_i_43yBLkLIcEVqGo,1176743
-yeref/tonweb.js,sha256=Jf6aFOQ1OIY4q7fINYz-m5LsI3seMus124M5SYYZmtE,443659
-yeref/yeref.py,sha256=Bz4O6nHqtnk7yl1BEFKGa4QqwN8l0-yrVek7aMF3a2s,1053206
-yeref-0.24.69.dist-info/METADATA,sha256=5gcF9XblmBzDf_vsb5p-b4HE9HSZ7JW_W5XGJBO7d4A,119
-yeref-0.24.69.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-yeref-0.24.69.dist-info/top_level.txt,sha256=yCQKchWHbfV-3OuQPYRdi2loypD-nmbDJbtt3OuKKkY,6
-yeref-0.24.69.dist-info/RECORD,,