analyser_hj3415 2.2.0__tar.gz → 2.3.0__tar.gz

{analyser_hj3415-2.2.0 → analyser_hj3415-2.3.0}/PKG-INFO

@@ -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 → analyser_hj3415-2.3.0}/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-2.2.0 → analyser_hj3415-2.3.0}/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 → analyser_hj3415-2.3.0}/pyproject.toml

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

analyser_hj3415-2.3.0/tests/_trial_temp/test.log

@@ -0,0 +1 @@
+2024-08-21 16:23:57+0900 [-] Log opened.

{analyser_hj3415-2.2.0 → analyser_hj3415-2.3.0}/tests/testmyredis.py

@@ -17,42 +17,42 @@ class MyredisTests(unittest.TestCase):
     def tearDown(self):
         pass
 
-    def test_red(self):
+    def test_red_n_score(self):
         test_one = random.choice(self.test_codes)
         print(test_one, '/', Corps.get_name(test_one))
-        pprint.pprint(myredis.red(test_one))
+        pprint.pprint(myredis.red_n_score(test_one))
 
         time.sleep(2)
 
         print(test_one, '/', Corps.get_name(test_one))
-        pprint.pprint(myredis.red(test_one))
+        pprint.pprint(myredis.red_n_score(test_one))
 
-    def test_mil(self):
+    def test_mil_n_score(self):
         test_one = random.choice(self.test_codes)
         print(test_one, '/', Corps.get_name(test_one))
-        pprint.pprint(myredis.mil(test_one))
+        pprint.pprint(myredis.mil_n_score(test_one))
 
         time.sleep(2)
 
         print(test_one, '/', Corps.get_name(test_one))
-        pprint.pprint(myredis.mil(test_one))
+        pprint.pprint(myredis.mil_n_score(test_one))
 
-    def test_blue(self):
+    def test_blue_n_score(self):
         test_one = random.choice(self.test_codes)
         print(test_one, '/', Corps.get_name(test_one))
-        pprint.pprint(myredis.blue(test_one))
+        pprint.pprint(myredis.blue_n_score(test_one))
 
         time.sleep(2)
 
         print(test_one, '/', Corps.get_name(test_one))
-        pprint.pprint(myredis.blue(test_one))
+        pprint.pprint(myredis.blue_n_score(test_one))
 
-    def test_growth(self):
+    def test_growth_n_score(self):
         test_one = random.choice(self.test_codes)
         print(test_one, '/', Corps.get_name(test_one))
-        pprint.pprint(myredis.growth(test_one))
+        pprint.pprint(myredis.growth_n_score(test_one))
 
         time.sleep(2)
 
         print(test_one, '/', Corps.get_name(test_one))
-        pprint.pprint(myredis.growth(test_one))
+        pprint.pprint(myredis.growth_n_score(test_one))

analyser_hj3415-2.2.0/tests/_trial_temp/test.log

@@ -1 +0,0 @@
-2024-08-21 11:38:08+0900 [-] Log opened.