analyser_hj3415 2.2.0__py2.py3-none-any.whl → 2.3.0__py2.py3-none-any.whl

analyser_hj3415/analysers/score.py

@@ -7,7 +7,6 @@ from typing import Tuple
 from db_hj3415 import myredis, mymongo
 from analyser_hj3415.analysers import eval
 from utils_hj3415 import utils
-from analyser_hj3415 import myredis as analyser_redis
 
 import logging
 
@@ -45,7 +44,7 @@ def red(code: str) -> int:
         recent_price = float('nan')
         return 0
 
-    red_price = analyser_redis.red(code)['red_price']
+    red_price = eval.red(code)['red_price']
     deviation = cal_deviation(recent_price, red_price)
     if red_price < 0 or (recent_price >= red_price):
         score = 0
@@ -86,9 +85,9 @@ def mil(code: str) -> Tuple[int, int, int, int]:
     Returns:
         tuple: 주주수익률, 이익지표, 투자수익률, PFCF포인트
     """
-    mil_dict = analyser_redis.mil(code)
+    mil_dict = eval.mil(code)
 
-    print(pprint.pformat(mil_dict, width=200))
+    # print(pprint.pformat(mil_dict, width=200))
 
     # 주주수익률 평가
     if math.isnan(mil_dict['주주수익률']):
@@ -179,9 +178,9 @@ def blue(code: str) -> Tuple[int, int, int, int, int]:
 
     c104y = myredis.C104(code, 'c104y')
 
-    blue_dict = analyser_redis.blue(code)
+    blue_dict = eval.blue(code)
 
-    print(pprint.pformat(blue_dict, width=200))
+    # print(pprint.pformat(blue_dict, width=200))
 
     def 유동비율평가(유동비율: float) -> int:
         # 채점은 0을 기준으로 마이너스 해간다. 즉 0이 제일 좋은 상태임.
@@ -276,7 +275,7 @@ def growth(code: str) -> Tuple[int, int]:
     Returns:
         tuple : 매출액증가율, 영업이익률 평가 포인트
     """
-    growth_dict = analyser_redis.growth(code)
+    growth_dict = eval.growth(code)
 
     logger.debug(pprint.pformat(growth_dict, width=200))
 

analyser_hj3415/myredis.py

@@ -1,11 +1,11 @@
-from analyser_hj3415.analysers import eval
+from analyser_hj3415.analysers import eval, score
 from db_hj3415.myredis import Base
 import json
 
 page = '.analyser'
 
 
-def red(code: str) -> dict:
+def red_n_score(code: str) -> dict:
     """
     redis 사용 - 소멸타이머 사용
     리턴값
@@ -24,6 +24,7 @@ def red(code: str) -> dict:
     except AttributeError:
         # redis에 해당하는 값이 없는 경우
         data = eval.red(code)
+        data['score'] = score.red(code)
         # print(data)
         if data:
             # 데이터를 Redis에 캐싱
@@ -37,7 +38,7 @@ def red(code: str) -> dict:
         return json.loads(cached_data)
 
 
-def mil(code: str) -> dict:
+def mil_n_score(code: str) -> dict:
     """
     redis 사용 - 소멸타이머 사용
     리턴값
@@ -79,6 +80,7 @@ def mil(code: str) -> dict:
     except AttributeError:
         # redis에 해당하는 값이 없는 경우
         data = eval.mil(code)
+        data['score'] = score.mil(code)
         # print(data)
         if data:
             # 데이터를 Redis에 캐싱
@@ -92,7 +94,7 @@ def mil(code: str) -> dict:
         return json.loads(cached_data)
 
 
-def blue(code: str) -> dict:
+def blue_n_score(code: str) -> dict:
     """
     redis 사용 - 소멸타이머 사용
     리턴값
@@ -130,6 +132,7 @@ def blue(code: str) -> dict:
     except AttributeError:
         # redis에 해당하는 값이 없는 경우
         data = eval.blue(code)
+        data['score'] = score.blue(code)
         # print(data)
         if data:
             # 데이터를 Redis에 캐싱
@@ -143,7 +146,7 @@ def blue(code: str) -> dict:
         return json.loads(cached_data)
 
 
-def growth(code: str) -> dict:
+def growth_n_score(code: str) -> dict:
     """
     redis 사용 - 소멸타이머 사용
     리턴값
@@ -162,6 +165,7 @@ def growth(code: str) -> dict:
     except AttributeError:
         # redis에 해당하는 값이 없는 경우
         data = eval.growth(code)
+        data['score'] = score.growth(code)
         # print(data)
         if data:
             # 데이터를 Redis에 캐싱

{analyser_hj3415-2.2.0.dist-info → analyser_hj3415-2.3.0.dist-info}/METADATA

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

{analyser_hj3415-2.2.0.dist-info → analyser_hj3415-2.3.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
 analyser_hj3415/.DS_Store,sha256=OQfTSOHL-zjUtnNyBpNRVUJUstR4j6I7jihKDFQQmME,6148
 analyser_hj3415/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 analyser_hj3415/cli.py,sha256=qzRnpDRJvQnQevSKHBpKbTsBjmSWllZjzTV4z_alg2A,4891
-analyser_hj3415/myredis.py,sha256=zgsXO4G2VsXt4LID4VF-Y7AqkPjV8Th66a2czuma_bM,8738
+analyser_hj3415/myredis.py,sha256=mSAELRPfiahhD_0yPeKtOhVEiOotOjYZv-T-JNG8kOU,8941
 analyser_hj3415/run.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 analyser_hj3415/tools.py,sha256=SNsrnL5CKmKAdFkmlwgREMIkWDRi6N9LngCdhhhop3Y,13606
 analyser_hj3415/trash.py,sha256=vHrv8Q61QOkcwhmWfrj_yVdsdd5MoAxs9gXMOJEjMHM,8360
 analyser_hj3415/analysers/eval.py,sha256=mlHi6EPc8l8O6vKnWyX4Cz1BaeGhUpWM8gVZRNhm-JU,13299
 analyser_hj3415/analysers/report.py,sha256=whggmLXl7yF-BjQ6JKgxmhILT2T4uFP-rit_BSes9xM,9189
-analyser_hj3415/analysers/score.py,sha256=C_Xiqo44o2OAXHaHiHYLa60HwKwpUt_H18uO5Iff1TM,16308
-analyser_hj3415-2.2.0.dist-info/entry_points.txt,sha256=dHaCM3eOAGONmxTWuRVqo9Zyq2C7J5TZmpH0PD6FW5k,103
-analyser_hj3415-2.2.0.dist-info/LICENSE,sha256=QVKTp0dTnB5xG8RLgG17LwSWCKNEzYoVVM6KjoCPKc0,1079
-analyser_hj3415-2.2.0.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
-analyser_hj3415-2.2.0.dist-info/METADATA,sha256=OJhj-1acjb5Ht817i0tzqYdLUkA94NpGVZ-dclMstKo,6417
-analyser_hj3415-2.2.0.dist-info/RECORD,,
+analyser_hj3415/analysers/score.py,sha256=j5bH_r2-Sc53JWgmdBmL7pJk9cc8oQ7iZkYRPPOA-so,16217
+analyser_hj3415-2.3.0.dist-info/entry_points.txt,sha256=dHaCM3eOAGONmxTWuRVqo9Zyq2C7J5TZmpH0PD6FW5k,103
+analyser_hj3415-2.3.0.dist-info/LICENSE,sha256=QVKTp0dTnB5xG8RLgG17LwSWCKNEzYoVVM6KjoCPKc0,1079
+analyser_hj3415-2.3.0.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+analyser_hj3415-2.3.0.dist-info/METADATA,sha256=S1sYBsG7yZg3-ngZckbo4EABYBYD93wTE4MFWwiaG2s,6417
+analyser_hj3415-2.3.0.dist-info/RECORD,,