mns-common 1.3.9.3__tar.gz → 1.3.9.5__tar.gz

{mns_common-1.3.9.3 → mns_common-1.3.9.5}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.3.9.3
+Version: 1.3.9.5

{mns_common-1.3.9.3 → mns_common-1.3.9.5}/mns_common/api/akshare/k_line_api.py

@@ -9,89 +9,11 @@ import requests
 import pandas as pd
 import mns_common.component.common_service_fun_api as common_service_fun_api
 from datetime import datetime
-from functools import lru_cache
 import numpy as np
 
 
-@lru_cache(maxsize=None)
-def code_id_map_em() -> dict:
-    """
-    东方财富-股票和市场代码
-    http://quote.eastmoney.com/center/gridlist.html#hs_a_board
-    :return: 股票和市场代码
-    :rtype: dict
-    """
-    url = "http://80.push2.eastmoney.com/api/qt/clist/get"
-    params = {
-        "pn": "1",
-        "pz": "5000",
-        "po": "1",
-        "np": "3",
-        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
-        "fltt": "2",
-        "invt": "2",
-        "fid": "f3",
-        "fs": "m:1 t:2,m:1 t:23",
-        "fields": "f12",
-        "_": "1623833739532",
-    }
-    r = requests.get(url, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df = pd.DataFrame(data_json["data"]["diff"])
-    temp_df["market_id"] = 1
-    temp_df.columns = ["sh_code", "sh_id"]
-    code_id_dict = dict(zip(temp_df["sh_code"], temp_df["sh_id"]))
-    params = {
-        "pn": "1",
-        "pz": "5000",
-        "po": "1",
-        "np": "3",
-        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
-        "fltt": "2",
-        "invt": "2",
-        "fid": "f3",
-        "fs": "m:0 t:6,m:0 t:80",
-        "fields": "f12",
-        "_": "1623833739532",
-    }
-    r = requests.get(url, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df_sz = pd.DataFrame(data_json["data"]["diff"])
-    temp_df_sz["sz_id"] = 0
-    code_id_dict.update(dict(zip(temp_df_sz["f12"], temp_df_sz["sz_id"])))
-    now_date = datetime.now()
-    now_time = int(now_date.timestamp() * 1000)
-    now_time = str(now_time)
-
-    params = {
-        "pn": "1",
-        "pz": "5000",
-        "po": "1",
-        "np": "3",
-        "ut": "bd1d9ddb04089700cf9c27f6f7426281",
-        "fltt": "2",
-        "invt": "2",
-        "fid": "f3",
-        "fs": "m:0 t:81 s:2048",
-        "fields": "f12",
-        "_": now_time,
-    }
-    r = requests.get(url, params=params)
-    data_json = r.json()
-    if not data_json["data"]["diff"]:
-        return pd.DataFrame()
-    temp_df_sz = pd.DataFrame(data_json["data"]["diff"])
-    temp_df_sz["bj_id"] = 0
-    code_id_dict.update(dict(zip(temp_df_sz["f12"], temp_df_sz["bj_id"])))
-    return code_id_dict
-
-
 def stock_zh_a_hist(
-        symbol: str = "000001",
+        symbol: str = "0.000001",
         period: str = 'daily',
         start_date: str = "19700101",
         end_date: str = "22220101",
@@ -113,7 +35,6 @@ def stock_zh_a_hist(
     :return: 每日行情
     :rtype: pandas.DataFrame
     """
-    code_id_dict = code_id_map_em()
     adjust_dict = {"qfq": "1", "hfq": "2", "": "0"}
     period_dict = {'daily': '101', 'weekly': '102', 'monthly': '103'}
     url = "http://push2his.eastmoney.com/api/qt/stock/kline/get"

{mns_common-1.3.9.3 → mns_common-1.3.9.5}/mns_common/api/xueqiu/xue_qiu_k_line_api.py

@@ -5,7 +5,6 @@ file_path = os.path.abspath(__file__)
 end = file_path.index('mns') + 16
 project_path = file_path[0:end]
 sys.path.append(project_path)
-from loguru import logger
 import requests
 import pandas as pd
 
@@ -42,28 +41,26 @@ def get_xue_qiu_k_line(symbol, period, cookie, end_time, hq):
         "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/134.0.0.0 Safari/537.36",
         "cookie": cookie
     }
-    try:
-        response = requests.get(
-            url=url,
-            params=params,
-            headers=headers
-        )
 
-        if response.status_code == 200:
-            response_data = response.json()
-            df = pd.DataFrame(
-                data=response_data['data']['item'],
-                columns=response_data['data']['column']
-            )
-            # 处理DataFrame列（秒级时间戳）
-            df['str_day'] = pd.to_datetime(df['timestamp'], unit='ms').dt.normalize()
-            df["str_day"] = df["str_day"].dt.strftime("%Y-%m-%d")
-            return df
-        else:
-            return pd.DataFrame()
-    except BaseException as e:
-        logger.error("同步股票年度数据出现异常:{},{}", symbol, e)
-        return pd.DataFrame()
+    response = requests.get(
+        url=url,
+        params=params,
+        headers=headers
+    )
+
+    if response.status_code == 200:
+        response_data = response.json()
+        df = pd.DataFrame(
+            data=response_data['data']['item'],
+            columns=response_data['data']['column']
+        )
+        # 处理DataFrame列（秒级时间戳）
+        df['str_day'] = pd.to_datetime(df['timestamp'], unit='ms').dt.normalize()
+        df["str_day"] = df["str_day"].dt.strftime("%Y-%m-%d")
+        return df
+    else:
+        # 直接抛出带有明确信息的异常
+        raise ValueError("调用雪球接口失败")
 
 
 if __name__ == '__main__':

{mns_common-1.3.9.3 → mns_common-1.3.9.5}/mns_common.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-common
-Version: 1.3.9.3
+Version: 1.3.9.5

{mns_common-1.3.9.3 → mns_common-1.3.9.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='mns_common',
-    version='1.3.9.3',
+    version='1.3.9.5',
     # packages=["mns_common", "mns_common.api",
     #           "mns_common.api.akshare",
     #           "mns_common.api.em",