yeref 0.24.91__tar.gz → 0.24.92__tar.gz

{yeref-0.24.91 → yeref-0.24.92}/PKG-INFO

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

{yeref-0.24.91 → yeref-0.24.92}/setup.py

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

{yeref-0.24.91 → yeref-0.24.92}/yeref/yeref.py

@@ -16005,17 +16005,18 @@ async def calc_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
             ))
         print(f"gen {data_users=}")
 
-        await return_activity_metrics(bot, data_users, EXTRA_D, BASE_P, data_ents, schema_name)
-        await return_unit_metrics(bot, data_users, EXTRA_D, BASE_P)
-        await return_cohort_metrics(bot, data_users, EXTRA_D, BASE_P)
-        await return_retention_metrics(bot, data_users, EXTRA_D, BASE_P)
-        await return_profit_and_loss_metrics(bot, data_users, EXTRA_D, BASE_P)
+        r1 = await return_activity_metrics(bot, data_users, EXTRA_D, BASE_P, data_ents, schema_name)
+        r2 = await return_unit_metrics(bot, data_users, EXTRA_D, BASE_P)
+        r3 = await return_cohort_metrics(bot, data_users, EXTRA_D, BASE_P)
+        r4 = await return_retention_metrics(bot, data_users, EXTRA_D, BASE_P)
+        r5 = await return_profit_and_loss_metrics(bot, data_users, EXTRA_D, BASE_P)
     except Exception as e:
         logger.info(log_ % str(e))
         await asyncio.sleep(round(random.uniform(0, 1), 2))
 
 
 async def return_activity_metrics(bot, data_users, EXTRA_D, BASE_P, data_ents, schema_name):
+    result = None
     try:
         metrics_by_month = defaultdict(lambda: {
             "dau": 0,
@@ -16119,14 +16120,18 @@ async def return_activity_metrics(bot, data_users, EXTRA_D, BASE_P, data_ents, s
             csvfile.write(f"Unique wallet count: {len(wallets_set)}\n")
             csvfile.write(f"Unique users count: {len(users_set)}\n")
 
+        result = f_name
         thumb = types.FSInputFile(os.path.join(EXTRA_D, 'parse.jpg'))
         await bot.send_document(chat_id=my_tid, document=types.FSInputFile(f_name), thumbnail=thumb)
     except Exception as e:
         logger.info(log_ % str(e))
         await asyncio.sleep(round(random.uniform(0, 1), 2))
+    finally:
+        return result
 
 
 async def return_unit_metrics(bot, data_users, EXTRA_D):
+    result = None
     try:
         metrics = defaultdict(lambda: {
             "new_users": 0,
@@ -16211,8 +16216,8 @@ async def return_unit_metrics(bot, data_users, EXTRA_D):
                 "CAC": ""
             })
 
-        path = os.path.join(EXTRA_D, "2_unit_metrics.csv")
-        with open(path, "w", newline="", encoding="utf-8") as f:
+        f_name = os.path.join(EXTRA_D, "2_unit_metrics.csv")
+        with open(f_name, "w", newline="", encoding="utf-8") as f:
             writer = csv.writer(f)
             writer.writerow(["MO", "N", "MRR", "ARPU", "ARR", "ChurnR", "LTV1", "LTV2", "CMGR", "CAC"])
             for row in results:
@@ -16228,14 +16233,18 @@ async def return_unit_metrics(bot, data_users, EXTRA_D):
                 writer.writerow([])
                 writer.writerow([f"Rev ~ ×{round(avg, 2)} monthly"])
 
+        result = f_name
         thumb = types.FSInputFile(os.path.join(EXTRA_D, "parse.jpg"))
-        await bot.send_document(chat_id=my_tid, document=types.FSInputFile(path), thumbnail=thumb)
+        await bot.send_document(chat_id=my_tid, document=types.FSInputFile(f_name), thumbnail=thumb)
     except Exception as e:
         logger.info(log_ % str(e))
         await asyncio.sleep(round(random.uniform(0, 1), 2))
+    finally:
+        return result
 
 
 async def return_cohort_metrics(bot, data_users, EXTRA_D):
+    result = None
     try:
         cohorts = defaultdict(set)
         activity_months = defaultdict(set)
@@ -16311,22 +16320,26 @@ async def return_cohort_metrics(bot, data_users, EXTRA_D):
 
         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:
+        f_name = os.path.join(EXTRA_D, "3_cohort_metrics.csv")
+        with open(f_name, "w", newline="", encoding="utf-8") as f:
             writer = csv.writer(f)
             for r in table:
                 writer.writerow(r)
             writer.writerow([])
             writer.writerow([f"Churn ~ ×{avg_churn:.2f} monthly"])
 
+        result = f_name
         thumb = types.FSInputFile(os.path.join(EXTRA_D, "parse.jpg"))
-        await bot.send_document(chat_id=my_tid, document=types.FSInputFile(path), thumbnail=thumb)
+        await bot.send_document(chat_id=my_tid, document=types.FSInputFile(f_name), thumbnail=thumb)
     except Exception as e:
         logger.info(log_ % str(e))
         await asyncio.sleep(round(random.uniform(0, 1), 2))
+    finally:
+        return result
 
 
 async def return_retention_metrics(bot, data_users, EXTRA_D):
+    result = None
     try:
         rev_by_cohort = defaultdict(lambda: defaultdict(float))
         cohort_users = defaultdict(set)
@@ -16366,8 +16379,8 @@ async def return_retention_metrics(bot, data_users, EXTRA_D):
         num_cohorts = len(cohort_months)
         first_cohort = cohort_months[0]
 
-        path = os.path.join(EXTRA_D, "4_retention_metrics.csv")
-        with open(path, "w", newline="", encoding="utf-8") as f:
+        f_name = os.path.join(EXTRA_D, "4_retention_metrics.csv")
+        with open(f_name, "w", newline="", encoding="utf-8") as f:
             writer = csv.writer(f)
             header = ["Месяц/Когорта"] + [
                 f"{c} ({len(cohort_users[c])})" for c in cohort_months
@@ -16407,14 +16420,18 @@ async def return_retention_metrics(bot, data_users, EXTRA_D):
             writer.writerow([])
             writer.writerow([f"NRR ~ ×{avg_multiplier:.2f} monthly"])
 
+        result = f_name
         thumb = types.FSInputFile(os.path.join(EXTRA_D, "parse.jpg"))
-        await bot.send_document(chat_id=my_tid, document=types.FSInputFile(path), thumbnail=thumb)
+        await bot.send_document(chat_id=my_tid, document=types.FSInputFile(f_name), thumbnail=thumb)
     except Exception as e:
         logger.info(log_ % str(e))
         await asyncio.sleep(round(random.uniform(0, 1), 2))
+    finally:
+        return result
 
 
 async def return_profit_and_loss_metrics(bot, data_users, EXTRA_D):
+    result = None
     try:
         metrics = defaultdict(lambda: {"sum_amount": 0.0})
 
@@ -16461,8 +16478,8 @@ async def return_profit_and_loss_metrics(bot, data_users, EXTRA_D):
                 fmt(NP)
             ])
 
-        path = os.path.join(EXTRA_D, "5_profit_and_loss_metrics.csv")
-        with open(path, "w", newline="", encoding="utf-8") as f:
+        f_name = os.path.join(EXTRA_D, "5_profit_and_loss_metrics.csv")
+        with open(f_name, "w", newline="", encoding="utf-8") as f:
             writer = csv.writer(f)
             writer.writerow([
                 "Mo", "MRR", "COGS", "Gross Profit",
@@ -16471,11 +16488,14 @@ async def return_profit_and_loss_metrics(bot, data_users, EXTRA_D):
             for row in results:
                 writer.writerow(row)
 
+        result = f_name
         thumb = types.FSInputFile(os.path.join(EXTRA_D, "parse.jpg"))
-        await bot.send_document(chat_id=my_tid, document=types.FSInputFile(path), thumbnail=thumb)
+        await bot.send_document(chat_id=my_tid, document=types.FSInputFile(f_name), thumbnail=thumb)
     except Exception as e:
         logger.info(log_ % str(e))
         await asyncio.sleep(round(random.uniform(0, 1), 2))
+    finally:
+        return result
 # endregion
 
 

{yeref-0.24.91 → yeref-0.24.92}/yeref.egg-info/PKG-INFO

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