analyser_hj3415 2.9.13__tar.gz → 2.9.15__tar.gz

{analyser_hj3415-2.9.13 → analyser_hj3415-2.9.15}/PKG-INFO

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

{analyser_hj3415-2.9.13 → analyser_hj3415-2.9.15}/analyser_hj3415/tsa.py

@@ -193,7 +193,7 @@ class MyProphet:
             Exception("to 인자가 맞지 않습니다.")
 
     @classmethod
-    def ranking(cls, refresh = False, expire_time_h = 24) -> OrderedDict:
+    def ranking(cls, refresh = False, expire_time_h = 24, top='all') -> OrderedDict:
         """
         가장 최근 날짜의 랭킹 분석
         :param refresh:
@@ -228,7 +228,14 @@ class MyProphet:
 
         data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_ranking, timer=expire_time_h * 3600)
 
-        return OrderedDict(sorted(data_dict.items(), key=lambda item: item[1], reverse=True))
+        ranking = OrderedDict(sorted(data_dict.items(), key=lambda item: item[1], reverse=True))
+        if top == 'all':
+            return ranking
+        else:
+            if isinstance(top, int):
+                return OrderedDict(list(ranking.items())[:top])
+            else:
+                raise ValueError("top 인자는 'all' 이나 int형 이어야 합니다.")
 
 @dataclass
 class LSTMData:
@@ -664,9 +671,18 @@ class MyLSTM:
         plt.title('Stock Price Prediction with LSTM Ensemble')
         plt.show()"""
 
+    def is_up(self)-> bool:
+        # 튜플의 [0]은 날짜 [1]은 값 배열
+        data = self.get_final_predictions(refresh=False, expire_time_h=24)[1]
+        # 데이터를 1D 배열로 변환
+        flattened_data = data.flatten()
+        tsa_logger.debug(f"flattened_data : {flattened_data}")
+        # 증가 여부 확인
+        return all(flattened_data[i] < flattened_data[i + 1] for i in range(len(flattened_data) - 1))
+
     @staticmethod
     def caching_based_on_prophet_ranking(refresh: bool, expire_time_h: int, top=20):
-        ranking_topn = OrderedDict(itertools.islice(MyProphet.ranking(refresh=False).items(), top))
+        ranking_topn = MyProphet.ranking(refresh=False, top=top)
         tsa_logger.info(ranking_topn)
         mylstm = MyLSTM('005930')
         print(f"*** LSTM prediction redis cashing top{top} items ***")

{analyser_hj3415-2.9.13 → analyser_hj3415-2.9.15}/pyproject.toml

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