analyser_hj3415 2.8.0__tar.gz → 2.8.1__tar.gz

{analyser_hj3415-2.8.0 → analyser_hj3415-2.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: analyser_hj3415
-Version: 2.8.0
+Version: 2.8.1
 Summary: Stock analyser and database processing programs
 Author-email: Hyungjin Kim <hj3415@gmail.com>
 Description-Content-Type: text/markdown

{analyser_hj3415-2.8.0 → analyser_hj3415-2.8.1}/analyser_hj3415/tsa.py

@@ -105,12 +105,13 @@ class MyProphet:
 
     def get_yhat(self) -> dict:
         """
-        예측하는 첫째날의 예측 데이터를 반환한다.
+        최근 날짜의 예측데이터를 반환한다.
         :return: {'ds':..., 'yhat':.., 'yhat_lower':.., 'yhat_upper':..,}
         """
         df = self.df_forecast
-        analyser_logger.debug(df)
-        yhat_dict = df.iloc[0][['ds', 'yhat_lower', 'yhat_upper', 'yhat']].to_dict()
+        last_real_date = self.df_real.iloc[-1]['ds']
+        analyser_logger.info(last_real_date)
+        yhat_dict = df[df['ds']==last_real_date].iloc[0][['ds', 'yhat_lower', 'yhat_upper', 'yhat']].to_dict()
         analyser_logger.info(yhat_dict)
         return yhat_dict
 
@@ -186,14 +187,16 @@ class MyProphet:
             p = MyProphet('005930')
             for i, code in enumerate(myredis.Corps.list_all_codes()):
                 p.code = code
-                recent_price = p._preprocessing_for_prophet().iloc[-1]['y']
+                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()
                 analyser_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} 최근가격:{recent_price} 기대하한값:{yhat_lower} 편차:{deviation}")
+                    print(f"{i}.{p.code}/{p.name} date: {recent_date} 가격:{recent_price} 기대하한값:{yhat_lower} 편차:{deviation}")
             return data
 
         data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_ranking, timer=expire_time)

{analyser_hj3415-2.8.0 → analyser_hj3415-2.8.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "analyser_hj3415"
-version = "2.8.0"
+version = "2.8.1"
 authors = [{name = "Hyungjin Kim", email = "hj3415@gmail.com"}]
 description = "Stock analyser and database processing programs"
 readme = "README.md"