tfduck-bsd 0.18.3__tar.gz → 0.18.6__tar.gz

{tfduck-bsd-0.18.3/tfduck_bsd.egg-info → tfduck-bsd-0.18.6}/PKG-INFO

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

{tfduck-bsd-0.18.3 → tfduck-bsd-0.18.6}/setup.py

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

tfduck-bsd-0.18.6/tfduck/__init__.py

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

{tfduck-bsd-0.18.3 → tfduck-bsd-0.18.6}/tfduck/tga/tga.py

@@ -196,6 +196,7 @@ class ThinkDataQuery(BaseTga):
         retry_count=2,
         conn_timeout=30,
         tga_data_timeout=600,
+        retry_wait=1,
     ):
         """
         @des:从thinkdata的openapi获取数据----流式，为了节省内存---配合下面的getquerycsv
@@ -228,6 +229,7 @@ class ThinkDataQuery(BaseTga):
                 # else:
                 #     break
                 if 1:
+                    time.sleep(retry_wait)
                     continue
         if gol_e is not None:
             raise gol_e
@@ -281,7 +283,7 @@ class ThinkDataQuery(BaseTga):
                     if data["return_code"] == 0:
                         cols = data["data"]["headers"]
                         df = pandas.DataFrame(
-                            data=[], columns=cols, type=object
+                            data=[], columns=cols, dtype=object
                         )  # 保存表头
                         # 解决科学计数法的问题
                         df = df.astype(str)
@@ -307,7 +309,7 @@ class ThinkDataQuery(BaseTga):
                 i += 1
                 if len(datas) == block_size:  # 1000000条保存一次
                     df = pandas.DataFrame(
-                        data=datas, columns=cols, type=object
+                        data=datas, columns=cols, dtype=object
                     )  # 保存表头
                     # 解决科学计数法的问题
                     df = df.astype(str)
@@ -322,7 +324,9 @@ class ThinkDataQuery(BaseTga):
                     BMOBJ.clog(ctx, i)
             BMOBJ.clog(ctx, f"total: {i}")
             if len(datas) > 0:  # 保存最后收尾的
-                df = pandas.DataFrame(data=datas, columns=cols, type=object)  # 保存表头
+                df = pandas.DataFrame(
+                    data=datas, columns=cols, dtype=object
+                )  # 保存表头
                 # 解决科学计数法的问题
                 df = df.astype(str)
                 df = df.astype("string")
@@ -361,6 +365,7 @@ class ThinkDataQuery(BaseTga):
         retry_count=2,
         conn_timeout=30,
         tga_data_timeout=600,
+        retry_wait=1,
     ):
         """
         @des:从thinkdata的openapi获取数据----流式，为了节省内存---配合下面的getquerycsv
@@ -393,6 +398,7 @@ class ThinkDataQuery(BaseTga):
                 # else:
                 #     break
                 if 1:
+                    time.sleep(retry_wait)
                     continue
         if gol_e is not None:
             raise gol_e
@@ -409,6 +415,7 @@ class ThinkDataQuery(BaseTga):
         print_size=100000,
         conn_timeout=30,
         tga_data_timeout=600,
+        retry_wait=1,
     ):
         """
         @des: 接口装饰器--修改为get_data_csv，防止全面修改代码
@@ -423,6 +430,7 @@ class ThinkDataQuery(BaseTga):
             retry_count,
             conn_timeout,
             tga_data_timeout,
+            retry_wait,
         )
         return result
 

{tfduck-bsd-0.18.3 → tfduck-bsd-0.18.6/tfduck_bsd.egg-info}/PKG-INFO

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

tfduck-bsd-0.18.3/tfduck/__init__.py

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