From 1489b35077fbd1f2a8d9441f19c01dcd711a3371 Mon Sep 17 00:00:00 2001
From: jwu <jwu@bigquant.ai>
Date: Mon, 30 Dec 2024 11:29:22 +0800
Subject: [PATCH 1/4] upgrade this module to fit 3.0

---
 src/sql_join_2/__init__.py                    |  29 ++++----
 .../__pycache__/__init__.cpython-311.pyc      | Bin 0 -> 2555 bytes
 src/sql_join_2/meta.json                      |  62 ++++++++++++++++++
 3 files changed, 75 insertions(+), 16 deletions(-)
 create mode 100644 src/sql_join_2/__pycache__/__init__.cpython-311.pyc
 create mode 100644 src/sql_join_2/meta.json

diff --git a/src/sql_join_2/__init__.py b/src/sql_join_2/__init__.py
index 093063e..bb213f2 100644
--- a/src/sql_join_2/__init__.py
+++ b/src/sql_join_2/__init__.py
@@ -15,20 +15,6 @@
 # 是否自动缓存结果
 cacheable = True
 
-
-LEARNING_ALGORITHMS = {
-    "rank": "lambdarank",
-    "lambdarank": "lambdarank",
-    "regression": "regression",
-    "binaryclassification": "binaryclassification",
-    "排序": "lambdarank",
-    "回归": "regression",
-    "二分类": "binaryclassification",
-    "logloss": "logloss",
-}
-FAI_CLUSTERS = {"不加速": None}
-
-
 SQL_JOIN = """WITH
 sql1 AS (
     {sql1}
@@ -49,9 +35,20 @@ def run(
     """DAI 合并SQL。"""
     import dai
 
+    if not sql1 or not sql2:
+        raise ValueError("sql1 和 sql2 不能为空")
+
+    sql1 = sql1.read()
+    if isinstance(sql1, dict):
+        sql1 = sql1["sql"]
+
+    sql2 = sql2.read()
+    if isinstance(sql2, dict):
+        sql2 = sql2["sql"]
+
     # 拆分features_sql和label
-    sql_statements_1 = dai._functions.parse_query(sql1.read_text())
-    sql_statements_2 = dai._functions.parse_query(sql2.read_text())
+    sql_statements_1 = dai._functions.parse_query(sql1)
+    sql_statements_2 = dai._functions.parse_query(sql2)
 
     join_sql = sql_join.format(sql1=sql_statements_1.pop(), sql2=sql_statements_2.pop())
     join_sql = ";\n".join(list(set(sql_statements_1 + sql_statements_2))) + ";\n" + join_sql
diff --git a/src/sql_join_2/__pycache__/__init__.cpython-311.pyc b/src/sql_join_2/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..48b58d303486f765f9a91cc1f994501e234013df
GIT binary patch
literal 2555
zcma(STWk|YaL+#b&gaAqA=D%h#1xmt6^fP60s(}Slt6+=P?}Iu7wL5P&dGt}GkbSX
zf>SJr+7ubEs#f%eDwSwjN`&~TQdC4g`{|1;C0Yr|5(KFFQA_;s)!B0rFhPhp?|Nr;
zUOPK8`%87TfB-Jm;^BE0LJujj3{^{uX9O14kc^^8W@JZ#i8Ao-OgKiJQ740BHp<Gb
zs7rQ7-7**DWIoEvo~TFh#2Hy|AjNsYwn4SYUb$+fdfI`|Ef{5xeXsENU&B*l^LSTe
z)+ipic4qCg6EwkC(p2|~rgic=m9~bNI4=h#T+u3d{RE0u%Z>pQt~b|#{L}kCKECpE
z^9fB&h9Aw|cr^RlK>wkCsN%jbLzo`IcdEnvrj#^H8koo5-+6rb_Tr6+C%Lao>KAY?
z<|Y^a_&wM*)-YliDScNYa$FrgMMYX-+GymAdQy!Hj-5Q(GuSQYrxLBfj)7pa5Ck|!
z(QzTXmD1ZP>1{w4gn_O@T^|nyKM3ys<Zy4$mOgm6r;o1Mf=32=`VIt}Wyw&s2Gyi)
zU~^PS8exI3l+&yR|6mbp{qN5#_!(>^!am861~e1L6gXY2o>F3JT#bpw*_0wCrBTI}
zY+I3RTas)eJSY-rluQq3Egu<l5+~5Z4#LSwTrv{|sg+Da6XD#cgkmVRV&cY%VdA9e
zUI`#!!D%VBa)q$L!=U)HDM%4WJDPH6+?ht$k!Ezi@e;4>oMs>aV3gqklSWi(HB1BP
z)(UwX8Qcnj(#W7Tm!L9XFrS75uV3Co<0#F%l?A540`o=-Ooas|?K}acScWMYs#TCi
zmFFI3-$I6YMaGqOOuZC^7e><T)JySrL9dKq+VwVEGp@>bj=N>|6iu8}V9+950wb`z
zLMY9qU1NY&djBR&c2oYeJ&(H~GRut&P0>PF1!;GswsFqb@Pg@te|eqeX1GdDXdb*-
z1N-|rdV(vZ@Gx@$(<JOO8(^jd7+m}|TdvecvzMP<y!UAK?vtB$F>Q-s2d0;eX~f4I
zyM-`=eUw~7oU)`6;ZrGLDqR?Bn6OxpWFn|Kt#BzBgBq39m_Y<FZYE=fswH*eO-Wc+
z#8ak%&k}cB!=sWxoGC3uSX#4$O{h8$bj83lvxsm8tF$_mFAPizi*SccBV`(Tn1A6H
zrWc0kIY|wzez0yRw87|N>naL#2x>_LM*Ac>JsItB6rS&mjA)}uL{d#%!I75b{uq&!
z)1#VfCKNqFE!Y~`BB$E{BBH1!RYMe8QfG-1n@RjGXxs=x-v*VRL8U6>@@Edxujuuc
z5aZgBGwi<yzV-R~k1XHzf^U1C-wwN1+b^|$vpc&xv+n`7CKtNSTHJ;Lw}EmuF8J5x
zy0Ygc*|+5@xzYN@@4lQ5w9W-u?}V(tjzVBZo~>I5G`xmd^ark<zjQty`fxt9b1t;g
z3hgR{cI7+z=R1zfbsVuejutwOPM){?Lk0g(rhCC(cXjO2*!9qLJ->Nde*1oF^M0%8
zK%wb?)zDpN=(hYl1%J=qU6#K;KX}aYAIo$Xy}s<;d2eXW8=4xjye$Q93!Kwim2Lka
zl=n7S-ll@LDbF@NgV>?iO4kI0uI-*nlj0h5M96H$tOaB-cjd{w+fVQ3p8k|w{Q4d|
zdpBW=a9TM{bSfFdn_wn<O4ALIUeNo1?t!7x{*pmOZ*8UzZ-#Z)M>tWGwU{Upho%z`
zBtZGz%h~6KM`Hw1osU6=4Qr6Y)p4vUNjY)0{3>x&*2D?oiAk{$MLM2P2oKMXNFPJO
zrZj92Hm1pnog}s+_&qReTesbO&hIH(+>5ut2K8V67p9VvVVDKfm`9BZ$dj?ZA`0Xy
ze<dCXbs2ZjTc6>JH5)S3MPW;ZD^}HHJSEms#b)@@M%2%I#+0~5CRjo+EeJJ}o3dMS
zO?Qsvg-%Q8EC`(?Cu|g7x8b5<ZscD#DP`li&wp+H%gp<FEnjcJ*IU-fBd$6lO~faM
ga;Gi##)5le-qlp{ESs}!mZv=qW^D<rp6p=!57fJMa{vGU

literal 0
HcmV?d00001

diff --git a/src/sql_join_2/meta.json b/src/sql_join_2/meta.json
new file mode 100644
index 0000000..0ee546d
--- /dev/null
+++ b/src/sql_join_2/meta.json
@@ -0,0 +1,62 @@
+{
+  "name": "sql_join_2",
+  "version": 9999,
+  "owner": "bigquant",
+  "shared": true,
+  "data": {
+    "source_code": "",
+    "source_deps": "",
+    "cacheable": true,
+    "opensource": false,
+    "serviceversion": 9999,
+    "friendly_name": "SQL合并 2",
+    "category": "数据处理",
+    "arguments": "(sql1=, sql2=, sql_join='WITH\\nsql1 AS (\\n    {sql1}\\n),\\nsql2 AS (\\n    {sql2}\\n)\\n\\nSELECT * FROM sql1 JOIN sql2 USING (date, instrument)\\n')",
+    "doc": "DAI 合并SQL。",
+    "doc_url": "https://bigquant.com/wiki/",
+    "interface": [
+      {
+        "type_name": null,
+        "desc": "数据",
+        "specific_type_name": null,
+        "name": "data",
+        "optional": false,
+        "type": "通用",
+        "type_code": "output_port"
+      },
+      {
+        "type_name": null,
+        "desc": "sql 1，SQL 1",
+        "specific_type_name": "DataSource",
+        "name": "sql1",
+        "optional": false,
+        "type": "通用",
+        "type_code": "input_port"
+      },
+      {
+        "type_name": null,
+        "desc": "sql 2，SQL 2",
+        "specific_type_name": "DataSource",
+        "name": "sql2",
+        "optional": false,
+        "type": "通用",
+        "type_code": "input_port"
+      },
+      {
+        "type_name": "Script",
+        "desc": "合并SQL",
+        "specific_type_name": null,
+        "language": "",
+        "default": "WITH\nsql1 AS (\n    {sql1}\n),\nsql2 AS (\n    {sql2}\n)\n\nSELECT * FROM sql1 JOIN sql2 USING (date, instrument)\n",
+        "auto_complete_type": "sql",
+        "optional": true,
+        "type_code": "code",
+        "name": "sql_join"
+      }
+    ],
+    "visible": true,
+    "created_by": "biglearning"
+  },
+  "rank": 0,
+  "keep_source": false
+}
\ No newline at end of file

From aaa204a81b2ee28921b1a4c278f07d4c58b6d380 Mon Sep 17 00:00:00 2001
From: jwu <jwu@bigquant.ai>
Date: Mon, 30 Dec 2024 11:35:59 +0800
Subject: [PATCH 2/4] upgrade output format

---
 src/sql_join_2/__init__.py                    |   3 ++-
 .../__pycache__/__init__.cpython-311.pyc      | Bin 2555 -> 2566 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sql_join_2/__init__.py b/src/sql_join_2/__init__.py
index bb213f2..118306f 100644
--- a/src/sql_join_2/__init__.py
+++ b/src/sql_join_2/__init__.py
@@ -53,7 +53,8 @@ def run(
     join_sql = sql_join.format(sql1=sql_statements_1.pop(), sql2=sql_statements_2.pop())
     join_sql = ";\n".join(list(set(sql_statements_1 + sql_statements_2))) + ";\n" + join_sql
 
-    data = dai.DataSource.write_text(join_sql)
+    # data = dai.DataSource.write_text(join_sql)
+    data = dai.DataSource.write_json({"sql": join_sql})
     return I.Outputs(data=data)
 
 
diff --git a/src/sql_join_2/__pycache__/__init__.cpython-311.pyc b/src/sql_join_2/__pycache__/__init__.cpython-311.pyc
index 48b58d303486f765f9a91cc1f994501e234013df..ae7b35c0a8b5a0ee1abb8c23b73b1564f55ad3d3 100644
GIT binary patch
delta 210
zcmew@+$O@eoR^o20SMYeiqd)6HuCi|F)rCWk13srErq3qEt7FGJ1Zk2OIC4y-eexO
z&5Tx?53unuN_}8s;NkDFyUwk0iCbks>WYX9s%96t&988qPkzW=#b~=YhJ!IwhEd@I
z1CY4ECD5VRqc%Z)L(By(r;A)pSGb%$FasqXV3S}4X=7vH7wt&wNt+P8LgPT`1wP-4
de7;xsd_S<uOy0;TB?2=UY&?Xpn|z;B1^{*MK&k)$

delta 142
zcmZn@`7O-1oR^o20SKCfiqfyMZshA{VqCC!9#c9KQw`f@ZdOJ{mXg$plF0&Wn;DHa
zA7SHT6n?<X*JF2`TjdhB%7TcC+<I5I^(MbzuVS=WoX)|>Ce5hufkAq5E~f+wkojP8
g0jCHPtMuggoHC5kllO2+i9i&9Rlx|G$*(wN02v1-IsgCw


From 9779f676aba2957cdc83323b288eed2147b98698 Mon Sep 17 00:00:00 2001
From: jwu <jwu@bigquant.ai>
Date: Mon, 30 Dec 2024 11:36:14 +0800
Subject: [PATCH 3/4] upgrade output format

---
 src/sql_join_2/__init__.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/sql_join_2/__init__.py b/src/sql_join_2/__init__.py
index 118306f..2d7d780 100644
--- a/src/sql_join_2/__init__.py
+++ b/src/sql_join_2/__init__.py
@@ -53,7 +53,6 @@ def run(
     join_sql = sql_join.format(sql1=sql_statements_1.pop(), sql2=sql_statements_2.pop())
     join_sql = ";\n".join(list(set(sql_statements_1 + sql_statements_2))) + ";\n" + join_sql
 
-    # data = dai.DataSource.write_text(join_sql)
     data = dai.DataSource.write_json({"sql": join_sql})
     return I.Outputs(data=data)
 

From 06bc9cff04371b4225f32d36d70c717c1869a95a Mon Sep 17 00:00:00 2001
From: jwu <jwu@bigquant.ai>
Date: Mon, 30 Dec 2024 11:39:26 +0800
Subject: [PATCH 4/4] delete pycache

---
 .../__pycache__/__init__.cpython-311.pyc      | Bin 2566 -> 0 bytes
 src/sql_join_2/meta.json                      |  62 ------------------
 2 files changed, 62 deletions(-)
 delete mode 100644 src/sql_join_2/__pycache__/__init__.cpython-311.pyc
 delete mode 100644 src/sql_join_2/meta.json

diff --git a/src/sql_join_2/__pycache__/__init__.cpython-311.pyc b/src/sql_join_2/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index ae7b35c0a8b5a0ee1abb8c23b73b1564f55ad3d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2566
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

diff --git a/src/sql_join_2/meta.json b/src/sql_join_2/meta.json
deleted file mode 100644
index 0ee546d..0000000
--- a/src/sql_join_2/meta.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "name": "sql_join_2",
-  "version": 9999,
-  "owner": "bigquant",
-  "shared": true,
-  "data": {
-    "source_code": "",
-    "source_deps": "",
-    "cacheable": true,
-    "opensource": false,
-    "serviceversion": 9999,
-    "friendly_name": "SQL合并 2",
-    "category": "数据处理",
-    "arguments": "(sql1=, sql2=, sql_join='WITH\\nsql1 AS (\\n    {sql1}\\n),\\nsql2 AS (\\n    {sql2}\\n)\\n\\nSELECT * FROM sql1 JOIN sql2 USING (date, instrument)\\n')",
-    "doc": "DAI 合并SQL。",
-    "doc_url": "https://bigquant.com/wiki/",
-    "interface": [
-      {
-        "type_name": null,
-        "desc": "数据",
-        "specific_type_name": null,
-        "name": "data",
-        "optional": false,
-        "type": "通用",
-        "type_code": "output_port"
-      },
-      {
-        "type_name": null,
-        "desc": "sql 1，SQL 1",
-        "specific_type_name": "DataSource",
-        "name": "sql1",
-        "optional": false,
-        "type": "通用",
-        "type_code": "input_port"
-      },
-      {
-        "type_name": null,
-        "desc": "sql 2，SQL 2",
-        "specific_type_name": "DataSource",
-        "name": "sql2",
-        "optional": false,
-        "type": "通用",
-        "type_code": "input_port"
-      },
-      {
-        "type_name": "Script",
-        "desc": "合并SQL",
-        "specific_type_name": null,
-        "language": "",
-        "default": "WITH\nsql1 AS (\n    {sql1}\n),\nsql2 AS (\n    {sql2}\n)\n\nSELECT * FROM sql1 JOIN sql2 USING (date, instrument)\n",
-        "auto_complete_type": "sql",
-        "optional": true,
-        "type_code": "code",
-        "name": "sql_join"
-      }
-    ],
-    "visible": true,
-    "created_by": "biglearning"
-  },
-  "rank": 0,
-  "keep_source": false
-}
\ No newline at end of file