mns-common 1.3.9.4__tar.gz → 1.3.9.6__tar.gz

{mns_common-1.3.9.4 → mns_common-1.3.9.6}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.3.9.4
+Version: 1.3.9.6

{mns_common-1.3.9.4 → mns_common-1.3.9.6}/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.4 → mns_common-1.3.9.6}/mns_common/api/xueqiu/xue_qiu_k_line_api.py

@@ -60,7 +60,7 @@ def get_xue_qiu_k_line(symbol, period, cookie, end_time, hq):
         return df
     else:
         # 直接抛出带有明确信息的异常
-        raise ValueError("获取到的DataFrame数据为空")
+        raise ValueError("调用雪球接口失败")
 
 
 if __name__ == '__main__':

{mns_common-1.3.9.4 → mns_common-1.3.9.6}/mns_common/component/proxies/proxy_common_api.py

@@ -7,7 +7,6 @@ project_path = file_path[0:end]
 sys.path.append(project_path)
 
 import mns_common.api.proxies.liu_guan_proxy_api as liu_guan_proxy_api
-from functools import lru_cache
 import pandas as pd
 import mns_common.utils.data_frame_util as data_frame_util
 from mns_common.db.MongodbUtil import MongodbUtil
@@ -17,23 +16,26 @@ import datetime
 mongodb_util = MongodbUtil('27017')
 
 
-@lru_cache(maxsize=None)
 def query_liu_guan_proxy_ip():
     ip_proxy_pool = mongodb_util.find_all_data(db_name_constant.IP_PROXY_POOL)
     return ip_proxy_pool
 
 
-def clear_proxy_ip_cache():
-    query_liu_guan_proxy_ip.cache_clear()
+def remove_proxy_ip():
     mongodb_util.remove_data({}, db_name_constant.IP_PROXY_POOL)
 
 
-def check_valid(str_now_date, ip_proxy_pool):
+def check_valid(ip_proxy_pool):
     effect_time = list(ip_proxy_pool['effect_time'])[0]
+
+    now_date = datetime.datetime.now()
+
+    str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
+
     if effect_time > str_now_date:
         return True
     else:
-        clear_proxy_ip_cache()
+        remove_proxy_ip()
         return False
 
 
@@ -48,7 +50,7 @@ def generate_proxy_ip(minutes):
         secret = list(stock_account_info['account'])[0]
 
         now_date = datetime.datetime.now()
-        time_to_add = datetime.timedelta(minutes=minutes - 1, seconds=50)
+        time_to_add = datetime.timedelta(minutes=minutes - 1, seconds=30)
         new_date = now_date + time_to_add
         str_now_date = new_date.strftime('%Y-%m-%d %H:%M:%S')
 
@@ -65,20 +67,21 @@ def generate_proxy_ip(minutes):
         return ip
 
 
-def get_proxy_ip(str_now_date, minutes):
+def get_proxy_ip( minutes):
     ip_proxy_pool = query_liu_guan_proxy_ip()
     if data_frame_util.is_empty(ip_proxy_pool):
         return generate_proxy_ip(minutes)
     else:
-        if check_valid(str_now_date, ip_proxy_pool):
+        if check_valid( ip_proxy_pool):
             return list(ip_proxy_pool['ip'])[0]
         else:
             return generate_proxy_ip(minutes)
 
 
 if __name__ == '__main__':
+    get_proxy_ip(1)
     while True:
-        now_date = datetime.datetime.now()
-        str_now_date_test = now_date.strftime('%Y-%m-%d %H:%M:%S')
+        now_date_test = datetime.datetime.now()
+        str_now_date_test = now_date_test.strftime('%Y-%m-%d %H:%M:%S')
         ip_test = get_proxy_ip(str_now_date_test)
         print(ip_test)

{mns_common-1.3.9.4 → mns_common-1.3.9.6}/mns_common.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-common
-Version: 1.3.9.4
+Version: 1.3.9.6

{mns_common-1.3.9.4 → mns_common-1.3.9.6}/setup.py

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