analyser_hj3415 3.1.2__py3-none-any.whl → 3.2.1__py3-none-any.whl

analyser_hj3415/analyser/compile.py

@@ -11,8 +11,60 @@ from analyser_hj3415.analyser import eval
 mylogger = setup_logger(__name__,'WARNING')
 expire_time = tools.to_int(os.getenv('DEFAULT_EXPIRE_TIME_H', 48)) * 3600
 
+class MICompile:
+    def __init__(self, mi_type: str):
+        assert mi_type in tsa.MIs.keys(), f"Invalid MI type ({tsa.MIs.keys()})"
+        self._mi_type = mi_type
+        self.prophet = tsa.MIProphet(mi_type)
+        self.lstm = tsa.MILSTM(mi_type)
 
-class Compile:
+    @property
+    def mi_type(self) -> str:
+        return self._mi_type
+
+    @mi_type.setter
+    def mi_type(self, mi_type: str):
+        assert mi_type in tsa.MIs.keys(), f"Invalid MI type ({tsa.MIs.keys()})"
+        self._mi_type = mi_type
+        self.prophet.mi_type = mi_type
+        self.lstm.mi_type = mi_type
+
+    def get(self, refresh=False) -> dict:
+        print(f"{self.mi_type}의 compiling을 시작합니다.")
+        redis_name = self.mi_type + '_mi_compile'
+        print(
+            f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {expire_time / 3600}h")
+
+        def fetch_mi_compile() -> dict:
+            trading_action, prophet_score = self.prophet.scoring()
+            print(f"{self.mi_type}")
+            self.lstm.initializing()
+            _, lstm_grade = self.lstm.get_final_predictions(refresh=refresh, num=5)
+            is_lstm_up = self.lstm.is_lstm_up()
+
+            return {
+                'name': self.mi_type,
+                'trading_action': trading_action,
+                'prophet_score': prophet_score,
+                'lstm_grade': lstm_grade,
+                'is_lstm_up': is_lstm_up
+            }
+
+        data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_mi_compile, timer=expire_time)
+        return data_dict
+
+    @staticmethod
+    def analyser_lstm_all_mi(refresh: bool):
+        mi_lstm = tsa.MILSTM('wti')
+        print(f"*** LSTM prediction redis cashing Market Index items ***")
+        for mi_type in tsa.MIs.keys():
+            mi_lstm.mi_type = mi_type
+            print(f"{mi_lstm.mi_type}")
+            mi_lstm.initializing()
+            mi_lstm.get_final_predictions(refresh=refresh, num=5)
+
+
+class CorpCompile:
     def __init__(self, code: str, expect_earn=0.06):
         assert tools.is_6digit(code), f'Invalid value : {code}'
         self._code = code
@@ -36,12 +88,13 @@ class Compile:
         self.prophet.code = code
 
     def get(self, refresh=False) -> dict:
+
         print(f"{self.code}/{self.name}의 compiling을 시작합니다.")
-        redis_name = self.code + '_compile_scores'
+        redis_name = self.code + '_corp_compile'
         print(
             f"redisname: '{redis_name}' / refresh : {refresh} / expire_time : {expire_time/3600}h")
 
-        def fetch_compile_scores() -> dict:
+        def fetch_corp_compile() -> dict:
             mylogger.info("Red score 계산중..")
             red_score = self.red.get(verbose=False).score
 
@@ -59,9 +112,42 @@ class Compile:
                 'trading_action': trading_action,
                 'prophet_score': prophet_score,
             }
-        data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_compile_scores, timer=expire_time)
+        data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_corp_compile, timer=expire_time)
         return data_dict
 
+    @staticmethod
+    def red_ranking(expect_earn: float = 0.06, refresh=False) -> OrderedDict:
+        # 이전 expect earn 과 비교하여 다르거나 없으면 강제 refresh 설정
+        redis_name = 'red_ranking_prev_expect_earn'
+        pee = tools.to_float(myredis.Base.get_value(redis_name))
+        if pee != expect_earn:
+            # expect earn의 이전 계산값이 없거나 이전 값과 다르면 새로 계산
+            mylogger.warning(
+                f"expect earn : {expect_earn} / prev expect earn : {pee} 두 값이 달라 refresh = True"
+            )
+            myredis.Base.set_value(redis_name, str(expect_earn))
+            refresh = True
+
+        print("**** Start red_ranking... ****")
+        redis_name = 'red_ranking'
+        print(
+            f"redisname: '{redis_name}' / expect_earn: {expect_earn} / refresh : {refresh} / expire_time : {expire_time / 3600}h")
+
+        def fetch_ranking(refresh_in: bool) -> dict:
+            data = {}
+            red = eval.Red(code='005930', expect_earn=expect_earn)
+            for i, code in enumerate(myredis.Corps.list_all_codes()):
+                red.code = code
+                red_score = red.get(refresh=refresh_in, verbose=False).score
+                if red_score > 0:
+                    data[code] = red_score
+                    print(f"{i}: {red} - {red_score}")
+            return data
+
+        data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_ranking, refresh, timer=expire_time)
+
+        return OrderedDict(sorted(data_dict.items(), key=lambda item: item[1], reverse=True))
+
     @staticmethod
     def prophet_ranking(refresh=False, top: Union[int, str]='all') -> OrderedDict:
 
@@ -73,7 +159,7 @@ class Compile:
 
         def fetch_ranking() -> dict:
             data = {}
-            c = Compile('005930')
+            c = CorpCompile('005930')
             for code in myredis.Corps.list_all_codes():
                 try:
                     c.code = code
@@ -100,7 +186,7 @@ class Compile:
 
     @staticmethod
     def analyse_lstm_topn(refresh: bool, top=40):
-        ranking_topn = Compile.prophet_ranking(refresh=False, top=top)
+        ranking_topn = CorpCompile.prophet_ranking(refresh=False, top=top)
         mylogger.info(ranking_topn)
         corp_lstm = tsa.CorpLSTM('005930')
         print(f"*** LSTM prediction redis cashing top{top} items ***")
@@ -110,36 +196,4 @@ class Compile:
             corp_lstm.initializing()
             corp_lstm.get_final_predictions(refresh=refresh, num=5)
 
-    @staticmethod
-    def red_ranking(expect_earn: float = 0.06, refresh=False) -> OrderedDict:
-        # 이전 expect earn 과 비교하여 다르거나 없으면 강제 refresh 설정
-        redis_name = 'red_ranking_prev_expect_earn'
-        pee = tools.to_float(myredis.Base.get_value(redis_name))
-        if pee != expect_earn:
-            # expect earn의 이전 계산값이 없거나 이전 값과 다르면 새로 계산
-            mylogger.warning(
-                f"expect earn : {expect_earn} / prev expect earn : {pee} 두 값이 달라 refresh = True"
-            )
-            myredis.Base.set_value(redis_name, str(expect_earn))
-            refresh = True
-
-        print("**** Start red_ranking... ****")
-        redis_name = 'red_ranking'
-        print(
-            f"redisname: '{redis_name}' / expect_earn: {expect_earn} / refresh : {refresh} / expire_time : {expire_time / 3600}h")
-
-        def fetch_ranking(refresh_in: bool) -> dict:
-            data = {}
-            red = eval.Red(code='005930', expect_earn=expect_earn)
-            for i, code in enumerate(myredis.Corps.list_all_codes()):
-                red.code = code
-                red_score = red.get(refresh=refresh_in, verbose=False).score
-                if red_score > 0:
-                    data[code] = red_score
-                    print(f"{i}: {red} - {red_score}")
-            return data
-
-        data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_ranking, refresh, timer=expire_time)
-
-        return OrderedDict(sorted(data_dict.items(), key=lambda item: item[1], reverse=True))
 

analyser_hj3415/analyser/tsa/prophet.py

@@ -128,10 +128,10 @@ class MyProphet:
         fig2 = self.model.plot_components(self.df_forecast)
         plt.show()  # 시각화 창 띄우기
 
-    def export(self, to="str") -> Optional[str]:
+    def export(self, to="html") -> Optional[str]:
         """
         prophet과 plotly로 그래프를 그려서 html을 문자열로 반환
-        :param to: str, png, htmlfile
+        :param to: html, png, file
         :return:
         """
         # Plotly를 사용한 시각화
@@ -161,7 +161,7 @@ class MyProphet:
             showlegend=False,
         )
 
-        if to == 'str':
+        if to == 'html':
             # 그래프 HTML로 변환 (string 형식으로 저장)
             graph_html = plot(fig, output_type='div')
             return graph_html
@@ -169,8 +169,8 @@ class MyProphet:
             # 그래프를 PNG 파일로 저장
             fig.write_image(f"myprophet_{self.ticker}.png")
             return None
-        elif to == 'htmlfile':
-            # 그래프를 HTML로 저장
+        elif to == 'file':
+            # 그래프를 HTML 파일로 저장
             plot(fig, filename=f'myprophet_{self.ticker}.html', auto_open=False)
             return None
         else:

analyser_hj3415/cli.py

@@ -99,9 +99,9 @@ def analyser_manager():
             mymongo.Logs.save('cli', 'INFO', 'run >> analyser red ranking')
             try:
                 if args.expect_earn is None:
-                    result = compile.Compile.red_ranking(refresh=args.refresh)
+                    result = compile.CorpCompile.red_ranking(refresh=args.refresh)
                 else:
-                    result = compile.Compile.red_ranking(expect_earn=args.expect_earn, refresh=args.refresh)
+                    result = compile.CorpCompile.red_ranking(expect_earn=args.expect_earn, refresh=args.refresh)
                 print(result)
             except Exception as e:
                 print(e)
@@ -171,7 +171,7 @@ def analyser_manager():
         if args.command == 'ranking':
             mymongo.Logs.save('cli', 'INFO', 'run >> analyser prophet ranking')
             try:
-                result = compile.Compile.prophet_ranking(refresh=args.refresh)
+                result = compile.CorpCompile.prophet_ranking(refresh=args.refresh)
                 print(result)
             except Exception as e:
                 print(e)
@@ -191,9 +191,10 @@ def analyser_manager():
             mymongo.Logs.save('cli', 'INFO', f'run >> analyser lstm caching')
             try:
                 if args.top:
-                    compile.Compile.analyse_lstm_topn(refresh=args.refresh, top=args.top)
+                    compile.CorpCompile.analyse_lstm_topn(refresh=args.refresh, top=args.top)
                 else:
-                    compile.Compile.analyse_lstm_topn(refresh=args.refresh)
+                    compile.CorpCompile.analyse_lstm_topn(refresh=args.refresh)
+                compile.MICompile.analyser_lstm_all_mi(refresh=args.refresh)
             except Exception as e:
                 print(e)
                 mymongo.Logs.save('cli','ERROR', f'analyser lstm caching 실행중 에러 - {e}')

{analyser_hj3415-3.1.2.dist-info → analyser_hj3415-3.2.1.dist-info}/METADATA

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

{analyser_hj3415-3.1.2.dist-info → analyser_hj3415-3.2.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 analyser_hj3415/__init__.py,sha256=f2E9Neh7Nzkhvdj7HWWlgxZK2sB95rBtaIgWEHzxK9E,450
-analyser_hj3415/cli.py,sha256=l-ZRCh_a2QXO-HWYb1S3d2A29pYmMb2RpsMAtoeGQDE,11727
+analyser_hj3415/cli.py,sha256=iNyZz77BNe_aPcqiJrhWhjvxJZJQfmWQev8dM9xu2H8,11824
 analyser_hj3415/analyser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-analyser_hj3415/analyser/compile.py,sha256=e3ziVf8SX0K6rk9XFPAhi7cpxTaFlKYCQ2dHACzLlPo,5763
+analyser_hj3415/analyser/compile.py,sha256=INd9XI-V21Q48HQkk8oUke7k_mE4kIbqorahiaPeKaQ,7720
 analyser_hj3415/analyser/eval/__init__.py,sha256=IP1d0Q3nOCAD3zK1qxrC685MkJQfUh-qaXc7xptTxk8,80
 analyser_hj3415/analyser/eval/blue.py,sha256=fq_eln7-EdwICNQ2sMXAfZKXGhQ29EaJwsGvn7xA29U,7632
 analyser_hj3415/analyser/eval/common.py,sha256=wcWJg_jNgr02i1U62oZGgLt2iscdle9X-u4aMnZl89Q,14127
@@ -10,13 +10,13 @@ analyser_hj3415/analyser/eval/mil.py,sha256=wN1jPu5zLJjoDk3kL7piL-4jWhpsAMeQpsTZ
 analyser_hj3415/analyser/eval/red.py,sha256=rJbidKlo2s2EJHBGn4HDbfCDcEGP5Rst8iQeJ6jlzNA,10988
 analyser_hj3415/analyser/tsa/__init__.py,sha256=0XIpMgYIiyDrSE3sp9S0J0gXwW4cpk6nQmxSjC3KkY4,371
 analyser_hj3415/analyser/tsa/lstm.py,sha256=22Rd1PTBeDAvITb1zw65Y51lLB76w6MyWXNKku6RzjM,29975
-analyser_hj3415/analyser/tsa/prophet.py,sha256=Xeb1GxvQQAacFtTFYN0fmzk6iYQkFSex2HDaY2Ek7OY,10154
+analyser_hj3415/analyser/tsa/prophet.py,sha256=jHaOufe7FAJanPXgPh0YxvQ4OiATJue_7cDyfHnq1hc,10156
 analyser_hj3415/workroom/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 analyser_hj3415/workroom/mysklearn.py,sha256=wJXKz5MqqTzADdG2mqRMMzc_G9RzwYjj5_j4gyOopxQ,2030
 analyser_hj3415/workroom/mysklearn2.py,sha256=1lIy6EWEQHkOzDS-av8U0zQH6DuCLKWMI73dnJx5KRs,1495
 analyser_hj3415/workroom/score.py,sha256=P6nHBJYmyhigGtT4qna4BmNtvt4B93b7SKyzdstJK24,17376
 analyser_hj3415/workroom/trash.py,sha256=zF-W0piqkGr66UP6-iybo9EXh2gO0RP6R1FnIpsGkl8,12262
-analyser_hj3415-3.1.2.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
-analyser_hj3415-3.1.2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-analyser_hj3415-3.1.2.dist-info/METADATA,sha256=fUkCXxwBSLJA_LKypntfXbZfPxhJy-WefnP6ZUihtvg,6777
-analyser_hj3415-3.1.2.dist-info/RECORD,,
+analyser_hj3415-3.2.1.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
+analyser_hj3415-3.2.1.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+analyser_hj3415-3.2.1.dist-info/METADATA,sha256=ysCQEllcgKTZjSHajJ6lx0iyGfS_DI5MUACiPRpnwew,6777
+analyser_hj3415-3.2.1.dist-info/RECORD,,