yeref 0.24.45__tar.gz → 0.24.48__tar.gz

{yeref-0.24.45 → yeref-0.24.48}/PKG-INFO

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

{yeref-0.24.45 → yeref-0.24.48}/setup.py

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

{yeref-0.24.45 → yeref-0.24.48}/yeref/yeref.py

@@ -15955,7 +15955,7 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         users_set = set()
         pay_set = set()
 
-        def process_user_rows(rows, schema_name=""):
+        def process_user_rows(rows):
             # months = ["2025-06", "2025-07", "2025-08", "2025-09"]
             # data_users = []
             # for _ in range(3):
@@ -16044,7 +16044,6 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
                     last_key = list(last_status.keys())[0]
                     if last_key not in ['left', 'kicked']:
                         users_set.add(USER_TID)
-                        pay_set.add(USER_TID)
                 else:
                     users_set.add(USER_TID)
 
@@ -16066,20 +16065,15 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
 
                 for it in USER_TXS:
                     dt_start = it.get("DT_START", "")
-                    amount = int(it.get("AMOUNT", "0"))
                     dt_tx = datetime.strptime(dt_start, "%d-%m-%Y_%H-%M-%S")
                     month_key = dt_tx.strftime("%Y-%m")
                     metrics_by_month[month_key]["tx"] += 1
 
                 for it in USER_PAYMENTS:
                     dt_start = it.get("DT_START", "")
-                    amount = int(it.get("AMOUNT", "0"))
                     dt_tx = datetime.strptime(dt_start, "%d-%m-%Y_%H-%M-%S")
                     month_key = dt_tx.strftime("%Y-%m")
-                    metrics_by_month[month_key]["tx"] += 1
-
-                # metrics_by_month[month_key]["tx"] += len(USER_TXS)
-                # metrics_by_month[month_key]["pay"] += len(USER_PAYMENTS)
+                    metrics_by_month[month_key]["pay"] += 1
 
                 if USER_DT:
                     dt_obj = datetime.strptime(USER_DT, "%d-%m-%Y_%H-%M-%S")
@@ -16092,7 +16086,7 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             sql = f'SELECT USER_TID, USER_VARS, USER_LSTS FROM {schema_name}_{ENT_TID}.USER'
             data_users = await db_select_pg(sql, (), BASE_P)
             print(f"schema_name {data_users=}")
-            process_user_rows(data_users, schema_name)
+            process_user_rows(data_users)
 
         sql = f"SELECT USER_TID, USER_VARS, USER_LSTS FROM \"USER\""
         data_users = await db_select_pg(sql, (), BASE_P)
@@ -16100,7 +16094,7 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         process_user_rows(data_users)
 
         all_months = sorted(metrics_by_month.keys())
-        f_name = os.path.join(EXTRA_D, "1_metrics.csv")
+        f_name = os.path.join(EXTRA_D, "1_activity_metrics.csv")
         with open(f_name, mode="w", encoding="utf-8", newline="") as csvfile:
             writer = csv.writer(csvfile, delimiter=',')
             writer.writerow(["MO", "/start", "/startapp", "DAU", "MAU", "Wallets", "TX Count", "PAY Count", "TVL"])
@@ -16126,6 +16120,191 @@ async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
     except Exception as e:
         logger.info(log_ % str(e))
         await asyncio.sleep(round(random.uniform(0, 1), 2))
+
+
+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,
+            "sum_amount": 0.0,
+            "payments_count": 0,
+            "churn_count": 0
+        })
+        # набор пользователей, чтобы не дважды считать N в одном месяце
+        seen_new = set()
+
+        months = ["2025-06", "2025-07", "2025-08", "2025-09"]
+        data_users = []
+        for _ in range(3):
+            # дата входа
+            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 and random.random() < 0.5:
+                tx_month = random.choice(user_mau)
+                tx_day = random.randint(1, 28)
+                tx_date = f"{tx_month}-{tx_day:02}"
+                dt_tx = datetime.strptime(tx_date, "%Y-%m-%d")
+                if dt_tx >= entry_dt_obj:
+                    txs = [{
+                        "TYPE": random.choice(["don", "sub", "pst"]),
+                        "AMOUNT": str(random.randint(1, 10)),
+                        "ADDRESS": f"address{random.randint(1, 999)}",
+                        "DT_START": f"{dt_tx.strftime('%d-%m-%Y')}_12-00-00",
+                    }]
+                    user_dau_dates.add(tx_date)
+
+            # платеж
+            if user_mau and random.random() < 0.5:
+                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_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})
+            ))
+
+        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_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")
+                if (USER_TID, mo) not in seen_new:
+                    seen_new.add((USER_TID, mo))
+                    metrics[mo]["N"] += 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")
+                mo_p = dt_p.strftime("%Y-%m")
+                val = float(amt) * 0.013
+                metrics[mo_p]["sum_amount"] += val
+                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")
+                    metrics[mo_s]["churn_count"] += 1
+                    break
+
+        # список месяцев в порядке
+        all_months = sorted(metrics.keys())
+        results = []
+        first_mrr = None
+        for idx, mo in enumerate(all_months):
+            data = metrics[mo]
+            N = data["N"]
+            MRR = data["sum_amount"]
+
+            def fmt(x):
+                return (f"{x:.2f}".rstrip("0").rstrip(".")) if x is not None else ""
+            mrr_fmt = fmt(MRR)
+
+            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
+
+            # CMGR: от первого месяца до текущего
+            if idx == 0 or first_mrr is None or first_mrr == 0:
+                CMGR = None
+                if idx == 0:
+                    first_mrr = MRR
+            else:
+                CMGR = ((MRR / first_mrr) ** (1 / idx) ) - 1
+
+            results.append({
+                "MO": mo,
+                "N": str(N),
+                "MRR": mrr_fmt,
+                "ARPU": fmt(ARPU),
+                "ARR": fmt(ARR),
+                "ChurnR": fmt(ChurnR),
+                "LTV1": fmt(LTV1),
+                "CMGR": fmt(CMGR),
+                "CAC": ""
+            })
+
+        path = os.path.join(EXTRA_D, "2_unit_metrics.csv")
+        with open(path, "w", newline="", encoding="utf-8") as f:
+            writer = csv.writer(f)
+            writer.writerow(["MO", "N", "MRR", "ARPU", "ARR", "ChurnR", "LTV1", "CMGR", "CAC"])
+            for row in results:
+                writer.writerow([
+                    row["MO"], row["N"], row["MRR"], row["ARPU"], row["ARR"],
+                    row["ChurnR"], row["LTV1"], row["CMGR"], row["CAC"]
+                ])
+
+        # отправить файл
+        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.45 → yeref-0.24.48}/yeref.egg-info/PKG-INFO

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