analyser_hj3415 2.2.0__py2.py3-none-any.whl → 2.4.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/cli.py

@@ -1,109 +1,24 @@
 import argparse
-from utils_hj3415 import utils
-from .db import chk_db, mongo
-from . import eval, report
-from scraper2_hj3415.nfscrapy import run as nfsrun
+from utils_hj3415 import noti
 
 
-def dbmanager():
-    cmd = ['repair', 'sync', 'eval', 'update']
+def analyser():
+    from analyser_hj3415.myredis import red_ranking
+    commands = {
+        'ranking': red_ranking
+    }
     parser = argparse.ArgumentParser()
-    parser.add_argument('cmd', help=f"Command - {cmd}")
-    parser.add_argument('target', help="Target for scraping (type 6digit code or 'all' or 'parts')")
-    parser.add_argument('-d', '--db_path', help="Set mongo database path")
+    parser.add_argument('command', help=f"Commands - {commands.keys()}")
+    parser.add_argument('--noti', action='store_true', help='작업완료후 메시지 전송여부')
 
     args = parser.parse_args()
 
-    db_path = args.db_path if args.db_path else "mongodb://192.168.0.173:27017"
-    client = mongo.connect_mongo(db_path)
-
-    if args.cmd in cmd:
-        if args.cmd == 'repair':
-            if args.target == 'all' or utils.is_6digit(args.target):
-                need_for_repair_codes = chk_db.chk_integrity_corps(client, args.target)
-                # repair dict 예시 - {'343510': ['c106', 'c104', 'c103'], '298000': ['c104'], '091810': ['c104']}
-                print(f"Need for repairing codes :{need_for_repair_codes}")
-                if need_for_repair_codes:
-                    # x = input("Do you want to try to repair db by scraping? (y/N)")
-                    # if x == 'y' or x == 'Y':
-                        for code, failed_page_list in need_for_repair_codes.items():
-                            for page in failed_page_list:
-                                if page == 'c101':
-                                    nfsrun.c101([code, ], db_path)
-                                elif page == 'c103':
-                                    nfsrun.c103([code, ], db_path)
-                                elif page == 'c104':
-                                    nfsrun.c104([code, ], db_path)
-                                elif page == 'c106':
-                                    nfsrun.c106([code, ], db_path)
-                            recheck_result = chk_db.chk_integrity_corps(client, code)
-                            if recheck_result:
-                                # 다시 스크랩해도 오류가 지속되는 경우
-                                print(f"The db integrity failure persists..{recheck_result}")
-                                # x = input(f"Do you want to delete {code} on DB? (y/N)")
-                                # if x == 'y' or x == 'Y':
-                                #    mongo.Corps.del_db(client, code)
-                                # else:
-                                #    print("Canceled.")
-                                mongo.Corps.del_db(client, code)
-                    # else:
-                    #     print("Done.")
-                else:
-                    print("Done.")
-            else:
-                print(f"Invalid target option : {args.target}")
-        elif args.cmd == 'update':
-            if args.target == 'all' or utils.is_6digit(args.target):
-                need_for_update_codes = list(chk_db.chk_modifying_corps(client, args.target).keys())
-                # need_for_update_codes 예시 - [codes....]
-                print(f"Need for updating codes :{need_for_update_codes}")
-                if need_for_update_codes:
-                    nfsrun.c103(need_for_update_codes, db_path)
-                    nfsrun.c104(need_for_update_codes, db_path)
-                    nfsrun.c106(need_for_update_codes, db_path)
-            elif args.target == 'parts':
-                pass
-            else:
-                print(f"Invalid target option : {args.target}")
-        elif args.cmd == 'sync':
-            if args.target == 'all':
-                chk_db.sync_mongo_with_krx(client)
-            else:
-                print(f"The target should be 'all' in sync command.")
-        elif args.cmd == 'eval':
-            if args.target == 'all':
-                # eval을 평가해서 데이터베이스에 저장한다.
-                eval.make_today_eval_df(client, refresh=True)
-            else:
-                print(f"The target should be 'all' in sync command.")
-    else:
-        print(f"The command should be in {cmd}")
-
-    client.close()
-
-
-def evalmanager():
-    cmd = ['report', ]
-    parser = argparse.ArgumentParser()
-    parser.add_argument('cmd', help=f"Command - {cmd}")
-    parser.add_argument('target', help="Target for scraping (type 6digit code or 'all' or 'parts')")
-    parser.add_argument('-d', '--db_path', help="Set mongo database path")
-
-    args = parser.parse_args()
-
-    db_path = args.db_path if args.db_path else "mongodb://192.168.0.173:27017"
-    client = mongo.connect_mongo(db_path)
-
-    if args.cmd in cmd:
-        if args.cmd == 'report':
-            if utils.is_6digit(args.target):
-                print(report.Report(client, args.target))
-            else:
-                print(f"Invalid target option : {args.target}")
+    if args.command in commands.keys():
+        if args.command == 'ranking':
+            print(commands['ranking']())
+            if args.noti:
+                noti.telegram_to('manager', "오늘의 red ranking을 저장했습니다.(유효 12시간)")
     else:
-        print(f"The command should be in {cmd}")
+        print(f"The command should be in {list(commands.keys())}")
 
 
-if __name__ == "__main__":
-    # dbmanager()
-    evalmanager()

analyser_hj3415/myredis.py

@@ -1,11 +1,53 @@
-from analyser_hj3415.analysers import eval
+from analyser_hj3415.analysers import eval, score
 from db_hj3415.myredis import Base
 import json
+from collections import OrderedDict
+from db_hj3415 import myredis as db_myredis
+
 
 page = '.analyser'
 
 
-def red(code: str) -> dict:
+def red_ranking() -> OrderedDict:
+    """
+    redis를 사용하며 red score를 계산해서 0이상의 값을 가지는 종목을 순서대로 저장하여 반환한다.
+    :return: OrderedDict([('023590', 101),
+             ('009970', 99),
+             ('010060', 91),...])
+    """
+    redis_name = 'red_ranking'
+
+    try:
+        cached_data = Base.redis_client.get(redis_name).decode('utf-8')
+    except AttributeError:
+        # redis에 해당하는 값이 없는 경우
+        data = {}
+        for i, code in enumerate(db_myredis.Corps.list_all_codes()):
+            s = score.red(code)
+            if s <= 0:
+                continue
+            data[code] = s
+            # print(i, code, s)
+
+        # print(data)
+        if data:
+            # 데이터를 Redis에 캐싱
+            Base.redis_client.set(redis_name, json.dumps(data))
+            # 12시간 후 키가 자동으로 제거됨
+            Base.redis_client.expire(redis_name, 3600 * 12)
+        print("analysers.eval 데이터 계산하기 - myredis.red_ranking")
+        # ordereddict를 이용해서 딕셔너리의 값을 기준으로 내림차순 정렬함.
+        return OrderedDict(sorted(data.items(), key=lambda item: item[1], reverse=True))
+    else:
+        print(f"Redis 캐시에서 데이터 가져오기(남은시간:{round(Base.redis_client.ttl(redis_name)/3600,1)}시간) - myredis.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:
     """
     redis 사용 - 소멸타이머 사용
     리턴값
@@ -24,6 +66,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 +80,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 +122,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 +136,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 +174,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 +188,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 +207,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/trash.py

@@ -207,4 +207,83 @@ def mil(code: str) -> Tuple[int, int, int, int]:
         p = 0
     score4 = 0 if 0 > p else p
 
-    return score1, score2, score3, score4
+    return score1, score2, score3, score4
+
+
+
+
+def dbmanager():
+    cmd = ['repair', 'sync', 'eval', 'update']
+    parser = argparse.ArgumentParser()
+    parser.add_argument('cmd', help=f"Command - {cmd}")
+    parser.add_argument('target', help="Target for scraping (type 6digit code or 'all' or 'parts')")
+    parser.add_argument('-d', '--db_path', help="Set mongo database path")
+
+    args = parser.parse_args()
+
+    db_path = args.db_path if args.db_path else "mongodb://192.168.0.173:27017"
+    client = mongo.connect_mongo(db_path)
+
+    if args.cmd in cmd:
+        if args.cmd == 'repair':
+            if args.target == 'all' or utils.is_6digit(args.target):
+                need_for_repair_codes = chk_db.chk_integrity_corps(client, args.target)
+                # repair dict 예시 - {'343510': ['c106', 'c104', 'c103'], '298000': ['c104'], '091810': ['c104']}
+                print(f"Need for repairing codes :{need_for_repair_codes}")
+                if need_for_repair_codes:
+                    # x = input("Do you want to try to repair db by scraping? (y/N)")
+                    # if x == 'y' or x == 'Y':
+                        for code, failed_page_list in need_for_repair_codes.items():
+                            for page in failed_page_list:
+                                if page == 'c101':
+                                    nfsrun.c101([code, ], db_path)
+                                elif page == 'c103':
+                                    nfsrun.c103([code, ], db_path)
+                                elif page == 'c104':
+                                    nfsrun.c104([code, ], db_path)
+                                elif page == 'c106':
+                                    nfsrun.c106([code, ], db_path)
+                            recheck_result = chk_db.chk_integrity_corps(client, code)
+                            if recheck_result:
+                                # 다시 스크랩해도 오류가 지속되는 경우
+                                print(f"The db integrity failure persists..{recheck_result}")
+                                # x = input(f"Do you want to delete {code} on DB? (y/N)")
+                                # if x == 'y' or x == 'Y':
+                                #    mongo.Corps.del_db(client, code)
+                                # else:
+                                #    print("Canceled.")
+                                mongo.Corps.del_db(client, code)
+                    # else:
+                    #     print("Done.")
+                else:
+                    print("Done.")
+            else:
+                print(f"Invalid target option : {args.target}")
+        elif args.cmd == 'update':
+            if args.target == 'all' or utils.is_6digit(args.target):
+                need_for_update_codes = list(chk_db.chk_modifying_corps(client, args.target).keys())
+                # need_for_update_codes 예시 - [codes....]
+                print(f"Need for updating codes :{need_for_update_codes}")
+                if need_for_update_codes:
+                    nfsrun.c103(need_for_update_codes, db_path)
+                    nfsrun.c104(need_for_update_codes, db_path)
+                    nfsrun.c106(need_for_update_codes, db_path)
+            elif args.target == 'parts':
+                pass
+            else:
+                print(f"Invalid target option : {args.target}")
+        elif args.cmd == 'sync':
+            if args.target == 'all':
+                chk_db.sync_mongo_with_krx(client)
+            else:
+                print(f"The target should be 'all' in sync command.")
+        elif args.cmd == 'eval':
+            if args.target == 'all':
+                # eval을 평가해서 데이터베이스에 저장한다.
+                eval.make_today_eval_df(client, refresh=True)
+            else:
+                print(f"The target should be 'all' in sync command.")
+    else:
+        print(f"The command should be in {cmd}")
+
+    client.close()

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.1
 Name: analyser_hj3415
-Version: 2.2.0
+Version: 2.4.0
 Summary: Stock analyser and database processing programs
 Author-email: Hyungjin Kim <hj3415@gmail.com>
 Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: MIT License
-Requires-Dist: utils-hj3415>=2.6.0
-Requires-Dist: db-hj3415>=3.3.2
+Requires-Dist: utils-hj3415>=2.6.1
+Requires-Dist: db-hj3415>=3.4.0
 Project-URL: Home, https://www.hyungjin.kr
 
 ### analyser-hj3415

analyser_hj3415-2.4.0.dist-info/RECORD

@@ -0,0 +1,14 @@
+analyser_hj3415/.DS_Store,sha256=OQfTSOHL-zjUtnNyBpNRVUJUstR4j6I7jihKDFQQmME,6148
+analyser_hj3415/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+analyser_hj3415/cli.py,sha256=fDLGwz5x_5Gy4yCkz1cNbhC3BhkYNZ1IqKglcGRvsu4,750
+analyser_hj3415/myredis.py,sha256=i6o61be2qv41boVEM1mQG5QNCELr5zSq9mH1csVfUx8,10628
+analyser_hj3415/tools.py,sha256=SNsrnL5CKmKAdFkmlwgREMIkWDRi6N9LngCdhhhop3Y,13606
+analyser_hj3415/trash.py,sha256=zF-W0piqkGr66UP6-iybo9EXh2gO0RP6R1FnIpsGkl8,12262
+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=j5bH_r2-Sc53JWgmdBmL7pJk9cc8oQ7iZkYRPPOA-so,16217
+analyser_hj3415-2.4.0.dist-info/entry_points.txt,sha256=vBiMpIhNh39VC3UPwgxQNPb54N8vMlr4g0zRcCOjPyo,57
+analyser_hj3415-2.4.0.dist-info/LICENSE,sha256=QVKTp0dTnB5xG8RLgG17LwSWCKNEzYoVVM6KjoCPKc0,1079
+analyser_hj3415-2.4.0.dist-info/WHEEL,sha256=Sgu64hAMa6g5FdzHxXv9Xdse9yxpGGMeagVtPMWpJQY,99
+analyser_hj3415-2.4.0.dist-info/METADATA,sha256=UiSrI8LK1WK8WWhrIqxcY6tAC0B4_ks-7eg3HI3m498,6417
+analyser_hj3415-2.4.0.dist-info/RECORD,,

analyser_hj3415-2.4.0.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+analyser=analyser_hj3415.cli:analyser
+

analyser_hj3415-2.2.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-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/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-2.2.0.dist-info/entry_points.txt

@@ -1,4 +0,0 @@
-[console_scripts]
-dbmanager=analyser_hj3415.cli:dbmanager
-evalmanager=analyser_hj3415.cli:evalmanager
-