analyser_hj3415 2.5.3__tar.gz → 2.5.4__tar.gz

{analyser_hj3415-2.5.3 → analyser_hj3415-2.5.4}/PKG-INFO

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

{analyser_hj3415-2.5.3 → analyser_hj3415-2.5.4}/analyser_hj3415/analysers/eval.py

@@ -2,7 +2,7 @@
 """
 import math
 
-from analyser_hj3415 import tools, cli
+from analyser_hj3415 import tools
 from utils_hj3415 import utils
 from db_hj3415 import myredis
 
@@ -16,11 +16,6 @@ logger.addHandler(ch)
 logger.setLevel(logging.WARNING)
 
 
-# 주식을 통한 기대수익률 - 금리가 3%일 경우 두배인 6% 정도로 잡는다.
-EXPECT_EARN = cli.AnalyserSettingsManager(cli.SETTINGS_FILE).get_value('EXPECT_EARN')
-print("EXPECT_EARN: ", EXPECT_EARN)
-
-
 def red(code: str) -> dict:
     """
     리턴값
@@ -46,6 +41,8 @@ def red(code: str) -> dict:
     d6, 투자부동산 = c103q.latest_value_pop2('투자부동산')
 
     # 사업가치 계산 - 지배주주지분 당기순이익 / 기대수익률
+    from analyser_hj3415 import cli
+    EXPECT_EARN = cli.AnalyserSettingsManager(cli.SETTINGS_FILE).get_value('EXPECT_EARN')
     사업가치 = round(utils.nan_to_zero(지배주주당기순이익) / EXPECT_EARN, 2)
 
     # 재산가치 계산 - 유동자산 - (유동부채*1.2) + 고정자산중 투자자산
@@ -74,6 +71,7 @@ def red(code: str) -> dict:
         '재산가치': 재산가치,
         '부채평가': 부채평가,
         '발행주식수': 발행주식수,
+        'EXPECT_EARN': EXPECT_EARN,
         'date': tools.set_data(d1, d2, d3, d4, d5, d6),  # ''값을 제거하고 리스트로 바꾼다.
     }
 

{analyser_hj3415-2.5.3 → analyser_hj3415-2.5.4}/analyser_hj3415/analysers/score.py

@@ -93,7 +93,9 @@ def mil(code: str) -> Tuple[int, int, int, int]:
     if math.isnan(mil_dict['주주수익률']):
         score1 = 0
     else:
-        주주수익률평가 = math.ceil(mil_dict['주주수익률'] - (eval.EXPECT_EARN * 100))
+        from analyser_hj3415 import cli
+        EXPECT_EARN = cli.AnalyserSettingsManager(cli.SETTINGS_FILE).get_value('EXPECT_EARN')
+        주주수익률평가 = math.ceil(mil_dict['주주수익률'] - (EXPECT_EARN * 100))
         score1 = 0 if 0 > 주주수익률평가 else 주주수익률평가
 
     # 이익지표 평가

{analyser_hj3415-2.5.3 → analyser_hj3415-2.5.4}/pyproject.toml

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