analyser_hj3415 2.9.18__tar.gz → 2.10.1__tar.gz

{analyser_hj3415-2.9.18 → analyser_hj3415-2.10.1}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.3
 Name: analyser_hj3415
-Version: 2.9.18
+Version: 2.10.1
 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.18 → analyser_hj3415-2.10.1}/analyser_hj3415/tsa.py

@@ -192,6 +192,21 @@ class MyProphet:
         else:
             Exception("to 인자가 맞지 않습니다.")
 
+    def scoring(self) -> int:
+        last_real_data = self.df_real.iloc[-1]
+        recent_price = last_real_data['y']
+        recent_date = datetime.strftime(last_real_data['ds'], '%Y-%m-%d')
+        yhat_dict = self.get_yhat()
+        tsa_logger.info(f'recent_price: {recent_price}, yhat_dict: {yhat_dict}')
+        yhat_lower = int(yhat_dict['yhat_lower'])
+        deviation = int(eval.Tools.cal_deviation(recent_price, yhat_lower))
+        if recent_price > yhat_lower:
+            score = -deviation
+        else:
+            score = deviation
+        print(f"{self.code}/{self.name} date: {recent_date} 가격:{recent_price} 기대하한값:{yhat_lower} 편차:{deviation} score:{score}")
+        return score
+
     @classmethod
     def ranking(cls, refresh = False, expire_time_h = 24, top='all') -> OrderedDict:
         """
@@ -208,22 +223,14 @@ class MyProphet:
         def fetch_ranking() -> dict:
             data = {}
             p = MyProphet('005930')
-            for i, code in enumerate(myredis.Corps.list_all_codes()):
+            for code in myredis.Corps.list_all_codes():
                 try:
                     p.code = code
                 except ValueError:
                     tsa_logger.error(f'myprophet ranking error : {code}/{myredis.Corps(code, "c101").get_name()}')
                     continue
-                last_real_data = p._preprocessing_for_prophet().iloc[-1]
-                recent_price = last_real_data['y']
-                recent_date = datetime.strftime(last_real_data['ds'], '%Y-%m-%d')
-                yhat_dict = p.get_yhat()
-                tsa_logger.info(f'recent_price: {recent_price}, yhat_dict: {yhat_dict}')
-                yhat_lower = int(yhat_dict['yhat_lower'])
-                if recent_price < yhat_lower:
-                    deviation = int(eval.Tools.cal_deviation(recent_price, yhat_lower))
-                    data[code] = deviation
-                    print(f"{i}.{p.code}/{p.name} date: {recent_date} 가격:{recent_price} 기대하한값:{yhat_lower} 편차:{deviation}")
+                score = p.scoring()
+                data[code] = score
             return data
 
         data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_ranking, timer=expire_time_h * 3600)
@@ -346,12 +353,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 +540,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)

{analyser_hj3415-2.9.18 → analyser_hj3415-2.10.1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "analyser_hj3415"
-version = "2.9.18"
+version = "2.10.1"
 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",