yeref 0.24.80__tar.gz → 0.24.82__tar.gz

{yeref-0.24.80 → yeref-0.24.82}/PKG-INFO

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

{yeref-0.24.80 → yeref-0.24.82}/setup.py

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

{yeref-0.24.80 → yeref-0.24.82}/yeref/yeref.py

@@ -16373,16 +16373,15 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         total_lost = 0
         total_start = 0
         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
+                    lost = max(start_cnt - next_cnt, 0)
                     total_lost += lost
                     total_start += start_cnt
 
-        avg_churn = (total_lost / total_start * 100) if total_start else 0
+        avg_churn = (total_lost / total_start) if total_start else 0
 
         path = os.path.join(EXTRA_D, "3_cohort_metrics.csv")
         with open(path, "w", newline="", encoding="utf-8") as f:
@@ -16390,11 +16389,10 @@ 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:.0f} monthly"])
+            writer.writerow([f"Churn ~ ×{avg_churn:.2f} 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)
-
     except Exception as e:
         logger.info(log_ % str(e))
         await asyncio.sleep(round(random.uniform(0, 1), 2))
@@ -16555,6 +16553,131 @@ async def return_retention_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         await asyncio.sleep(round(random.uniform(0, 1), 2))
 
 
+async def return_profit_and_loss_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
+    try:
+        sql = 'SELECT 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=}")
+
+        metrics = defaultdict(lambda: {"sum_amount": 0.0})
+
+        for (USER_LSTS,) in data_users:
+            USER_LSTS = json.loads(USER_LSTS or "{}")
+            USER_PAYMENTS = USER_LSTS.get("USER_PAYMENTS", [])
+
+            for pay in USER_PAYMENTS:
+                dt_p = datetime.strptime(pay.get("DT_START", ""), "%d-%m-%Y_%H-%M-%S")
+                mo_p = dt_p.strftime("%Y-%m")
+                amt = float(pay.get("AMOUNT", 0)) * 0.013
+                metrics[mo_p]["sum_amount"] += amt
+
+        def fmt(x):
+            return f"{x:.2f}".rstrip("0").rstrip(".")
+
+        months_sorted = sorted(metrics.keys())
+        results = []
+
+        for mo in months_sorted:
+            MRR = metrics[mo]["sum_amount"]
+            COGS = 0.0
+            GP = MRR - COGS
+            OPEX = 4.5
+            OP = GP - OPEX
+            COMM = MRR * 0.3
+            EXCH = MRR * 0.01
+            NP = OP - COMM - EXCH
+
+            results.append([
+                mo.upper()[5:] + "_" + mo[:4],  # Format to "JUN_2024"
+                fmt(MRR),
+                fmt(COGS),
+                fmt(GP),
+                fmt(OPEX),
+                fmt(OP),
+                fmt(COMM),
+                fmt(EXCH),
+                fmt(NP)
+            ])
+
+        path = os.path.join(EXTRA_D, "4_profit_and_loss_metrics.csv")
+        with open(path, "w", newline="", encoding="utf-8") as f:
+            writer = csv.writer(f)
+            writer.writerow([
+                "Месяц", "Total MRR", "COGS", "Валовая прибыль",
+                "OPEX", "Операционная прибыль", "Комиссия (30%)", "Обмен (1%)", "Чистая прибыль"
+            ])
+            for row in results:
+                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.80 → yeref-0.24.82}/yeref.egg-info/PKG-INFO

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