analyser_hj3415 2.9.6__tar.gz → 2.9.8__tar.gz

{analyser_hj3415-2.9.6 → analyser_hj3415-2.9.8}/PKG-INFO

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

{analyser_hj3415-2.9.6 → analyser_hj3415-2.9.8}/analyser_hj3415/cli.py

@@ -55,6 +55,7 @@ def analyser_manager():
     # caching 파서
     caching_parser = lstm_subparser.add_parser('caching', help='lstm 랭킹 책정 및 레디스 저장')
     caching_parser.add_argument('-r', '--refresh', action='store_true', help='래디스 캐시를 사용하지 않고 강제로 재계산 할지')
+    caching_parser.add_argument('-t', '--top', type=int, help='prophet ranking 몇위까지 작업을 할지')
     caching_parser.add_argument('-n', '--noti', action='store_true', help='작업 완료 후 메시지 전송 여부')
     # red - get 파서
     lstm_get_parser = lstm_subparser.add_parser('get', help='lstm get 책정 및 레디스 저장')
@@ -218,20 +219,27 @@ def analyser_manager():
                 noti.telegram_to('manager', f"오늘의 Growth({args.code})를 레디스 캐시에 저장했습니다.(유효 12시간)")
     elif args.type == 'prophet':
         if args.command == 'ranking':
-            result = tsa.MyProphet.ranking(refresh=args.refresh)
+            myprophet = tsa.MyProphet
+            myprophet.expire_time_h = 72
+            result = myprophet.ranking(refresh=args.refresh)
             print(result)
             if args.noti:
-                noti.telegram_to('manager', "오늘의 prophet ranking을 레디스캐시에 저장했습니다.(유효 24시간)")
+                noti.telegram_to('manager', f"오늘의 prophet ranking을 레디스캐시에 저장했습니다.(유효 {myprophet.expire_time_h}시간)")
     elif args.type == 'lstm':
+        mylstm = tsa.MyLSTM
+        mylstm.expire_time_h = 72
         if args.command == 'caching':
-            result = tsa.MyLSTM('005930').caching_based_on_prophet_ranking(refresh=args.refresh)
+            if args.top:
+                mylstm.caching_based_on_prophet_ranking(refresh=args.refresh, top=args.top)
+            else:
+                mylstm.caching_based_on_prophet_ranking(refresh=args.refresh)
             if args.noti:
-                noti.telegram_to('manager', "오늘의 lstm caching을 레디스캐시에 저장했습니다.(유효 24시간)")
+                noti.telegram_to('manager', f"오늘의 lstm caching(top={args.top if args.top else 20})을 레디스캐시에 저장했습니다.(유효 {mylstm.expire_time_h}시간)")
         elif args.command == 'get':
             assert utils.is_6digit(args.code), "code 인자는 6자리 숫자이어야 합니다."
-            result = tsa.MyLSTM(args.code).get_final_predictions(refresh=args.refresh)
+            result = mylstm(args.code).get_final_predictions(refresh=args.refresh)
             if args.noti:
-                noti.telegram_to('manager', f"LSTM 분석을({args.code})를 레디스 캐시에 저장했습니다.(유효 12시간)")
+                noti.telegram_to('manager', f"LSTM 분석을({args.code})를 레디스 캐시에 저장했습니다.(유효 {mylstm.expire_time_h}시간)")
     elif args.type == 'setting':
         if args.command == 'set':
             settings_manager.set_value(args.title, args.value)

{analyser_hj3415-2.9.6 → analyser_hj3415-2.9.8}/analyser_hj3415/tsa.py

@@ -33,6 +33,7 @@ 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()
@@ -204,7 +205,7 @@ class MyProphet:
         redis_name = 'myprophet_ranking'
 
         print(
-            f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {expire_time / 3600}h")
+            f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {MyProphet.expire_time_h}h")
 
         def fetch_ranking() -> dict:
             data = {}
@@ -223,7 +224,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=expire_time)
+        data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_ranking, timer=MyProphet.expire_time_h * 3600)
 
         return OrderedDict(sorted(data_dict.items(), key=lambda item: item[1], reverse=True))
 
@@ -264,6 +265,7 @@ class MyLSTM:
     """
     # 미래 몇일을 예측할 것인가?
     future_days = 30
+    expire_time_h = 24
 
     def __init__(self, code: str):
         assert utils.is_6digit(code), f'Invalid value : {code}'
@@ -498,7 +500,7 @@ class MyLSTM:
         redis_name = f'{self.code}_mylstm_predictions'
 
         print(
-            f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {expire_time / 3600}h")
+            f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {MyLSTM.expire_time_h}h")
 
         def fetch_final_predictions(num_in) -> tuple:
             """
@@ -529,7 +531,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=expire_time)
+        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 = [datetime.strptime(date, '%Y-%m-%d') for date in future_dates_str]
@@ -661,14 +663,16 @@ class MyLSTM:
         plt.title('Stock Price Prediction with LSTM Ensemble')
         plt.show()"""
 
-    def caching_based_on_prophet_ranking(self, refresh: bool, top=20):
+    @staticmethod
+    def caching_based_on_prophet_ranking(refresh: bool, top=20):
         ranking_topn = OrderedDict(itertools.islice(MyProphet.ranking().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()):
-            print(f"{i+1}. {self.code}/{self.name}")
-            self.code = code
-            self.get_final_predictions(refresh=refresh, num=5)
+            mylstm.code = code
+            print(f"{i+1}. {mylstm.code}/{mylstm.name}")
+            mylstm.get_final_predictions(refresh=refresh, num=5)
 
 
 

{analyser_hj3415-2.9.6 → analyser_hj3415-2.9.8}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "analyser_hj3415"
-version = "2.9.6"
+version = "2.9.8"
 description = "Stock analyser and database processing programs"
 readme = "README.md"
 requires-python = ">=3.6"