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.

Sign up for GitHub

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

Jump to bottom

AI분야 release Pull Request #434

Merged
merged 64 commits into from
Jul 24, 2024
Merged

AI분야 release Pull Request #434

merged 64 commits into from
Jul 24, 2024

Commits on Jun 28, 2024

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

    @chaewon215
    chaewon215 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    f4b5e82 View commit details
    Browse the repository at this point in the history

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

    @chaewon215
    chaewon215 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    5df5897 View commit details
    Browse the repository at this point in the history

  3. feat: dockerfile 업로드

    @chaewon215
    chaewon215 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    adb5180 View commit details
    Browse the repository at this point in the history

  4. docs: requirements.txt 수정

    @chaewon215
    chaewon215 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    5baab51 View commit details
    Browse the repository at this point in the history

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

    @chaewon215
    chaewon215 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    59487a6 View commit details
    Browse the repository at this point in the history

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

    @chaewon215
    chaewon215 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    6225434 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #327 from chaewon215/docs/#325 

    [AI/docs] AI 브랜치의 PR 템플릿 동기화
    @chaewon215
    chaewon215 authored Jun 28, 2024
    Configuration menu
    Copy the full SHA
    dbabdc1 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2024

  1. Merge pull request #326 from chaewon215/fix/#323 

    [AI/fix] 음식분류모델 결과 반환 형태 변경
    @Kyeong6
    Kyeong6 authored Jun 30, 2024
    Configuration menu
    Copy the full SHA
    3d33def View commit details
    Browse the repository at this point in the history

  2. Merge pull request #328 from chaewon215/feat/#324 

    [AI/feat] 음식분류모델에 대한 Dockerfile 작성
    @Kyeong6
    Kyeong6 authored Jun 30, 2024
    Configuration menu
    Copy the full SHA
    f31102d View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. style: 기존 torchserve 디렉터리 삭제

    @chaewon215
    chaewon215 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    2e1df73 View commit details
    Browse the repository at this point in the history

  2. style: label 파일 디렉터리 생성

    @chaewon215
    chaewon215 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    a73555b View commit details
    Browse the repository at this point in the history

  3. style: decoded_token.py 파일 복제

    @chaewon215
    chaewon215 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    778d0f5 View commit details
    Browse the repository at this point in the history

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

    @chaewon215
    chaewon215 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    889fed8 View commit details
    Browse the repository at this point in the history

  5. style: utility 파일 디렉터리 생성

    @chaewon215
    chaewon215 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    3a00731 View commit details
    Browse the repository at this point in the history

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

    @chaewon215
    chaewon215 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    66bf075 View commit details
    Browse the repository at this point in the history

  7. style: torchserve 실행에 필요한 파일

    @chaewon215
    chaewon215 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    2e72086 View commit details
    Browse the repository at this point in the history

  8. style: requirements.txt 업로드

    @chaewon215
    chaewon215 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    68a208a View commit details
    Browse the repository at this point in the history

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

    @chaewon215
    chaewon215 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    3125c67 View commit details
    Browse the repository at this point in the history

  10. fix: git lfs 추적 파일 변경

    @chaewon215
    chaewon215 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    c00a986 View commit details
    Browse the repository at this point in the history

  11. style: 모델 구조 파일

    @chaewon215
    chaewon215 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    5f14845 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #348 from chaewon215/fix/#334 

    [AI/fix] torchserve 파일 디렉토리 구조 변경
    @chaewon215
    chaewon215 authored Jul 2, 2024
    Configuration menu
    Copy the full SHA
    4b89166 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. fix: dockerfile 수정

    @chaewon215
    chaewon215 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    914032e View commit details
    Browse the repository at this point in the history

  2. fix: module import 경로 수정

    @chaewon215
    chaewon215 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    eb96045 View commit details
    Browse the repository at this point in the history

  3. fix: extra files 경로 수정

    @chaewon215
    chaewon215 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    03998ac View commit details
    Browse the repository at this point in the history

  4. Merge pull request #355 from chaewon215/fix/#354

    @chaewon215
    chaewon215 authored Jul 3, 2024
    Configuration menu
    Copy the full SHA
    3389c43 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2024

  1. feat: requirements.txt 생성

    @Kyeong6
    Kyeong6 committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    4196e33 View commit details
    Browse the repository at this point in the history

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

    @Kyeong6
    Kyeong6 committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    6cbca3b View commit details
    Browse the repository at this point in the history

  3. feat: Dockerfile 작성

    @Kyeong6
    Kyeong6 committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    79bff0b View commit details
    Browse the repository at this point in the history

  4. feat: .dockerignore 작성

    @Kyeong6
    Kyeong6 committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    097dcc8 View commit details
    Browse the repository at this point in the history

  5. feat: api.py 파일 HTTPError 설정

    @Kyeong6
    Kyeong6 committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    1509035 View commit details
    Browse the repository at this point in the history

  6. feat: crud.py 파일 HTTPError 설정

    @Kyeong6
    Kyeong6 committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    911de75 View commit details
    Browse the repository at this point in the history

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

    @Kyeong6
    Kyeong6 committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    4bbc91c View commit details
    Browse the repository at this point in the history

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

    @Kyeong6
    Kyeong6 committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    c9455d2 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. fix: model parameter file 업로드

    @chaewon215
    chaewon215 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    2ccbde7 View commit details
    Browse the repository at this point in the history

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

    @chaewon215
    chaewon215 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    7006178 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #366 from chaewon215/fix/#365 

    [AI/fix] 모델 파라미터 파일 업로드
    @chaewon215
    chaewon215 authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    4f23f3e View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

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

    @chaewon215
    chaewon215 committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    3e04c47 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #370 from chaewon215/docs/#369 

    [AI/docs] 누락된 데이터 파일 추가
    @chaewon215
    chaewon215 authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    b14de87 View commit details
    Browse the repository at this point in the history

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

    @chaewon215
    chaewon215 committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    1ca520d View commit details
    Browse the repository at this point in the history

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

    @chaewon215
    chaewon215 committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    ce06b0d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #372 from chaewon215/fix/#371 

    [AI/fix] docker 사이즈 축소를 위한 코드 수정
    @chaewon215
    chaewon215 authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    4e9fa03 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. feat: NHANES 데이터 추가

    @saine0501
    saine0501 committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    e46ff1c View commit details
    Browse the repository at this point in the history

  2. fix: 프롬프트 수정

    @saine0501
    saine0501 committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    465ce38 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #382 from saine0501/feat/#364 

    [AI/feat] 데이터 변경
    @saine0501
    saine0501 authored Jul 14, 2024
    Configuration menu
    Copy the full SHA
    c26ef3c View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. feat: 배포 준비 상태 완료

    @Kyeong6
    Kyeong6 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    d16d30a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #391 from Kyeong6/feat/#314 

    [AI/feat]Docker를 사용한 배포준비 완료
    @Kyeong6
    Kyeong6 authored Jul 16, 2024
    Configuration menu
    Copy the full SHA
    9b402be View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

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

    @Kyeong6
    Kyeong6 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    38d836b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #393 from Kyeong6/feat/#373 

    [AI/feat] EC2 서버 구축(AI 서버)
    @Kyeong6
    Kyeong6 authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    97bcf15 View commit details
    Browse the repository at this point in the history

  3. fix: Dockerfile 수정 및 csv파일 추가

    @Kyeong6
    Kyeong6 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    e85fb4b View commit details
    Browse the repository at this point in the history

  4. feat: config.py DB_URL 로그 확인

    @Kyeong6
    Kyeong6 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    9c94fdf View commit details
    Browse the repository at this point in the history

  5. Merge pull request #394 from Kyeong6/feat/#361 

    [AI/fix] Dockerfile 수정 및 EC2 배포
    @Kyeong6
    Kyeong6 authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    1c30669 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. fix: EATceed/.gitignore 파일 수정

    @Kyeong6
    Kyeong6 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    5f7f929 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #406 from Kyeong6/feat/#405 

    fix: EATceed/.gitignore 파일 수정
    @Kyeong6
    Kyeong6 authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    080893b View commit details
    Browse the repository at this point in the history

  3. setting: 최상단의 .gitattributes 삭제

    @chaewon215
    chaewon215 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    a7b078f View commit details
    Browse the repository at this point in the history

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

    @chaewon215
    chaewon215 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    72483b9 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #408 from chaewon215/setting/#407 

    [AI/setting] .gitattributes 파일 위치 변경
    @chaewon215
    chaewon215 authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    c1ce33b View commit details
    Browse the repository at this point in the history

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

    @Kyeong6
    Kyeong6 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    76b1143 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #410 from Kyeong6/feat/#409 

    [AI/fix] AI 브랜치 스프린트 마감을 위한 충돌 해결
    @Kyeong6
    Kyeong6 authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    70c8464 View commit details
    Browse the repository at this point in the history

  8. fix: .gitignore 파일 수정

    @Kyeong6
    Kyeong6 committed Jul 18, 2024
    Configuration menu
    Copy the full SHA
    197dfe6 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #412 from Kyeong6/feat/#411 

    [AI/fix] AI 브랜치 스프린트 마감을 위한 충돌 해결
    @Kyeong6
    Kyeong6 authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    dcfacc3 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

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

    @Kyeong6
    Kyeong6 committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    bb72dc2 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #419 from Kyeong6/feat/#418 

    feat: 충돌 해결을 위한 파일 조정
    @Kyeong6
    Kyeong6 authored Jul 21, 2024
    Configuration menu
    Copy the full SHA
    657dc42 View commit details
    Browse the repository at this point in the history

  3. docs: gitignore

    @Kyeong6
    Kyeong6 committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    e163feb View commit details
    Browse the repository at this point in the history

  4. Merge pull request #417 from JNU-econovation/ai 

    [AI/fix] AI 브랜치 충돌 해결
    @Kyeong6
    Kyeong6 authored Jul 21, 2024
    Configuration menu
    Copy the full SHA
    84d9324 View commit details
    Browse the repository at this point in the history