analyser_hj3415 2.5.7__py2.py3-none-any.whl → 2.6.0__py2.py3-none-any.whl

analyser_hj3415/analysers/eval.py

@@ -16,7 +16,7 @@ logger.addHandler(ch)
 logger.setLevel(logging.WARNING)
 
 
-def red(code: str) -> dict:
+def red(code: str, expect_earn: float) -> dict:
     """
     리턴값
     {
@@ -41,10 +41,7 @@ def red(code: str) -> dict:
     d6, 투자부동산 = c103q.latest_value_pop2('투자부동산')
 
     # 사업가치 계산 - 지배주주지분 당기순이익 / 기대수익률
-    from analyser_hj3415 import cli
-    EXPECT_EARN = utils.to_float(cli.AnalyserSettingsManager(cli.SETTINGS_FILE).get_value('EXPECT_EARN'))
-    print('EXPECT_EARN', EXPECT_EARN)
-    사업가치 = round(utils.nan_to_zero(지배주주당기순이익) / EXPECT_EARN, 2)
+    사업가치 = round(utils.nan_to_zero(지배주주당기순이익) / expect_earn, 2)
 
     # 재산가치 계산 - 유동자산 - (유동부채*1.2) + 고정자산중 투자자산
     재산가치 = round(유동자산 - (유동부채 * 1.2) + utils.nan_to_zero(투자자산) + utils.nan_to_zero(투자부동산), 2)
@@ -72,7 +69,7 @@ def red(code: str) -> dict:
         '재산가치': 재산가치,
         '부채평가': 부채평가,
         '발행주식수': 발행주식수,
-        'EXPECT_EARN': EXPECT_EARN,
+        'EXPECT_EARN': expect_earn,
         'date': tools.set_data(d1, d2, d3, d4, d5, d6),  # ''값을 제거하고 리스트로 바꾼다.
     }
 

analyser_hj3415/analysers/score.py

@@ -32,7 +32,7 @@ def cal_deviation(v1: float, v2: float) -> float:
     return deviation
 
 
-def red(code: str) -> int:
+def red(code: str, expect_earn: float) -> int:
     """red price와 최근 주가의 괴리율 파악
 
     Returns:
@@ -44,7 +44,7 @@ def red(code: str) -> int:
         recent_price = float('nan')
         return 0
 
-    red_price = eval.red(code)['red_price']
+    red_price = eval.red(code, expect_earn)['red_price']
     deviation = cal_deviation(recent_price, red_price)
     if red_price < 0 or (recent_price >= red_price):
         score = 0
@@ -56,7 +56,7 @@ def red(code: str) -> int:
     return utils.to_int(score)
 
 
-def mil(code: str) -> Tuple[int, int, int, int]:
+def mil(code: str, expect_earn: float) -> Tuple[int, int, int, int]:
     """
     - 재무활동현금흐름이 마이너스라는 것은 배당급 지급했거나, 자사주 매입했거나, 부채를 상환한 상태임.
     - 반대는 채권자로 자금을 조달했거나 신주를 발행했다는 의미
@@ -93,9 +93,7 @@ def mil(code: str) -> Tuple[int, int, int, int]:
     if math.isnan(mil_dict['주주수익률']):
         score1 = 0
     else:
-        from analyser_hj3415 import cli
-        EXPECT_EARN = utils.to_float(cli.AnalyserSettingsManager(cli.SETTINGS_FILE).get_value('EXPECT_EARN'))
-        주주수익률평가 = math.ceil(mil_dict['주주수익률'] - (EXPECT_EARN * 100))
+        주주수익률평가 = math.ceil(mil_dict['주주수익률'] - (expect_earn * 100))
         score1 = 0 if 0 > 주주수익률평가 else 주주수익률평가
 
     # 이익지표 평가

analyser_hj3415/cli.py

@@ -23,7 +23,7 @@ class AnalyserSettingsManager(SettingsManager):
         self.save_settings()
         print(f"{title}: {value}가 저장되었습니다")
 
-    def get_value(self, title: str) -> str:
+    def get_value(self, title: str):
         assert title in self.TITLES, f"title 인자는 {self.TITLES} 중에 있어야 합니다."
         return self.settings_dict.get(title, self.DEFAULT_SETTINGS[title])
 
@@ -35,6 +35,7 @@ class AnalyserSettingsManager(SettingsManager):
 
 def analyser_manager():
     settings_manager = AnalyserSettingsManager(SETTINGS_FILE)
+    expect_earn = settings_manager.get_value('EXPECT_EARN')
 
     parser = argparse.ArgumentParser(description="Analyser Commands")
     type_subparsers = parser.add_subparsers(dest='type', help='분석 타입')
@@ -79,14 +80,14 @@ def analyser_manager():
                 print("**** red_n_score all code ****")
                 for i, code in enumerate(myredis.Corps.list_all_codes()):
                     print(f'{i} / {code}')
-                    red_n_score(code)
+                    red_n_score(code, expect_earn)
             else:
                 assert utils.is_6digit(args.code), "code 인자는 6자리 숫자이어야 합니다."
-                print(args.code, red_n_score(args.code))
+                print(args.code, red_n_score(args.code, expect_earn))
             if args.noti:
                 noti.telegram_to('manager', f"오늘의 red and score({args.code})를 레디스캐시에 저장했습니다.(유효 12시간)")
         elif args.command == 'ranking':
-            result = red_ranking()
+            result = red_ranking(expect_earn)
             print(result)
             if args.noti:
                 noti.telegram_to('manager', "오늘의 red ranking을 레디스캐시에 저장했습니다.(유효 12시간)")
@@ -96,10 +97,10 @@ def analyser_manager():
                 print("**** mil_n_score all code ****")
                 for i, code in enumerate(myredis.Corps.list_all_codes()):
                     print(f'{i} / {code}')
-                    mil_n_score(code)
+                    mil_n_score(code, expect_earn)
             else:
                 assert utils.is_6digit(args.code), "code 인자는 6자리 숫자이어야 합니다."
-                print(args.code, mil_n_score(args.code))
+                print(args.code, mil_n_score(args.code, expect_earn))
             if args.noti:
                 noti.telegram_to('manager', f"오늘의 mil and score({args.code})를 레디스캐시에 저장했습니다.(유효 12시간)")
     elif args.type == 'setting':
@@ -112,6 +113,3 @@ def analyser_manager():
             print(settings_manager.load_settings())
     else:
         parser.print_help()
-
-
-

analyser_hj3415/myredis.py

@@ -8,7 +8,7 @@ from db_hj3415 import myredis as db_myredis
 page = '.analyser'
 
 
-def red_ranking() -> OrderedDict:
+def red_ranking(expect_earn: float) -> OrderedDict:
     """
     redis를 사용하며 red score를 계산해서 0이상의 값을 가지는 종목을 순서대로 저장하여 반환한다.
     :return: OrderedDict([('023590', 101),
@@ -23,7 +23,7 @@ def red_ranking() -> OrderedDict:
         # redis에 해당하는 값이 없는 경우
         data = {}
         for i, code in enumerate(db_myredis.Corps.list_all_codes()):
-            red_score = score.red(code)
+            red_score = score.red(code, expect_earn)
             if red_score <= 0:
                 continue
             data[code] = red_score
@@ -44,7 +44,7 @@ def red_ranking() -> OrderedDict:
         return OrderedDict(sorted(json.loads(cached_data).items(), key=lambda item: item[1], reverse=True))
 
 
-def red_n_score(code: str) -> dict:
+def red_n_score(code: str, expect_earn: float) -> dict:
     """
     redis 사용 - 소멸타이머 사용
     리턴값
@@ -62,8 +62,8 @@ def red_n_score(code: str) -> dict:
         cached_data = Base.redis_client.get(redis_name).decode('utf-8')
     except AttributeError:
         # redis에 해당하는 값이 없는 경우
-        data = eval.red(code)
-        data['score'] = score.red(code)
+        data = eval.red(code, expect_earn)
+        data['score'] = score.red(code, expect_earn)
         # print(data)
         if data:
             # 데이터를 Redis에 캐싱
@@ -77,7 +77,7 @@ def red_n_score(code: str) -> dict:
         return json.loads(cached_data)
 
 
-def mil_n_score(code: str) -> dict:
+def mil_n_score(code: str, expect_earn: float) -> dict:
     """
     redis 사용 - 소멸타이머 사용
     리턴값
@@ -119,7 +119,7 @@ def mil_n_score(code: str) -> dict:
     except AttributeError:
         # redis에 해당하는 값이 없는 경우
         data = eval.mil(code)
-        data['score'] = score.mil(code)
+        data['score'] = score.mil(code, expect_earn)
         # print(data)
         if data:
             # 데이터를 Redis에 캐싱

analyser_hj3415/tools.py

@@ -15,6 +15,7 @@ logger.setLevel(logging.WARNING)
 def set_data(*args) -> list:
     """
     비유효한 내용 제거(None,nan)하고 중복된 항목 제거하고 리스트로 반환한다.
+    여기서 set의 의미는 집합을 뜻함
     :param args:
     :return:
     """

{analyser_hj3415-2.5.7.dist-info → analyser_hj3415-2.6.0.dist-info}/METADATA

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

analyser_hj3415-2.6.0.dist-info/RECORD

@@ -0,0 +1,14 @@
+analyser_hj3415/.DS_Store,sha256=qr9-0FPn5CFKe6kEu8_dWCNhzQ0sN7bwQgffKsaJEEo,6148
+analyser_hj3415/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+analyser_hj3415/cli.py,sha256=xxbkpaKuLeOF5T9zD0MdsbK9lvSWrYFWU0MUOlttTJM,5704
+analyser_hj3415/myredis.py,sha256=VC4gxZwBZhE1MduuG0XSTQXogQAahdm-JkB0Loh2DC4,10868
+analyser_hj3415/tools.py,sha256=m0zs-nFfpxuLaDh22EwsYJSgBirfSVmge8a6fvxRq60,13753
+analyser_hj3415/trash.py,sha256=zF-W0piqkGr66UP6-iybo9EXh2gO0RP6R1FnIpsGkl8,12262
+analyser_hj3415/analysers/eval.py,sha256=qqGTi8YUF6SYfopGM3VaPVYjyC_hVTLlmKkVA2Zz3kg,13251
+analyser_hj3415/analysers/report.py,sha256=yY-AeDHOqDPrm4lpvZv3NPTJK1Z7lKsjoO5ck8AP6u4,9007
+analyser_hj3415/analysers/score.py,sha256=narJQZFnBM4srV32TpmrOdj4VFskpl0ePymixRxp3Sk,15901
+analyser_hj3415-2.6.0.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
+analyser_hj3415-2.6.0.dist-info/LICENSE,sha256=QVKTp0dTnB5xG8RLgG17LwSWCKNEzYoVVM6KjoCPKc0,1079
+analyser_hj3415-2.6.0.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+analyser_hj3415-2.6.0.dist-info/METADATA,sha256=mWhUbMAhIWCXqAeyvqelCH9tMqB2mstIx9Uu1nFebXk,6417
+analyser_hj3415-2.6.0.dist-info/RECORD,,

analyser_hj3415-2.5.7.dist-info/RECORD

@@ -1,14 +0,0 @@
-analyser_hj3415/.DS_Store,sha256=qr9-0FPn5CFKe6kEu8_dWCNhzQ0sN7bwQgffKsaJEEo,6148
-analyser_hj3415/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-analyser_hj3415/cli.py,sha256=cXXOZGJjjC9xQrT9-NwgnBbgMDwnpm7hSybAoYcZNAs,5591
-analyser_hj3415/myredis.py,sha256=T5ESGx1QBrO7mTMlSzqIm975Wks-X9WqrPWVWgFRHUE,10758
-analyser_hj3415/tools.py,sha256=T7QYJekKvWNlJtiqu_FaiX3FGfDc71NY4vrbEDfBEt0,13705
-analyser_hj3415/trash.py,sha256=zF-W0piqkGr66UP6-iybo9EXh2gO0RP6R1FnIpsGkl8,12262
-analyser_hj3415/analysers/eval.py,sha256=55JtgTx-ICthJHySQeRclU1PJSvmOjUlz8glN-OV85k,13411
-analyser_hj3415/analysers/report.py,sha256=yY-AeDHOqDPrm4lpvZv3NPTJK1Z7lKsjoO5ck8AP6u4,9007
-analyser_hj3415/analysers/score.py,sha256=sH79RYTDrBD06tdKADsAd9lAvgFGN7385lLJsE3qy_Q,15998
-analyser_hj3415-2.5.7.dist-info/entry_points.txt,sha256=ZfjPnJuH8SzvhE9vftIPMBIofsc65IAWYOhqOC_L5ck,65
-analyser_hj3415-2.5.7.dist-info/LICENSE,sha256=QVKTp0dTnB5xG8RLgG17LwSWCKNEzYoVVM6KjoCPKc0,1079
-analyser_hj3415-2.5.7.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-analyser_hj3415-2.5.7.dist-info/METADATA,sha256=l_xx2YDzz5xkau7LSHCl7EPWkikulO3f_3VDsh9RaZI,6417
-analyser_hj3415-2.5.7.dist-info/RECORD,,