analyser_hj3415 3.4.0__tar.gz → 3.4.2__tar.gz

{analyser_hj3415-3.4.0 → analyser_hj3415-3.4.2}/PKG-INFO

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

{analyser_hj3415-3.4.0 → analyser_hj3415-3.4.2}/analyser_hj3415/analyser/eval/growth.py

@@ -170,6 +170,7 @@ class Growth:
         로그:
             - 캐시 검색 상태와 새로 생성된 데이터를 출력합니다.
         """
+
         redis_name = f"{self.code}_growth"
         mylogger.info(f"{self} GrowthData를 레디스캐시에서 가져오거나 새로 생성합니다.. refresh : {refresh}")
         if verbose:

{analyser_hj3415-3.4.0 → analyser_hj3415-3.4.2}/analyser_hj3415/analyser/tsa/prophet.py

@@ -1,5 +1,7 @@
 from datetime import datetime, timedelta
-from typing import Optional, Tuple
+from typing import Optional, Tuple, List, Dict
+
+import pandas
 import yfinance as yf
 import pandas as pd
 from prophet import Prophet
@@ -33,6 +35,16 @@ class ProphetData:
     trading_action: str = ''
     score: int = None
 
+@dataclass
+class ProphetChartData:
+    ticker: str
+
+    labels: List[pandas.Timestamp]
+    prices: List[Dict[pandas.Timestamp, float]]
+    yhats: List[Dict[pandas.Timestamp, float]]
+    yhat_uppers: List[Dict[pandas.Timestamp, float]]
+    yhat_lowers: List[Dict[pandas.Timestamp, float]]
+
 
 class MyProphet:
     def __init__(self, ticker: str):
@@ -242,6 +254,46 @@ class MyProphet:
 
         return prophet_data
 
+    def generate_chart_data(self, refresh: bool) -> ProphetChartData:
+        """
+        1. 현재 주가 (실제 데이터)
+            •	df_real['ds'] → x축 (날짜)
+            •	df_real['y'] → y축 (실제 주가)
+
+        2. 예측 값 범위 (최소/최대)
+            •	df_forecast['ds'] → x축 (날짜)
+            •	df_forecast['yhat_lower'] → y축 (최소 예측값)
+            •	df_forecast['yhat_upper'] → y축 (최대 예측값)
+        """
+        print("**** Start generate_chart_data... ****")
+        redis_name = f'{self.ticker}_myprophet_chart_data'
+
+        print(
+            f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {expire_time / 3600}h")
+
+        def fetch_generate_prophet_chart_data() -> ProphetChartData:
+            self.initializing()
+
+            # 날짜를 기준으로 합치기 (outer join)
+            merged_df = pd.merge(self.df_real, self.df_forecast, on="ds", how="outer")
+            # 날짜 정렬
+            merged_df = merged_df.sort_values(by="ds").reset_index(drop=True)
+
+            data = ProphetChartData(
+                ticker=self.ticker,
+                labels=merged_df["ds"].tolist(),
+                prices=[{"x": ds, "y": y} for ds, y in zip(merged_df["ds"], merged_df["y"]) if pd.notna(y)], # type: ignore
+                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
+            )
+            return data
+
+        prophet_chart_data = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_generate_prophet_chart_data,
+                                                         timer=expire_time)
+        return prophet_chart_data
+
+
     def visualization(self):
         """
         Prophet 모델의 예측 결과를 시각화합니다.

{analyser_hj3415-3.4.0 → analyser_hj3415-3.4.2}/pyproject.toml

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