analyser_hj3415 4.0.5__py3-none-any.whl → 4.0.7__py3-none-any.whl

analyser_hj3415/analyser/tsa/common.py

@@ -1,6 +1,9 @@
 import numpy as np
+from dataclasses import dataclass, field
+from typing import List
 import pandas as pd
-from marshmallow import fields
+from marshmallow import fields, Schema
+from marshmallow_dataclass import class_schema
 
 
 def is_up_by_OLS(data: dict) -> bool:
@@ -34,12 +37,25 @@ def is_up_by_OLS(data: dict) -> bool:
     # 4) 기울기가 양수면 "우상향 추세"로 판별
     return slope > 0
 
-
+@dataclass
 class PandasTimestampField(fields.DateTime):
     """pandas.Timestamp를 ISO 8601 문자열로 직렬화하고 역직렬화하는 필드"""
 
+    def __init__(self, *args, **kwargs):
+        # 꼭 부모의 __init__을 호출해야 함
+        super().__init__(*args, **kwargs)
+
     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)
+
+@dataclass
+class ChartPoint:
+    """prices 리스트의 각 원소(x, y)를 표현할 데이터 클래스"""
+    x: pd.Timestamp = field(metadata={"marshmallow_field": PandasTimestampField()})
+    y: float
+
+
+

analyser_hj3415/analyser/tsa/lstm.py

@@ -16,7 +16,7 @@ from marshmallow import fields
 from utils_hj3415 import tools, setup_logger
 from db_hj3415 import myredis
 from analyser_hj3415.analyser import MIs, tsa
-from analyser_hj3415.analyser.tsa.common import PandasTimestampField
+from analyser_hj3415.analyser.tsa.common import PandasTimestampField, ChartPoint
 
 mylogger = setup_logger(__name__,'INFO')
 expire_time = tools.to_int(os.getenv('DEFAULT_EXPIRE_TIME_H', 48)) * 3600
@@ -79,11 +79,8 @@ class LSTMChartData:
     ticker: str
 
     labels: List[pd.Timestamp] = field(metadata={"marshmallow_field": fields.List(PandasTimestampField())})
-    prices: List[Dict[pd.Timestamp, float]] = field(
-        metadata={"marshmallow_field": fields.List(fields.Dict(keys=PandasTimestampField(), values=fields.Float()))})
-    future_prices: List[Dict[pd.Timestamp, float]] = field(
-        metadata={"marshmallow_field": fields.List(fields.Dict(keys=PandasTimestampField(), values=fields.Float()))})
-
+    prices: List[ChartPoint]
+    future_prices: List[ChartPoint]
     grade: LSTMGrade
     num: int
     is_lstm_up: bool

analyser_hj3415/analyser/tsa/prophet.py

@@ -15,7 +15,7 @@ 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
+from analyser_hj3415.analyser.tsa.common import PandasTimestampField, ChartPoint
 
 
 mylogger = setup_logger(__name__,'INFO')
@@ -41,14 +41,10 @@ class ProphetChartData:
     ticker: str
 
     labels: List[pd.Timestamp] = field(metadata={"marshmallow_field": fields.List(PandasTimestampField())})
-    prices: List[Dict[pd.Timestamp, float]] = field(
-        metadata={"marshmallow_field": fields.List(fields.Dict(keys=PandasTimestampField(), values=fields.Float()))})
-    yhats: List[Dict[pd.Timestamp, float]] = field(
-        metadata={"marshmallow_field": fields.List(fields.Dict(keys=PandasTimestampField(), values=fields.Float()))})
-    yhat_uppers: List[Dict[pd.Timestamp, float]] = field(
-        metadata={"marshmallow_field": fields.List(fields.Dict(keys=PandasTimestampField(), values=fields.Float()))})
-    yhat_lowers: List[Dict[pd.Timestamp, float]] = field(
-        metadata={"marshmallow_field": fields.List(fields.Dict(keys=PandasTimestampField(), values=fields.Float()))})
+    prices: List[ChartPoint]
+    yhats: List[ChartPoint]
+    yhat_uppers: List[ChartPoint]
+    yhat_lowers: List[ChartPoint]
 
     is_prophet_up: bool
 

{analyser_hj3415-4.0.5.dist-info → analyser_hj3415-4.0.7.dist-info}/METADATA

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

{analyser_hj3415-4.0.5.dist-info → analyser_hj3415-4.0.7.dist-info}/RECORD

@@ -8,10 +8,10 @@ analyser_hj3415/analyser/eval/growth.py,sha256=sfJ7h06efrTfL4ylhUCV525IzUzilbun1
 analyser_hj3415/analyser/eval/mil.py,sha256=mFMiFCuCBvlQrhQcM5hMg8U4zF32TS1GnUmk8fPd950,15178
 analyser_hj3415/analyser/eval/red.py,sha256=b-Odud8pxQIO2NjI7m3HbK4FOND5WhaoYV94mCHqDPo,13907
 analyser_hj3415/analyser/tsa/__init__.py,sha256=pg20ZQRABedTdaIoOr5t043RNKtJ7ji_WmnZrD1IhPg,147
-analyser_hj3415/analyser/tsa/common.py,sha256=fDzHf-j1S7JIDEFpfn-ogr5sCBM3TCq88BygAlY2HbU,1397
-analyser_hj3415/analyser/tsa/lstm.py,sha256=v1I9vxPQfA_Y8eAlJ5BGflOlEz87uFUnGwCI5bB27Fc,28388
-analyser_hj3415/analyser/tsa/prophet.py,sha256=AwXvdCQAv9mHa1SSS6FfeJAqcWKToJxmAZ_qRtr0ibk,18269
-analyser_hj3415-4.0.5.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
-analyser_hj3415-4.0.5.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-analyser_hj3415-4.0.5.dist-info/METADATA,sha256=JlaHA44xer9S53VnI60NaUbhSMWDd-n8PR-HuWuFjMY,6777
-analyser_hj3415-4.0.5.dist-info/RECORD,,
+analyser_hj3415/analyser/tsa/common.py,sha256=ZLUkifupOlLKsrPiqR3y6FaEN4M_loZhxCZXYxkX0us,1874
+analyser_hj3415/analyser/tsa/lstm.py,sha256=Ew6banylC0rXFKiyKz2n5kE3lmJUP65NZvr11VjOsVM,28115
+analyser_hj3415/analyser/tsa/prophet.py,sha256=sJPbJg7bTViF0jWeFfFrThwpryLmn528RmELxeARYe0,17713
+analyser_hj3415-4.0.7.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
+analyser_hj3415-4.0.7.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+analyser_hj3415-4.0.7.dist-info/METADATA,sha256=xLDHA852h0Zgt8mGCLg8FjrT0-WHZlrCCMH3IVDQAdE,6777
+analyser_hj3415-4.0.7.dist-info/RECORD,,