analyser_hj3415 4.1.0__py3-none-any.whl → 4.1.2__py3-none-any.whl

analyser_hj3415/analyser/eval/mil.py

@@ -1,12 +1,13 @@
 import os
 from dataclasses import dataclass
-from typing import Tuple
+from typing import Tuple, List, Dict
 import math
 
 from utils_hj3415 import tools, setup_logger
 from db_hj3415 import myredis, mymongo
 
 from analyser_hj3415.analyser.eval.common import Tools
+import pickle
 
 
 mylogger = setup_logger(__name__,'INFO')
@@ -85,6 +86,9 @@ class Mil:
         name (str): 기업명.
         _code (str): 기업 종목 코드.
     """
+
+    REDIS_MIL_DATA_SUFFIX = "mil_data"
+
     def __init__(self, code: str):
         assert tools.is_6digit(code), f'Invalid value : {code}'
         mylogger.debug(f"Mil : 종목코드 ({code})")
@@ -299,15 +303,15 @@ class Mil:
         return [0,]
 
     def _generate_data(self, refresh: bool) -> MilData:
-        mylogger.info(f"In generate_data..refresh : {refresh}")
+        mylogger.debug(f"In generate_data..refresh : {refresh}")
         시가총액_억 = self.get_marketcap억(refresh)
-        mylogger.info(f"{self} 시가총액(억) : {시가총액_억}")
+        mylogger.debug(f"{self} 시가총액(억) : {시가총액_억}")
 
         d1, 주주수익률, 재무활동현금흐름 = self._calc주주수익률(시가총액_억, refresh)
-        mylogger.info(f"{self} 주주수익률 : {주주수익률}, {d1}")
+        mylogger.debug(f"{self} 주주수익률 : {주주수익률}, {d1}")
 
         d2, 이익지표, 영업활동현금흐름, 지배주주당기순이익 = self._calc이익지표(시가총액_억, refresh)
-        mylogger.info(f"{self} 이익지표 : {이익지표}, {d2}")
+        mylogger.debug(f"{self} 이익지표 : {이익지표}, {d2}")
 
         d3, roic_r, roic_dict, roe_r, roe106, roa_r = self._calc투자수익률(refresh)
         d4, fcf_dict, pfcf_dict, pcr_dict = self._calc가치지표(시가총액_억, refresh)
@@ -364,10 +368,57 @@ class Mil:
         로그:
             - 캐시 검색 상태와 새로 생성된 데이터를 출력합니다.
         """
-        redis_name = f"{self.code}_mil"
+        redis_name = f"{self.code}_{self.REDIS_MIL_DATA_SUFFIX}"
         mylogger.debug(f"{self} redisname: '{redis_name}' / refresh : {refresh} / expire_time : {expire_time/3600}h")
 
         def fetch_generate_data(refresh_in: bool) -> dict:
             return self._generate_data(refresh_in) # type: ignore
 
-        return myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_generate_data, refresh, timer=expire_time)
+        return myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_generate_data, refresh, timer=expire_time)
+
+    @classmethod
+    def bulk_generate_data(cls, codes: List[str], refresh: bool) -> Dict[str, MilData]:
+        # --- (1) 파이프라인 GET ---
+        pipe = myredis.Base.redis_client.pipeline()
+        redis_keys = [f"{code}_{cls.REDIS_MIL_DATA_SUFFIX}" for code in codes]
+        for redis_key in redis_keys:
+            pipe.get(redis_key)
+        results_from_redis = pipe.execute()  # [val1, val2, ...]
+
+        final_results = {}
+        missing_codes = []
+
+        # refresh=True 이면 기존 데이터 무시하고 다시 계산해야 하므로 모두 missing 처리
+        if refresh:
+            missing_codes = codes[:]
+        else:
+            # refresh=False 이면, Redis 값이 None인 티커만 다시 계산
+            for code, val in zip(codes, results_from_redis):
+                if val is None:
+                    missing_codes.append(code)
+                else:
+                    # Redis에 pickled 데이터가 있다면 언피클해서 담기
+                    red_data = pickle.loads(val)
+                    final_results[code] = red_data
+
+        # --- (2) 필요한 티커만 직접 연산 ---
+        newly_computed_data = {}
+        for code in missing_codes:
+            mylogger.debug(f"*** bulk_generate_data : {code}")
+            data = cls(code)._generate_data(refresh=True)
+            newly_computed_data[code] = data
+
+        # --- (3) 파이프라인 SET ---
+        if newly_computed_data:
+            pipe = myredis.Base.redis_client.pipeline()
+            for code, data in newly_computed_data.items():
+                redis_key = f"{code}_{cls.REDIS_MIL_DATA_SUFFIX}"
+                # ProphetLatestData 객체를 pickle로 직렬화
+                pickled_data = pickle.dumps(data)
+                # SET + expire_time
+                pipe.setex(redis_key, expire_time, pickled_data)
+            pipe.execute()
+
+        # 최종 결과 딕셔너리 (캐시에 있었던 것 + 새로 만든 것)
+        final_results.update(newly_computed_data)
+        return final_results

analyser_hj3415/analyser/eval/red.py

@@ -306,7 +306,7 @@ class Red:
         newly_computed_data = {}
         for code in missing_codes:
             mylogger.debug(f"*** bulk_generate_data : {code}")
-            data = cls(code, expect_earn)._generate_data(refresh=refresh)
+            data = cls(code, expect_earn)._generate_data(refresh=True)
             newly_computed_data[code] = data
 
         # --- (3) 파이프라인 SET ---

analyser_hj3415/analyser/tsa/lstm.py

@@ -17,7 +17,6 @@ from utils_hj3415 import tools, setup_logger
 from db_hj3415 import myredis
 from analyser_hj3415.analyser import MIs, tsa
 from analyser_hj3415.analyser.tsa.common import PandasTimestampField, ChartPoint
-import pickle
 
 mylogger = setup_logger(__name__,'INFO')
 expire_time = tools.to_int(os.getenv('DEFAULT_EXPIRE_TIME_H', 48)) * 3600
@@ -557,24 +556,12 @@ class MyLSTM:
 
     @staticmethod
     def bulk_get_chart_data(tickers: List[str]) -> Dict[str, Optional[LSTMChartData]]:
-        # --- (1) 파이프라인 GET ---
-        pipe = myredis.Base.redis_client.pipeline()
         redis_keys = [f"{ticker}_{MyLSTM.REDIS_LSTM_DATA_SUFFIX}" for ticker in tickers]
-        for redis_key in redis_keys:
-            pipe.get(redis_key)
-        results_from_redis = pipe.execute()  # [val1, val2, ...]
-
-        final_results = {}
-
-        for ticker, val in zip(tickers, results_from_redis):
-            if val is None:
-                final_results[ticker] = None
-            else:
-                # Redis에 pickled 데이터가 있다면 언피클해서 담기
-                lstm_data = pickle.loads(val)
-                final_results[ticker] = lstm_data
-
-        return final_results
+        redis_key_data = myredis.Base.bulk_get_data(redis_keys)
+        ticker_data = {}
+        for redis_key, data in redis_key_data.items():
+            ticker_data[redis_key.split('_')[0]] = data
+        return ticker_data
 
     @staticmethod
     def caching_chart_data(tickers:list, num:int):

{analyser_hj3415-4.1.0.dist-info → analyser_hj3415-4.1.2.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.3
 Name: analyser_hj3415
-Version: 4.1.0
+Version: 4.1.2
 Summary: Stock analyser and database processing programs
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 Requires-Dist: utils-hj3415>=3.0.10
-Requires-Dist: db-hj3415>=4.3.5
+Requires-Dist: db-hj3415>=4.4.0
 Requires-Dist: scikit-learn>=1.5.2
 Requires-Dist: plotly>=5.24.1
 Requires-Dist: yfinance>=0.2.44

{analyser_hj3415-4.1.0.dist-info → analyser_hj3415-4.1.2.dist-info}/RECORD

@@ -5,13 +5,13 @@ analyser_hj3415/analyser/eval/__init__.py,sha256=IP1d0Q3nOCAD3zK1qxrC685MkJQfUh-
 analyser_hj3415/analyser/eval/blue.py,sha256=p5JPwkQYoO0dsOe3VnfMV3pOWLzNsAFvLCUK56f85Xo,10782
 analyser_hj3415/analyser/eval/common.py,sha256=sNXapoofShA43ww_SLjXmIjkrAr1AhAcezdaN_X_3Us,11443
 analyser_hj3415/analyser/eval/growth.py,sha256=tlHxLx4u5h7bNG0T8ViJujX20QllfrSaBl-TBqFNkEs,6362
-analyser_hj3415/analyser/eval/mil.py,sha256=uaS7MHNlytrjEgdLc9S1zhXb5bzVAwlSMlnQWop2Hbw,15017
-analyser_hj3415/analyser/eval/red.py,sha256=DZBV0qMzWD8KGvAbdxrohCVT0a5luduuhKQoN3OtNwc,13909
+analyser_hj3415/analyser/eval/mil.py,sha256=aSEqlpytkI0A5_jZKOFLUbPgXc-WiKJUVDZuyI_L3fI,17147
+analyser_hj3415/analyser/eval/red.py,sha256=1wbZWFBWQjnnE4uQQVE34Wfl2YXePzJ2yqKmfLxicoc,13906
 analyser_hj3415/analyser/tsa/__init__.py,sha256=pg20ZQRABedTdaIoOr5t043RNKtJ7ji_WmnZrD1IhPg,147
 analyser_hj3415/analyser/tsa/common.py,sha256=ZLUkifupOlLKsrPiqR3y6FaEN4M_loZhxCZXYxkX0us,1874
-analyser_hj3415/analyser/tsa/lstm.py,sha256=X59xHpMxEaR95Tf9OIdBT4KXFTMAwZF-_s0CMHRCTk0,29401
+analyser_hj3415/analyser/tsa/lstm.py,sha256=oENuJyyo6U9MMn4UF4ZauGai51_dJisMSUNBiH8udXo,28998
 analyser_hj3415/analyser/tsa/prophet.py,sha256=a8XPiikRFbqHjbDT7C3hK5RsqOp5JyAbY7lDFNQfBzM,17884
-analyser_hj3415-4.1.0.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
-analyser_hj3415-4.1.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-analyser_hj3415-4.1.0.dist-info/METADATA,sha256=cVVNfXeU__3S1w621s_3t71x6DIQpg967nhc1Wj-4oM,6777
-analyser_hj3415-4.1.0.dist-info/RECORD,,
+analyser_hj3415-4.1.2.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
+analyser_hj3415-4.1.2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+analyser_hj3415-4.1.2.dist-info/METADATA,sha256=JxwlkMpOKXNToZlcgU0NL0cI8jZbl_EZMtwhnh-wy7w,6777
+analyser_hj3415-4.1.2.dist-info/RECORD,,