yeref 0.24.40__tar.gz → 0.24.42__tar.gz

{yeref-0.24.40 → yeref-0.24.42}/PKG-INFO

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

{yeref-0.24.40 → yeref-0.24.42}/setup.py

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

{yeref-0.24.40 → yeref-0.24.42}/yeref/yeref.py

@@ -15944,6 +15944,7 @@ async def return_view_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             "mau": 0,
             "wallets": 0,
             "tx": 0,
+            "pay": 0,
             "tvl": 0,
             "/start": 0,
             "/startapp": 0
@@ -15954,6 +15955,76 @@ async def return_view_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         users_set = set()
 
         def process_user_rows(rows):
+            # 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 rows:
                 USER_VARS = json.loads(USER_VARS or "{}")
                 USER_LSTS = json.loads(USER_LSTS or "{}")
@@ -15963,10 +16034,17 @@ async def return_view_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
                 USER_DAU = USER_LSTS.get("USER_DAU", [])
                 USER_MAU = USER_LSTS.get("USER_MAU", [])
                 USER_TXS = USER_LSTS.get("USER_TXS", [])
+                USER_PAYMENTS = USER_LSTS.get("USER_PAYMENTS", [])
                 USER_STATUSES = USER_LSTS.get("USER_STATUSES", [])
 
                 if USER_WALLET: wallets_set.add(USER_WALLET)
-                if not len(USER_STATUSES): users_set.add(USER_TID)
+                if USER_STATUSES:
+                    last_status = max(USER_STATUSES, key=lambda x: list(x.values())[0])
+                    last_key = list(last_status.keys())[0]
+                    if last_key not in ['left', 'kicked']:
+                        users_set.add(USER_TID)
+                else:
+                    users_set.add(USER_TID)
 
                 for day_str in USER_DAU:
                     dt_day = datetime.strptime(day_str, "%Y-%m-%d")
@@ -15984,13 +16062,16 @@ async def return_view_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
                         if USER_WALLET:
                             metrics_by_month[month_key]["wallets"] += 1
 
-                for tx in USER_TXS:
-                    dt_start = tx.get("DT_START", "")
-                    amount = int(tx.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]["tvl"] += amount
+                # for tx in USER_TXS:
+                #     dt_start = tx.get("DT_START", "")
+                #     amount = int(tx.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]["tvl"] += amount
+
+                metrics_by_month[month_key]["tx"] += len(USER_TXS)
+                metrics_by_month[month_key]["pay"] += len(USER_PAYMENTS)
 
                 if USER_DT:
                     dt_obj = datetime.strptime(USER_DT, "%d-%m-%Y_%H-%M-%S")
@@ -16002,17 +16083,19 @@ async def return_view_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             ENT_TID = item[0]
             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"{data_users=}")
             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)
+        print(f"{data_users=}")
         process_user_rows(data_users)
 
         all_months = sorted(metrics_by_month.keys())
         f_name = os.path.join(EXTRA_D, "1_metrics.csv")
         with open(f_name, mode="w", encoding="utf-8", newline="") as csvfile:
             writer = csv.writer(csvfile, delimiter=',')
-            writer.writerow(["MO", "DAU", "MAU", "Wallets", "Transactions", "TVL", "/start", "/startapp"])
+            writer.writerow(["MO", "DAU", "MAU", "Wallets", "TX Count", "PAY Count", "/start", "/startapp", "TVL"])
             for ym in all_months:
                 row = [
                     ym,
@@ -16020,9 +16103,10 @@ async def return_view_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
                     metrics_by_month[ym]["mau"],
                     metrics_by_month[ym]["wallets"],
                     metrics_by_month[ym]["tx"],
-                    "",
+                    metrics_by_month[ym]["pay"],
                     metrics_by_month[ym]["/start"],
                     metrics_by_month[ym]["/startapp"],
+                    "",
                 ]
                 writer.writerow(row)
             csvfile.write("\n")

{yeref-0.24.40 → yeref-0.24.42}/yeref.egg-info/PKG-INFO

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