tfduck-bsd 0.1.5__tar.gz → 0.19.8__tar.gz

tfduck_bsd-0.19.8/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2018 The Python Packaging Authority
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

tfduck_bsd-0.19.8/PKG-INFO

@@ -0,0 +1,31 @@
+Metadata-Version: 2.1
+Name: tfduck_bsd
+Version: 0.19.8
+Summary: A small example package
+Home-page: UNKNOWN
+Author: yuanxiao
+Author-email: yuan6785@163.com
+License: UNKNOWN
+Platform: UNKNOWN
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.5
+Description-Content-Type: text/markdown
+License-File: LICENSE
+
+# Example Package
+
+This is a simple example package. You can use
+[Github-flavored Markdown](https://guides.github.com/features/mastering-markdown/)
+> 测试命令行工具
+```
+tfd a1 a2
+```
+
+> 测试脚本内容
+```
+    >>> from tfduck_pkg.helloworld import HelloWorld
+    >>> HelloWorld().test()
+```
+

{tfduck-bsd-0.1.5 → tfduck_bsd-0.19.8}/setup.py

@@ -1,11 +1,14 @@
+"""
+未加密的tfduck/setup.py的代码
+"""
 import setuptools
 
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
 setuptools.setup(
-    name="tfduck-bsd",
-    version="0.1.5",
+    name="tfduck_bsd",
+    version="0.19.8",
     author="yuanxiao",
     author_email="yuan6785@163.com",
     description="A small example package",
@@ -15,9 +18,18 @@ setuptools.setup(
     packages=setuptools.find_packages(),
     # 需要安装的依赖
     install_requires=[
+         'arrow>=0.15.5',   
          'requests>=2.20.0',
          'django==2.2.12',
-         'oss2==2.5.0'
+         'oss2==2.15.0', # 原来是2.5.0
+         'ThinkingDataSdk==1.8.0', #1.1.14, 1.6.2 1.8.0支持字典和数组
+         'kubernetes==12.0.1',
+         'sagemaker==2.183.0', # 2.24.1# modify by yx 2023-02-27, 2023-09-18 到 2.183.0 [最后支持3.7的版本], 上一个版本2.135.0
+         'boto3==1.28.49', # 1.24.27 1.18.36 # modify by yx 2023-02-27, 2023-09-18 到 1.28.49, 上一个版本1.26.79
+         'trino==0.327.0'
+         # 下面的包不能放到这里安装,依赖太多，需要尽量简单
+         # 'importlib_metadata==1.6.1',
+         # 'duckdb==0.3.4'
     ],
     python_requires=">=3.5",
     classifiers=[

tfduck_bsd-0.19.8/tfduck/__init__.py

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

{tfduck-bsd-0.1.5 → tfduck_bsd-0.19.8}/tfduck/bdp_sdk_py/opends/opends.py

@@ -9,27 +9,32 @@ import requests
 import requests.adapters
 import six
 
-class BM(object):
-    def log_error(self, *args, **kwargs):
-        try:
-            if args:
-                print(args)
-            if kwargs:
-                print(kwargs)
-        except:
-            pass
-BMOBJ = BM()
-
-opends_api_url_prefix = 'https://open.bdp.cn'
+from tfduck.common.defines import BMOBJ
+
+# class BM(object):
+#     def log_error(self, *args, **kwargs):
+#         try:
+#             if args:
+#                 print(args)
+#             if kwargs:
+#                 print(kwargs)
+#         except:
+#             pass
+# BMOBJ = BM()
+
+# opends_api_url_prefix = 'https://open.bdp.cn'
+opends_api_url_prefix = 'http://172.22.129.1:8361' # 李波搭建的bdp传输后台 外网http://47.89.187.14:8361 内网：http://172.22.129.1:8361
 # yx_socks5_proxy = {"http": "socks5://127.0.0.1:1080",
-#                    "https": "socks5://127.0.0.1:1080"}  
-yx_socks5_proxy = {"http": "http://47.101.168.174:8899",
-                   "https": "http://47.101.168.174:8899"}
- # 走[国内代理]的好处，因为[BDP服务器]在北京，[BDP服务器]本身有超时机制，传输数据超时就触发连接中断错误，导致各种connection abort,ssl oef,enconet等错误
- # 数据从[美东]->[国内代理]，因为[国内代理]自己设置的，不存在[美东]->[国内代理]有数据超时的问题
- # 如果是[国内代理]-->[BDP服务器]，因为国内传输很快，所以就不会触发BDP的超时机制
-use_socks5_proxy = False 
-need_redirect = True
+#                    "https": "socks5://127.0.0.1:1080"}
+yx_socks5_proxy = {
+    "http": "http://bdp-proxy:okbdp@161.117.59.90:80",  # "http://47.101.168.174:8899",
+    "https": "http://bdp-proxy:okbdp@161.117.59.90:80",  # "http://47.101.168.174:8899"
+}
+# 走[国内代理]的好处，因为[BDP服务器]在北京，[BDP服务器]本身有超时机制，传输数据超时就触发连接中断错误，导致各种connection abort,ssl oef,enconet等错误
+# 数据从[美东]->[国内代理]，因为[国内代理]自己设置的，不存在[美东]->[国内代理]有数据超时的问题
+# 如果是[国内代理]-->[BDP服务器]，因为国内传输很快，所以就不会触发BDP的超时机制
+use_socks5_proxy = False
+need_redirect = False
 VERSION = "1.0.3"
 
 
@@ -54,13 +59,6 @@ class OpenDS:
             param = {}
         param['_t'] = time.time()
         param['access_token'] = self.token
-
-        headers = {
-            'Content-type': 'text/html;charset=utf-8',
-            'Content-Encoding': 'gzip',
-            "User-Agent": "bdp-sdk-python, {version}".format(version=VERSION)
-        }
-
         try_count = 0
         result = {}
         while True:
@@ -70,33 +68,40 @@ class OpenDS:
                 # BMOBJ.log_error("requests default retry count: %s" %
                 #                 requests.adapters.DEFAULT_RETRIES)
                 if payload:
+                    headers = {
+                        'Content-type': 'text/html;charset=utf-8',
+                        # 'Content-Encoding': 'gzip',
+                        "User-Agent": "bdp-sdk-python, {version}".format(version=VERSION)
+                    }
                     payload_str = u'%s' % json.dumps(payload)
                     # gzip
                     # s = io.StringIO() #only python2
                     # g = gzip.GzipFile(fileobj=s, mode='w')
-                    s = six.BytesIO()  # python 3
-                    payload_str = payload_str.encode("utf8")
-                    g = gzip.GzipFile(fileobj=s, mode='w')
-                    g.write(payload_str)
-                    g.close()
+                    if 0:
+                        s = six.BytesIO()  # python 3
+                        payload_str = payload_str.encode("utf8")
+                        g = gzip.GzipFile(fileobj=s, mode='w')
+                        g.write(payload_str)
+                        g.close()
+                    else:
+                        payload_str = payload_str.encode("utf8") # 不用gzip的方式
                     if use_socks5_proxy:
                         res = requests.post(
-                            _url, data=s.getvalue(), headers=headers, verify=False, timeout=(60, 3600), proxies=yx_socks5_proxy).text  # 连接超时60秒，读取超时3600秒
+                            _url, data=payload_str, headers=headers, verify=False, timeout=(60, 3600), proxies=yx_socks5_proxy).text  # 连接超时60秒，读取超时3600秒
                     else:
                         res = requests.post(
-                            _url, data=s.getvalue(), headers=headers, verify=False, timeout=(60, 3600)).text  # 连接超时60秒，读取超时3600秒
-                        # if 0: # 解压出来看看对不对
-                        #     test_value = s.getvalue()
-                        #     data = gzip.GzipFile('', 'rb', 9, six.BytesIO(test_value))
-                        #     page = data.read()
-                        #     jdata = json.loads(page.decode("utf8"))
-                        #     print(33333 ,len(jdata))
+                            _url, data=payload_str, headers=headers, verify=False, timeout=(60, 3600)).text  # 连接超时60秒，读取超时3600秒
                 else:
+                    headers = {
+                        'Content-type': 'text/html;charset=utf-8',
+                        # 'Content-Encoding': 'gzip',
+                        "User-Agent": "bdp-sdk-python, {version}".format(version=VERSION)
+                    }
                     if use_socks5_proxy:
-                        res = requests.post(
+                        res = requests.get(
                             _url, headers=headers, verify=False, timeout=(60, 3600), proxies=yx_socks5_proxy).text  # 连接超时60秒，读取超时3600秒
                     else:
-                        res = requests.post(
+                        res = requests.get(
                             _url, headers=headers, verify=False, timeout=(60, 3600)).text  # 连接超时60秒，读取超时3600秒
                 result = json.loads(res)
 
@@ -114,7 +119,7 @@ class OpenDS:
             # HttpServer默认设置了超时时间为2分钟，当一个请求的处理时间超过2分钟，HttpServer会自动将该请求的socket关闭掉，于是客户端便收到了 ECONNRESET 的错误信息了
             # 修改每次上传的最大条数可以减少这个ECONNRESET的出现问题
             # 例如: (Caused by SSLError(SSLError("bad handshake: SysCallError(104, 'ECONNRESET')",),))
-            # except IOError as e3: # 有时候是其他IO错误 
+            # except IOError as e3: # 有时候是其他IO错误
             #     try_count += 1
             #     BMOBJ.log_error(
             #         'can not connect to server, retry ... | reason: %s' % str(e3))