analyser_hj3415 2.9.17__tar.gz → 2.10.0__tar.gz

{analyser_hj3415-2.9.17 → analyser_hj3415-2.10.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.3
 Name: analyser_hj3415
-Version: 2.9.17
+Version: 2.10.0
 Summary: Stock analyser and database processing programs
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Requires-Dist: utils-hj3415>=2.9.2
-Requires-Dist: db-hj3415>=4.1.4
+Requires-Dist: utils-hj3415>=2.9.4
+Requires-Dist: db-hj3415>=4.2.3
 Requires-Dist: scikit-learn>=1.5.2
 Requires-Dist: plotly>=5.24.1
 Requires-Dist: yfinance>=0.2.44

{analyser_hj3415-2.9.17 → analyser_hj3415-2.10.0}/analyser_hj3415/tsa.py

@@ -290,7 +290,7 @@ class MyLSTM:
     @code.setter
     def code(self, code: str):
         assert utils.is_6digit(code), f'Invalid value : {code}'
-        tsa_logger.info(f'change code : {self.code} -> {code}')
+        tsa_logger.debug(f'change code : {self.code} -> {code}')
 
         self._code = code
         self.name = myredis.Corps(code, 'c101').get_name()
@@ -346,12 +346,28 @@ class MyLSTM:
                 y.append(data[i + time_step, 0])
             return np.array(X), np.array(y)
 
+        
         X_train, y_train_1d = create_dataset(train_data_2d)
         X_test, y_test_1d = create_dataset(test_data_2d)
+        tsa_logger.debug(X_train.shape)
+        tsa_logger.debug(X_test.shape)
 
-        # LSTM 모델 입력을 위해 데이터를 3차원으로 변환
-        X_train_3d = X_train.reshape(X_train.shape[0], X_train.shape[1], 1)
-        X_test_3d = X_test.reshape(X_test.shape[0], X_test.shape[1], 1)
+        try:
+            # LSTM 모델 입력을 위해 데이터를 3차원으로 변환
+            X_train_3d = X_train.reshape(X_train.shape[0], X_train.shape[1], 1)
+            X_test_3d = X_test.reshape(X_test.shape[0], X_test.shape[1], 1)
+        except IndexError:
+            return LSTMData(
+                code=self.code,
+                data_2d=np.array([]),
+                train_size=0,
+                train_data_2d=np.array([]),
+                test_data_2d=np.array([]),
+                X_train_3d=np.array([]),
+                X_test_3d=np.array([]),
+                y_train_1d=np.array([]),
+                y_test_1d=np.array([]),
+            )
 
         tsa_logger.debug(f'n_dim - X_train_3d : {X_train_3d.ndim}, X_test_3d : {X_test_3d.ndim}, y_train : {y_train_1d.ndim}, y_test : {y_test_1d.ndim}')
         tsa_logger.debug(f'len - X_train_3d : {len(X_train_3d)}, X_test_3d : {len(X_test_3d)}, y_train : {len(y_train_1d)}, y_test : {len(y_test_1d)}')
@@ -517,8 +533,11 @@ class MyLSTM:
             :return:
             """
             # 앙상블 테스트와 채점
-            _, _, ensemble_future_predictions_2d = self.ensemble_training(
+            try:
+                _, _, ensemble_future_predictions_2d = self.ensemble_training(
                 num=num_in)
+            except IndexError:
+                return [], []
 
             """if grading:
                 lstm_grade = self.grading(ensemble_train_predictions_2d, ensemble_test_predictions_2d)
@@ -671,17 +690,14 @@ class MyLSTM:
         plt.title('Stock Price Prediction with LSTM Ensemble')
         plt.show()"""
 
-    def is_up(self)-> Optional[bool]:
+    def is_up(self)-> bool:
         # 튜플의 [0]은 날짜 [1]은 값 배열
-        if myredis.Base.exists(f'{self.code}_mylstm_predictions'):
-            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))
-        else:
-            return None
+        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):

{analyser_hj3415-2.9.17 → analyser_hj3415-2.10.0}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "analyser_hj3415"
-version = "2.9.17"
+version = "2.10.0"
 description = "Stock analyser and database processing programs"
 readme = "README.md"
 requires-python = ">=3.6"
@@ -20,8 +20,8 @@ requires-python = ">=3.6"
 #    "Operating System :: OS Independent"
 #]
 dependencies = [
-    "utils-hj3415>=2.9.2",
-    "db-hj3415>=4.1.4",
+    "utils-hj3415>=2.9.4",
+    "db-hj3415>=4.2.3",
     "scikit-learn>=1.5.2",
     "plotly>=5.24.1",
     "yfinance>=0.2.44",