yeref 0.24.70__tar.gz → 0.24.71__tar.gz

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

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

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

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

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

@@ -16405,71 +16405,6 @@ async def return_retention_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         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(30):
-            # дата входа
-            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)
-
-            # вход в приложение
-            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=}")
-
-        # Собираем платежи и дату входа для каждого пользователя
         rev_by_cohort = defaultdict(lambda: defaultdict(float))
         cohort_users = defaultdict(set)
 
@@ -16485,7 +16420,6 @@ async def return_retention_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             for pay in USER_LSTS.get("USER_PAYMENTS", []):
                 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)
@@ -16495,56 +16429,45 @@ async def return_retention_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
                 rev_by_cohort[cohort_mo][offset] += amt
 
         cohort_months = sorted(cohort_users.keys())
-        # Определяем максимальный период
+        if not cohort_months:
+            return
+
         max_offset = 0
         for c in cohort_months:
             if rev_by_cohort[c]:
                 max_offset = max(max_offset, max(rev_by_cohort[c].keys()))
 
-        # Сумма выручки 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)
-            # Заголовок
-            header = ["Месяц / Когорта"]
-            for c in cohort_months:
-                header.append(f"{c} ({len(cohort_users[c])})")
-            header.append("∑")
+            header = ["Месяц / Когорта"] + [
+                f"{c} ({len(cohort_users[c])})" for c in cohort_months
+            ] + ["∑"]
             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 = [f"M{i+1} ({i} мес)"]
                 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}%)"
+                    if i == 0:
+                        pct = 100
+                        cell = f"{rev:.1f} ({pct}%)"
                         row.append(cell)
                         row_sum += rev
                     else:
-                        row.append("")
+                        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)
 
-            # Средний рост 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 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)
 

{yeref-0.24.70 → yeref-0.24.71}/yeref.egg-info/PKG-INFO

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