analyser_hj3415 2.9.9__py3-none-any.whl → 2.9.11__py3-none-any.whl

analyser_hj3415/cli.py

@@ -2,9 +2,9 @@ import argparse
 import os
 import pprint
 
-from utils_hj3415 import noti, utils
+from utils_hj3415 import utils
 from utils_hj3415.helpers import SettingsManager
-from db_hj3415 import myredis, mypeewee
+from db_hj3415 import myredis, mymongo
 
 class AnalyserSettingsManager(SettingsManager):
     DEFAULT_SETTINGS = {
@@ -33,8 +33,6 @@ class AnalyserSettingsManager(SettingsManager):
         print(f"{title}이 기본값 ({self.DEFAULT_SETTINGS[title]}) 으로 초기화 되었습니다.")
 
 
-log_cli = mypeewee.LogManager('cli')
-
 def analyser_manager():
     settings_manager = AnalyserSettingsManager()
     expect_earn_from_setting = settings_manager.get_value('EXPECT_EARN')
@@ -151,10 +149,10 @@ def analyser_manager():
 
                 # 원래 저장되었던 기대수익률로 다시 복원
                 eval.Red.expect_earn = ee_orig
-            log_cli.save('INFO', f'run >> analyser red get {args.code}')
+            mymongo.Logs.save('cli','INFO', f'run >> analyser red get {args.code}')
 
         elif args.command == 'ranking':
-            log_cli.save('INFO', 'run >> analyser red ranking')
+            mymongo.Logs.save('cli','INFO', 'run >> analyser red ranking')
             result = eval.Red.ranking(expect_earn=args.expect_earn, refresh=args.refresh)
             print(result)
 
@@ -172,7 +170,7 @@ def analyser_manager():
                 mil = eval.Mil(args.code)
                 print(f"*** Mil - {mil} ***")
                 pprint.pprint(mil.get(args.refresh))
-            log_cli.save('INFO', f'run >> analyser mil get {args.code}')
+            mymongo.Logs.save('cli','INFO', f'run >> analyser mil get {args.code}')
 
     elif args.type == 'blue':
         if args.command == 'get':
@@ -188,7 +186,7 @@ def analyser_manager():
                 blue = eval.Blue(args.code)
                 print(f"*** Blue - {blue} ***")
                 pprint.pprint(blue.get(args.refresh))
-            log_cli.save('INFO', f'run >> analyser blue get {args.code}')
+            mymongo.Logs.save('cli','INFO', f'run >> analyser blue get {args.code}')
 
     elif args.type == 'growth':
         if args.command == 'get':
@@ -204,29 +202,27 @@ def analyser_manager():
                 growth = eval.Growth(args.code)
                 print(f"*** growth - {growth} ***")
                 pprint.pprint(growth.get(args.refresh))
-            log_cli.save('INFO', f'run >> analyser growth get {args.code}')
+            mymongo.Logs.save('cli','INFO', f'run >> analyser growth get {args.code}')
 
     elif args.type == 'prophet':
         if args.command == 'ranking':
             myprophet = tsa.MyProphet
-            myprophet.expire_time_h = 72
-            result = myprophet.ranking(refresh=args.refresh)
+            result = myprophet.ranking(refresh=args.refresh, expire_time_h=24)
             print(result)
-            log_cli.save('INFO', 'run >> analyser prophet ranking')
+            mymongo.Logs.save('cli','INFO', 'run >> analyser prophet ranking')
 
     elif args.type == 'lstm':
         mylstm = tsa.MyLSTM
-        mylstm.expire_time_h = 72
         if args.command == 'caching':
             if args.top:
-                mylstm.caching_based_on_prophet_ranking(refresh=args.refresh, top=args.top)
+                mylstm.caching_based_on_prophet_ranking(refresh=args.refresh, expire_time_h=48, top=args.top)
             else:
-                mylstm.caching_based_on_prophet_ranking(refresh=args.refresh)
-            log_cli.save('INFO', f'run >> analyser lstm caching / top={args.top if args.top else 20})')
+                mylstm.caching_based_on_prophet_ranking(refresh=args.refresh, expire_time_h=48)
+            mymongo.Logs.save('cli','INFO', f'run >> analyser lstm caching / top={args.top if args.top else 20})')
         elif args.command == 'get':
             assert utils.is_6digit(args.code), "code 인자는 6자리 숫자이어야 합니다."
-            result = mylstm(args.code).get_final_predictions(refresh=args.refresh)
-            log_cli.save('INFO', f'run >> analyser lstm get {args.code}')
+            result = mylstm(args.code).get_final_predictions(refresh=args.refresh, expire_time_h=48)
+            mymongo.Logs.save('cli','INFO', f'run >> analyser lstm get {args.code}')
 
     elif args.type == 'setting':
         if args.command == 'set':
@@ -239,5 +235,3 @@ def analyser_manager():
 
     else:
         parser.print_help()
-
-log_cli.close()

analyser_hj3415/tsa.py

@@ -30,10 +30,8 @@ import logging
 
 tsa_logger = helpers.setup_logger('tsa_logger', logging.WARNING)
 
-expire_time = 3600 * 24
 
 class MyProphet:
-    expire_time_h = 24
     def __init__(self, code: str):
         assert utils.is_6digit(code), f'Invalid value : {code}'
         self.scaler = StandardScaler()
@@ -195,7 +193,7 @@ class MyProphet:
             Exception("to 인자가 맞지 않습니다.")
 
     @classmethod
-    def ranking(cls, refresh = False) -> OrderedDict:
+    def ranking(cls, refresh = False, expire_time_h = 24) -> OrderedDict:
         """
         가장 최근 날짜의 랭킹 분석
         :param refresh:
@@ -205,7 +203,7 @@ class MyProphet:
         redis_name = 'myprophet_ranking'
 
         print(
-            f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {MyProphet.expire_time_h}h")
+            f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {expire_time_h}h")
 
         def fetch_ranking() -> dict:
             data = {}
@@ -224,7 +222,7 @@ class MyProphet:
                     print(f"{i}.{p.code}/{p.name} date: {recent_date} 가격:{recent_price} 기대하한값:{yhat_lower} 편차:{deviation}")
             return data
 
-        data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_ranking, timer=MyProphet.expire_time_h * 3600)
+        data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_ranking, timer=expire_time_h * 3600)
 
         return OrderedDict(sorted(data_dict.items(), key=lambda item: item[1], reverse=True))
 
@@ -265,7 +263,6 @@ class MyLSTM:
     """
     # 미래 몇일을 예측할 것인가?
     future_days = 30
-    expire_time_h = 48
 
     def __init__(self, code: str):
         assert utils.is_6digit(code), f'Invalid value : {code}'
@@ -489,7 +486,7 @@ class MyLSTM:
             test_r2=test_r2,
         )
 
-    def get_final_predictions(self, refresh, num=5) -> tuple:
+    def get_final_predictions(self, refresh: bool, expire_time_h: int, num=5) -> tuple:
         """
         미래 예측치를 레디스 캐시를 이용하여 반환함
         :param refresh:
@@ -500,7 +497,7 @@ class MyLSTM:
         redis_name = f'{self.code}_mylstm_predictions'
 
         print(
-            f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {MyLSTM.expire_time_h}h")
+            f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {expire_time_h}h")
 
         def fetch_final_predictions(num_in) -> tuple:
             """
@@ -531,7 +528,7 @@ class MyLSTM:
 
             return future_dates_str, final_future_predictions.tolist()
 
-        future_dates_str, final_future_predictions = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_final_predictions, num, timer=MyLSTM.expire_time_h * 3600)
+        future_dates_str, final_future_predictions = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_final_predictions, num, timer=expire_time_h * 3600)
 
         # 문자열을 날짜 형식으로 변환
         future_dates = [datetime.strptime(date, '%Y-%m-%d') for date in future_dates_str]
@@ -541,14 +538,14 @@ class MyLSTM:
 
         return future_dates, final_future_predictions
 
-    def export(self, refresh=False, to="str") -> Optional[str]:
+    def export(self, refresh=False, expire_time_h=24, to="str") -> Optional[str]:
         """
         prophet과 plotly로 그래프를 그려서 html을 문자열로 반환
         :param refresh:
         :param to: str, htmlfile, png
         :return:
         """
-        future_dates, final_future_predictions = self.get_final_predictions(refresh=refresh)
+        future_dates, final_future_predictions = self.get_final_predictions(refresh=refresh, expire_time_h=expire_time_h)
         final_future_predictions = final_future_predictions.reshape(-1) # 차원을 하나 줄인다.
 
         # 데이터 준비
@@ -636,7 +633,7 @@ class MyLSTM:
             Exception("to 인자가 맞지 않습니다.")
 
     def visualization(self, refresh=True):
-        future_dates, final_future_predictions = self.get_final_predictions(refresh=refresh)
+        future_dates, final_future_predictions = self.get_final_predictions(refresh=refresh, expire_time_h=1)
 
         # 시각화1
         plt.figure(figsize=(10, 6))
@@ -664,15 +661,15 @@ class MyLSTM:
         plt.show()"""
 
     @staticmethod
-    def caching_based_on_prophet_ranking(refresh: bool, top=20):
-        ranking_topn = OrderedDict(itertools.islice(MyProphet.ranking().items(), top))
+    def caching_based_on_prophet_ranking(refresh: bool, expire_time_h: int, top=20):
+        ranking_topn = OrderedDict(itertools.islice(MyProphet.ranking(refresh=False).items(), top))
         tsa_logger.info(ranking_topn)
         mylstm = MyLSTM('005930')
         print(f"*** LSTM prediction redis cashing top{top} items ***")
         for i, (code, _) in enumerate(ranking_topn.items()):
             mylstm.code = code
             print(f"{i+1}. {mylstm.code}/{mylstm.name}")
-            mylstm.get_final_predictions(refresh=refresh, num=5)
+            mylstm.get_final_predictions(refresh=refresh, expire_time_h=expire_time_h, num=5)
 
 
 

{analyser_hj3415-2.9.9.dist-info → analyser_hj3415-2.9.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: analyser_hj3415
-Version: 2.9.9
+Version: 2.9.11
 Summary: Stock analyser and database processing programs
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown

{analyser_hj3415-2.9.9.dist-info → analyser_hj3415-2.9.11.dist-info}/RECORD

@@ -1,13 +1,13 @@
 analyser_hj3415/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-analyser_hj3415/cli.py,sha256=CHdIdsPVzXRQoMazp0QJD-6-_DjlLTyJ4C1IBD3IQL8,12517
+analyser_hj3415/cli.py,sha256=90i1haDFNGpTNf-lnQKUARsN0lPFJgv_qXFSIsl1Sa4,12541
 analyser_hj3415/eval.py,sha256=WWIvB4BebjW9GNGcF8rMd-MLL-lPXUBOH01_FpSq95I,38811
-analyser_hj3415/tsa.py,sha256=yNYeLpuUH7eGNAmSadvkbHQ91gz9Z1o_u9dGwntF4OI,26916
+analyser_hj3415/tsa.py,sha256=8JSAdLLApcRDIjrTo8pveHliBUObzpGWlq-yxZNsIZw,26984
 analyser_hj3415/workroom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 analyser_hj3415/workroom/mysklearn.py,sha256=wJXKz5MqqTzADdG2mqRMMzc_G9RzwYjj5_j4gyOopxQ,2030
 analyser_hj3415/workroom/mysklearn2.py,sha256=1lIy6EWEQHkOzDS-av8U0zQH6DuCLKWMI73dnJx5KRs,1495
 analyser_hj3415/workroom/score.py,sha256=P6nHBJYmyhigGtT4qna4BmNtvt4B93b7SKyzdstJK24,17376
 analyser_hj3415/workroom/trash.py,sha256=zF-W0piqkGr66UP6-iybo9EXh2gO0RP6R1FnIpsGkl8,12262
-analyser_hj3415-2.9.9.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
-analyser_hj3415-2.9.9.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-analyser_hj3415-2.9.9.dist-info/METADATA,sha256=vTdeO4MRJYOfIOpyiuBPYC0XafTIbPA0NllgE1UD9ow,6776
-analyser_hj3415-2.9.9.dist-info/RECORD,,
+analyser_hj3415-2.9.11.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
+analyser_hj3415-2.9.11.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+analyser_hj3415-2.9.11.dist-info/METADATA,sha256=LA5DUuaj3BQQaZ2fdw_Q7RYaKefyJHHbZXY0qgsaRkE,6777
+analyser_hj3415-2.9.11.dist-info/RECORD,,