tushare 1.3.1__py3-none-any.whl → 1.3.2__py3-none-any.whl

tushare/__init__.py

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

tushare/stock/rtq.py

@@ -86,18 +86,26 @@ def realtime_quote(ts_code="688553.SH", src="sina", ):
         return get_realtime_quotes_dc(symbols)
 
 
+sina_stock_code = {}
+
+
 def get_realtime_quotes_sina(symbol="688553"):  # "688553"
+    global sina_stock_code
     symbols = []
+    syms = []
     for i in [j for j in symbol.split(",")]:
-        symbols.append(i.split(".")[0])
+        s = i.split(".")
+        sina_stock_code[s[0]] = s[1].upper()
+        symbols.append(s[1].lower() + s[0])
+        syms.append(s[0])
     # symbols = re.search(r"(\d+)", str(symbols), re.S | re.M).group(1)
     symbols_list = ''
     if isinstance(symbols, list) or isinstance(symbols, set) or \
             isinstance(symbols, tuple) or isinstance(symbols, pd.Series):
         for code in symbols:
-            symbols_list += ct._code_to_symbol(code) + ','
+            symbols_list += code + ','
     else:
-        symbols_list = ct._code_to_symbol(symbols)
+        symbols_list = symbols
     symbols_list = symbols_list[:-1] if len(symbols_list) > 8 else symbols_list
     root_url = ct.LIVE_DATA_URL % (ct.P_TYPE['http'], ct.DOMAINS['sinahq'], _get_current_timestamp(), symbols_list)
     response = requests.get(root_url,
@@ -109,8 +117,6 @@ def get_realtime_quotes_sina(symbol="688553"):  # "688553"
     text = response.content.decode('GBK')
     reg = re.compile(r'\="(.*?)\";')
     data = reg.findall(text)
-    regSym = re.compile(r'(?:sh|sz)(.*?)\=')
-    syms = regSym.findall(text)
     data_list = []
     syms_list = []
     for index, row in enumerate(data):
@@ -126,13 +132,18 @@ def get_realtime_quotes_sina(symbol="688553"):  # "688553"
     for txt in ls:
         df[txt] = df[txt].map(lambda x: x[:-2])
     df.columns = rtqv.LIVE_DATA_COLS
-    df["TS_CODE"] = df["TS_CODE"].apply(format_stock_code)
+    df["TS_CODE"] = df["TS_CODE"].apply(format_sina_stock_code)
     df["DATE"] = df["DATE"].apply(format_date_str)
     new_order = rtqv.LIVE_DATA_COLS_REINDEX
     df = df[new_order]
     return df
 
 
+def format_sina_stock_code(x):
+    ts_code = f"{x}.{sina_stock_code[x]}"
+    return ts_code
+
+
 def format_date_str(date_str):
     return date_str.replace("-", "")
 
@@ -453,9 +464,13 @@ def get_stock_all_a_sina(interval: Optional[int] = 3, page_count: Optional[int]
 
 
 def get_realtime_quotes_dc(symbols="688553"):
+    """
+    https://quote.eastmoney.com/sh601096.html
+    """
     symbols = str(symbols).split(",")[0]
     url = "https://push2.eastmoney.com/api/qt/stock/get"
     symbol = re.search(r"(\d+)", symbols, re.S | re.M).group(1)
+    # print(symbol)
     params = {
         "invt": "2",
         "fltt": "1",
@@ -468,51 +483,74 @@ def get_realtime_quotes_dc(symbols="688553"):
     }
     response = requests.get(url, headers=rtqv.dc_cookies, cookies=rtqv.dc_headers, params=params)
     data_info = response.json()["data"]
+    if not data_info:
+        return pd.DataFrame()
     name = data_info["f58"]
-    open = data_info["f45"] / 100
-    high = data_info["f44"] / 100
-    pre_close = data_info["f60"] / 100
-    low = data_info["f46"] / 100
-    price = data_info["f43"] / 100
+    open = data_info["f45"]  # / 100
+    high = data_info["f44"]  # / 100
+    pre_close = data_info["f60"]  # / 100
+    low = data_info["f46"]  # / 100
+    price = data_info["f43"]  # / 100 if data_info["f43"] != "-" else ""
     b5_v = data_info["f12"]
-    b5_p = data_info["f11"] / 100
+    b5_p = data_info["f11"]  # / 100 if data_info["f11"] != "-" else ""
     b4_v = data_info["f14"]
-    b4_p = data_info["f13"] / 100
+    b4_p = data_info["f13"]  # / 100 if data_info["f13"] != "-" else ""
     b3_v = data_info["f16"]
-    b3_p = data_info["f15"] / 100
+    b3_p = data_info["f15"]  # / 100 if data_info["f15"] != "-" else ""
     b2_v = data_info["f18"]
-    b2_p = data_info["f17"] / 100
+    b2_p = data_info["f17"]  # / 100 if data_info["f17"] != "-" else ""
     b1_v = data_info["f20"]
-    b1_p = data_info["f19"] / 100
+    b1_p = data_info["f19"]  # / 100 if data_info["f19"] != "-" else ""
     a5_v = data_info["f32"]
-    a5_p = data_info["f31"] / 100
+    a5_p = data_info["f31"]  # / 100 if data_info["f31"] != "-" else ""
     a4_v = data_info["f34"]
-    a4_p = data_info["f33"] / 100
+    a4_p = data_info["f33"]  # / 100 if data_info["f33"] != "-" else ""
     a3_v = data_info["f36"]
-    a3_p = data_info["f35"] / 100
+    a3_p = data_info["f35"]  # / 100 if data_info["f35"] != "-" else ""
     a2_v = data_info["f38"]
-    a2_p = data_info["f37"] / 100
+    a2_p = data_info["f37"]  # / 100 if data_info["f38"] != "-" else ""
     a1_v = data_info["f40"]
-    a1_p = data_info["f39"] / 100
+    a1_p = data_info["f39"]  # / 100 if data_info["f39"] != "-" else ""
     date_time = timestemp_to_time(data_info["f86"])
     date = date_time[0:10]
     times = date_time[10:]
     volume = data_info["f47"]
     amount = data_info["f48"]
-    bid = data_info["f19"] / 100
-    ask = data_info["f39"] / 100
+    bid = data_info["f19"]  # / 100 if data_info["f19"] != "-" else ""
+    ask = data_info["f39"]  # / 100 if data_info["f39"] != "-" else ""
     code = symbols
     data_list = [[name, open, pre_close, price, high, low, bid, ask, volume, amount,
                   b1_v, b1_p, b2_v, b2_p, b3_v, b3_p, b4_v, b4_p, b5_v, b5_p,
                   a1_v, a1_p, a2_v, a2_p, a3_v, a3_p, a4_v, a4_p, a5_v, a5_p, date, times, code]]
     df = pd.DataFrame(data_list, columns=rtqv.LIVE_DATA_COLS)
     df["DATE"] = df["DATE"].apply(format_date_str)
+    df["ASK"] = df["ASK"].apply(format_dc_str)
+    df["OPEN"] = df["OPEN"].apply(format_dc_str)
+    df["HIGH"] = df["HIGH"].apply(format_dc_str)
+    df["LOW"] = df["LOW"].apply(format_dc_str)
+    df["PRE_CLOSE"] = df["PRE_CLOSE"].apply(format_dc_str)
+    df["BID"] = df["BID"].apply(format_dc_str)
+    df["A1_P"] = df["A1_P"].apply(format_dc_str)
+    df["A2_P"] = df["A2_P"].apply(format_dc_str)
+    df["A3_P"] = df["A3_P"].apply(format_dc_str)
+    df["A4_P"] = df["A4_P"].apply(format_dc_str)
+    df["A5_P"] = df["A5_P"].apply(format_dc_str)
+    df["PRICE"] = df["PRICE"].apply(format_dc_str)
+    df["B1_P"] = df["B1_P"].apply(format_dc_str)
+    df["B2_P"] = df["B2_P"].apply(format_dc_str)
+    df["B3_P"] = df["B3_P"].apply(format_dc_str)
+    df["B4_P"] = df["B4_P"].apply(format_dc_str)
+    df["B5_P"] = df["B5_P"].apply(format_dc_str)
     new_order = rtqv.LIVE_DATA_COLS_REINDEX
     df = df[new_order]
     return df
 
 
+def format_dc_str(x):
+    return x / 100 if x != "-" else ""
+
+
 if __name__ == '__main__':
-    # df = realtime_quote(ts_code="688553.SH,600630.SH", src="sina")
-    df = realtime_list(src="dc", page_count=1)
+    df = realtime_quote(ts_code="000688.SH,000010.SH,000012.SH,399005.SZ", src="dc")
+    # df = realtime_list(src="dc", page_count=1)
     print(df)

{tushare-1.3.1.dist-info → tushare-1.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tushare
-Version: 1.3.1
+Version: 1.3.2
 Summary: A utility for crawling historical and Real-time Quotes data of China stocks
 Home-page: https://tushare.pro
 Author: Jimmy Liu

{tushare-1.3.1.dist-info → tushare-1.3.2.dist-info}/RECORD

@@ -16,7 +16,7 @@ test/test_realtime.py,sha256=YpEH3Ic3D-4dgL9BI9RbWNSD-ZM8KfuqtSxyBvexSRg,697
 test/test_stk_mins.py,sha256=ctaoAkclIKxNQT6KYuXaB5HESpZSD29dn-KLbUT2rmo,53600
 test/test_websocket.py,sha256=DgOEcX9vuYlPVfBi54AJZTh6k0eu9lG4qcOdJhGllNU,1079
 test/trading_test.py,sha256=otXiHdU0ob441x7o1swadfSEuyPusT7oYU8SQeesSxE,1147
-tushare/__init__.py,sha256=oyWBwCmHVxfR-F-VvB3G9u5eeeHosqS80BZoGK-dsDY,4698
+tushare/__init__.py,sha256=Djsh8Mjh3nO8M8ay3OjJPgLT-L715dmNLGNAz1Tk3aE,4698
 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
@@ -52,7 +52,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=hI-xtpmRoEE17w05hM6X-kcWxsFXe_kqOf5K_FevwAI,17034
+tushare/stock/rtq.py,sha256=yhgZJmr9kTVALabI0vYwgJPFA07TILg237Zw-rbVclg,18778
 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
@@ -84,8 +84,8 @@ tushare/util/verify_token.py,sha256=-GazF4ktzyJ7HbshHJibJeCgGhhxM31H18JmlOmEurc,
 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.3.1.dist-info/LICENSE,sha256=C2j55UI0Ul-1-wA1-rn7OaY6b3vGl4YukiyvYzHsU9o,1503
-tushare-1.3.1.dist-info/METADATA,sha256=UBQ_FLajHGgbjY0eUCPpVswBbWVBERD9uXetin_KiFc,2322
-tushare-1.3.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-tushare-1.3.1.dist-info/top_level.txt,sha256=0mgc2vMZJnuC65-OMhhOjT_zydkyE9Okxd1V3p2LeeA,13
-tushare-1.3.1.dist-info/RECORD,,
+tushare-1.3.2.dist-info/LICENSE,sha256=C2j55UI0Ul-1-wA1-rn7OaY6b3vGl4YukiyvYzHsU9o,1503
+tushare-1.3.2.dist-info/METADATA,sha256=7n6IifCUfacT3ECyRxd603liVkznLTMievsDVHwMhFU,2322
+tushare-1.3.2.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+tushare-1.3.2.dist-info/top_level.txt,sha256=0mgc2vMZJnuC65-OMhhOjT_zydkyE9Okxd1V3p2LeeA,13
+tushare-1.3.2.dist-info/RECORD,,