analyser_hj3415 2.10.6__py3-none-any.whl → 3.0.1__py3-none-any.whl

analyser_hj3415/{score.py → analyser/score.py}

@@ -1,12 +1,15 @@
-from db_hj3415 import myredis
-from utils_hj3415 import utils, helpers
+import os
 import datetime
 from collections import OrderedDict
-from . import eval, tsa
 
-import logging
+from db_hj3415 import myredis
+from utils_hj3415 import tools, setup_logger
+
+from analyser_hj3415.analyser import tsa
+from analyser_hj3415.analyser import eval
 
-score_logger = helpers.setup_logger('score_logger', logging.WARNING)
+mylogger = setup_logger(__name__,'WARNING')
+expire_time = tools.to_int(os.getenv('DEFAULT_EXPIRE_TIME_H', 48)) * 3600
 
 
 def is_within_last_three_days(date_to_check: datetime.datetime.date) -> bool:
@@ -34,8 +37,8 @@ class Score:
 
     @code.setter
     def code(self, code: str):
-        assert utils.is_6digit(code), f'Invalid value : {code}'
-        score_logger.info(f'change code : {self.code} -> {code}')
+        assert tools.is_6digit(code), f'Invalid value : {code}'
+        mylogger.info(f'change code : {self.code} -> {code}')
         self._code = code
         self.c101.code = code
         self.name = self.c101.get_name()
@@ -46,7 +49,7 @@ class Score:
         self.lstm.code = code
         self.prophet.code = code
 
-    def get(self, refresh=False, expire_time_h=24) -> dict:
+    def get(self, refresh=False) -> dict:
         """
         한 종목의 각분야 평가를 모아서 딕셔너리 형태로 반환함.
         redis_name = self.code + '_score'
@@ -65,13 +68,13 @@ class Score:
         print(f"{self.code}/{self.name}의 scoring을 시작합니다.")
         redis_name = self.code + '_score'
         print(
-            f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {expire_time_h}h")
+            f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {expire_time/3600}h")
 
         def fetch_score() -> dict:
-            score_logger.info("시가총액 데이터 추출중..")
-            시가총액 = utils.format_large_number(int(self.c101.get_recent()['시가총액']))
+            mylogger.info("시가총액 데이터 추출중..")
+            시가총액 = tools.format_large_number(int(self.c101.get_recent()['시가총액']))
 
-            score_logger.info("C108 최근 데이터 추출중..")
+            mylogger.info("C108 최근 데이터 추출중..")
             # c108이 최근에 업데이트 되었는지...
             c108_recent_date = self.c108.get_recent_date()
             # print('code - ', code, ' | c108 recent date - ', c108_recent_date.date())
@@ -80,19 +83,19 @@ class Score:
             else:
                 is_update_c108 = is_within_last_three_days(c108_recent_date.date())
 
-            score_logger.info("Red score 계산중..")
+            mylogger.info("Red score 계산중..")
             red_score = self.red.get(verbose=False).score
 
-            score_logger.info("Mil data 계산중..")
+            mylogger.info("Mil data 계산중..")
             mil_data = self.mil.get(verbose=False)
 
-            score_logger.info("Lstm 최근 데이터 조회중..")
+            mylogger.info("Lstm 최근 데이터 조회중..")
             if myredis.Base.exists(f'{self.code}_mylstm_predictions'):
                 is_lstm_up = self.lstm.is_up()
             else:
                 is_lstm_up = None
 
-            score_logger.info("\tProphet 최근 데이터 조회중..")
+            mylogger.info("\tProphet 최근 데이터 조회중..")
             prophet_score = self.prophet.scoring()
 
             return {
@@ -105,19 +108,17 @@ class Score:
                 'is_lstm_up': is_lstm_up,
                 'prophet_score': prophet_score,
             }
-        data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_score, timer=expire_time_h * 3600)
+        data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_score, timer=expire_time)
         return data_dict
 
     @classmethod
-    def ranking(self, refresh=False, expire_time_h=24, top='all') -> OrderedDict:
+    def ranking(self, refresh=False, top='all') -> OrderedDict:
         """
             prophet score 기준으로 정렬하여 ordered dict로 반환함
 
             Parameters:
                 refresh (bool): Specifies whether to refresh the ranking data. Defaults
                     to `False`.
-                expire_time_h (int): Time in hours after which the cached data should
-                    expire. Defaults to `24` hours.
                 top (Union[str, int]): Determines how many top rankings to return.
                     Defaults to `'all'`. If an integer is provided, it limits the
                     ranking to the specified count.
@@ -134,7 +135,7 @@ class Score:
         redis_name = 'score_ranking'
 
         print(
-            f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {expire_time_h}h")
+            f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {expire_time/3600}h")
 
         def fetch_ranking() -> dict:
             data = {}
@@ -143,13 +144,13 @@ class Score:
                 try:
                     s.code = code
                 except ValueError:
-                    score_logger.error(f'score ranking error : {code}')
+                    mylogger.error(f'score ranking error : {code}')
                     continue
                 score = s.get(refresh=refresh)
                 data[code] = score
             return data
 
-        data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_ranking, timer=expire_time_h * 3600)
+        data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_ranking, timer=expire_time)
 
         # prophet_score를 기준으로 정렬
         ranking = OrderedDict(sorted(data_dict.items(), key=lambda x: x[1]['prophet_score'], reverse=True))

analyser_hj3415/analyser/tsa/__init__.py

@@ -0,0 +1,2 @@
+from .lstm import *
+from .prophet import *