mns-common 1.2.4.7__tar.gz → 1.2.4.8__tar.gz

{mns_common-1.2.4.7 → mns_common-1.2.4.8}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.2.4.7
+Version: 1.2.4.8

{mns_common-1.2.4.7 → mns_common-1.2.4.8}/mns_common/api/ths/zt/ths_stock_zt_pool_v2_api.py

@@ -70,6 +70,7 @@ def get_ths_stock_zt_reason_with_cache(str_day):
         return stock_zt_reason
 
 
+# 数据不对 todo
 def get_zt_reason(str_day):
     if data_frame_util.is_string_not_empty(str_day):
         key_word = str_day + '涨停'
@@ -98,12 +99,13 @@ def get_zt_reason(str_day):
         "a股市值(不含限售股)" + no_slash_day: "flow_mv",
         "几天几板" + no_slash_day: "statistics_detail",
         "涨停类型" + no_slash_day: "zt_type",
-        "code": "symbol",
         "最新价": "now_price",
         "最新涨跌幅": "chg",
+        "code": "simple_code",
 
     })
-    zt_df['symbol'] = zt_df['symbol'].astype(str)
+    zt_df['code'] = zt_df['code'].astype(str)
+    zt_df['symbol'] = zt_df['code'].astype(str).str.slice(0, 6)
     if 'statistics_detail' in zt_df.columns:
         zt_df['statistics'] = zt_df['statistics_detail'].apply(convert_statistics)
     if 'code' in zt_df.columns:
@@ -113,6 +115,8 @@ def get_zt_reason(str_day):
     zt_df['zt_flag'] = True
     zt_df['str_day'] = str_day
     zt_df = zt_df.fillna('')
+    # 渣渣有重复的数据
+    zt_df.drop_duplicates('symbol', keep='last', inplace=True)
     return zt_df
 
 
@@ -280,11 +284,18 @@ def merge_zt_reason(now_zt_pool_df, str_day, last_trade_zt):
                                   left_index=True, right_index=True)
         now_zt_pool_df.dropna(subset=['symbol'], inplace=True)
         return now_zt_pool_df
-    zt_reason_df = zt_reason_df[['symbol', 'zt_reason']]
 
-    zt_reason_df = zt_reason_df.set_index(['symbol'], drop=True)
+    zt_reason_df_copy = zt_reason_df.copy()
+    zt_reason_df_copy = zt_reason_df_copy[['symbol', 'zt_reason']]
+    zt_reason_df_copy.symbol = zt_reason_df_copy.symbol.astype(str)
+    zt_reason_df_copy = zt_reason_df_copy.set_index(['symbol'], drop=True)
     now_zt_pool_df = now_zt_pool_df.set_index(['symbol'], drop=False)
-    result_zt_df = pd.merge(now_zt_pool_df, zt_reason_df, how='outer',
+
+    # 检查索引是否有重复
+    print("now_zt_pool_df 索引是否有重复:", now_zt_pool_df.index.duplicated().any())
+    print("zt_reason_df 索引是否有重复:", zt_reason_df_copy.index.duplicated().any())
+
+    result_zt_df = pd.merge(now_zt_pool_df, zt_reason_df_copy, how='outer',
                             left_index=True, right_index=True)
 
     # 找出 'symbol' 列中为 NaN 值的数据
@@ -363,6 +374,12 @@ def zt_reason_group(zt_pool_df):
 
 
 if __name__ == '__main__':
+    str_day_test = '2024-09-27'
+    em_now_zt_pool_test = stock_zt_pool_api.stock_em_zt_pool_df(date_handle_util.no_slash_date(str_day_test))
+    ths_zt_pool_df = get_zt_reason(str_day_test)
+
+    em_now_zt_pool_test.loc[~(em_now_zt_pool_test['symbol'].isin(ths_zt_pool_df['symbol']))]
+
     while True:
         result_zt_df_test = get_now_zt_pool_with_reason('2024-09-27')
         zt_reason_group(result_zt_df_test)

mns_common-1.2.4.8/mns_common/component/company/company_hk_service_api.py

@@ -0,0 +1,25 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 14
+project_path = file_path[0:end]
+sys.path.append(project_path)
+from functools import lru_cache
+from mns_common.db.MongodbUtil import MongodbUtil
+import pandas as pd
+import mns_common.utils.data_frame_util as data_frame_util
+import mns_common.component.common_service_fun_api as common_service_fun_api
+import mns_common.constant.db_name_constant as db_name_constant
+
+mongodb_util = MongodbUtil('27017')
+
+
+@lru_cache(maxsize=None)
+def get_hk_company_info():
+    query_field = {'symbol': 1,
+                   'name': 1,
+                   'industry': 1,
+                   'hk_ggt': 1}
+    return mongodb_util.find_query_data_choose_field(db_name_constant.COMPANY_INFO_HK,
+                                                     {}, query_field)

{mns_common-1.2.4.7 → mns_common-1.2.4.8}/mns_common.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.2.4.7
+Version: 1.2.4.8

{mns_common-1.2.4.7 → mns_common-1.2.4.8}/mns_common.egg-info/SOURCES.txt

@@ -67,6 +67,7 @@ mns_common/component/classify/symbol_classify_param.py
 mns_common/component/company/__init__.py
 mns_common/component/company/company_common_service_api.py
 mns_common/component/company/company_common_service_new_api.py
+mns_common/component/company/company_hk_service_api.py
 mns_common/component/concept/__init__.py
 mns_common/component/concept/kpl_concept_common_service_api.py
 mns_common/component/concept/ths_concept_common_service_api.py

{mns_common-1.2.4.7 → mns_common-1.2.4.8}/setup.py

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