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

AI분야 release Pull Request #434

Merged
merged 64 commits into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
f4b5e82
fix: 음식분류모델 결과 반환 형태 변경
chaewon215 Jun 28, 2024
5df5897
docs: AI 브랜치의 PR 템플릿 동기화
chaewon215 Jun 28, 2024
adb5180
feat: dockerfile 업로드
chaewon215 Jun 28, 2024
5baab51
docs: requirements.txt 수정
chaewon215 Jun 28, 2024
59487a6
fix: docker 환경 구축을 위한 모델 config 수정
chaewon215 Jun 28, 2024
6225434
feat: docker 내에서 mar 파일을 생성하는 shell script 작성
chaewon215 Jun 28, 2024
dbabdc1
Merge pull request #327 from chaewon215/docs/#325
chaewon215 Jun 28, 2024
3d33def
Merge pull request #326 from chaewon215/fix/#323
Kyeong6 Jun 30, 2024
f31102d
Merge pull request #328 from chaewon215/feat/#324
Kyeong6 Jun 30, 2024
2e1df73
style: 기존 torchserve 디렉터리 삭제
chaewon215 Jul 2, 2024
a73555b
style: label 파일 디렉터리 생성
chaewon215 Jul 2, 2024
778d0f5
style: decoded_token.py 파일 복제
chaewon215 Jul 2, 2024
889fed8
fix: config.py 파일 복제 및 수정
chaewon215 Jul 2, 2024
3a00731
style: utility 파일 디렉터리 생성
chaewon215 Jul 2, 2024
66bf075
fix: 변경된 디렉터리 구조를 따라 쉘 스크립트 수정
chaewon215 Jul 2, 2024
2e72086
style: torchserve 실행에 필요한 파일
chaewon215 Jul 2, 2024
68a208a
style: requirements.txt 업로드
chaewon215 Jul 2, 2024
3125c67
fix: 변경된 디렉터리 구조를 따라 파일 내용 수정
chaewon215 Jul 2, 2024
c00a986
fix: git lfs 추적 파일 변경
chaewon215 Jul 2, 2024
5f14845
style: 모델 구조 파일
chaewon215 Jul 2, 2024
4b89166
Merge pull request #348 from chaewon215/fix/#334
chaewon215 Jul 2, 2024
914032e
fix: dockerfile 수정
chaewon215 Jul 3, 2024
eb96045
fix: module import 경로 수정
chaewon215 Jul 3, 2024
03998ac
fix: extra files 경로 수정
chaewon215 Jul 3, 2024
3389c43
Merge pull request #355 from chaewon215/fix/#354
chaewon215 Jul 3, 2024
4196e33
feat: requirements.txt 생성
Kyeong6 Jul 7, 2024
6cbca3b
feat: 스케줄러 시간 실제 프로젝트 시간으로 변경
Kyeong6 Jul 7, 2024
79bff0b
feat: Dockerfile 작성
Kyeong6 Jul 7, 2024
097dcc8
feat: .dockerignore 작성
Kyeong6 Jul 7, 2024
1509035
feat: api.py 파일 HTTPError 설정
Kyeong6 Jul 7, 2024
911de75
feat: crud.py 파일 HTTPError 설정
Kyeong6 Jul 7, 2024
4bbc91c
feat: diet_analysis.py 파일 HTTPError 추가 작성
Kyeong6 Jul 7, 2024
c9455d2
feat: member_pk에 해당하는 음식 데이터가 존재하지 않았을 경우의 응답 메시지 추가
Kyeong6 Jul 7, 2024
2ccbde7
fix: model parameter file 업로드
chaewon215 Jul 8, 2024
7006178
fix: 사용하지 않는 파일 삭제
chaewon215 Jul 8, 2024
4f23f3e
Merge pull request #366 from chaewon215/fix/#365
chaewon215 Jul 8, 2024
3e04c47
docs: 누락된 데이터 파일 추가
chaewon215 Jul 9, 2024
b14de87
Merge pull request #370 from chaewon215/docs/#369
chaewon215 Jul 9, 2024
1ca520d
fix: dockerfile에서 pip install requirements.txt 삭제
chaewon215 Jul 9, 2024
ce06b0d
fix: torchserve에서 사용하는 requirements.txt 수정
chaewon215 Jul 9, 2024
4e9fa03
Merge pull request #372 from chaewon215/fix/#371
chaewon215 Jul 9, 2024
e46ff1c
feat: NHANES 데이터 추가
saine0501 Jul 14, 2024
465ce38
fix: 프롬프트 수정
saine0501 Jul 14, 2024
c26ef3c
Merge pull request #382 from saine0501/feat/#364
saine0501 Jul 14, 2024
d16d30a
feat: 배포 준비 상태 완료
Kyeong6 Jul 16, 2024
9b402be
Merge pull request #391 from Kyeong6/feat/#314
Kyeong6 Jul 16, 2024
38d836b
feat: Dockerfile 배포 변경으로 인한 수정
Kyeong6 Jul 17, 2024
97bcf15
Merge pull request #393 from Kyeong6/feat/#373
Kyeong6 Jul 17, 2024
e85fb4b
fix: Dockerfile 수정 및 csv파일 추가
Kyeong6 Jul 17, 2024
9c94fdf
feat: config.py DB_URL 로그 확인
Kyeong6 Jul 17, 2024
1c30669
Merge pull request #394 from Kyeong6/feat/#361
Kyeong6 Jul 17, 2024
5f7f929
fix: EATceed/.gitignore 파일 수정
Kyeong6 Jul 18, 2024
080893b
Merge pull request #406 from Kyeong6/feat/#405
Kyeong6 Jul 18, 2024
a7b078f
setting: 최상단의 .gitattributes 삭제
chaewon215 Jul 18, 2024
72483b9
setting: food_classification 내로 .gitattributes 이동 및 수정
chaewon215 Jul 18, 2024
c1ce33b
Merge pull request #408 from chaewon215/setting/#407
chaewon215 Jul 18, 2024
76b1143
fix: pull_request_template.md 파일 위치 변경
Kyeong6 Jul 18, 2024
70c8464
Merge pull request #410 from Kyeong6/feat/#409
Kyeong6 Jul 18, 2024
197dfe6
fix: .gitignore 파일 수정
Kyeong6 Jul 18, 2024
dcfacc3
Merge pull request #412 from Kyeong6/feat/#411
Kyeong6 Jul 18, 2024
bb72dc2
feat: 충돌 해결을 위한 파일 조정
Kyeong6 Jul 21, 2024
657dc42
Merge pull request #419 from Kyeong6/feat/#418
Kyeong6 Jul 21, 2024
e163feb
docs: gitignore
Kyeong6 Jul 21, 2024
84d9324
Merge pull request #417 from JNU-econovation/ai
Kyeong6 Jul 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
2 changes: 0 additions & 2 deletions AI/.gitattributes

This file was deleted.

File renamed without changes.
595 changes: 595 additions & 0 deletions AI/data/diet/preprocessed.csv

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions AI/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
version: '3.8'

services:
server:
build:
context: ./server
ports:
- "8000:8000"
env_file:
- .env
depends_on:
- food_classification

food_classification:
build:
context: ./food_classification
ports:
- "8080:8080"
env_file:
- .env
1 change: 1 addition & 0 deletions AI/food_classification/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
model/model_param.pt filter=lfs diff=lfs merge=lfs -text
32 changes: 32 additions & 0 deletions AI/food_classification/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# pytorch/torchserve 이미지는 아래 코드를 통해 다운로드 가능
# $ sudo docker pull pytorch/torchserve:latest
FROM pytorch/torchserve:latest

# setting workdir in the container
WORKDIR /detect_model

# change user and change permissions
USER root
RUN chmod 777 -R .

# torchserve 실행에 필요한 파일 복사
COPY ./labels /detect_model/labels
COPY ./model /detect_model/model
COPY ./src /detect_model/src
COPY ./requirements.txt /detect_model/requirements.txt

# apt-get update에서 오류가 발생하여 추가한 코드
# 시간 관련 설정을 변경
RUN echo "Acquire::Check-Valid-Until \"false\";\nAcquire::Check-Date \"false\";" | cat > /etc/apt/apt.conf.d/10no--check-valid-until

RUN apt-get update
RUN apt install zip unzip

# create mar
RUN bash /detect_model/src/create-mar.sh

ENV JWT_SECRET="secretKeydlqslekdsecretKeydlqslekdsecretKeydlqslekdsecretKeydlqslekdsecretKeydlqslekdsecretKeydlqslekdse"

# start the server
CMD ["torchserve", "--start", "--models", "all", "--ts-config", "/detect_model/src/config.properties", "--no-config-snapshots"]
# ENTRYPOINT
Loading
Loading