analyser_hj3415 3.4.1__py3-none-any.whl → 3.4.2__py3-none-any.whl

analyser_hj3415/analyser/tsa/prophet.py

@@ -1,5 +1,7 @@
 from datetime import datetime, timedelta
-from typing import Optional, Tuple, List
+from typing import Optional, Tuple, List, Dict
+
+import pandas
 import yfinance as yf
 import pandas as pd
 from prophet import Prophet
@@ -29,11 +31,20 @@ class ProphetData:
     yhat: float
     yhat_upper: float
     yhat_lower: float
-    forecast_data: List[dict]
 
     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):
@@ -233,7 +244,6 @@ class MyProphet:
                 yhat=latest_yhat['yhat'],
                 yhat_lower=latest_yhat['yhat_lower'],
                 yhat_upper=latest_yhat['yhat_upper'],
-                forecast_data=self.df_forecast.to_dict(orient='records'),
             )
 
             data.trading_action, data.score = scoring(data.price, data.yhat_lower, data.yhat_upper)
@@ -244,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.1.dist-info → analyser_hj3415-3.4.2.dist-info}/METADATA

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

{analyser_hj3415-3.4.1.dist-info → analyser_hj3415-3.4.2.dist-info}/RECORD

@@ -11,13 +11,13 @@ analyser_hj3415/analyser/eval/red.py,sha256=8aJPpiVzLOZtt6kILCzqcfL8BrEVgIld1iI3
 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=P8peqg6ZUpCSNKupjFlyba3xbPZoYtpd2UihXib_4Do,28548
-analyser_hj3415/analyser/tsa/prophet.py,sha256=U2d8-o8Mv5H5LCmX5Nr1_ZeBhyNuECqsOsO4dsUvWOc,14768
+analyser_hj3415/analyser/tsa/prophet.py,sha256=AlDU6YmjSf094diTVpMe0w06Z-FZ_2KAsDm2rshzxpA,16957
 analyser_hj3415/workroom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 analyser_hj3415/workroom/mysklearn.py,sha256=wJXKz5MqqTzADdG2mqRMMzc_G9RzwYjj5_j4gyOopxQ,2030
 analyser_hj3415/workroom/mysklearn2.py,sha256=1lIy6EWEQHkOzDS-av8U0zQH6DuCLKWMI73dnJx5KRs,1495
 analyser_hj3415/workroom/score.py,sha256=P6nHBJYmyhigGtT4qna4BmNtvt4B93b7SKyzdstJK24,17376
 analyser_hj3415/workroom/trash.py,sha256=zF-W0piqkGr66UP6-iybo9EXh2gO0RP6R1FnIpsGkl8,12262
-analyser_hj3415-3.4.1.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
-analyser_hj3415-3.4.1.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-analyser_hj3415-3.4.1.dist-info/METADATA,sha256=DTGoL_-4sVPcmZQZV9TV5OBTnKDv1smq70zkZisKjmk,6777
-analyser_hj3415-3.4.1.dist-info/RECORD,,
+analyser_hj3415-3.4.2.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
+analyser_hj3415-3.4.2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+analyser_hj3415-3.4.2.dist-info/METADATA,sha256=F3_EIBCZD-sDpwathQJp9cCa_yF46fgHDegSF_FPeB8,6777
+analyser_hj3415-3.4.2.dist-info/RECORD,,