analyser_hj3415 4.5.4__py3-none-any.whl → 4.6.0__py3-none-any.whl

analyser_hj3415/analyser/eval/blue.py

@@ -139,16 +139,17 @@ class Blue:
             except ZeroDivisionError:
                 mylogger.info(f'유동자산: {유동자산value} + 추정영업현금흐름: {추정영업현금흐름value} / 유동부채: {유동부채value}')
                 계산된유동비율 = float('inf')
-            finally:
-                mylogger.debug(f'{self} 계산된 유동비율 : {계산된유동비율}')
-
-                try:
-                    date, *_ = Tools.date_set(유동자산date, 유동부채date, 추정영업현금흐름date)
-                except ValueError:
-                    # 날짜 데이터가 없는경우
-                    date = ''
-                mylogger.warning(f'{self} 유동비율 이상(100 이하 또는 nan) : {유동비율value} -> 재계산 : {계산된유동비율}')
-                return date, 계산된유동비율
+
+            mylogger.debug(f'{self} 계산된 유동비율 : {계산된유동비율}')
+
+            try:
+                date, *_ = Tools.date_set(유동자산date, 유동부채date, 추정영업현금흐름date)
+            except ValueError:
+                # 날짜 데이터가 없는경우
+                date = ''
+
+            mylogger.warning(f'{self} 유동비율 이상(100 이하 또는 nan) : {유동비율value} -> 재계산 : {계산된유동비율}')
+            return date, 계산된유동비율
         else:
             return 유동비율date, 유동비율value
 

analyser_hj3415/analyser/tsa/common.py

@@ -1,11 +1,26 @@
 import numpy as np
-from dataclasses import dataclass, field
-from typing import Optional
 import pandas as pd
-from marshmallow import fields
+from dataclasses_json import config
+from dataclasses import dataclass, field
+from typing import Optional, List
+from dataclasses_json import dataclass_json
+from datetime import date
+from dataclasses_json import config
+from dataclasses import dataclass, field
+from dataclasses_json import dataclass_json
 
 
 def is_up_by_OLS(data: dict) -> bool:
+    """
+    주어진 데이터의 값들을 날짜 순으로 정렬한 후, 최소제곱법(OLS)을 이용해 선형 회귀 기울기를 계산합니다.
+    데이터가 비어있거나 계산에 필요한 데이터 포인트(1개 이하)가 있는 경우에는 추세를 판단할 수 없으므로 False를 반환합니다.
+
+    Parameters:
+        data (dict): 날짜(문자열)를 키로, 해당 날짜의 값(숫자)을 값으로 하는 딕셔너리.
+
+    Returns:
+        bool: 계산된 기울기가 양수이면 True (우상향 추세), 그렇지 않으면 False.
+    """
     if not data:
         # 데이터가 비어있으면 추세를 판단할 수 없음
         return False
@@ -36,25 +51,90 @@ def is_up_by_OLS(data: dict) -> bool:
     # 4) 기울기가 양수면 "우상향 추세"로 판별
     return slope > 0
 
+
+@dataclass
+class LSTMGrade:
+    """
+    LSTM 모델 학습 결과를 평가하기 위한 데이터 클래스.
+
+    속성:
+        ticker (str): 주식 티커(symbol).
+        train_mse (float): 학습 데이터에 대한 평균 제곱 오차(MSE).
+        train_mae (float): 학습 데이터에 대한 평균 절대 오차(MAE).
+        train_r2 (float): 학습 데이터에 대한 결정 계수(R²).
+        test_mse (float): 테스트 데이터에 대한 평균 제곱 오차(MSE).
+        test_mae (float): 테스트 데이터에 대한 평균 절대 오차(MAE).
+        test_r2 (float): 테스트 데이터에 대한 결정 계수(R²).
+    """
+    ticker: str
+    train_mse: float
+    train_mae: float
+    train_r2: float
+    test_mse: float
+    test_mae: float
+    test_r2: float
+
+
+# ⓐ 단일 Timestamp ↔ ISO-8601 문자열
+ts_enc   = lambda ts: ts.isoformat()
+ts_dec   = lambda s: pd.Timestamp(s)
+
+# ⓑ Timestamp 리스트 ↔ 문자열 리스트
+list_enc = lambda seq: [ts.isoformat() for ts in seq]
+list_dec = lambda seq: [pd.Timestamp(s) for s in seq]
+
+
+@dataclass_json
+@dataclass
+class ChartPoint:
+    """prices 리스트의 각 원소(x, y)를 표현"""
+    x: pd.Timestamp = field(metadata=config(encoder=ts_enc, decoder=ts_dec))
+    y: Optional[float] = None
+
+
+@dataclass_json
 @dataclass
-class PandasTimestampField(fields.DateTime):
-    """pandas.Timestamp를 ISO 8601 문자열로 직렬화하고 역직렬화하는 필드"""
+class ProphetChartData:
+    ticker: str
+
+    labels: List[pd.Timestamp] = field(metadata=config(encoder=list_enc, decoder=list_dec))
+    prices: List[ChartPoint]
+    yhats:  List[ChartPoint]
+    yhat_uppers: List[ChartPoint]
+    yhat_lowers: List[ChartPoint]
 
-    def __init__(self, *args, **kwargs):
-        # 꼭 부모의 __init__을 호출해야 함
-        super().__init__(*args, **kwargs)
+    is_prophet_up: bool
 
-    def _serialize(self, value, attr, obj, **kwargs):
-        return value.isoformat() if isinstance(value, pd.Timestamp) else None
 
-    def _deserialize(self, value, attr, data, **kwargs):
-        return pd.Timestamp(value)
+# ISO-8601(YYYY-MM-DD) 포맷으로 직렬화·역직렬화
+date_enc = lambda d: d.isoformat()
+date_dec = lambda s: date.fromisoformat(s)
 
+
+@dataclass_json
 @dataclass
-class ChartPoint:
-    """prices 리스트의 각 원소(x, y)를 표현할 데이터 클래스"""
-    x: pd.Timestamp = field(metadata={"marshmallow_field": PandasTimestampField()})
-    y: Optional[float] = field(default=None, metadata={"marshmallow_field": fields.Float(allow_none=True)})
+class LSTMChartData:
+    ticker: str
+
+    labels: List[pd.Timestamp] = field(metadata=config(encoder=list_enc, decoder=list_dec))
+    prices: List[ChartPoint]
+    future_prices: List[ChartPoint]
+    grade: LSTMGrade
+    num: int
+    is_lstm_up: bool
+
+
+@dataclass_json
+@dataclass
+class ProphetLatestData:
+    ticker: str
 
+    date: date = field(metadata=config(encoder=date_enc, decoder=date_dec))
 
+    price: float
+    yhat: float
+    yhat_upper: float
+    yhat_lower: float
 
+    trading_action: str = ''
+    score: int | None = None

analyser_hj3415/analyser/tsa/lstm.py

@@ -10,14 +10,13 @@ from tensorflow.keras.layers import LSTM, Dense, Dropout # type: ignore
 from tensorflow.keras.callbacks import EarlyStopping # type: ignore
 from tensorflow.keras import Input # type: ignore
 from sklearn.metrics import mean_squared_error, mean_absolute_error, r2_score
-from dataclasses import dataclass, field
-from marshmallow import fields
+from dataclasses import dataclass
 
 from utils_hj3415 import tools, setup_logger
 from db_hj3415 import myredis
 from db_hj3415.mymongo.flask import Favorites
 from analyser_hj3415.analyser import MIs, tsa
-from analyser_hj3415.analyser.tsa.common import PandasTimestampField, ChartPoint
+from analyser_hj3415.analyser.tsa.common import LSTMChartData, LSTMGrade
 
 mylogger = setup_logger(__name__,'WARNING')
 
@@ -51,41 +50,6 @@ class LSTMData:
     y_test_1d: np.ndarray
 
 
-@dataclass
-class LSTMGrade:
-    """
-    LSTM 모델 학습 결과를 평가하기 위한 데이터 클래스.
-
-    속성:
-        ticker (str): 주식 티커(symbol).
-        train_mse (float): 학습 데이터에 대한 평균 제곱 오차(MSE).
-        train_mae (float): 학습 데이터에 대한 평균 절대 오차(MAE).
-        train_r2 (float): 학습 데이터에 대한 결정 계수(R²).
-        test_mse (float): 테스트 데이터에 대한 평균 제곱 오차(MSE).
-        test_mae (float): 테스트 데이터에 대한 평균 절대 오차(MAE).
-        test_r2 (float): 테스트 데이터에 대한 결정 계수(R²).
-    """
-    ticker: str
-    train_mse: float
-    train_mae: float
-    train_r2: float
-    test_mse: float
-    test_mae: float
-    test_r2: float
-
-
-@dataclass
-class LSTMChartData:
-    ticker: str
-
-    labels: List[pd.Timestamp] = field(metadata={"marshmallow_field": fields.List(PandasTimestampField())})
-    prices: List[ChartPoint]
-    future_prices: List[ChartPoint]
-    grade: LSTMGrade
-    num: int
-    is_lstm_up: bool
-
-
 class MyLSTM:
     """
     주가 데이터를 기반으로 LSTM 모델을 생성, 학습 및 예측하는 클래스.

analyser_hj3415/analyser/tsa/myprophet.py

@@ -7,44 +7,16 @@ import yfinance as yf
 import pandas as pd
 from prophet import Prophet
 from sklearn.preprocessing import StandardScaler
-from dataclasses import dataclass, field
-from marshmallow import fields
 
 from utils_hj3415 import tools, setup_logger
 from db_hj3415 import myredis
 
 from analyser_hj3415.analyser import eval, MIs, tsa
-from analyser_hj3415.analyser.tsa.common import PandasTimestampField, ChartPoint
+from analyser_hj3415.analyser.tsa.common import ProphetChartData, ProphetLatestData
 
 
 mylogger = setup_logger(__name__,'WARNING')
 
-@dataclass
-class ProphetLatestData:
-    ticker: str
-
-    date: datetime.date = field(metadata={"marshmallow_field": fields.Date()})
-    price: float
-    yhat: float
-    yhat_upper: float
-    yhat_lower: float
-
-    trading_action: str = ''
-    score: int = None
-
-
-@dataclass
-class ProphetChartData:
-    ticker: str
-
-    labels: List[pd.Timestamp] = field(metadata={"marshmallow_field": fields.List(PandasTimestampField())})
-    prices: List[ChartPoint]
-    yhats: List[ChartPoint]
-    yhat_uppers: List[ChartPoint]
-    yhat_lowers: List[ChartPoint]
-
-    is_prophet_up: bool
-
 
 class MyProphet:
 

{analyser_hj3415-4.5.4.dist-info → analyser_hj3415-4.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: analyser_hj3415
-Version: 4.5.4
+Version: 4.6.0
 Summary: Stock analyser and database processing programs
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
@@ -12,7 +12,8 @@ Requires-Dist: yfinance>=0.2.54
 Requires-Dist: prophet>=1.1.6
 Requires-Dist: kaleido>=0.2.1
 Requires-Dist: matplotlib>=3.9.2
-Requires-Dist: marshmallow>=3.26.0
+Requires-Dist: dataclasses_json>=0.6.7
+Requires-Dist: pandas>=2.2.3
 Requires-Dist: tensorflow-macos>=2.16.2; platform_machine == 'arm64' and sys_platform == 'darwin'
 Requires-Dist: tensorflow-metal>=0.5.0; platform_machine == 'arm64' and sys_platform == 'darwin'
 Requires-Dist: tensorflow>=2.18.0; platform_machine != 'arm64' or sys_platform != 'darwin'

{analyser_hj3415-4.5.4.dist-info → analyser_hj3415-4.6.0.dist-info}/RECORD

@@ -3,16 +3,16 @@ analyser_hj3415/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 analyser_hj3415/cli.py,sha256=drfh0cqZ0LUHUJMJeyXcv1QTD7VYJMr58gcY4WHsVk4,11956
 analyser_hj3415/analyser/__init__.py,sha256=N0XyBfWJNpDS_6JYziKETWePO_jtFB1m7E8Qbwt1w0Q,1096
 analyser_hj3415/analyser/eval/__init__.py,sha256=IP1d0Q3nOCAD3zK1qxrC685MkJQfUh-qaXc7xptTxk8,80
-analyser_hj3415/analyser/eval/blue.py,sha256=KBoKevikS74ys9zcVls6GaEdBkW-avcxHWkSPywOcPU,10644
+analyser_hj3415/analyser/eval/blue.py,sha256=-t_9Tm2n8tfrPRDIDT9YU7EQLaFqPa89_7JS8wqVcfA,10593
 analyser_hj3415/analyser/eval/common.py,sha256=sNXapoofShA43ww_SLjXmIjkrAr1AhAcezdaN_X_3Us,11443
 analyser_hj3415/analyser/eval/growth.py,sha256=LunZcZvhly_2PWUZBbd0gW9ZImWYT5sAu_iixVLxGuc,6226
 analyser_hj3415/analyser/eval/mil.py,sha256=6_1SuWqG1fsuZUKuaABhSqNsYCgj5np35auWhnE5wdk,15289
 analyser_hj3415/analyser/eval/red.py,sha256=YXk7QX1No9mzGJlWnwfJ2aTUTbSS_LnPUL4PKzx0Aws,12051
 analyser_hj3415/analyser/tsa/__init__.py,sha256=7j-WshikzsDGGo_wuFoMPNmYfY-bLSEMd6o1MKSQKLI,150
-analyser_hj3415/analyser/tsa/common.py,sha256=iRwk88zBtEIqzSmTQWmQIWiiqZ9gN7GLtDUa5rx8IGM,1918
-analyser_hj3415/analyser/tsa/lstm.py,sha256=KPBTwOQT60WToRFQ4AAInK_JP7yA6wDpyTMsl_oNscY,29935
-analyser_hj3415/analyser/tsa/myprophet.py,sha256=2wIky5i5ZFn72BLPMEfxNvrK4Hdaww6i5wR_l1IysqA,19088
-analyser_hj3415-4.5.4.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
-analyser_hj3415-4.5.4.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-analyser_hj3415-4.5.4.dist-info/METADATA,sha256=hhMyS0mF8yBsekMi1XbiUDlYeLqt60Pa3BPrJSlNbZA,6811
-analyser_hj3415-4.5.4.dist-info/RECORD,,
+analyser_hj3415/analyser/tsa/common.py,sha256=NxssIm7z1V3W-Vt8B89eT_bUa4YJRTeUbfyBZdXns90,4180
+analyser_hj3415/analyser/tsa/lstm.py,sha256=l0P79Zm1X3PMbyX6d449j8V5pI1yiQfYdtQZr06khw4,28819
+analyser_hj3415/analyser/tsa/myprophet.py,sha256=INwn7tM6i9WCZkGb9uQm_Q4mmPRvZn06kW1__vnzloA,18445
+analyser_hj3415-4.6.0.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
+analyser_hj3415-4.6.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+analyser_hj3415-4.6.0.dist-info/METADATA,sha256=Nhgb9gPJUr2dKBGW9aREyuZF-ym7ht2jMoNmvG7sNJ0,6844
+analyser_hj3415-4.6.0.dist-info/RECORD,,

{analyser_hj3415-4.5.4.dist-info → analyser_hj3415-4.6.0.dist-info}/WHEEL

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