Code

[AI/fix] AI 브랜치 충돌 해결#417

Code

Merged

Kyeong6 merged 63 commits intodevelopJNU-econovation/EATceed-BE:developfrom aiJNU-econovation/EATceed-BE:aiCopy head branch name to clipboardJul 21, 2024

+6,605-1,182

Commits

Commits on Jun 28, 2024

• fix: 음식분류모델 결과 반환 형태 변경

  chaewon215

  committed
  f4b5e82

  Copy full SHA for f4b5e82

• docs: AI 브랜치의 PR 템플릿 동기화

  chaewon215

  committed
  5df5897

  Copy full SHA for 5df5897

• feat: dockerfile 업로드

  chaewon215

  committed
  adb5180

  Copy full SHA for adb5180

• docs: requirements.txt 수정

  chaewon215

  committed
  5baab51

  Copy full SHA for 5baab51

• fix: docker 환경 구축을 위한 모델 config 수정

  chaewon215

  committed
  59487a6

  Copy full SHA for 59487a6

• feat: docker 내에서 mar 파일을 생성하는 shell script 작성

  chaewon215

  committed
  6225434

  Copy full SHA for 6225434

• Merge pull request #327 from chaewon215/docs/#325

  Show description for dbabdc1
  chaewon215

  authored
  dbabdc1

  Copy full SHA for dbabdc1

Commits on Jun 30, 2024

• Merge pull request #326 from chaewon215/fix/#323

  Show description for 3d33def
  Kyeong6

  authored
  3d33def

  Copy full SHA for 3d33def

• Merge pull request #328 from chaewon215/feat/#324

  Show description for f31102d
  Kyeong6

  authored
  f31102d

  Copy full SHA for f31102d

Commits on Jul 2, 2024

• style: 기존 torchserve 디렉터리 삭제

  chaewon215

  committed
  2e1df73

  Copy full SHA for 2e1df73

• style: label 파일 디렉터리 생성

  chaewon215

  committed
  a73555b

  Copy full SHA for a73555b

• style: decoded_token.py 파일 복제

  chaewon215

  committed
  778d0f5

  Copy full SHA for 778d0f5

• fix: config.py 파일 복제 및 수정

  chaewon215

  committed
  889fed8

  Copy full SHA for 889fed8

• style: utility 파일 디렉터리 생성

  chaewon215

  committed
  3a00731

  Copy full SHA for 3a00731

• fix: 변경된 디렉터리 구조를 따라 쉘 스크립트 수정

  chaewon215

  committed
  66bf075

  Copy full SHA for 66bf075

• style: torchserve 실행에 필요한 파일

  chaewon215

  committed
  2e72086

  Copy full SHA for 2e72086

• style: requirements.txt 업로드

  chaewon215

  committed
  68a208a

  Copy full SHA for 68a208a

• fix: 변경된 디렉터리 구조를 따라 파일 내용 수정

  chaewon215

  committed
  3125c67

  Copy full SHA for 3125c67

• fix: git lfs 추적 파일 변경

  chaewon215

  committed
  c00a986

  Copy full SHA for c00a986

• style: 모델 구조 파일

  chaewon215

  committed
  5f14845

  Copy full SHA for 5f14845

• Merge pull request #348 from chaewon215/fix/#334

  Show description for 4b89166
  chaewon215

  authored
  4b89166

  Copy full SHA for 4b89166

Commits on Jul 3, 2024

• fix: dockerfile 수정

  chaewon215

  committed
  914032e

  Copy full SHA for 914032e

• fix: module import 경로 수정

  chaewon215

  committed
  eb96045

  Copy full SHA for eb96045

• fix: extra files 경로 수정

  chaewon215

  committed
  03998ac

  Copy full SHA for 03998ac

• Merge pull request #355 from chaewon215/fix/#354

  chaewon215

  authored
  3389c43

  Copy full SHA for 3389c43

Commits on Jul 7, 2024

• feat: requirements.txt 생성

  Kyeong6

  committed
  4196e33

  Copy full SHA for 4196e33

• feat: 스케줄러 시간 실제 프로젝트 시간으로 변경

  Kyeong6

  committed
  6cbca3b

  Copy full SHA for 6cbca3b

• feat: Dockerfile 작성

  Kyeong6

  committed
  79bff0b

  Copy full SHA for 79bff0b

• feat: .dockerignore 작성

  Kyeong6

  committed
  097dcc8

  Copy full SHA for 097dcc8

• feat: api.py 파일 HTTPError 설정

  Kyeong6

  committed
  1509035

  Copy full SHA for 1509035

• feat: crud.py 파일 HTTPError 설정

  Kyeong6

  committed
  911de75

  Copy full SHA for 911de75

• feat: diet_analysis.py 파일 HTTPError 추가 작성

  Kyeong6

  committed
  4bbc91c

  Copy full SHA for 4bbc91c

• feat: member_pk에 해당하는 음식 데이터가 존재하지 않았을 경우의 응답 메시지 추가

  Kyeong6

  committed
  c9455d2

  Copy full SHA for c9455d2

Commits on Jul 8, 2024

• fix: model parameter file 업로드

  chaewon215

  committed
  2ccbde7

  Copy full SHA for 2ccbde7

• fix: 사용하지 않는 파일 삭제

  chaewon215

  committed
  7006178

  Copy full SHA for 7006178

• Merge pull request #366 from chaewon215/fix/#365

  Show description for 4f23f3e
  chaewon215

  authored
  4f23f3e

  Copy full SHA for 4f23f3e

Commits on Jul 9, 2024

• docs: 누락된 데이터 파일 추가

  chaewon215

  committed
  3e04c47

  Copy full SHA for 3e04c47

• Merge pull request #370 from chaewon215/docs/#369

  Show description for b14de87
  chaewon215

  authored
  b14de87

  Copy full SHA for b14de87

• fix: dockerfile에서 pip install requirements.txt 삭제

  chaewon215

  committed
  1ca520d

  Copy full SHA for 1ca520d

• fix: torchserve에서 사용하는 requirements.txt 수정

  chaewon215

  committed
  ce06b0d

  Copy full SHA for ce06b0d

• Merge pull request #372 from chaewon215/fix/#371

  Show description for 4e9fa03
  chaewon215

  authored
  4e9fa03

  Copy full SHA for 4e9fa03

Commits on Jul 14, 2024

• feat: NHANES 데이터 추가

  saine0501

  committed
  e46ff1c

  Copy full SHA for e46ff1c

• fix: 프롬프트 수정

  saine0501

  committed
  465ce38

  Copy full SHA for 465ce38

• Merge pull request #382 from saine0501/feat/#364

  Show description for c26ef3c
  saine0501

  authored
  c26ef3c

  Copy full SHA for c26ef3c

Commits on Jul 16, 2024

• feat: 배포 준비 상태 완료

  Kyeong6

  committed
  d16d30a

  Copy full SHA for d16d30a

• Merge pull request #391 from Kyeong6/feat/#314

  Show description for 9b402be
  Kyeong6

  authored
  9b402be

  Copy full SHA for 9b402be

Commits on Jul 17, 2024

• feat: Dockerfile 배포 변경으로 인한 수정

  Kyeong6

  committed
  38d836b

  Copy full SHA for 38d836b

• Merge pull request #393 from Kyeong6/feat/#373

  Show description for 97bcf15
  Kyeong6

  authored
  97bcf15

  Copy full SHA for 97bcf15

• fix: Dockerfile 수정 및 csv파일 추가

  Kyeong6

  committed
  e85fb4b

  Copy full SHA for e85fb4b

• feat: config.py DB_URL 로그 확인

  Kyeong6

  committed
  9c94fdf

  Copy full SHA for 9c94fdf

• Merge pull request #394 from Kyeong6/feat/#361

  Show description for 1c30669
  Kyeong6

  authored
  1c30669

  Copy full SHA for 1c30669

Commits on Jul 18, 2024

• fix: EATceed/.gitignore 파일 수정

  Kyeong6

  committed
  5f7f929

  Copy full SHA for 5f7f929

• Merge pull request #406 from Kyeong6/feat/#405

  Show description for 080893b
  Kyeong6

  authored
  080893b

  Copy full SHA for 080893b

• setting: 최상단의 .gitattributes 삭제

  chaewon215

  committed
  a7b078f

  Copy full SHA for a7b078f

• setting: food_classification 내로 .gitattributes 이동 및 수정

  chaewon215

  committed
  72483b9

  Copy full SHA for 72483b9

• Merge pull request #408 from chaewon215/setting/#407

  Show description for c1ce33b
  chaewon215

  authored
  c1ce33b

  Copy full SHA for c1ce33b

• fix: pull_request_template.md 파일 위치 변경

  Kyeong6

  committed
  76b1143

  Copy full SHA for 76b1143

• Merge pull request #410 from Kyeong6/feat/#409

  Show description for 70c8464
  Kyeong6

  authored
  70c8464

  Copy full SHA for 70c8464

• fix: .gitignore 파일 수정

  Kyeong6

  committed
  197dfe6

  Copy full SHA for 197dfe6

• Merge pull request #412 from Kyeong6/feat/#411

  Show description for dcfacc3
  Kyeong6

  authored
  dcfacc3

  Copy full SHA for dcfacc3

Commits on Jul 21, 2024

• feat: 충돌 해결을 위한 파일 조정

  Kyeong6

  committed
  bb72dc2

  Copy full SHA for bb72dc2

• Merge pull request #419 from Kyeong6/feat/#418

  Show description for 657dc42
  Kyeong6

  authored
  657dc42

  Copy full SHA for 657dc42

• docs: gitignore

  Kyeong6

  committed
  e163feb

  Copy full SHA for e163feb