analyser_hj3415 3.2.1__tar.gz → 3.2.2__tar.gz

{analyser_hj3415-3.2.1 → analyser_hj3415-3.2.2}/PKG-INFO

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

{analyser_hj3415-3.2.1 → analyser_hj3415-3.2.2}/analyser_hj3415/__init__.py

@@ -6,8 +6,3 @@ env_path = get_env_path()
 if env_path is None:
     mylogger.warning(f"환경변수 파일(.env)를 찾을수 없습니다. 기본 설정값으로 프로그램을 실행합니다.")
 load_dotenv(env_path)
-
-from analyser_hj3415.analyser import eval
-from analyser_hj3415.analyser import compile
-from analyser_hj3415.analyser import tsa
-

analyser_hj3415-3.2.2/analyser_hj3415/analyser/__init__.py

@@ -0,0 +1,12 @@
+MIs = {
+    "wti": "CL=F",
+    "gold": "GC=F",
+    "silver": "SI=F",
+    "usdidx": "DX-Y.NYB",
+    "usdkrw": "KRW=X",
+    "sp500": "^GSPC",
+    "kospi": "^KS11",
+    "nikkei": "^N225",
+    "china": "^HSI",
+    "irx": "^IRX",
+}

{analyser_hj3415-3.2.1 → analyser_hj3415-3.2.2}/analyser_hj3415/analyser/compile.py

@@ -5,15 +5,14 @@ from typing import Union
 from db_hj3415 import myredis,mymongo
 from utils_hj3415 import tools, setup_logger
 
-from analyser_hj3415.analyser import tsa
-from analyser_hj3415.analyser import eval
+from analyser_hj3415.analyser import tsa, eval, MIs
 
 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()})"
+        assert mi_type in MIs.keys(), f"Invalid MI type ({MIs.keys()})"
         self._mi_type = mi_type
         self.prophet = tsa.MIProphet(mi_type)
         self.lstm = tsa.MILSTM(mi_type)
@@ -24,30 +23,64 @@ class MICompile:
 
     @mi_type.setter
     def mi_type(self, mi_type: str):
-        assert mi_type in tsa.MIs.keys(), f"Invalid MI type ({tsa.MIs.keys()})"
+        assert mi_type in MIs.keys(), f"Invalid MI type ({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:
+        """
+        특정 MI(Market Index) 타입 데이터를 컴파일하고 반환합니다.
+        데이터를 Redis 캐시에서 가져오거나, 새로 생성하여 캐시에 저장합니다.
+
+        Args:
+            refresh (bool, optional):
+                - True: 캐시를 무시하고 데이터를 새로 생성하여 저장.
+                - False: 캐시된 데이터를 가져오며, 없을 경우 새로 생성.
+                Defaults to False.
+
+        Returns:
+            dict: MI 데이터를 포함하는 딕셔너리로 반환하며, 다음의 키를 포함합니다:
+                - 'name' (str): MI 타입 이름.
+                - 'trading_action' (str): 예측된 매매 신호 ('buy', 'sell', 'hold').
+                - 'prophet_score' (float): Prophet 모델의 예측 점수.
+                - 'lstm_grade' (float): LSTM 모델의 최종 예측 점수.
+                - 'is_lstm_up' (bool): LSTM 모델이 상승 신호를 나타내는지 여부.
+                - 'prophet_html' (str): prophet_html,
+                - 'lstm_html' (str): lstm_html ,
+        Example:
+            {
+                'name': 'example_mi',
+                'trading_action': 'buy',
+                'prophet_score': 0.88,
+                'lstm_grade': 0.92,
+                'is_lstm_up': True,
+                'prophet_html': prophet_html...,
+                'lstm_html': lstm_html...,
+            }
+        """
         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}")
+            trading_action, prophet_score = self.prophet.scoring()
+            prophet_html = self.prophet.export()
             self.lstm.initializing()
             _, lstm_grade = self.lstm.get_final_predictions(refresh=refresh, num=5)
             is_lstm_up = self.lstm.is_lstm_up()
+            lstm_html= self.lstm.export()
 
             return {
                 'name': self.mi_type,
                 'trading_action': trading_action,
                 'prophet_score': prophet_score,
                 'lstm_grade': lstm_grade,
-                'is_lstm_up': is_lstm_up
+                'is_lstm_up': is_lstm_up,
+                'prophet_html': prophet_html,
+                'lstm_html': lstm_html,
             }
 
         data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_mi_compile, timer=expire_time)
@@ -57,7 +90,7 @@ class MICompile:
     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():
+        for mi_type in MIs.keys():
             mi_lstm.mi_type = mi_type
             print(f"{mi_lstm.mi_type}")
             mi_lstm.initializing()
@@ -88,7 +121,37 @@ class CorpCompile:
         self.prophet.code = code
 
     def get(self, refresh=False) -> dict:
-
+        """
+        특정 기업 데이터를 컴파일하여 반환합니다.
+        데이터를 Redis 캐시에서 가져오거나, 새로 생성하여 캐시에 저장합니다.
+
+        Args:
+            refresh (bool, optional):
+                - True: 캐시를 무시하고 데이터를 새로 생성하여 저장.
+                - False: 캐시된 데이터를 가져오며, 없을 경우 새로 생성.
+                Defaults to False.
+
+        Returns:
+            dict: 기업 데이터를 포함하는 딕셔너리로 반환되며, 다음의 키를 포함합니다:
+                - 'name' (str): 기업 이름.
+                - 'red_score' (float): 기업의 Red Score (위험 점수).
+                - '이익지표' (float): 기업의 이익 지표.
+                - '주주수익률' (float): 주주 수익률.
+                - 'trading_action' (str): 예측된 매매 신호 ('buy', 'sell', 'hold').
+                - 'prophet_score' (float): Prophet 모델의 예측 점수.
+                - 'prophet_html' (str): prophet_html,
+
+        Example:
+            {
+                'name': 'Samsung Electronics',
+                'red_score': 0.85,
+                '이익지표': 0.75,
+                '주주수익률': 0.10,
+                'trading_action': 'buy',
+                'prophet_score': 0.92,
+                'prophet_html': prophet_html...,
+            }
+        """
         print(f"{self.code}/{self.name}의 compiling을 시작합니다.")
         redis_name = self.code + '_corp_compile'
         print(
@@ -103,6 +166,7 @@ class CorpCompile:
 
             mylogger.info("\tProphet 최근 데이터 조회중..")
             trading_action, prophet_score = self.prophet.scoring()
+            prophet_html = self.prophet.export()
 
             return {
                 'name': self.name,
@@ -111,6 +175,7 @@ class CorpCompile:
                 '주주수익률': mil_data.주주수익률,
                 'trading_action': trading_action,
                 'prophet_score': prophet_score,
+                'prophet_html': prophet_html,
             }
         data_dict = myredis.Base.fetch_and_cache_data(redis_name, refresh, fetch_corp_compile, timer=expire_time)
         return data_dict

analyser_hj3415-3.2.2/analyser_hj3415/analyser/tsa/__init__.py

@@ -0,0 +1,3 @@
+from analyser_hj3415.analyser.tsa.lstm import *
+from analyser_hj3415.analyser.tsa.prophet import *
+

{analyser_hj3415-3.2.1 → analyser_hj3415-3.2.2}/analyser_hj3415/analyser/tsa/lstm.py

@@ -1,6 +1,3 @@
-"""
-Time Series Analysis
-"""
 import os
 import numpy as np
 import yfinance as yf
@@ -20,6 +17,7 @@ from dataclasses import dataclass
 
 from utils_hj3415 import tools, setup_logger
 from db_hj3415 import myredis
+from analyser_hj3415.analyser import MIs
 
 
 mylogger = setup_logger(__name__,'WARNING')
@@ -702,7 +700,6 @@ class CorpLSTM(MyLSTM):
 
 class MILSTM(MyLSTM):
     def __init__(self, mi_type: str):
-        from analyser_hj3415.analyser.tsa import MIs
         assert mi_type in MIs.keys(), f"Invalid MI type ({MIs.keys()})"
         self._mi_type = mi_type
         super().__init__(ticker=MIs[mi_type])
@@ -713,7 +710,6 @@ class MILSTM(MyLSTM):
 
     @mi_type.setter
     def mi_type(self, mi_type: str):
-        from analyser_hj3415.analyser.tsa import MIs
         assert mi_type in MIs.keys(), f"Invalid MI type ({MIs.keys()})"
         self._mi_type = mi_type
         self.ticker = MIs[mi_type]

{analyser_hj3415-3.2.1 → analyser_hj3415-3.2.2}/analyser_hj3415/analyser/tsa/prophet.py

@@ -11,7 +11,8 @@ from plotly.offline import plot
 from utils_hj3415 import tools, setup_logger
 from db_hj3415 import myredis
 
-from analyser_hj3415.analyser import eval
+from analyser_hj3415.analyser import eval, MIs
+
 
 mylogger = setup_logger(__name__,'WARNING')
 
@@ -252,7 +253,6 @@ class CorpProphet(MyProphet):
 
 class MIProphet(MyProphet):
     def __init__(self, mi_type: str):
-        from analyser_hj3415.analyser.tsa import MIs
         assert mi_type in MIs.keys(), f"Invalid MI type ({MIs.keys()})"
         self._mi_type = mi_type
         super().__init__(ticker=MIs[mi_type])
@@ -263,7 +263,6 @@ class MIProphet(MyProphet):
 
     @mi_type.setter
     def mi_type(self, mi_type: str):
-        from analyser_hj3415.analyser.tsa import MIs
         assert mi_type in MIs.keys(), f"Invalid MI type ({MIs.keys()})"
         self._mi_type = mi_type
         self.ticker = MIs[mi_type]

{analyser_hj3415-3.2.1 → analyser_hj3415-3.2.2}/analyser_hj3415/cli.py

@@ -2,12 +2,11 @@ import argparse
 import pprint
 
 from utils_hj3415 import tools
-from analyser_hj3415.analyser import eval, tsa, compile
+from analyser_hj3415.analyser import eval, tsa, compile, MIs
 from db_hj3415 import myredis, mymongo
 
 
 def analyser_manager():
-    from analyser_hj3415.analyser.tsa import MIs
     parser = argparse.ArgumentParser(description="Analyser Commands")
     type_subparsers = parser.add_subparsers(dest='type', help='분석 타입')
 

{analyser_hj3415-3.2.1 → analyser_hj3415-3.2.2}/pyproject.toml

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

analyser_hj3415-3.2.1/analyser_hj3415/analyser/tsa/__init__.py

@@ -1,15 +0,0 @@
-from analyser_hj3415.analyser.tsa.lstm import *
-from analyser_hj3415.analyser.tsa.prophet import *
-
-MIs = {
-        "wti": "CL=F",
-        "gold": "GC=F",
-        "silver": "SI=F",
-        "usdidx": "DX-Y.NYB",
-        "usdkrw": "KRW=X",
-        "sp500": "^GSPC",
-        "kospi": "^KS11",
-        "nikkei": "^N225",
-        "china": "^HSI",
-        "irx": "^IRX",
-    }