analyser_hj3415 3.0.0__tar.gz → 3.0.2__tar.gz

{analyser_hj3415-3.0.0 → analyser_hj3415-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: analyser_hj3415
-Version: 3.0.0
+Version: 3.0.2
 Summary: Stock analyser and database processing programs
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown

{analyser_hj3415-3.0.0 → analyser_hj3415-3.0.2}/analyser_hj3415/cli.py

@@ -39,6 +39,7 @@ def analyser_manager():
     # red - get 파서
     red_get_parser = red_subparser.add_parser('get', help='red get 책정 및 레디스 저장')
     red_get_parser.add_argument('code', type=str, help='종목코드 or all')
+    red_get_parser.add_argument('-e', '--expect_earn', type=float, help='기대수익률 (실수 값 입력)')
     red_get_parser.add_argument('-r', '--refresh', action='store_true', help='래디스 캐시를 사용하지 않고 강제로 재계산 할지')
 
     # mil 명령어 서브파서
@@ -69,8 +70,12 @@ def analyser_manager():
 
     if args.type == 'red':
         if args.command == 'get':
-            if args.code == 'all':
+            if args.expect_earn is None:
                 red = eval.Red('005930')
+            else:
+                red = eval.Red('005930', expect_earn=args.expect_earn)
+            if args.code == 'all':
+
                 print("**** Red - all codes ****")
                 for i, code in enumerate(myredis.Corps.list_all_codes()):
                     red.code = code
@@ -79,14 +84,17 @@ def analyser_manager():
             else:
                 assert tools.is_6digit(args.code), "code 인자는 6자리 숫자이어야 합니다."
                 # 저장된 기대수익률을 불러서 임시저장
-                red = eval.Red(args.code)
+                red.code = args.code
                 print(f"*** Red - {red} ***")
                 pprint.pprint(red.get(args.refresh))
             mymongo.Logs.save('cli','INFO', f'run >> analyser red get {args.code}')
 
         elif args.command == 'ranking':
             mymongo.Logs.save('cli','INFO', 'run >> analyser red ranking')
-            result = eval.Red.ranking(expect_earn=args.expect_earn, refresh=args.refresh)
+            if args.expect_earn is None:
+                result = eval.Red.ranking(refresh=args.refresh)
+            else:
+                result = eval.Red.ranking(expect_earn=args.expect_earn, refresh=args.refresh)
             print(result)
 
     elif args.type == 'mil':
@@ -144,16 +152,17 @@ def analyser_manager():
             mymongo.Logs.save('cli','INFO', 'run >> analyser prophet ranking')
 
     elif args.type == 'lstm':
-        mylstm = tsa.MyLSTM
         if args.command == 'caching':
             if args.top:
-                mylstm.caching_based_on_prophet_ranking(refresh=args.refresh, top=args.top)
+                tsa.MyLSTM.caching_based_on_prophet_ranking(refresh=args.refresh, top=args.top)
             else:
-                mylstm.caching_based_on_prophet_ranking(refresh=args.refresh)
+                tsa.MyLSTM.caching_based_on_prophet_ranking(refresh=args.refresh)
             mymongo.Logs.save('cli','INFO', f'run >> analyser lstm caching / top={args.top if args.top else 20}')
         elif args.command == 'get':
             assert tools.is_6digit(args.code), "code 인자는 6자리 숫자이어야 합니다."
-            result = mylstm(args.code).get_final_predictions(refresh=args.refresh)
+            mylstm = tsa.MyLSTM(args.code)
+            mylstm.initializing()
+            mylstm.ensemble_training(num=5)
             mymongo.Logs.save('cli','INFO', f'run >> analyser lstm get {args.code}')
     else:
         parser.print_help()

{analyser_hj3415-3.0.0 → analyser_hj3415-3.0.2}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "analyser_hj3415"
-version = "3.0.0"
+version = "3.0.2"
 description = "Stock analyser and database processing programs"
 readme = "README.md"
 requires-python = ">=3.6"