analyser_hj3415 4.0.2__py3-none-any.whl → 4.0.4__py3-none-any.whl

analyser_hj3415/analyser/tsa/prophet.py

@@ -170,7 +170,7 @@ class MyProphet:
             mylogger.debug(forecast)
             return forecast
 
-        mylogger.debug("Initializing data for MyProphet")
+        mylogger.info("Initializing data for MyProphet")
 
         self.scaler = StandardScaler()
         self.model = Prophet()
@@ -279,7 +279,8 @@ class MyProphet:
             f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {expire_time / 3600}h")
 
         def fetch_generate_prophet_chart_data() -> ProphetChartData:
-            if self.initialized:
+            mylogger.debug(f'initialized: {self.initialized}')
+            if not self.initialized:
                 self.initializing()
 
             # 날짜를 기준으로 합치기 (outer join)
@@ -294,7 +295,7 @@ class MyProphet:
                 yhats=[{"x": ds, "y": yhat} for ds, yhat in zip(merged_df["ds"], merged_df["yhat"])], # type: ignore
                 yhat_uppers=[{"x": ds, "y": yhat_upper} for ds, yhat_upper in zip(merged_df["ds"], merged_df["yhat_upper"])], # type: ignore
                 yhat_lowers=[{"x": ds, "y": yhat_lower} for ds, yhat_lower in zip(merged_df["ds"], merged_df["yhat_lower"])], # type: ignore
-                is_prophet_up=self.is_prophet_up(refresh=refresh),
+                is_prophet_up=tsa.common.is_up_by_OLS(self.df_forecast.set_index('ds')['yhat'].to_dict()),
             )
             return data
 
@@ -302,28 +303,6 @@ class MyProphet:
                                                          timer=expire_time)
         return prophet_chart_data
 
-    def is_prophet_up(self, refresh: bool) -> bool:
-        """
-        Prophet 예측이 상승 추세인지 여부를 확인합니다.
-
-        매개변수:
-            refresh (bool): 데이터를 새로 생성할지 여부.
-
-        반환값:
-            bool: 상승 추세 여부.
-        """
-        mylogger.debug("**** Caching is_prophet_up ... ****")
-        redis_name = f'{self.ticker}_is_prophet_up'
-        mylogger.info(f"redisname: '{redis_name}' / expire_time : {expire_time / 3600}h")
-
-        def fetch_is_prophet_up():
-            if self.initialized:
-                self.initializing()
-            yhat_dict = self.df_forecast.set_index('ds')['yhat'].to_dict()
-            return tsa.common.is_up_by_OLS(yhat_dict)
-
-        return myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_is_prophet_up, timer=expire_time)
-
     @staticmethod
     def is_valid_date(date_string):
         """
@@ -344,7 +323,7 @@ class MyProphet:
             return False
 
     @staticmethod
-    def bulk_generate_latest_data(tickers: List[str], refresh: bool) -> Dict[str, ProphetLatestData]:
+    def bulk_get_latest_data(tickers: List[str], refresh: bool) -> Dict[str, ProphetLatestData]:
         # --- (1) 파이프라인 GET ---
         pipe = myredis.Base.redis_client.pipeline()
         redis_keys = [f"{ticker}_{MyProphet.REDIS_LATEST_DATA_SUFFIX}" for ticker in tickers]
@@ -428,7 +407,7 @@ class CorpProphet(MyProphet):
         mylogger.info("**** Start prophet ranking ... ****")
 
         data = {}
-        for ticker, latest_data in MyProphet.bulk_generate_latest_data(
+        for ticker, latest_data in MyProphet.bulk_get_latest_data(
                 [CorpProphet.code_to_ticker(code) for code in myredis.Corps.list_all_codes()], refresh=refresh).items():
             code = CorpProphet.ticker_to_code(ticker)
             score = latest_data.score
@@ -446,8 +425,8 @@ class CorpProphet(MyProphet):
                 raise ValueError("top 인자는 'all' 이나 int형 이어야 합니다.")
 
     @staticmethod
-    def bulk_generate_latest_data(codes: List[str], refresh: bool) -> Dict[str, ProphetLatestData]:
-        return MyProphet.bulk_generate_latest_data([CorpProphet.code_to_ticker(code) for code in codes], refresh=refresh)
+    def bulk_get_latest_data(codes: List[str], refresh: bool) -> Dict[str, ProphetLatestData]:
+        return MyProphet.bulk_get_latest_data([CorpProphet.code_to_ticker(code) for code in codes], refresh=refresh)
 
 
 class MIProphet(MyProphet):

{analyser_hj3415-4.0.2.dist-info → analyser_hj3415-4.0.4.dist-info}/METADATA

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

{analyser_hj3415-4.0.2.dist-info → analyser_hj3415-4.0.4.dist-info}/RECORD

@@ -10,8 +10,8 @@ analyser_hj3415/analyser/eval/red.py,sha256=b-Odud8pxQIO2NjI7m3HbK4FOND5WhaoYV94
 analyser_hj3415/analyser/tsa/__init__.py,sha256=pg20ZQRABedTdaIoOr5t043RNKtJ7ji_WmnZrD1IhPg,147
 analyser_hj3415/analyser/tsa/common.py,sha256=OnsZ_cFYmNzmk0tV5qSqVW-5jJyrwMWHguWdS2Z6fvY,979
 analyser_hj3415/analyser/tsa/lstm.py,sha256=55MV62jSPqdOw1zAk1zB7LacNDesPsrmcUwHqaCz6Gs,27974
-analyser_hj3415/analyser/tsa/prophet.py,sha256=dQ0g1pEv-ELugsg586w2yH0WJQQqr1zV_Wo7UXG_3WE,18337
-analyser_hj3415-4.0.2.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
-analyser_hj3415-4.0.2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-analyser_hj3415-4.0.2.dist-info/METADATA,sha256=Fk1VW_PXcF-9FA5YFahSiHC0164i0o0ExB5zrF19des,6777
-analyser_hj3415-4.0.2.dist-info/RECORD,,
+analyser_hj3415/analyser/tsa/prophet.py,sha256=5ykwT6jaX_yzV3l_aHyby-QwLfxOMJaQjAfBpEEK46A,17572
+analyser_hj3415-4.0.4.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
+analyser_hj3415-4.0.4.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+analyser_hj3415-4.0.4.dist-info/METADATA,sha256=BHVuHK-W4aalJCs9uVE_ozlr-0y01SoilK9BIxMMUqE,6777
+analyser_hj3415-4.0.4.dist-info/RECORD,,