mns-common 1.5.0.1__py3-none-any.whl → 1.5.0.2__py3-none-any.whl

mns_common/api/akshare/k_line_api.py

@@ -18,6 +18,7 @@ def stock_zh_a_hist(
         start_date: str = "19700101",
         end_date: str = "22220101",
         adjust: str = "",
+        proxies: str = None
 ) -> pd.DataFrame:
     """
     东方财富网-行情首页-沪深京 A 股-每日行情
@@ -32,6 +33,9 @@ def stock_zh_a_hist(
     :type end_date: str
     :param adjust: choice of {"qfq": "前复权", "hfq": "后复权", "": "不复权"}
     :type adjust: str
+    :param proxies: 代理ip
+    :type proxies: str
+
     :return: 每日行情
     :rtype: pandas.DataFrame
     """
@@ -53,7 +57,12 @@ def stock_zh_a_hist(
         "end": "20500000",
         "_": now_time,
     }
-    r = requests.get(url, params=params)
+
+    if proxies is None:
+        r = requests.get(url, params=params)
+    else:
+        r = requests.get(url, params=params, proxies=proxies)
+
     data_json = r.json()
     temp_df = pd.DataFrame([item.split(",") for item in data_json["data"]["klines"]])
     temp_df.columns = [

mns_common/api/k_line/stock_k_line_data_api.py

@@ -33,7 +33,7 @@ def stock_k_line_hist(
     :type adjust: str
     :param timeout: choice of None or a positive float number
     :type timeout: float
-        :param proxies: 代理ip
+    :param proxies: 代理ip
     :type proxies: str
 
     :return: 每日行情
@@ -55,10 +55,10 @@ def stock_k_line_hist(
     }
 
     if proxies is None:
-
         r = requests.get(url, params=params, timeout=timeout)
     else:
         r = requests.get(url, params=params, proxies=proxies, timeout=timeout)
+
     data_json = r.json()
     if not (data_json["data"] and data_json["data"]["klines"]):
         return pd.DataFrame()

{mns_common-1.5.0.1.dist-info → mns_common-1.5.0.2.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-common
-Version: 1.5.0.1
+Version: 1.5.0.2
 

{mns_common-1.5.0.1.dist-info → mns_common-1.5.0.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mns_common/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/api/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/api/akshare/__init__.py,sha256=xu36nA6MJTauswUWPfKIKH0E-lpOAHTw2TL5QI_6TeY,165
-mns_common/api/akshare/k_line_api.py,sha256=q2rlBTdyc-8D75Bj6Zf5wvMBgSSJxDeKBxnio7Z91Bk,3762
+mns_common/api/akshare/k_line_api.py,sha256=CWP4oNN914-jhGMqrAxw4Q_M_LkOsyohos-tRFkooK8,3954
 mns_common/api/akshare/stock_bid_ask_api.py,sha256=oHGhCFpCWQB6MNWOUWX0CIO31FQkF55oRQQx1sFO14k,4024
 mns_common/api/akshare/stock_dt_pool.py,sha256=sKedOTzqsBZprJHJEr2sRYa8xbeSK7tRenqBE3wOdUc,2245
 mns_common/api/akshare/stock_zb_pool.py,sha256=ylcVgZTzsD3qz9WaItLtoqTf4t-Ex49MDtZUk0xaB5Q,2126
@@ -22,7 +22,7 @@ mns_common/api/em/real_time/east_money_stock_us_api.py,sha256=RiTrdZDuDgTOtiMSD1
 mns_common/api/hk/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/api/hk/ths_hk_company_info_api.py,sha256=Cxlbuccopa0G1s8o0uTnnyLn2QaxOvbDpJQJOj7J8a8,5360
 mns_common/api/k_line/__init__.py,sha256=itoGlqKhsx7EVXQoD1vchDKQ5GPB16vDjofTSuQtrXg,161
-mns_common/api/k_line/stock_k_line_data_api.py,sha256=oOtgSRik-F36FWdcWVIRlyYC2rCePvmZEjONFh1yjkk,3724
+mns_common/api/k_line/stock_k_line_data_api.py,sha256=eR9fd4xbXcNKIT-pDMbgnQMUA1cpueRmzPwl6jnWJW8,3720
 mns_common/api/k_line/stock_minute_data_api.py,sha256=FNe9I_lvgdyEsKQVzdA0vZ5CWeB-KGtJiCpj0YPRuwY,5322
 mns_common/api/kpl/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/api/kpl/common/__init__.py,sha256=8b2PuXJM5fLoq71cWPXp695czQuaRtyR6OVHajGjDPc,161
@@ -157,7 +157,7 @@ mns_common/utils/date_handle_util.py,sha256=XS-MyA8_7k35LOCFAYOHgVcVkMft_Kc4Wa9U
 mns_common/utils/db_util.py,sha256=hSmfNAN4vEeEaUva6_cicZEhb2jSnib-Gvk2reke1vc,2590
 mns_common/utils/file_util.py,sha256=egWu6PenGPRp_ixrNTHKarT4dAnOT6FETR82EHUZJnQ,1042
 mns_common/utils/ip_util.py,sha256=UTcYfz_uytB__6nlBf7T-izuI7hi4XdB6ET0sJgEel4,969
-mns_common-1.5.0.1.dist-info/METADATA,sha256=s39Ru9_jwa3fZ315Ua1TJAyY-RoWdtrZwilleSyjI40,61
-mns_common-1.5.0.1.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-mns_common-1.5.0.1.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
-mns_common-1.5.0.1.dist-info/RECORD,,
+mns_common-1.5.0.2.dist-info/METADATA,sha256=CYHx6O_wKF-IT_k-imBMtkc1UUdXDoFJil9xSJN21AA,61
+mns_common-1.5.0.2.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+mns_common-1.5.0.2.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
+mns_common-1.5.0.2.dist-info/RECORD,,