Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feedback #1

Open
wants to merge 130 commits into
base: feedback
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
130 commits
Select commit Hold shift + click to select a range
e8b7cc7
Setting up GitHub Classroom Feedback
github-classroom[bot] Jan 30, 2024
2515051
docs: issue 및 pr template 작성 (#3)
2018007956 Feb 5, 2024
4edbc33
docs: naver,kakao,samsung stock data (#5)
MalMyeong Feb 9, 2024
4ed6957
feat: crawling.py (#7)
MalMyeong Feb 10, 2024
b7029ea
feat: realtime stock chart display (#9)
MalMyeong Feb 10, 2024
b062244
fix: config.toml for open streamlit (#11)
MalMyeong Feb 10, 2024
0259b09
feat: streamlit flag 패턴 매칭 추가 (#13)
Eddie-JUB Feb 12, 2024
34b8aca
feat: pattern matching 추가 및 tools 내 기존 관련 코드 삭제 (#15)
Eddie-JUB Feb 13, 2024
e7c7a6a
feat: candle matching streamlit 구현 (#17)
Eddie-JUB Feb 16, 2024
c502828
feat: streamlit menubar (#20)
MalMyeong Feb 16, 2024
b745ed0
feat: dashboard news 파트 추가 (#21)
Eddie-JUB Feb 17, 2024
a643e5a
feat: 주식 데이터 수집 코드 및 Dashboard 내 주식 데이터 시각화 파트 추가 (#23)
MalMyeong Feb 17, 2024
dae2f08
fix: 한국 주식데이터 수집 시 공휴일, 장마감 이후에 데이터 수집이 가능하도록 코드 수정 (#28)
MalMyeong Feb 19, 2024
4756d24
Feat/#24 requrements (#25)
Eddie-JUB Feb 19, 2024
9a53b1e
feat: candle pattern 코드 수정 및 tools 코드 삭제 (#29)
Eddie-JUB Feb 19, 2024
8237d9d
feat: home.py, about_us.py (#33)
minyun-e Feb 20, 2024
7a5dd2f
feat: candle matching 메뉴화 및 prediction 수정 (#32)
Eddie-JUB Feb 20, 2024
31292e2
feat: modify get_stock_df.py and update requirements.txt (#36)
Eddie-JUB Feb 20, 2024
616890a
fix: syspath to init
FinalCold Feb 20, 2024
aa85032
fix: syspath to init (#40)
FinalCold Feb 20, 2024
4d6db54
feat: stock prediction using hidden markov model (#41)
2018007956 Feb 20, 2024
4651d77
feat: CNN 기반 주가예측 모델 구현 (#42)
classaen7 Feb 20, 2024
874a54f
feat: non DL and LSTM models
FinalCold Feb 21, 2024
29a8005
refactor: 모델 폴더 통합 관리 (#46)
2018007956 Feb 21, 2024
8d1f345
fix: merge conflict
FinalCold Feb 21, 2024
cec02fb
fix: requirements 업데이트, cnn 모델 device 올리기, prediction default value 수…
Eddie-JUB Feb 22, 2024
8c84bfc
fix: hmm 결과 출력 수정 (#52)
2018007956 Feb 23, 2024
27f1e07
dev: backend baseline
2018007956 Feb 27, 2024
24de47c
feat: update requirements.txt
classaen7 Feb 27, 2024
da9bdd6
feat: backend_modelpred
classaen7 Feb 27, 2024
cd67a5a
Merge branch 'feat/model_predict' into dev/#53-backend
classaen7 Feb 27, 2024
c56de98
feat: docker 설정 (#58)
2018007956 Feb 27, 2024
9bfba77
feat: frontend 데모 제작 (#51)
Eddie-JUB Feb 28, 2024
b9dbb58
fix: update dockerfiles (#64)
2018007956 Feb 28, 2024
a7056ba
fix: docker v0.0 (#65)
2018007956 Mar 5, 2024
3a1ddee
feat: react baseline code 작성 (#72)
minyun-e Mar 6, 2024
cc1430f
feat: Poetry settings (#71)
2018007956 Mar 6, 2024
ed96f96
feat: DB 구축 (#68)
2018007956 Mar 6, 2024
cfee93e
remove: zbackend directory
classaen7 Mar 7, 2024
0315c88
fix: update docker v0.1 (#74)
2018007956 Mar 8, 2024
e03bb30
feat: 서비스 데모 배포를 위한 streamlit 코드 추가 (#61)
MalMyeong Mar 8, 2024
005de1a
feat: pattern matching UI 데모 제작 (#55)
Eddie-JUB Mar 8, 2024
055ff58
feat: stock search (#79)
MalMyeong Mar 8, 2024
ead04cc
develop: backend v0.1 (#62)
2018007956 Mar 8, 2024
4a8cec7
Merge branch 'develop' of https://github.com/boostcampaitech6/level2-…
2018007956 Mar 9, 2024
fda8b16
Merge branch 'develop' into dev/frontend
MalMyeong Mar 10, 2024
2072c25
develop: frontend v0.1 (#73)
minyun-e Mar 10, 2024
d4690c9
develop: backend v0.2 (#85)
2018007956 Mar 10, 2024
20e65c3
feat: Docker v1.0 / able to git clone (#84)
2018007956 Mar 11, 2024
8ff62be
feat: frontend v1.0 (#93)
Eddie-JUB Mar 14, 2024
0aa3f40
feat: naver news api 기능 추가 (#95)
Eddie-JUB Mar 15, 2024
510714f
feat: 데이터베이스 스키마 구현 (#99)
2018007956 Mar 15, 2024
a908482
Revert "feat: 데이터베이스 스키마 구현" (#102)
2018007956 Mar 15, 2024
bab69b6
fix: rm CMD [npm start] in frontend/Dockerfile
2018007956 Mar 15, 2024
604c756
fix: rm CMD [npm start] in frontend/Dockerfile
2018007956 Mar 15, 2024
63a0ad9
refactor: modify frontend baseline code (#106)
minyun-e Mar 17, 2024
ccd45ae
fix: code bugs (#108)
minyun-e Mar 21, 2024
ab414c1
feat: airflow codes (#101)
classaen7 Mar 21, 2024
09f9bf6
fix: merge conflict
2018007956 Mar 21, 2024
18201c3
feat: WAS서버와 DB서버 분리 (#112)
2018007956 Mar 26, 2024
65537be
feat: show stock info in result page (#111)
MalMyeong Mar 26, 2024
fdbead2
feat: add gauge chart (#121)
minyun-e Mar 26, 2024
5f68e06
feat: kakao login & logout, fix result page
FinalCold Mar 26, 2024
9406887
feat: model score result
FinalCold Mar 29, 2024
7957e31
feat: Airflow 결과물 mysql db에 저장하는 베이스라인 작성 (#115)
classaen7 Mar 29, 2024
363f790
feat: home change, add favorite
FinalCold Mar 29, 2024
0a58b5a
feat: Airflow 배치 서빙 및 Mysql 주기적 업데이트 (#131)
classaen7 Mar 30, 2024
f2dd2fa
feat: change_design
minyun-e Mar 30, 2024
fa0339a
feat: change_design
minyun-e Mar 31, 2024
0c2561d
feat: change_design
minyun-e Mar 31, 2024
4a0a63c
feat: kakao login in backend (#136)
2018007956 Mar 31, 2024
1af295a
feat: kakao login in frontend (#137)
2018007956 Mar 31, 2024
da0be01
feat: frontend-result, search color change
Eddie-JUB Mar 31, 2024
5d1e4ac
feat: change_design
minyun-e Mar 31, 2024
4e58dc5
feat: model score result (#139)
2018007956 Mar 31, 2024
520ee6f
feat: calculate model score in backend (#138)
2018007956 Mar 31, 2024
9b75794
fix: localhost to server_ip using env var. in frontend (#142)
2018007956 Mar 31, 2024
812d86f
feat: set environment variable in backend (#141)
2018007956 Mar 31, 2024
c1b691b
feat: change_design
minyun-e Mar 31, 2024
d00fbb1
feat: favorite page in frontend (#145)
2018007956 Mar 31, 2024
d30bba0
feat: add favorite api, stock info (#144)
2018007956 Mar 31, 2024
e9478b9
fix: merge conflict
2018007956 Mar 31, 2024
a107741
fix: localhost to server_ip using env
2018007956 Mar 31, 2024
d7f67bd
Merge pull request #143 from boostcampaitech6/feat/#124-change_design
minyun-e Mar 31, 2024
e1ad0e5
feat: merge dev/frontend
2018007956 Mar 31, 2024
650c69a
feat: merge dev/backend
2018007956 Mar 31, 2024
febf6a8
fix: add required packages in back
2018007956 Mar 31, 2024
c3ed4be
fix: call server_ip using env in db
2018007956 Mar 31, 2024
dd98c82
fix: localhost to server_ip in front
2018007956 Mar 31, 2024
4f9ffc6
fix: back codes
2018007956 Mar 31, 2024
5103b93
fix: merge conflict
2018007956 Mar 31, 2024
c88f95d
fix: reflect codes modified in release/0.0
2018007956 Mar 31, 2024
b1b819e
fix: reflect codes modified in release/0.0
2018007956 Mar 31, 2024
0b766c7
fix: reflect codes modified in release/0.0
2018007956 Mar 31, 2024
b14f448
fix: manage server ip as env var in db
2018007956 Mar 31, 2024
617cd96
fix: manage server ip as env var in db
2018007956 Mar 31, 2024
fb78fde
fix: host ip in db must be hardcoded
2018007956 Mar 31, 2024
be6272c
fix: code bugs in front favorite screen
2018007956 Mar 31, 2024
d8bcfa1
fix: code bugs in front favorite screen
2018007956 Mar 31, 2024
8337454
fix: code bugs in front favorite screen
2018007956 Mar 31, 2024
1adcba2
fix: code bugs in front favorite screen
2018007956 Mar 31, 2024
7975ca4
feat: 모델 종합 점수에 따라 주식짤 띄우기 (#151)
2018007956 Apr 2, 2024
39cd096
fix: rebase #151-2
2018007956 Apr 2, 2024
6f41617
fix: add port on result screen
FinalCold Apr 1, 2024
5f179b9
feat: change favorite page UI
minyun-e Apr 1, 2024
3b9d9fc
fix: port, result screen string to float
FinalCold Apr 1, 2024
baf694d
feat: change mobile intro file / add Google Analytics
minyun-e Apr 1, 2024
62f4851
fix: rebase #151-7
2018007956 Apr 2, 2024
a05026c
fix: del handling cachedata-favorite page
minyun-e Apr 2, 2024
af368df
fix: merge conflict
2018007956 Apr 2, 2024
fa755bb
fix: front port 3001->80
2018007956 Apr 2, 2024
f9fc00e
fix: front port 3001->80
2018007956 Apr 2, 2024
cc12c31
fix: add poetry plotly
2018007956 Apr 2, 2024
b2a92bb
fix: front code bugs
2018007956 Apr 2, 2024
c756671
fix: front code bugs
2018007956 Apr 2, 2024
afeb53e
fix: code bugs in back
2018007956 Apr 2, 2024
4a8ca84
fix: poetry add python-dotenv
2018007956 Apr 3, 2024
956f9c2
Merge branch 'dev/frontend' of https://github.com/boostcampaitech6/le…
2018007956 Apr 3, 2024
1f65bf7
feat: docker v2.0 for serving
2018007956 Apr 3, 2024
cd7768a
fix: docker workdir path in score.py
2018007956 Apr 3, 2024
1e87a8a
feat: set docker-compose to v2.0
2018007956 Apr 3, 2024
0dc3391
feat: modify streamlit demo
Apr 7, 2024
3732ea6
remove: delete files
minyun-e Apr 7, 2024
b94dd88
remove: hmm in streamlit_demo
2018007956 Apr 7, 2024
1fcd0ff
remove: unused codes
2018007956 Apr 7, 2024
6975fa4
fix: docker-compose env key name
2018007956 Apr 7, 2024
ec58ef2
docs: README.md
2018007956 Apr 8, 2024
9aba7ca
remove: unused files
2018007956 Apr 8, 2024
4ed9d81
fix: README.md
2018007956 Apr 15, 2024
6e168e7
feat: CNN model training (#77)
classaen7 Apr 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
refactor: 모델 폴더 통합 관리 (#46)
* remove: duplicate files

#44

* organize: move cnn folder to a subfolder in models

#44

* refactor: file tree

#44

* docs: add hmmlearn to requirements.txt

#44

* refactor: remove annotation

#44
2018007956 authored Feb 21, 2024
commit 29a80054e6141913413707a6ec68092556c654a4
114 changes: 0 additions & 114 deletions candle_matching/candle_rankings.py

This file was deleted.

412 changes: 0 additions & 412 deletions candle_matching/find_candle_patterns.py

This file was deleted.

134 changes: 0 additions & 134 deletions candle_matching/pattern_descriptions.py

This file was deleted.

1 change: 0 additions & 1 deletion streamlit/cnn_model/__init__.py

This file was deleted.

3 changes: 2 additions & 1 deletion streamlit/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
from .hmm import *
from .hmm import *
from .cnn.cnn_st import *
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
Original file line number Diff line number Diff line change
@@ -115,28 +115,28 @@ def forward(self, x): # input: [N, 64, 60]
def get_CNN5d_5d():
model = CNN5d()
device = torch.device('cuda:0' if torch.cuda.is_available() else 'cpu')
state_dict = torch.load('./cnn_model/I5R5_Model.tar',map_location=torch.device(device))
state_dict = torch.load('models/cnn/I5R5_Model.tar',map_location=torch.device(device))
model.load_state_dict(state_dict['model_state_dict'])
return model

def get_CNN5d_20d():
model = CNN5d()
device = torch.device('cuda:0' if torch.cuda.is_available() else 'cpu')
state_dict = torch.load('./cnn_model/I5R20_Model.tar',map_location=torch.device(device))
state_dict = torch.load('models/cnn/I5R20_Model.tar',map_location=torch.device(device))
model.load_state_dict(state_dict['model_state_dict'])
return model

def get_CNN20d_5d():
model = CNN20d()
device = torch.device('cuda:0' if torch.cuda.is_available() else 'cpu')
state_dict = torch.load('./cnn_model/I20R5_Model.tar',map_location=torch.device(device))
state_dict = torch.load('models/cnn/I20R5_Model.tar',map_location=torch.device(device))
model.load_state_dict(state_dict['model_state_dict'])
return model

def get_CNN20d_20d():
model = CNN20d()
device = torch.device('cuda:0' if torch.cuda.is_available() else 'cpu')
state_dict = torch.load('./cnn_model/I20R20_Model.tar',map_location=torch.device(device))
state_dict = torch.load('models/cnn/I20R20_Model.tar',map_location=torch.device(device))
model.load_state_dict(state_dict['model_state_dict'])
return model

Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
import numpy as np
import torch
from PIL import Image
from cnn_model.cnn_inference import get_CNN5d_5d, get_CNN5d_20d, get_CNN20d_5d, get_CNN20d_20d, inference, image_to_np, grad_cam, image_to_tensor, time_calc
from .cnn_inference import get_CNN5d_5d, get_CNN5d_20d, get_CNN20d_5d, get_CNN20d_20d, inference, image_to_np, grad_cam, image_to_tensor, time_calc

def get_stock_data(ticker, period, interval):
stock = yf.Ticker(ticker)
@@ -130,13 +130,13 @@ def cnn_model_inference(company, ticker, period, interval):
percent = round(model_pred[pred_idx].item()*100,2)

if pred_idx == 0:
img = Image.open('cnn_model/bear.png').resize((256,256))
img = Image.open('models/cnn/bear.png').resize((256,256))
p_col1.image(img)
p_col2.markdown(f'''AI 모델의 분석 결과
**{company}**의 **{output_period}** 이후 주가는
:red[**{percent}%**] 확률로 :red[**하락**]을 예측합니다''')
elif pred_idx == 1:
img = Image.open('cnn_model/bull.png').resize((256,256))
img = Image.open('models/cnn/bull.png').resize((256,256))
p_col1.image(img)
p_col2.markdown(f'''AI 모델의 분석 결과
**{company}**의 **{output_period}** 이후 주가는
3 changes: 2 additions & 1 deletion streamlit/requirements.txt
Original file line number Diff line number Diff line change
@@ -89,4 +89,5 @@ finance-datareader
schedule
ta-lib-bin
torch==2.1.0
grad-cam
grad-cam
hmmlearn
4 changes: 2 additions & 2 deletions streamlit/views/prediction.py
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@
import streamlit as st
import yfinance as yf
import plotly.graph_objs as go
from cnn_model import cnn_model_inference
from models.hmm import HMM
from models import HMM
from models import cnn_model_inference

def app():
st.title('Stock Price Prediction')