mns-common 1.3.0.1__tar.gz → 1.3.0.3__tar.gz

{mns_common-1.3.0.1 → mns_common-1.3.0.3}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.3.0.1
+Version: 1.3.0.3

{mns_common-1.3.0.1 → mns_common-1.3.0.3}/mns_common/api/ths/concept/app/ths_concept_detail_app.py

@@ -182,5 +182,5 @@ def get_ths_concept_detail_by_app(symbol: str = "886019") -> pd.DataFrame:
 
 
 if __name__ == '__main__':
-    ths_concept_detail = get_ths_concept_detail_by_app('886077')
+    ths_concept_detail = get_ths_concept_detail_by_app('881165')
     print(ths_concept_detail)

{mns_common-1.3.0.1 → mns_common-1.3.0.3}/mns_common/api/ths/concept/app/ths_concept_index_app.py

@@ -88,6 +88,7 @@ def get_ths_concept_his_info(begin_time, end_time, page_size, query_type):
             result_list = result_json['data']['list']
             result_total = result_json['data']['total']
             result_df = pd.DataFrame(result_list)
+            result_df.fillna(0, inplace=True)
             result_df['chg'] = round(result_df['margin_of_increase'] * 100, 2)
             del result_df['margin_of_increase']
             result_df['result_total'] = result_total

{mns_common-1.3.0.1 → mns_common-1.3.0.3}/mns_common/api/ths/concept/web/ths_concept_detail_web.py

@@ -15,6 +15,7 @@ from io import StringIO
 import pandas as pd
 from bs4 import BeautifulSoup
 from akshare.utils.tqdm import get_tqdm
+import mns_common.component.cookie.cookie_info_service as cookie_info_service
 
 '''
 获取单只股票代码 symbol 所有概念详情
@@ -60,38 +61,23 @@ def stock_board_cons_ths(symbol: str = "301558") -> pd.DataFrame:
     :return: 行业板块或者概念板块的成份股
     :rtype: pandas.DataFrame
     """
+    ths_cookie = cookie_info_service.get_ths_cookie()
+
     headers = {
         "Accept": "text/html, */*; q=0.01",
-        "Accept-Encoding": "gzip, deflate, br, zstd",
         "Accept-Language": "zh-CN,zh;q=0.9",
         "Connection": "keep-alive",
-        "Cookie": ("searchGuide=sg; Hm_lvt_722143063e4892925903024537075d0d=1717667296,1718442548; "
-                   "Hm_lpvt_722143063e4892925903024537075d0d=1718442548; "
-                   "Hm_lvt_929f8b362150b1f77b477230541dbbc2=1717667296,1718442548; "
-                   "Hm_lpvt_929f8b362150b1f77b477230541dbbc2=1718442548; "
-                   "Hm_lvt_78c58f01938e4d85eaf619eae71b4ed1=1717667297,1718105758,1718442548; "
-                   "u_ukey=A10702B8689642C6BE607730E11E6E4A; u_uver=1.0.0; "
-                   "u_dpass=FiQNmw4Vyp2vyGzE6%2FEbtrgPtUViMbFi%2BSUJ1bTSIaqQP7Dl6EmBT0Xu4HBksFjJHi80LrSsTFH9a%2B6rtRvqGg%3D%3D; "
-                   "u_did=0112000691F9476ABA607A0E4F06AF9B; u_ttype=WEB; "
-                   "user=MDq%2BsNDQcE06Ok5vbmU6NTAwOjYxMzk4NTQ0ODo3LDExMTExMTExMTExLDQwOzQ0LDExLDQwOzYsMSw0MDs1LDEsNDA7MSwxMDEsNDA7MiwxLDQwOzMsMSw0MDs1LDEsNDA7OCwwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMSw0MDsxMDIsMSw0MDoyNzo6OjYwMzk4NTQ0ODoxNzE4NDQyNTkzOjo6MTYzNDU2Njk4MDo4NjQwMDowOjE5NjMyMzc1ZWNjOGUzNTJmYTczMmFhZjM4OTg3ZGMzNDpkZWZhdWx0XzQ6MQ%3D%3D; "
-                   "userid=602085498; u_name=%BE%B0%D0%D0pM; "
-                   "escapename=%25u666f%25u884cpM; "
-                   "ticket=092428c703980b80d5d407acddb6b474; user_status=0; "
-                   "utk=628aa7def3a67c0b3c66869803ab9e23; "
-                   "historystock=688272%7C*%7C301041%7C*%7C002156; "
-                   "spversion=20130314; "
-                   "Hm_lpvt_78c58f01938e4d85eaf619eae71b4ed1=1718504236; "
-                   "v=A6WXXy9vL7nJNkuWRIoO2C1psmra4ll0o5Y9yKeKYVzrvsuUbzJpRDPmT4I0"),
-        "Host": "q.10jqka.com.cn",
-        "Referer": "https://q.10jqka.com.cn/thshy",
+        "Referer": "https://q.10jqka.com.cn/thshy/detail/code/881160/",
         "Sec-Fetch-Dest": "empty",
         "Sec-Fetch-Mode": "cors",
         "Sec-Fetch-Site": "same-origin",
-        "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36",
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
         "X-Requested-With": "XMLHttpRequest",
-        "sec-ch-ua": "\"Google Chrome\";v=\"125\", \"Chromium\";v=\"125\", \"Not.A/Brand\";v=\"24\"",
+        "hexin-v": "A8KlBtusEcYFfQ2aigv4OairE8Mhk8SaeJa61gzb7ZTh7mx99CMWvUgnCuLf",
+        "sec-ch-ua": "\"Google Chrome\";v=\"131\", \"Chromium\";v=\"131\", \"Not_A Brand\";v=\"24\"",
         "sec-ch-ua-mobile": "?0",
-        "sec-ch-ua-platform": "\"macOS\""
+        "sec-ch-ua-platform": "\"Windows\"",
+        "cookie": ths_cookie
     }
     url = f"https://q.10jqka.com.cn/thshy/detail/field/199112/order/desc/page/1/ajax/1/code/{symbol}"
     r = requests.get(url, headers=headers)
@@ -100,8 +86,8 @@ def stock_board_cons_ths(symbol: str = "301558") -> pd.DataFrame:
     soup = BeautifulSoup(r.text, "lxml")
     url_flag = "thshy"
     if soup.find(name="td", attrs={"colspan": "14"}):
-        url = f"https://q.10jqka.com.cn/gn/detail/field/199112/order/desc/page/1/ajax/1/code/{symbol}"
-        r = requests.get(url, headers=headers)
+        new_url = f"https://q.10jqka.com.cn/gn/detail/field/199112/order/desc/page/1/ajax/1/code/{symbol}"
+        r = requests.get(new_url, headers=headers)
         soup = BeautifulSoup(r.text, features="lxml")
         url_flag = "gn"
     try:
@@ -115,10 +101,10 @@ def stock_board_cons_ths(symbol: str = "301558") -> pd.DataFrame:
     for page in tqdm(range(1, page_num + 1), leave=False):
         try:
             time.sleep(2)
-            url = f"https://q.10jqka.com.cn/{url_flag}/detail/field/199112/order/desc/page/{page}/ajax/1/code/{symbol}"
-            r_detail = requests.get(url, headers=headers)
+            new_url = f"https://q.10jqka.com.cn/{url_flag}/detail/field/199112/order/desc/page/{page}/ajax/1/code/{symbol}"
+            r_detail = requests.get(new_url, headers=headers)
             if r_detail.status_code == 200:
-                temp_df = pd.read_html(StringIO(r.text))[0]
+                temp_df = pd.read_html(StringIO(r_detail.text))[0]
                 big_df = pd.concat(objs=[big_df, temp_df], ignore_index=True)
         except BaseException as e:
             logger.error("获取概念详细信息异常:{},{}", symbol, e)

{mns_common-1.3.0.1 → mns_common-1.3.0.3}/mns_common/constant/db_name_constant.py

@@ -155,3 +155,6 @@ STOCK_GDFX_FREE_TOP_10 = 'stock_gdfx_free_top_10'
 
 # 十大股东
 STOCK_GDFX_TOP_10 = 'stock_gdfx_top_10'
+
+# 同花顺行业列表
+THS_INDUSTRY_LIST = 'ths_industry_list'

{mns_common-1.3.0.1 → mns_common-1.3.0.3}/mns_common.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.3.0.1
+Version: 1.3.0.3

{mns_common-1.3.0.1 → mns_common-1.3.0.3}/setup.py

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