yeref 0.24.42__tar.gz → 0.24.44__tar.gz

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

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

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

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

{yeref-0.24.42 → yeref-0.24.44}/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':
@@ -15954,7 +15954,7 @@ async def return_view_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         wallets_set = set()
         users_set = set()
 
-        def process_user_rows(rows):
+        def process_user_rows(rows, schema_name=""):
             # months = ["2025-06", "2025-07", "2025-08", "2025-09"]
             # data_users = []
             # for _ in range(3):
@@ -16083,8 +16083,8 @@ 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)
+            print(f"schema_name {data_users=}")
+            process_user_rows(data_users, schema_name)
 
         sql = f"SELECT USER_TID, USER_VARS, USER_LSTS FROM \"USER\""
         data_users = await db_select_pg(sql, (), BASE_P)
@@ -16095,17 +16095,17 @@ async def return_view_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         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", "TX Count", "PAY Count", "/start", "/startapp", "TVL"])
+            writer.writerow(["MO", "/start", "/startapp", "DAU", "MAU", "Wallets", "TX Count", "PAY Count", "TVL"])
             for ym in all_months:
                 row = [
                     ym,
+                    metrics_by_month[ym]["/start"],
+                    metrics_by_month[ym]["/startapp"],
                     metrics_by_month[ym]["dau"],
                     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)

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

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