tushare 1.4.5__py3-none-any.whl → 1.4.7__py3-none-any.whl

tushare/__init__.py

@@ -2,7 +2,7 @@
 import codecs
 import os
 
-__version__ = '1.4.5'
+__version__ = '1.4.7'
 __author__ = 'Jimmy Liu'
 
 """

tushare/pro/data_pro.py

@@ -3,7 +3,7 @@
 pro init 
 Created on 2018/07/01
 @author: Jimmy Liu
-@group : https://waditu.com
+@group : https://tushare.pro
 @contact: jimmysoa@sina.cn
 """
 from __future__  import division
@@ -12,8 +12,8 @@ from tushare.pro import client
 from tushare.util import upass
 from tushare.util.formula import MA
 
-PRICE_COLS = ['open', 'close', 'high', 'low']
-FORMAT = lambda x: '%.4f' % x
+PRICE_COLS = ['open', 'close', 'high', 'low', 'pre_close']
+FORMAT = lambda x: '%.2f' % x
 FREQS = {'D': '1DAY',
          'W': '1WEEK',
          'Y': '1YEAR',
@@ -48,6 +48,7 @@ def pro_bar(ts_code='', api=None, start_date='', end_date='', freq='D', asset='E
            adjfactor = False,
            offset = None,
            limit = None,
+           fields = '',
            contract_type = '',
            retry_count = 3):
     """
@@ -143,6 +144,11 @@ def pro_bar(ts_code='', api=None, start_date='', end_date='', freq='D', asset='E
                         data['pct_chg'] = data['pct_chg'].map(lambda x: FORMAT(x)).astype(float)
                     else:
                         data = data.drop(['trade_date', 'pre_close'], axis=1)
+                else:
+                    data['pre_close'] = data['close'].shift(-1)
+                    data['change'] = data['close'] - data['pre_close']
+                    data['pct_chg'] = data['change'] / data['pre_close'] * 100
+                    data['pct_chg'] = data['pct_chg'].map(lambda x: FORMAT(x)).astype(float)
             elif asset == 'I':
                 if freq == 'D':
                     data = api.index_daily(ts_code=ts_code, start_date=start_date, end_date=end_date, offset=offset, limit=limit)
@@ -161,7 +167,7 @@ def pro_bar(ts_code='', api=None, start_date='', end_date='', freq='D', asset='E
                 if freq == 'D':
                     data = api.opt_daily(ts_code=ts_code, start_date=start_date, end_date=end_date, exchange=exchange, offset=offset, limit=limit)
                 if 'min' in freq:
-                    data = api.stk_mins(ts_code=ts_code, start_date=start_date, end_date=end_date, freq=freq, offset=offset, limit=limit)
+                    data = api.opt_mins(ts_code=ts_code, start_date=start_date, end_date=end_date, freq=freq, offset=offset, limit=limit)
             elif asset == 'CB':
                 if freq == 'D':
                     data = api.cb_daily(ts_code=ts_code, start_date=start_date, end_date=end_date, offset=offset, limit=limit)
@@ -175,11 +181,8 @@ def pro_bar(ts_code='', api=None, start_date='', end_date='', freq='D', asset='E
                     freq = 'daily'
                 elif freq == 'w':
                     freq = 'week'
-                data = api.coinbar(
-                    exchange=exchange, symbol=ts_code, freq=freq,
-                    start_dae=start_date, end_date=end_date,
-                    contract_type=contract_type
-                )
+                data = api.coinbar(exchange=exchange, symbol=ts_code, freq=freq, start_dae=start_date, end_date=end_date,
+                                   contract_type=contract_type)
             if ma is not None and len(ma) > 0:
                 for a in ma:
                     if isinstance(a, int):
@@ -191,6 +194,9 @@ def pro_bar(ts_code='', api=None, start_date='', end_date='', freq='D', asset='E
         except Exception as e:
             print(e)
         else:
+            if fields is not None and fields != '':
+                f_list = [col.strip() for col in fields.split(',')]
+                data = data[f_list]
             return data
     raise IOError('ERROR.')
 
@@ -211,5 +217,7 @@ def ht_subs(username, password):
 
 
 if __name__ == '__main__':
-    # upass.set_token('')
+#     upass.set_token('')
     pro = pro_api()
+    df = pro_bar(ts_code='688539.SH', adj='qfq')
+    print(df)

tushare/stock/rtq.py

@@ -563,10 +563,10 @@ def get_realtime_quotes_dc(symbols="688553"):
     if not data_info:
         return pd.DataFrame()
     name = data_info["f58"]
-    open = data_info["f45"]  # / 100
+    open = data_info["f46"]  # / 100
     high = data_info["f44"]  # / 100
     pre_close = data_info["f60"]  # / 100
-    low = data_info["f46"]  # / 100
+    low =  data_info["f45"] # / 100
     price = data_info["f43"]  # / 100 if data_info["f43"] != "-" else ""
     b5_v = format_str_to_float(data_info["f12"])
     b5_p = data_info["f11"]  # / 100 if data_info["f11"] != "-" else ""
@@ -636,8 +636,8 @@ def format_str_to_float(x):
 
 if __name__ == '__main__':
     # df = realtime_quote(ts_code="000688.SH,000010.SH,000012.SH,399005.SZ", src="sina")
-    df = realtime_list(src="sina", page_count=1)
-    print(df)
+    # df = realtime_list(src="sina", page_count=1)
+    # print(df)
     ts_code = '399005.SZ'
     ts_code = '000001.SZ'
     # ts_code = '836149.BJ'
@@ -647,3 +647,5 @@ if __name__ == '__main__':
     ts_code = '688111.SH'
     df = realtime_quote(src="dc", ts_code=ts_code)
     print(df)
+
+

{tushare-1.4.5.dist-info → tushare-1.4.7.dist-info}/METADATA

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: tushare
-Version: 1.4.5
+Version: 1.4.7
 Summary: A utility for crawling historical and Real-time Quotes data of China stocks
 Home-page: https://tushare.pro
 Author: Jimmy Liu
 Author-email: waditu@163.com
 License: BSD
 Keywords: Global Financial Data
-Platform: UNKNOWN
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
@@ -16,17 +15,13 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: License :: OSI Approved :: BSD License
 Description-Content-Type: text/plain
+License-File: LICENSE
 Requires-Dist: pandas
 Requires-Dist: requests
 Requires-Dist: lxml
 Requires-Dist: simplejson
-Requires-Dist: bs4 ==0.0.1
+Requires-Dist: bs4
 Requires-Dist: websocket-client ==0.57.0
-Requires-Dist: pytdx
-Requires-Dist: protobuf
-Requires-Dist: grpcio
-Requires-Dist: pycryptodome
-Requires-Dist: pydantic
 Requires-Dist: tqdm
 
 
@@ -54,21 +49,21 @@ Installation
 --------------
 
     pip install tushare
-
+    
 Upgrade
 ---------------
 
     pip install tushare --upgrade
-
+    
 Quick Start
 --------------
 
 ::
 
     import tushare as ts
-
+    
     ts.get_hist_data('600848')
-
+    
 return::
 
                 open    high   close     low     volume    p_change  ma5     
@@ -81,10 +76,14 @@ return::
     2012-01-18   7.000   7.300   6.890   6.880   13075.40     0.44   6.788
     2012-01-19   6.690   6.950   6.890   6.680    6117.32     0.00   6.770
     2012-01-20   6.870   7.080   7.010   6.870    6813.09     1.74   6.832
-
-
+    
+    
 Log
 --------------
+1.4.6
+-------
+- 修复 realtime_quote 实时盘口TICK快照(爬虫版)
+- 修复dc OPEN和LOW 值相反问题
 1.4.0
 -------
 - 增加 银河证券实时行情数据入口
@@ -96,6 +95,4 @@ Log
 1.2.73
 -------
 - 支持华泰实时数据15SECOND
-
-
-
+    

{tushare-1.4.5.dist-info → tushare-1.4.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-tushare/__init__.py,sha256=BRDLaOC6I6WPuhh1rcVboWFcUF-uGxw0F8Sbqxj3EOQ,4764
+tushare/__init__.py,sha256=psVu0ZLbywMr4wTiS7FWfrPJWsW7ks8EpgXY2qREgng,4764
 tushare/bond/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tushare/bond/bonds.py,sha256=PJM0xDiWZDpOPwDtbEU9PdP0M_Gu0c599YuB1rbZ3r8,232
 tushare/coins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -18,7 +18,7 @@ tushare/internet/caixinnews.py,sha256=IwNOB5F1q_CxfuP93-jgUpTW5yY5NANPRJXySm_bj2
 tushare/internet/indexes.py,sha256=oteQCv0k2X0pbhXRHwMSviD1AowJWE6xRjKkqr5RNCo,3595
 tushare/pro/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tushare/pro/client.py,sha256=91jKHO9OPrNWPp3193edresGg6UoX0NlmOqAdf0mX4A,1312
-tushare/pro/data_pro.py,sha256=Aej_6I0JkA2Evih4O8GDheTity2GgBPvIucLgfHS9js,10332
+tushare/pro/data_pro.py,sha256=SOHbK-j9CmZguuv0CLIT-Z3hUynEy96mbvvhrGN6y9I,10883
 tushare/stock/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tushare/stock/billboard.py,sha256=vCrbN7-NGXSpXMc8jq7NcjjHyu9pTcr4uXp559iA1wA,12833
 tushare/stock/classifying.py,sha256=3yWqlLhgj2irk-9ksKWFFS5HY-SnjfEr5erwJxBidG8,10539
@@ -34,7 +34,7 @@ tushare/stock/news_vars.py,sha256=CQ18hvyoeScelBCqKgF_rgAufoEALAUT8y_LERvZKHk,45
 tushare/stock/newsevent.py,sha256=STR7C8MjtZlaXTCG0QNaojBuK4-oxP_8hT7ZIvRpbiI,6944
 tushare/stock/ref_vars.py,sha256=MIxor-2rISl65I32vUzC-z7ZC_QFzG4sxOKDyjLWuU4,4449
 tushare/stock/reference.py,sha256=x_HZlrP58T-5OTZ7SLdf2Dh9THj1h7cT4wcIp42IHFI,38227
-tushare/stock/rtq.py,sha256=Gd0-DbmFc-QyFfAgKcwkANIlN8lB60TOgY2kPBN5GWk,23115
+tushare/stock/rtq.py,sha256=gMTTv8XOtCgStLa0DhXIXMJhf5jBsZbs_1zzQVugTDc,23123
 tushare/stock/rtq_vars.py,sha256=V6LeJkSP76z8veRfP_mGiQ63V5YBHoTMaqUA5hSBWh4,4200
 tushare/stock/shibor.py,sha256=Fx9OUZ429kz6l7ZdaYSD6p_X79ud69PDM9EZogm8xCY,6422
 tushare/stock/trading.py,sha256=3bvM4pexEYW-uGGEL7g6Vkte4sqGC1iYO6dC8mGLSdM,55619
@@ -71,8 +71,8 @@ tushare/util/verify_token.py,sha256=cuV3RErWbOC318NANCYL6K1LKZ3wSAL2yMwZHA7tD3s,
 tushare/util/protobuf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tushare/util/protobuf/funcs.py,sha256=UCdK8FxTyjPZsNzoEeXqYzqrQXUmRMvW5hua6GPA66A,779
 tushare/util/protobuf/response_pb2.py,sha256=vJH9ONkDuJlg6y-q1PvuDZoviKrK7hzNtMieQHK45DI,11347
-tushare-1.4.5.dist-info/LICENSE,sha256=C2j55UI0Ul-1-wA1-rn7OaY6b3vGl4YukiyvYzHsU9o,1503
-tushare-1.4.5.dist-info/METADATA,sha256=uDEL9Ina_cYyI8PoPRmUy_pBdrq8mSe9fb183LC-Wb0,2828
-tushare-1.4.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-tushare-1.4.5.dist-info/top_level.txt,sha256=HHOxMuqc31KuAIcxpE0t5dAPMKbaiRtjsjTMFd7FlXI,8
-tushare-1.4.5.dist-info/RECORD,,
+tushare-1.4.7.dist-info/LICENSE,sha256=C2j55UI0Ul-1-wA1-rn7OaY6b3vGl4YukiyvYzHsU9o,1503
+tushare-1.4.7.dist-info/METADATA,sha256=xdDYzUgnrx-NOwrlgXbcFkjdo0_hw5oIDoW7JjCPkQs,2838
+tushare-1.4.7.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+tushare-1.4.7.dist-info/top_level.txt,sha256=HHOxMuqc31KuAIcxpE0t5dAPMKbaiRtjsjTMFd7FlXI,8
+tushare-1.4.7.dist-info/RECORD,,

{tushare-1.4.5.dist-info → tushare-1.4.7.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any