yeref 0.24.39__tar.gz → 0.24.41__tar.gz

{yeref-0.24.39 → yeref-0.24.41}/PKG-INFO

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

{yeref-0.24.39 → yeref-0.24.41}/setup.py

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

{yeref-0.24.39 → yeref-0.24.41}/yeref/yeref.py

@@ -2437,7 +2437,7 @@ effects_real_my = {'5107584321108051014': '👍', '5159385139981059251': '❤',
 
 themes_ = ['🐥', '⛄', '💎', '👨\u200d🏫', '🌷', '💜', '🎄', '🎮']
 extra_prompt = 'hyper-realistic image, iphone photo, ultra-realistic photography, cinematic photo, uhd motion capture, high-contrast image, 8k camera, atmospheric light'
-short_description = f"""👩🏽‍💻 Web3ᵀᴼᴺ-@tg-#neuro apps
+short_description = f"""👩🏽‍💻 Web3ᵀᴼᴺ-@tg-#neuro apps for⋅ᯅ⋅creators
 
 Start: t.me/FereyDemoBot
 🇬🇧🇨🇳🇦🇪🇪🇸🇷🇺🇫🇷
@@ -15470,7 +15470,7 @@ async def pay_handler_for_all(bot, message, ideas_en, ideas_ru, PROJECT_USERNAME
         USER_LSTS["USER_PAYMENTS"] = USER_PAYMENTS
         USER_LSTS = json.dumps(USER_LSTS, ensure_ascii=False)
 
-        sql = f"UPDATE \"USER\" SET USER_PAY=$1 WHERE USER_TID=$2"
+        sql = f"UPDATE \"USER\" SET USER_LSTS=$1 WHERE USER_TID=$2"
         await db_change_pg(sql, (USER_LSTS, chat_id,), BASE_P)
 
         text = f"{l_payment_success[lz]} ★{total_amount}, {payload_txt}\n\n♥️ @{PROJECT_USERNAME} {l_payment_hashtag[lz]}"
@@ -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
@@ -15963,6 +15964,7 @@ 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)
@@ -15984,13 +15986,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")
@@ -16012,7 +16017,7 @@ 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", "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 +16025,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.39 → yeref-0.24.41}/yeref.egg-info/PKG-INFO

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