mns-common 1.3.1.2__tar.gz → 1.3.1.4__tar.gz

{mns_common-1.3.1.2 → mns_common-1.3.1.4}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.3.1.2
+Version: 1.3.1.4

{mns_common-1.3.1.2 → mns_common-1.3.1.4}/mns_common/component/concept/ths_concept_common_service_api.py

@@ -68,6 +68,12 @@ def set_ths_concept(symbol, df):
 
     df['ths_concept_name_list_str'] = "-"
 
+    df['ths_concept_most_relative_name'] = "未有"
+
+    df['ths_concept_most_relative_code'] = 0
+
+    df['ths_concept_list'] = [[] for _ in range(len(df))]
+
     if ths_stock_concept_detail.shape[0] == 0:
         return df
 
@@ -83,6 +89,8 @@ def set_ths_concept(symbol, df):
         ths_stock_concept_detail = ths_stock_concept_detail[[
             'concept_code',
             'concept_name',
+            'grade',
+            'remark',
             'str_day',
             'str_now_time',
             'concept_create_day']]
@@ -91,12 +99,17 @@ def set_ths_concept(symbol, df):
 
         df.loc[:, 'ths_concept_list_info'] = ths_stock_concept_detail.to_string(index=False)
         df.loc[:, 'ths_concept_name_list_str'] = concept_name_str
+        ths_concept_list_record = ths_stock_concept_detail.to_dict(orient='records')
+        df.at[df.index[0], 'ths_concept_list'] = ths_concept_list_record
 
     ths_effective_concept_list = get_all_ths_effective_concept()
     ths_effective_concept_code_list = list(ths_effective_concept_list['symbol'])
 
     ths_stock_concept_detail_effective = ths_stock_concept_detail.loc[
         ths_stock_concept_detail['concept_code'].isin(ths_effective_concept_code_list)]
+
+    ths_stock_concept_detail_effective = ths_stock_concept_detail_effective.sort_values(by=['concept_code'],
+                                                                                        ascending=False)
     ths_concept_count = ths_stock_concept_detail_effective.shape[0]
 
     df.loc[:, 'ths_concept_count'] = ths_concept_count
@@ -116,6 +129,21 @@ def set_ths_concept(symbol, df):
 
     df['ths_concept_sync_day'] = list(ths_stock_concept_detail_last_one['str_day'])[0]
 
+    ths_stock_concept_detail_effective = ths_stock_concept_detail_effective.sort_values(by=['grade'],
+                                                                                        ascending=False)
+
+    # 最相关的概念
+    ths_stock_concept_detail_most_relative_one = ths_stock_concept_detail_effective.iloc[0:1]
+
+    if ths_stock_concept_detail_most_relative_one['concept_name'] is None:
+        df['ths_concept_most_relative_name'] = "未有"
+    else:
+        df['ths_concept_most_relative_name'] = list(ths_stock_concept_detail_last_one['concept_name'])[0]
+    if ths_stock_concept_detail_most_relative_one['concept_code'] is None:
+        df['ths_concept_most_relative_code'] = 0
+    else:
+        df['ths_concept_most_relative_code'] = list(ths_stock_concept_detail_most_relative_one['concept_code'])[0]
+
     return df
 
 
@@ -235,9 +263,6 @@ def get_choose_effective_ths_concept_no_cache():
 
 
 if __name__ == '__main__':
-    clear_effective_ths_concept_cache()
-    while True:
-        symbol_test = '885923'
-        get_one_symbol_all_ths_concept(symbol_test)
-        clear_one_concept_cache(symbol_test)
-        print(1)
+    symbol_test = '300085'
+    company_info_df = mongodb_util.find_query_data('company_info', {"symbol": symbol_test})
+    set_ths_concept(symbol_test, company_info_df)

{mns_common-1.3.1.2 → mns_common-1.3.1.4}/mns_common.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.3.1.2
+Version: 1.3.1.4

{mns_common-1.3.1.2 → mns_common-1.3.1.4}/setup.py

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