tfduck-bsd 0.16.8__tar.gz → 0.17.0__tar.gz

{tfduck-bsd-0.16.8/tfduck_bsd.egg-info → tfduck-bsd-0.17.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tfduck-bsd
-Version: 0.16.8
+Version: 0.17.0
 Summary: A small example package
 Home-page: UNKNOWN
 Author: yuanxiao

{tfduck-bsd-0.16.8 → tfduck-bsd-0.17.0}/setup.py

@@ -8,7 +8,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="tfduck-bsd",
-    version="0.16.8",
+    version="0.17.0",
     author="yuanxiao",
     author_email="yuan6785@163.com",
     description="A small example package",

tfduck-bsd-0.17.0/tfduck/__init__.py

@@ -0,0 +1 @@
+__version__="0.17.0"

{tfduck-bsd-0.16.8 → tfduck-bsd-0.17.0}/tfduck/tga/train_sql_ltv.py

@@ -243,6 +243,7 @@ class TrainFeatureSql(BaseTga):
                 SELECT
                     a1.user_register_time as user_register_time,
                     a1."#user_id" as user_user_id,
+                    a1."#distinct_id" as user_distinct_id,
                     b1."#user_id" as event_user_id,
                     CASE WHEN b1."yiap__itemrevenue" is NULL THEN 0 ELSE b1."yiap__itemrevenue" END yiap__itemrevenue,    
                     CASE WHEN b1."sdk_ad_price" is NULL THEN 0 ELSE b1."sdk_ad_price" END sdk_ad_price,
@@ -260,11 +261,11 @@ class TrainFeatureSql(BaseTga):
                         FROM
                         (
                             SELECT
-                                b.event_time_utc as user_register_time, a."#user_id"
+                                b.event_time_utc as user_register_time, a."#user_id", a."#distinct_id"
                             FROM
                             (
                                 SELECT
-                                    "#user_id"
+                                    "#user_id","#distinct_id"
                                 FROM
                                     {gconf.tga_user_table}
                                 WHERE
@@ -333,13 +334,15 @@ class TrainFeatureSql(BaseTga):
             -- (abs(from_ieee754_64(xxhash64(cast(cast(user_user_id as varchar) as varbinary)))) % 100) / 100. as tt_stable_rand 
             -- 直接用user_user_id作为排序值，排序的必须是唯一的，否则下面会对不上，会产生很多null的数据
             -- user_user_id as tt_stable_rand  -- 这种方式最保险，但是不能乱序，这样采样的数据就不是随机分布在每天的 
-            bitwise_xor(user_user_id, 906867964886667264) as tt_stable_rand  -- 这种方式可能会产生left null的情况，但是是少数，过滤掉就行，不影响结果，但支持乱序采样
+            -- bitwise_xor(user_user_id, 906867964886667264) as tt_stable_rand  -- 这种方式可能会产生left null的情况，但是是少数，过滤掉就行，不影响结果，但支持乱序采样
+            a3.user_distinct_id as tt_stable_rand  -- 这种方式最保险，即是乱序也是唯一
 
         FROM
         (
             -- 获取指定日期的注册用户 连接 这些用户在7-10天后的触发的事件 的 数量
             SELECT
                a2_1.user_user_id,
+               a2_1.user_distinct_id,
                a2_1.user_register_time,
                {
                 [
@@ -351,6 +354,7 @@ class TrainFeatureSql(BaseTga):
             FROM (
                 SELECT
                     a2.user_user_id as user_user_id,
+                    a2.user_distinct_id as user_distinct_id,
                     a2.user_register_time as user_register_time,
                     SUM(
                         CASE
@@ -370,7 +374,7 @@ class TrainFeatureSql(BaseTga):
                 (
                     new_user
                 ) a2
-                GROUP BY a2.user_user_id, a2.user_register_time
+                GROUP BY a2.user_user_id, a2.user_distinct_id, a2.user_register_time
             ) a2_1
         ) a3
     )

{tfduck-bsd-0.16.8 → tfduck-bsd-0.17.0}/tfduck/tga/train_sql_retain.py

@@ -232,6 +232,7 @@ class TrainFeatureSql(BaseTga):
                 SELECT
                     a1.user_register_time as user_register_time,
                     a1."#user_id" as user_user_id,
+                    a1."#distinct_id" as user_distinct_id,
                     b1."#user_id" as event_user_id,
                     -- b1."event_time_utc" as pd_event_time_utc,
                     floor(to_unixtime(b1.event_time_utc))-floor(to_unixtime(a1.user_register_time)) as pd_rt_dur
@@ -248,11 +249,12 @@ class TrainFeatureSql(BaseTga):
                         FROM
                         (
                             SELECT
-                                b.event_time_utc as user_register_time, a."#user_id"
+                                b.event_time_utc as user_register_time, a."#user_id", a."#distinct_id"
                             FROM
                             (
                                 SELECT
-                                    "#user_id"
+                                    "#user_id",
+                                    "#distinct_id"
                                 FROM
                                     {gconf.tga_user_table}
                                 WHERE
@@ -318,12 +320,14 @@ class TrainFeatureSql(BaseTga):
             -- (abs(from_ieee754_64(xxhash64(cast(cast(user_user_id as varchar) as varbinary)))) % 100) / 100. as tt_stable_rand 
             -- 直接用user_user_id作为排序值，排序的必须是唯一的，否则下面会对不上，会产生很多null的数据
             -- user_user_id as tt_stable_rand  -- 这种方式最保险，但是不能乱序，这样采样的数据就不是随机分布在每天的 
-            bitwise_xor(user_user_id, 906867964886667264) as tt_stable_rand  -- 这种方式可能会产生left null的情况，但是是少数，过滤掉就行，不影响结果，但支持乱序采样
+            -- bitwise_xor(user_user_id, 906867964886667264) as tt_stable_rand  -- 这种方式也不太行，数据会几种在某一天
+            a3.user_distinct_id as tt_stable_rand  -- 这种方式最保险，即是乱序也是唯一
         FROM
         (
             -- 获取指定日期的注册用户 连接 这些用户在7-10天后的触发的事件 的 数量
             SELECT
                 a2.user_user_id as user_user_id,
+                a2.user_distinct_id as user_distinct_id,
                 a2.user_register_time as user_register_time,
                 SUM(
                     CASE
@@ -336,7 +340,7 @@ class TrainFeatureSql(BaseTga):
             (
                 new_user
             ) a2
-            GROUP BY a2.user_user_id, a2.user_register_time
+            GROUP BY a2.user_user_id, a2.user_distinct_id, a2.user_register_time
         ) a3
     )
     , nav_table as (

{tfduck-bsd-0.16.8 → tfduck-bsd-0.17.0}/tfduck/tga/train_sql_yh.py

@@ -232,6 +232,7 @@ class TrainFeatureSql(BaseTga):
                 SELECT
                     a1.user_register_time as user_register_time,
                     a1."#user_id" as user_user_id,
+                    a1."#distinct_id" as user_distinct_id,
                     b1."#user_id" as event_user_id,
                     -- b1."event_time_utc" as pd_event_time_utc,
                     floor(to_unixtime(b1.event_time_utc))-floor(to_unixtime(a1.user_register_time)) as pd_rt_dur
@@ -248,11 +249,11 @@ class TrainFeatureSql(BaseTga):
                         FROM
                         (
                             SELECT
-                                b.event_time_utc as user_register_time, a."#user_id"
+                                b.event_time_utc as user_register_time, a."#user_id", a."#distinct_id"
                             FROM
                             (
                                 SELECT
-                                    "#user_id"
+                                    "#user_id","#distinct_id"
                                 FROM
                                     {gconf.tga_user_table}
                                 WHERE
@@ -322,19 +323,21 @@ class TrainFeatureSql(BaseTga):
             -- (abs(from_ieee754_64(xxhash64(cast(cast(user_user_id as varchar) as varbinary)))) % 100) / 100. as tt_stable_rand 
             -- 直接用user_user_id作为排序值，排序的必须是唯一的，否则下面会对不上，会产生很多null的数据
             -- user_user_id as tt_stable_rand  -- 这种方式最保险，但是不能乱序，这样采样的数据就不是随机分布在每天的 
-            bitwise_xor(user_user_id, 906867964886667264) as tt_stable_rand  -- 这种方式可能会产生left null的情况，但是是少数，过滤掉就行，不影响结果，但支持乱序采样
+            --bitwise_xor(user_user_id, 906867964886667264) as tt_stable_rand  -- 这种方式可能会产生left null的情况，但是是少数，过滤掉就行，不影响结果，但支持乱序采样
+            a3.user_distinct_id as tt_stable_rand  -- 这种方式最保险，即是乱序也是唯一
         FROM
         (
             -- 获取指定日期的注册用户 连接 这些用户在7-10天后的触发的事件 的 数量
             SELECT
                 a2.user_user_id as user_user_id,
+                a2.user_distinct_id as user_distinct_id,
                 a2.user_register_time as user_register_time,
                 SUM(CASE WHEN a2.event_user_id IS NULL THEN 0 ELSE 1 END) AS event_count
             FROM
             (
                 new_user
             ) a2
-            GROUP BY a2.user_user_id, a2.user_register_time
+            GROUP BY a2.user_user_id, a2.user_distinct_id, a2.user_register_time
         ) a3
     )
     , nav_table as (

{tfduck-bsd-0.16.8 → tfduck-bsd-0.17.0/tfduck_bsd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tfduck-bsd
-Version: 0.16.8
+Version: 0.17.0
 Summary: A small example package
 Home-page: UNKNOWN
 Author: yuanxiao

tfduck-bsd-0.16.8/tfduck/__init__.py

@@ -1 +0,0 @@
-__version__="0.16.8"