yeref 0.24.43__tar.gz → 0.24.45__tar.gz

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

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

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

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

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

@@ -15926,7 +15926,7 @@ async def upd_user_data(ENT_TID, data, web_app_init_data, PROJECT_USERNAME, BASE
 
 
 # region unit ecomonics
-async def return_view_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
+async def return_activity_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
     try:
         schema_name = "USER"
         if PROJECT_USERNAME == 'FereyBotBot':
@@ -15953,6 +15953,7 @@ async def return_view_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         seen_dau = set()
         wallets_set = set()
         users_set = set()
+        pay_set = set()
 
         def process_user_rows(rows, schema_name=""):
             # months = ["2025-06", "2025-07", "2025-08", "2025-09"]
@@ -16043,6 +16044,7 @@ async def return_view_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)
 
@@ -16062,16 +16064,22 @@ 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
-
-                metrics_by_month[month_key]["tx"] += len(USER_TXS)
-                metrics_by_month[month_key]["pay"] += len(USER_PAYMENTS)
+                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)
 
                 if USER_DT:
                     dt_obj = datetime.strptime(USER_DT, "%d-%m-%Y_%H-%M-%S")

{yeref-0.24.43 → yeref-0.24.45}/yeref.egg-info/PKG-INFO

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