analyser_hj3415 2.9.4__py3-none-any.whl → 2.9.6__py3-none-any.whl

analyser_hj3415/cli.py

@@ -56,6 +56,11 @@ def analyser_manager():
     caching_parser = lstm_subparser.add_parser('caching', help='lstm 랭킹 책정 및 레디스 저장')
     caching_parser.add_argument('-r', '--refresh', action='store_true', help='래디스 캐시를 사용하지 않고 강제로 재계산 할지')
     caching_parser.add_argument('-n', '--noti', action='store_true', help='작업 완료 후 메시지 전송 여부')
+    # red - get 파서
+    lstm_get_parser = lstm_subparser.add_parser('get', help='lstm get 책정 및 레디스 저장')
+    lstm_get_parser.add_argument('code', type=str, help='종목코드')
+    lstm_get_parser.add_argument('-r', '--refresh', action='store_true', help='래디스 캐시를 사용하지 않고 강제로 재계산 할지')
+    lstm_get_parser.add_argument('-n', '--noti', action='store_true', help='작업 완료 후 메시지 전송 여부')
 
     # red 명령어 서브파서
     red_parser = type_subparsers.add_parser('red', help='red 타입')
@@ -222,6 +227,11 @@ def analyser_manager():
             result = tsa.MyLSTM('005930').caching_based_on_prophet_ranking(refresh=args.refresh)
             if args.noti:
                 noti.telegram_to('manager', "오늘의 lstm caching을 레디스캐시에 저장했습니다.(유효 24시간)")
+        elif args.command == 'get':
+            assert utils.is_6digit(args.code), "code 인자는 6자리 숫자이어야 합니다."
+            result = tsa.MyLSTM(args.code).get_final_predictions(refresh=args.refresh)
+            if args.noti:
+                noti.telegram_to('manager', f"LSTM 분석을({args.code})를 레디스 캐시에 저장했습니다.(유효 12시간)")
     elif args.type == 'setting':
         if args.command == 'set':
             settings_manager.set_value(args.title, args.value)

analyser_hj3415/tsa.py

@@ -1,6 +1,8 @@
 """
 Time Series Analysis
 """
+from pprint import pprint
+
 import numpy as np
 import yfinance as yf
 from datetime import datetime, timedelta
@@ -98,6 +100,8 @@ class MyProphet:
 
         # 추가 변수를 정규화
         df['volume_scaled'] = self.scaler.fit_transform(df[['volume']])
+        tsa_logger.debug('_preprocessing_for_prophet')
+        tsa_logger.debug(df)
         return df
 
     def _make_forecast(self) -> pd.DataFrame:
@@ -108,12 +112,16 @@ class MyProphet:
 
         # 향후 180일 동안의 주가 예측
         future = self.model.make_future_dataframe(periods=180)
+        tsa_logger.debug('_make_forecast_future')
+        tsa_logger.debug(future)
 
         # 미래 데이터에 거래량 추가 (평균 거래량을 사용해 정규화)
         future_volume = pd.DataFrame({'volume': [self.raw_data['Volume'].mean()] * len(future)})
         future['volume_scaled'] = self.scaler.transform(future_volume[['volume']])
 
         forecast = self.model.predict(future)
+        tsa_logger.debug('_make_forecast')
+        tsa_logger.debug(forecast)
         return forecast
 
     def get_yhat(self) -> dict:
@@ -292,11 +300,14 @@ class MyLSTM:
         four_years_ago = today - timedelta(days=365 * 4)
         tsa_logger.info(f"start: {four_years_ago.strftime('%Y-%m-%d')}, end: {today.strftime('%Y-%m-%d')}")
 
-        return yf.download(
+        df = yf.download(
             self.code + '.KS',
             start=four_years_ago.strftime('%Y-%m-%d'),
             end=today.strftime('%Y-%m-%d')
         )
+        df.index = df.index.tz_localize(None)
+        tsa_logger.debug(df)
+        return df
 
     def _preprocessing_for_lstm(self) -> LSTMData:
         """
@@ -538,17 +549,61 @@ class MyLSTM:
         future_dates, final_future_predictions = self.get_final_predictions(refresh=refresh)
         final_future_predictions = final_future_predictions.reshape(-1) # 차원을 하나 줄인다.
 
-        # Plotly를 사용한 시각화
+        # 데이터 준비
+        self.raw_data = self.raw_data.reset_index()
+        data = self.raw_data[['Date', 'Close']][-120:].reset_index(drop=True)
+
+        # 'Date'와 'Close' 열 추출
+        actual_dates = pd.to_datetime(data['Date'])
+        actual_close = data['Close']
+
+        # 'actual_close'가 Series인지 확인
+        if isinstance(actual_close, pd.DataFrame):
+            actual_close = actual_close.squeeze()
+
+        # 'Close' 열의 데이터 타입 확인
+        actual_close = actual_close.astype(float)
+
+        # 예측 데이터 준비
+        predicted_dates = pd.to_datetime(future_dates)
+        predicted_close = pd.Series(final_future_predictions, index=range(len(final_future_predictions))).astype(float)
+
+        # 그래프 생성
         fig = go.Figure()
 
-        # 실제 데이터
-        fig.add_trace(go.Scatter(x=self.raw_data.index[-120:], y=self.raw_data['Close'][-120:], mode='markers', name='실제주가'))
-        tsa_logger.debug(f"self.raw_data.index[-120:] - {self.raw_data.index[-120:]}")
-        tsa_logger.debug(f"self.raw_data['Close'][-120:] - {self.raw_data['Close'][-120:]}")
-        # 예측 데이터
-        fig.add_trace(go.Scatter(x=future_dates, y=final_future_predictions, mode='lines+markers', name='예측치(30일)'))
-        tsa_logger.debug(f"future_dates - {future_dates}")
-        tsa_logger.debug(f"final_future_predictions - {final_future_predictions}")
+        # 실제 데이터 추가
+        fig.add_trace(go.Scatter(
+            x=actual_dates,
+            y=actual_close,
+            mode='markers',
+            name='실제주가'
+        ))
+
+        # 예측 데이터 추가
+        fig.add_trace(go.Scatter(
+            x=predicted_dates,
+            y=predicted_close,
+            mode='lines+markers',
+            name='예측치(30일)'
+        ))
+
+        # 레이아웃 업데이트
+        fig.update_layout(
+            xaxis_title='일자',
+            yaxis_title='주가(원)',
+            xaxis=dict(
+                tickformat='%Y/%m',
+            ),
+            yaxis=dict(
+                tickformat=".0f",
+            ),
+            showlegend=True,
+        )
+
+        tsa_logger.debug(f"actual_dates({len(actual_dates)}) - {actual_dates}")
+        tsa_logger.debug(f"actual_close({len(actual_close)} - {actual_close}")
+        tsa_logger.debug(f"predicted_dates({len(future_dates)}) - {future_dates}")
+        tsa_logger.debug(f"predicted_close({len(predicted_close)}) - {predicted_close}")
 
         fig.update_layout(
             # title=f'{self.code} {self.name} 주가 예측 그래프(prophet)',

{analyser_hj3415-2.9.4.dist-info → analyser_hj3415-2.9.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: analyser_hj3415
-Version: 2.9.4
+Version: 2.9.6
 Summary: Stock analyser and database processing programs
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
@@ -12,6 +12,7 @@ Requires-Dist: yfinance>=0.2.44
 Requires-Dist: prophet>=1.1.6
 Requires-Dist: kaleido>=0.2.1
 Requires-Dist: matplotlib>=3.9.2
+Requires-Dist: tensorflow>=2.18.0
 
 ### analyser-hj3415
 

{analyser_hj3415-2.9.4.dist-info → analyser_hj3415-2.9.6.dist-info}/RECORD

@@ -1,14 +1,14 @@
 analyser_hj3415/.DS_Store,sha256=S5yjTP1issWmV5kF2CFjGHm5OJHgkuTaZHuxjIwSkfc,6148
 analyser_hj3415/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-analyser_hj3415/cli.py,sha256=EW0-lIrpZHNNeDKksxC4qDBCiHPkYMGMHsZhAg6VsS8,12870
+analyser_hj3415/cli.py,sha256=NZ5guApdRCWqpW0f_ECwSpGCccdja011wWsUYkccvbY,13717
 analyser_hj3415/eval.py,sha256=WWIvB4BebjW9GNGcF8rMd-MLL-lPXUBOH01_FpSq95I,38811
-analyser_hj3415/tsa.py,sha256=WKiXYcCr68LI2SI4O6X5aAYNq3s_xUsuGMgysMgnutQ,25249
+analyser_hj3415/tsa.py,sha256=BsuyLZQcQE_VV7xOlw6_xpRAhwfY5FU_J-jBWTai7lg,26774
 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-2.9.4.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
-analyser_hj3415-2.9.4.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-analyser_hj3415-2.9.4.dist-info/METADATA,sha256=a4U3zm9lVLsFjkeehCSBuS6Q_iWslZ9rPWZ0zP4eonU,6490
-analyser_hj3415-2.9.4.dist-info/RECORD,,
+analyser_hj3415-2.9.6.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
+analyser_hj3415-2.9.6.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+analyser_hj3415-2.9.6.dist-info/METADATA,sha256=E9NDlUi2M4vi7-RnFJTK-6w754uZHCnbVY7ZoaCqK20,6524
+analyser_hj3415-2.9.6.dist-info/RECORD,,

{analyser_hj3415-2.9.4.dist-info → analyser_hj3415-2.9.6.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: flit 3.10.1
 Root-Is-Purelib: true
 Tag: py3-none-any