mns-common 1.3.1.2__py3-none-any.whl → 1.3.1.3__py3-none-any.whl

mns_common/component/concept/ths_concept_common_service_api.py

@@ -68,6 +68,8 @@ def set_ths_concept(symbol, df):
 
     df['ths_concept_name_list_str'] = "-"
 
+    df['ths_concept_list'] = [[] for _ in range(len(df))]
+
     if ths_stock_concept_detail.shape[0] == 0:
         return df
 
@@ -83,6 +85,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 +95,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 +125,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 +259,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.dist-info → mns_common-1.3.1.3.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.3.1.2
+Version: 1.3.1.3
 

{mns_common-1.3.1.2.dist-info → mns_common-1.3.1.3.dist-info}/RECORD

@@ -70,7 +70,7 @@ mns_common/component/company/company_common_service_api.py,sha256=pqb11v5y0uFWJt
 mns_common/component/company/company_common_service_new_api.py,sha256=lSPsNzvxOK7MEHtXz8ZaBV3haCXIQY8Bs8hMPYH5V_U,5542
 mns_common/component/concept/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/component/concept/kpl_concept_common_service_api.py,sha256=Ruc3INOhVjB0X1LeMRX0zL3uhv9OLweG2hj6wkZffow,3235
-mns_common/component/concept/ths_concept_common_service_api.py,sha256=ik_3T0oWtyTWYOSjmSEGrcd32DsvoHqiEYeGDMLIRRg,10270
+mns_common/component/concept/ths_concept_common_service_api.py,sha256=tlOFU4Sg29RXWlMz6_RAsa1tTwnQThmxgwXZoRoW4VI,11559
 mns_common/component/cookie/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
 mns_common/component/cookie/cookie_info_service.py,sha256=IIFKj84dnBrUOt2Wl6kbCj-BDdFX_X9z8IIk4LxLNTc,754
 mns_common/component/data/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
@@ -125,7 +125,7 @@ mns_common/utils/date_handle_util.py,sha256=P4WJUmoDpo4IoCrt2z4keyr7pqXHKmCZBVod
 mns_common/utils/db_util.py,sha256=hSmfNAN4vEeEaUva6_cicZEhb2jSnib-Gvk2reke1vc,2590
 mns_common/utils/file_util.py,sha256=egWu6PenGPRp_ixrNTHKarT4dAnOT6FETR82EHUZJnQ,1042
 mns_common/utils/ip_util.py,sha256=UTcYfz_uytB__6nlBf7T-izuI7hi4XdB6ET0sJgEel4,969
-mns_common-1.3.1.2.dist-info/METADATA,sha256=uww6ToOYzqwkZ_duiWpxMiOLBaDLmfmxfa105P107EA,61
-mns_common-1.3.1.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mns_common-1.3.1.2.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
-mns_common-1.3.1.2.dist-info/RECORD,,
+mns_common-1.3.1.3.dist-info/METADATA,sha256=IB2w6l4kNXgezNtBQhxY4SsgtbdWfUBS0HJ-ssIFsZk,61
+mns_common-1.3.1.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mns_common-1.3.1.3.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
+mns_common-1.3.1.3.dist-info/RECORD,,