analyser_hj3415 2.9.12__tar.gz → 2.9.14__tar.gz

{analyser_hj3415-2.9.12 → analyser_hj3415-2.9.14}/PKG-INFO

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

{analyser_hj3415-2.9.12 → analyser_hj3415-2.9.14}/analyser_hj3415/cli.py

@@ -207,7 +207,7 @@ def analyser_manager():
     elif args.type == 'prophet':
         if args.command == 'ranking':
             myprophet = tsa.MyProphet
-            result = myprophet.ranking(refresh=args.refresh, expire_time_h=24)
+            result = myprophet.ranking(refresh=args.refresh, expire_time_h=48)
             print(result)
             mymongo.Logs.save('cli','INFO', 'run >> analyser prophet ranking')
 
@@ -215,13 +215,13 @@ def analyser_manager():
         mylstm = tsa.MyLSTM
         if args.command == 'caching':
             if args.top:
-                mylstm.caching_based_on_prophet_ranking(refresh=args.refresh, expire_time_h=48, top=args.top)
+                mylstm.caching_based_on_prophet_ranking(refresh=args.refresh, expire_time_h=96, top=args.top)
             else:
-                mylstm.caching_based_on_prophet_ranking(refresh=args.refresh, expire_time_h=48)
+                mylstm.caching_based_on_prophet_ranking(refresh=args.refresh, expire_time_h=96)
             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, expire_time_h=48)
+            result = mylstm(args.code).get_final_predictions(refresh=args.refresh, expire_time_h=96)
             mymongo.Logs.save('cli','INFO', f'run >> analyser lstm get {args.code}')
 
     elif args.type == 'setting':

{analyser_hj3415-2.9.12 → analyser_hj3415-2.9.14}/analyser_hj3415/eval.py

@@ -10,7 +10,7 @@ import logging
 
 eval_logger = helpers.setup_logger('eval_logger', logging.WARNING)
 
-expire_time = 3600 * 24
+expire_time = 3600 * 48
 
 class Tools:
     @staticmethod

{analyser_hj3415-2.9.12 → analyser_hj3415-2.9.14}/analyser_hj3415/tsa.py

@@ -193,7 +193,7 @@ class MyProphet:
             Exception("to 인자가 맞지 않습니다.")
 
     @classmethod
-    def ranking(cls, refresh = False, expire_time_h = 24) -> OrderedDict:
+    def ranking(cls, refresh = False, expire_time_h = 24, top='all') -> OrderedDict:
         """
         가장 최근 날짜의 랭킹 분석
         :param refresh:
@@ -209,7 +209,11 @@ class MyProphet:
             data = {}
             p = MyProphet('005930')
             for i, code in enumerate(myredis.Corps.list_all_codes()):
-                p.code = code
+                try:
+                    p.code = code
+                except ValueError:
+                    tsa_logger.error(f'myprophet ranking error : {code}/{myredis.Corps(code, "c101").get_name()}')
+                    continue
                 last_real_data = p._preprocessing_for_prophet().iloc[-1]
                 recent_price = last_real_data['y']
                 recent_date = datetime.strftime(last_real_data['ds'], '%Y-%m-%d')
@@ -224,7 +228,14 @@ class MyProphet:
 
         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))
+        ranking = OrderedDict(sorted(data_dict.items(), key=lambda item: item[1], reverse=True))
+        if top == 'all':
+            return ranking
+        else:
+            if isinstance(top, int):
+                return OrderedDict(list(ranking.items())[:top])
+            else:
+                raise ValueError("top 인자는 int 형이어야 합니다.")
 
 @dataclass
 class LSTMData:

{analyser_hj3415-2.9.12 → analyser_hj3415-2.9.14}/pyproject.toml

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