yeref 0.24.66__tar.gz → 0.24.68__tar.gz

{yeref-0.24.66 → yeref-0.24.68}/PKG-INFO

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

{yeref-0.24.66 → yeref-0.24.68}/setup.py

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

{yeref-0.24.66 → yeref-0.24.68}/yeref/yeref.py

@@ -16238,6 +16238,71 @@ async def return_cohort_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(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)
+
+            # вход в приложение
+            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=}")
+
+
         cohorts = defaultdict(set)
         activity_months = defaultdict(set)
 
@@ -16261,6 +16326,7 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
                     pass
 
         cohort_months = sorted(cohorts.keys())
+        num_months = len(cohort_months)
 
         def add_months(mo_str, n):
             y, m = map(int, mo_str.split("-"))
@@ -16269,7 +16335,7 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             new_m = (total - 1) % 12 + 1
             return f"{new_y:04d}-{new_m:02d}"
 
-        num_cohorts = len(cohort_months)
+        # Собираем таблицу посменно по календарным месяцам
         table = []
         header = ["Месяц/Когорта"]
         for mo in cohort_months:
@@ -16277,40 +16343,44 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         header.append("∑")
         table.append(header)
 
-        # Собираем саму таблицу
-        for i in range(num_cohorts):
+        # Матрица для подсчёта retention (counts[i][j] = активных из когорты j в календарном месяце i)
+        counts = [[0] * num_months for _ in range(num_months)]
+        for i in range(num_months):
+            calendar_mo = cohort_months[i]
             row = [f"M{i+1}"]
             row_sum = 0
-            for cohort_mo in cohort_months:
-                target_mo = add_months(cohort_mo, i)
-                if i == 0:
+
+            for j in range(num_months):
+                if j > i:
+                    row.append("")
+                    continue
+
+                cohort_mo = cohort_months[j]
+                if i == j:
+                    # первый месяц когорты
                     val = len(cohorts[cohort_mo])
                 else:
-                    cnt = sum(1 for uid in cohorts[cohort_mo] if target_mo in activity_months.get(uid, set()))
-                    val = cnt
+                    # считаем, сколько из когорты j активны в календарном месяце i
+                    val = sum(1 for uid in cohorts[cohort_mo] if calendar_mo in activity_months.get(uid, set()))
+
+                counts[i][j] = val
                 if val:
                     row.append(str(val))
                     row_sum += val
                 else:
                     row.append("")
+
             row.append(str(row_sum))
             table.append(row)
 
-        # Считаем общий отток по всем когортам
+        # Считаем средний ежемесячный churn
         total_lost = 0
         total_start = 0
-        for cohort_mo in cohort_months:
-            counts = []
-            for i in range(num_cohorts):
-                target_mo = add_months(cohort_mo, i)
-                if i == 0:
-                    count = len(cohorts[cohort_mo])
-                else:
-                    count = sum(1 for uid in cohorts[cohort_mo] if target_mo in activity_months.get(uid, set()))
-                counts.append(count)
-            for k in range(len(counts) - 1):
-                start_cnt = counts[k]
-                next_cnt = counts[k + 1]
+        for j in range(num_months):
+            # для каждой когорты собираем по календарным месяцам
+            for i in range(j, num_months - 1):
+                start_cnt = counts[i][j]
+                next_cnt = counts[i + 1][j]
                 if start_cnt > 0:
                     lost = start_cnt - next_cnt
                     total_lost += lost
@@ -16334,6 +16404,7 @@ 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"'

{yeref-0.24.66 → yeref-0.24.68}/yeref.egg-info/PKG-INFO

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