yeref 0.24.61__tar.gz → 0.24.62__tar.gz

{yeref-0.24.61 → yeref-0.24.62}/PKG-INFO

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

{yeref-0.24.61 → yeref-0.24.62}/setup.py

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

{yeref-0.24.61 → yeref-0.24.62}/yeref.egg-info/PKG-INFO

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

{yeref-0.24.61 → yeref-0.24.62}/yeref/yeref.py

@@ -16135,70 +16135,6 @@ async def return_unit_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         })
         seen_new = set()
 
-        months = ["2025-06", "2025-07", "2025-08", "2025-09"]
-        data_users = []
-        for _ in range(20):
-            # дата входа
-            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:
-                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_STATUSES = []
-            if random.random() < 0.2:  # 10% шанс оттока
-                churn_month = random.choice(valid_months)
-                churn_day = random.randint(1, 28)
-                churn_date = f"{churn_month}-{churn_day:02}"
-                churn_ts = datetime.strptime(churn_date, "%Y-%m-%d").strftime("%d-%m-%Y") + "_23-59-59"
-                USER_STATUSES = [{random.choice(["left", "kicked"]): churn_ts}]
-
-            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, "USER_STATUSES": USER_STATUSES})
-            ))
-        print(f"gen {data_users=}")
-
         for USER_TID, USER_VARS, USER_LSTS in data_users:
             USER_VARS = json.loads(USER_VARS or "{}")
             USER_LSTS = json.loads(USER_LSTS or "{}")
@@ -16307,6 +16243,70 @@ async def return_cohort_metrics(bot, PROJECT_USERNAME, EXTRA_D, BASE_P):
         cohorts = defaultdict(set)        # cohort_month -> set(USER_TID)
         activity_months = defaultdict(set)  # USER_TID -> set месяцов, в которые был DAU
 
+        months = ["2025-06", "2025-07", "2025-08", "2025-09"]
+        data_users = []
+        for _ in range(20):
+            # дата входа
+            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:
+                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_STATUSES = []
+            if random.random() < 0.2:  # 10% шанс оттока
+                churn_month = random.choice(valid_months)
+                churn_day = random.randint(1, 28)
+                churn_date = f"{churn_month}-{churn_day:02}"
+                churn_ts = datetime.strptime(churn_date, "%Y-%m-%d").strftime("%d-%m-%Y") + "_23-59-59"
+                USER_STATUSES = [{random.choice(["left", "kicked"]): churn_ts}]
+
+            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, "USER_STATUSES": USER_STATUSES})
+            ))
+        print(f"gen {data_users=}")
+
         for USER_TID, USER_VARS, USER_LSTS in data_users:
             USER_VARS = json.loads(USER_VARS or "{}")
             USER_LSTS = json.loads(USER_LSTS or "{}")