Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
797 commits
Select commit Hold shift + click to select a range
923415a
refactor: 규정 Level과 Title 값 추가
leeseobin00 Nov 11, 2024
00d2282
refactor: 수정 시에도 null 값 허용
leeseobin00 Nov 11, 2024
b2c6600
refactor: 불필요한 어노테이션 제거
leeseobin00 Nov 11, 2024
aba9195
Merge branch 'feature/127-BE-Board_생성_로직_수정' into 'develop'
leeseobin00 Nov 11, 2024
ae2ede4
Merge branch 'develop' into feature/108-FE-chat_페이지_api_연동
sem1308 Nov 11, 2024
951690a
feat: 부정 피드백 api 연결
sem1308 Nov 11, 2024
8af27ec
fix: 기타 컴포넌트 수정
sem1308 Nov 11, 2024
1e11b68
refactor: 코드 정렬
sem1308 Nov 11, 2024
6e338e3
chore: 패키지 path 추가
sem1308 Nov 11, 2024
307949b
feat: filter exception handler 구현
sem1308 Nov 11, 2024
84dc68c
fix: filter exception handler에 cors 설정 추가
sem1308 Nov 11, 2024
df457e6
fix: filter 등록
sem1308 Nov 11, 2024
034baaa
feat: 토큰 만료시 토큰 삭제하도록 수정
sem1308 Nov 11, 2024
03e5439
style: 부정 피드백 이유 모달 width 변경
sem1308 Nov 11, 2024
cca4a9b
Merge branch 'feature/108-FE-chat_페이지_api_연동' into 'develop'
sem1308 Nov 11, 2024
2b5580e
feat:
imleokkkk Nov 12, 2024
38f657b
Fix: fix the config
JihwanByun Nov 12, 2024
43566a2
feat:
imleokkkk Nov 12, 2024
16d429b
Feat: common.ts 오류 수정
JihwanByun Nov 12, 2024
3f81d25
feat: Board 목록 API 연결 코드 구현
leeseobin00 Nov 11, 2024
a1841c6
feat: Board 즐겨찾기 생성 삭제 API 연결 코드 구현
leeseobin00 Nov 11, 2024
8cace26
feat: Board 목록 조회, 즐겨찾기 생성 삭제 관련 API 연결
leeseobin00 Nov 11, 2024
80fd28d
feat: Page 처리와 검색 API 연동
leeseobin00 Nov 11, 2024
b9835da
feat: Board 라우팅 처리
leeseobin00 Nov 11, 2024
6149696
feat: josn 포맷에 맞춰 key 변경
tony-728 Nov 12, 2024
b16aeea
feat: key값 변경
tony-728 Nov 12, 2024
1e167ef
fix: docker compose mongo db 인증 설정 추가
sem1308 Nov 12, 2024
0fd4502
fix: 검색 시 조건 변경 처리 추가
leeseobin00 Nov 12, 2024
e9340a0
docs: API 연결 문서 추가
leeseobin00 Nov 12, 2024
b92b965
Merge branch 'feature/124-BE-Board_목록_조회_연결' into 'develop'
leeseobin00 Nov 12, 2024
b3eb33f
fix: mongo db 인증 설정 수정
sem1308 Nov 12, 2024
9698315
Merge branch 'develop' of https://lab.ssafy.com/s11-final/S11P31S102 …
sem1308 Nov 12, 2024
d6c97b8
feat: 채용 전형 관리 규칙 데이터 추가
tony-728 Nov 12, 2024
d1833fe
feat: admin <-> 규정 확인하기 연결
imleokkkk Nov 12, 2024
7390ded
feat:
imleokkkk Nov 12, 2024
05b31a7
chore: frontend 배포 설정
sem1308 Nov 12, 2024
8aee51c
fix: front build 이미지 경로 수정
sem1308 Nov 12, 2024
e1527fd
feat: docs filter 추가
tony-728 Nov 12, 2024
85f5ee8
Feat:채팅방 제목 길이 수정
JihwanByun Nov 12, 2024
3881c73
Merge branch 'develop' of https://lab.ssafy.com/s11-final/S11P31S102 …
JihwanByun Nov 12, 2024
5a018d9
refactor: "" 제거하는 로직 추가
leeseobin00 Nov 12, 2024
3e73c63
feat: 파일 용량 증가
leeseobin00 Nov 12, 2024
2ca3886
feat: Board 라우터 추가
leeseobin00 Nov 12, 2024
f6c30b3
refactor: 변수 및 파일 명 Board로 통일
leeseobin00 Nov 12, 2024
797498b
feat: Board 관련 제목 및 내용 연결
leeseobin00 Nov 12, 2024
e1e52f8
chore: 필요 없는 주석 제거
tony-728 Nov 12, 2024
4a97095
feat: int로 비교할 수 있도록 type 수정
tony-728 Nov 12, 2024
5394421
feat: 규정 정보 연결
leeseobin00 Nov 12, 2024
d6de35a
Feat: 이메일중복확인 오류 수정
JihwanByun Nov 12, 2024
aef2e4f
Merge branch 'feature/128-BE-Board_상세_조회_API_연결' into 'develop'
leeseobin00 Nov 12, 2024
343430a
feat:
imleokkkk Nov 12, 2024
0a4bb9c
feat:
imleokkkk Nov 12, 2024
5a657e2
feat: Sidebar 즐겨찾기 목록 조회 API 연결
leeseobin00 Nov 12, 2024
7ad8761
fix: pdf 분석 툴 plumber로 변경
sem1308 Nov 12, 2024
37c5cdd
feat: modal 띄워주는 card component 구현
sem1308 Nov 12, 2024
1b83bfb
feat: 출서 표시 변경
sem1308 Nov 12, 2024
c5365ec
Merge branch 'feature/132-FE-채팅_출처_표시_수정' into 'develop'
sem1308 Nov 12, 2024
0f28817
feat: 즐겨찾기 추가 시 바로 반영
leeseobin00 Nov 12, 2024
34d5fdc
feat: json 데이터 띄어쓰기 수정
tony-728 Nov 12, 2024
29b5c34
feat: retriever에 score_threshold를 추가했습니다.
tony-728 Nov 12, 2024
42b87c3
feat: 즐겨찾기 생성 수정 시 바로 목록에 반영
leeseobin00 Nov 12, 2024
72db7e2
feat: Localhost CORS 허용
leeseobin00 Nov 12, 2024
8db175e
Merge branch 'feature/126-BE-Board_즐겨찾기_목록_조회_연결' into 'develop'
leeseobin00 Nov 12, 2024
246a141
feat: 질문 레벨 처리
tony-728 Nov 12, 2024
0ab305e
feat: 문서 포맷팅
tony-728 Nov 12, 2024
c54500c
feat: 띄어쓰기 추가 수정
tony-728 Nov 12, 2024
8bef438
feat: json 데이터 벡터 디비로 만드는 로직 수정
tony-728 Nov 12, 2024
04bbfb6
feat: tree 생성, 수정 api 연결
imleokkkk Nov 12, 2024
e71fde8
feat:
imleokkkk Nov 12, 2024
35729e3
Merge branch 'feature/121-fe-component_간_라우팅_연결' into 'develop'
sem1308 Nov 12, 2024
f349c18
feat: Package 추가
leeseobin00 Nov 12, 2024
4bc0d65
feat: 글씨체 추가
leeseobin00 Nov 12, 2024
d6bda9a
feat: SweetAlert 추가
leeseobin00 Nov 12, 2024
f88f806
chore: solve conflicts
leeseobin00 Nov 12, 2024
89b8bae
Merge branch 'feature/130-FE-CSS_수정' into 'develop'
leeseobin00 Nov 12, 2024
4051b2e
chore: solve conflicts
leeseobin00 Nov 13, 2024
591801c
chore: 아이콘 일부 변경
leeseobin00 Nov 13, 2024
d68fac9
chore: 하양 좋아요 추가
leeseobin00 Nov 13, 2024
0abef46
"Feat: 이메일 중복처리 공백 처리 로직 추가"
JihwanByun Nov 13, 2024
801155f
refactor: Sidebar 형식 통일화
leeseobin00 Nov 13, 2024
f5d2af5
refactor: BoardListContent를 index에 통합
leeseobin00 Nov 13, 2024
539f94d
feat: 날짜 포멧 구조화
leeseobin00 Nov 13, 2024
e1ff59f
style: 게시판 스타일 일부 변경
leeseobin00 Nov 13, 2024
59a3e16
Merge branch 'feature/130-FE-CSS_수정2' into 'develop'
leeseobin00 Nov 13, 2024
7ae9b46
feat: 규정 데이터 통합
tony-728 Nov 13, 2024
69c289e
feat: 출처 정보 접근 권한 처리
sem1308 Nov 13, 2024
cdbb454
Merge branch 'feature/131-FE-출처_정보_처리' into 'develop'
sem1308 Nov 13, 2024
835978c
Feat:메타데이터 추가
JihwanByun Nov 13, 2024
93decc0
refactor: Null 값 처리
leeseobin00 Nov 13, 2024
c0d4a85
feat: Board 알림 시 에러 구현
leeseobin00 Nov 13, 2024
315c002
feat: Board 생성 수정 시 FastAPI에 요청 구현
leeseobin00 Nov 13, 2024
b926c3e
Merge branch 'feature/133-BE-Board_생성_수정_시_알림_구현' into 'develop'
leeseobin00 Nov 13, 2024
4f67ba3
refactor: File이 Null인 경우에도 요청이 보내지도록 구현
leeseobin00 Nov 13, 2024
eec5a47
refactor: MongoDB에 Title도 저장되도록 구현
leeseobin00 Nov 13, 2024
182760d
Merge branch 'feature/133-BE-Board_생성_수정_시_알림_구현' into 'develop'
leeseobin00 Nov 13, 2024
9e5be11
refactor: 본인 기준으로 board 조회
leeseobin00 Nov 13, 2024
0618e2b
Merge branch 'feature/133-BE-Board_생성_수정_시_알림_구현' into 'develop'
leeseobin00 Nov 13, 2024
252f929
Merge branch 'develop' into 'feature/FE-요청취소처리'
JihwanByun Nov 13, 2024
80a2467
Merge branch 'feature/FE-요청취소처리' into 'develop'
JihwanByun Nov 13, 2024
b1f3f4c
chore: PDF 읽기 관련 dependency 추가
leeseobin00 Nov 13, 2024
5fc23de
feat: PDF 관련 DTO 생성
leeseobin00 Nov 13, 2024
7323e2c
refactor: Login 시 반환 값 추가
leeseobin00 Nov 13, 2024
626937d
feat: Board에서 파일 업로드 시 PDF 추출
leeseobin00 Nov 13, 2024
bc82f1a
refactor: Login 시 반환 값 수정
leeseobin00 Nov 13, 2024
fc2a06a
Merge branch 'feature/137-BE-일부_로직_수정' into 'develop'
leeseobin00 Nov 13, 2024
306d2e2
fix: css 및 버그 수정
sem1308 Nov 13, 2024
992f957
Merge branch 'develop' into '132-FE-css_및_버그_수정'
sem1308 Nov 13, 2024
64989ae
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 13, 2024
f71e7e8
refactor: 사용자 레벨을 고려하여 가져오는 로직 추가
leeseobin00 Nov 14, 2024
dd6b193
fix: 권한 확인 방법 수정
sem1308 Nov 14, 2024
d86fa6d
Merge branch 'feature/137-BE-일부_로직_수정2' into 'develop'
leeseobin00 Nov 14, 2024
54e5099
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 14, 2024
3008817
fix: 로그인 후 상태 새로고침해도 저장되게 수정
sem1308 Nov 14, 2024
1be0f73
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 14, 2024
4f83f86
feat: Header에 회원 정보 표시
leeseobin00 Nov 14, 2024
e7d2700
style: Header CSS 수정 및 아이콘 생성
leeseobin00 Nov 14, 2024
5171daf
Merge branch 'feature/130-FE-CSS_수정3' into 'develop'
leeseobin00 Nov 14, 2024
06c8ff8
style: 회원 조회 시 이미지 표시
leeseobin00 Nov 14, 2024
031267f
fix: 로그인 페이지에서 로그인 조건 추가
sem1308 Nov 14, 2024
1987d25
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 14, 2024
784e6f4
refactor: PDF 전달 시 제목 값 추가
leeseobin00 Nov 14, 2024
82c49e1
feat: 사용자 이름으로 회원 정보 필터링 추가
leeseobin00 Nov 14, 2024
d675914
refactor: Admin API 관련 내용 수정
leeseobin00 Nov 14, 2024
ae5149b
feat: Admin 관련 Component 구현
leeseobin00 Nov 14, 2024
7a16279
feat: 회원 관리 페이지 구현
leeseobin00 Nov 14, 2024
00c015b
Merge branch 'feature/130-FE-CSS_수정3' into 'develop'
leeseobin00 Nov 14, 2024
4e733ed
fix: 토큰 에러시 로그아웃 처리
sem1308 Nov 14, 2024
9b9895a
fix: 규정 생성 페이지 수정
sem1308 Nov 14, 2024
2020dba
feat: alert 기능 모음
sem1308 Nov 14, 2024
e97c9e6
refactor: alert 모음 기능 사용
sem1308 Nov 14, 2024
4dd3b08
fix: user persist 명 변경
sem1308 Nov 14, 2024
398dd5d
fix: space바 입력할 수 있도록 수정
sem1308 Nov 14, 2024
243b197
fix: space바 입력할 수 있도록 수정
sem1308 Nov 14, 2024
a7897b1
style: 목록에 필요한 svg 추가
leeseobin00 Nov 14, 2024
2e07a47
feat: Admin과 일반 사용자 구분하여 Sidebar 표시
leeseobin00 Nov 14, 2024
febfa7a
feat: Board에서 Admin 페이지 이동 시 조건 추가
leeseobin00 Nov 14, 2024
1753c9d
Merge branch 'feature/130-FE-CSS_수정3' into 'develop'
leeseobin00 Nov 14, 2024
04382ba
fix: 글 수정 수정중
sem1308 Nov 14, 2024
2eddf9a
Merge branch 'develop' into 132-FE-css_및_버그_수정
sem1308 Nov 14, 2024
606bc08
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 14, 2024
9b0db96
feat: 게시글 수정 기능 추가
sem1308 Nov 14, 2024
3f04750
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 14, 2024
d8a6b43
refactor: log 위치 변경
leeseobin00 Nov 15, 2024
f5cceba
feat: Sidebar footer 위치 고정
leeseobin00 Nov 15, 2024
697d5c8
Merge branch 'feature/130-FE-CSS_수정4' into 'develop'
leeseobin00 Nov 15, 2024
aae8f85
style: Logo 크기 조정
leeseobin00 Nov 15, 2024
e284f2a
fix: 새로고침, 토큰 오류 수정
sem1308 Nov 15, 2024
06707f6
Merge branch 'develop' into 132-FE-css_및_버그_수정
sem1308 Nov 15, 2024
920e7d7
feat: 파일 등록 및 수정 기능 추가
sem1308 Nov 15, 2024
ceb8947
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 15, 2024
fb4db80
refactor: Board 삭제 시 즐겨찾기도 삭제
leeseobin00 Nov 15, 2024
bb01f6b
style: Login, Register UI 개선
leeseobin00 Nov 15, 2024
cd2c60c
Merge branch 'feature/130-FE-CSS_수정4' into 'develop'
leeseobin00 Nov 15, 2024
27914d7
fix: 에러 처리
sem1308 Nov 15, 2024
bd4e044
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 15, 2024
9629377
feat: 출처 없을 시 메시지 표시 기능 추가
sem1308 Nov 15, 2024
f6c2192
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 15, 2024
e8fb1a1
fix: 즐겨찾기 아이콘 참조 수정
sem1308 Nov 15, 2024
b711c03
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 15, 2024
b06acd3
style: 채팅 스타일 변경
sem1308 Nov 15, 2024
b108f27
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 15, 2024
ba10f4c
refactor: ADMIN일때 sidebar 통일 및 Avatar 불러오기
leeseobin00 Nov 15, 2024
4412ad2
chore: solve conflict
leeseobin00 Nov 15, 2024
9f99b1c
Merge branch 'feature/130-FE-CSS_수정5' into 'develop'
leeseobin00 Nov 15, 2024
53a299c
style: null 값인 경우에 표시하지 않도록 함
leeseobin00 Nov 15, 2024
42b4b76
fix: 빈 규정 등록 가능하게 수정
sem1308 Nov 15, 2024
2bd061f
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 15, 2024
419c6ea
refactor: update 시 regulation null 값 허용
leeseobin00 Nov 15, 2024
83bc9fc
Merge branch 'feature/130-FE-CSS_수정5' into 'develop'
leeseobin00 Nov 15, 2024
a31bd8e
fix: 토큰 만료 처리
sem1308 Nov 15, 2024
cda2647
feat: 여러줄 입력 처리
sem1308 Nov 15, 2024
7cdf894
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 15, 2024
54a2836
fix: file 드라이브 마운트
sem1308 Nov 15, 2024
e4eb879
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 15, 2024
02c24be
fix: AI_BASE_URL 설정
sem1308 Nov 15, 2024
0ec8f1a
Merge branch '132-FE-css_및_버그_수정' into 'develop'
sem1308 Nov 15, 2024
65a7906
fix: ai 서버에 규정 목록 전달
sem1308 Nov 18, 2024
8b10353
fix: update시 파일명 전달
sem1308 Nov 18, 2024
791c7b8
feat : 파비콘 변경
sem1308 Nov 18, 2024
f2bd45c
feat: 알림 기능 추가
sem1308 Nov 18, 2024
42cfb48
feat: 알림 기능 추가
sem1308 Nov 18, 2024
a2c9ac9
fix: security 알람 설정 변경
sem1308 Nov 18, 2024
79219bb
fix: 알람 관련 security 설정 변경
sem1308 Nov 18, 2024
300ea97
fix: SSE 연결시 withCredentials 추가
sem1308 Nov 18, 2024
2871a10
chore : 주석 추가
sem1308 Nov 18, 2024
bb86351
chore: sse debug log 추가
sem1308 Nov 18, 2024
8843c97
chore: log 추가
sem1308 Nov 18, 2024
235d03e
chore: 코드 정렬
sem1308 Nov 18, 2024
bae0c91
fix: delete시 약간의 간격 추가하여 삭제될 때 까지 기다림
sem1308 Nov 18, 2024
4a0cb57
fix: 규정 관련 로직 수정
sem1308 Nov 18, 2024
a49dad4
chore: config 설정 변경
sem1308 Nov 18, 2024
cf58e45
fix: docker file 수정
sem1308 Nov 18, 2024
6a6d927
feat: 함수 인자 변경
tony-728 Nov 19, 2024
cf82214
feat: folder 이름 변경
tony-728 Nov 19, 2024
e559b4d
feat: sembot 개발 코드 archive
tony-728 Nov 19, 2024
2f8e9ab
feat: 중복 pdf 삭제
tony-728 Nov 19, 2024
da8a0c6
feat: gpu server에서 사용한 sembot upload
tony-728 Nov 19, 2024
3c3f619
Merge branch 'feature/113-ai-retriever_고도화' into 'develop'
tony-728 Nov 19, 2024
f7a471a
fix: ai 서버에 규정 목록 전달
leeseobin00 Nov 18, 2024
b5c656b
fix: update시 파일명 전달
leeseobin00 Nov 18, 2024
afc04b6
feat : 파비콘 변경
sem1308 Nov 18, 2024
8580a9c
feat: 알림 기능 추가
sem1308 Nov 18, 2024
61cdf9a
feat: 알림 기능 추가
sem1308 Nov 18, 2024
07bb1ba
fix: security 알람 설정 변경
sem1308 Nov 18, 2024
50520a9
fix: 알람 관련 security 설정 변경
sem1308 Nov 18, 2024
9f59e30
fix: SSE 연결시 withCredentials 추가
sem1308 Nov 18, 2024
ee28a37
chore : 주석 추가
sem1308 Nov 18, 2024
87590ed
chore: sse debug log 추가
sem1308 Nov 18, 2024
5b3a319
chore: log 추가
sem1308 Nov 18, 2024
9bab900
chore: 코드 정렬
sem1308 Nov 18, 2024
0cf0181
fix: delete시 약간의 간격 추가하여 삭제될 때 까지 기다림
sem1308 Nov 18, 2024
0201a81
fix: 규정 관련 로직 수정
sem1308 Nov 18, 2024
3d65058
chore: config 설정 변경
sem1308 Nov 18, 2024
2821a68
fix: docker file 수정
sem1308 Nov 18, 2024
c7a3dcd
feat: 규정 데이터 json으로 만들기
tony-728 Nov 8, 2024
6efc230
feat: FAISS distance_strategy 전략 수정
tony-728 Nov 8, 2024
bebaf41
feat: 출장 규칙 데이터 완료
tony-728 Nov 11, 2024
020d367
feat: 데이터 구성하기
tony-728 Nov 11, 2024
628cb73
feat: josn 포맷에 맞춰 key 변경
tony-728 Nov 12, 2024
e1bc58c
feat: key값 변경
tony-728 Nov 12, 2024
77b036b
feat: 채용 전형 관리 규칙 데이터 추가
tony-728 Nov 12, 2024
e9f7916
feat: docs filter 추가
tony-728 Nov 12, 2024
2f0375b
chore: 필요 없는 주석 제거
tony-728 Nov 12, 2024
4319750
feat: int로 비교할 수 있도록 type 수정
tony-728 Nov 12, 2024
3714051
feat: json 데이터 띄어쓰기 수정
tony-728 Nov 12, 2024
348a032
feat: retriever에 score_threshold를 추가했습니다.
tony-728 Nov 12, 2024
9c4efb2
feat: 질문 레벨 처리
tony-728 Nov 12, 2024
cd203ef
feat: 문서 포맷팅
tony-728 Nov 12, 2024
7c97413
feat: 띄어쓰기 추가 수정
tony-728 Nov 12, 2024
e82b99e
feat: json 데이터 벡터 디비로 만드는 로직 수정
tony-728 Nov 12, 2024
049de39
feat: 규정 데이터 통합
tony-728 Nov 13, 2024
fc60158
feat: 함수 인자 변경
tony-728 Nov 19, 2024
990618c
feat: folder 이름 변경
tony-728 Nov 19, 2024
af46cb3
feat: sembot 개발 코드 archive
tony-728 Nov 19, 2024
99b3364
feat: 중복 pdf 삭제
tony-728 Nov 19, 2024
93d7d06
feat: gpu server에서 사용한 sembot upload
tony-728 Nov 19, 2024
f90034d
Merge branch 'develop' of https://lab.ssafy.com/s11-final/S11P31S102 …
sem1308 Nov 19, 2024
cb54045
chore: 포팅 매뉴얼 작성
sem1308 Nov 19, 2024
eca6872
Update exec/포팅매뉴얼.md
tony-728 Nov 19, 2024
36ca647
chore: 포팅 매뉴얼 수정 및 실행 파일 수정
sem1308 Nov 19, 2024
292c0c6
feat:
tony-728 Nov 19, 2024
a6ffa64
feat:modify env
JihwanByun Nov 25, 2024
cb3cd63
Merge branch 'feature/FE-요청취소처리' into 'develop'
JihwanByun Nov 25, 2024
99ffaa7
Update README.md
JihwanByun Nov 25, 2024
dff90c7
chore: 불필요한 파일 제거
leeseobin00 Nov 26, 2024
21354b4
docs: 관련 파일 업로드
leeseobin00 Nov 26, 2024
c7d2521
docs: Readme 수정
leeseobin00 Nov 26, 2024
aca451c
docs: 이미지 파일 업로드
leeseobin00 Nov 26, 2024
4f2b77e
dosc: 스타일 변경
leeseobin00 Nov 26, 2024
758f0aa
Update README.md
leeseobin00 Dec 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.env
12 changes: 12 additions & 0 deletions .gitlab/merge_request_templates/default.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
## 이슈

Jira 이슈 : [S11P31S102-](https://ssafy.atlassian.net/browse/S11P31S102-)

## 개요
이 Merge Request는 기능을 추가합니다.

## 변경 사항
-

## 추가 사항
-
7 changes: 4 additions & 3 deletions .gitmessage.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,14 @@ feat:
################
# 꼬릿말(footer)을 아랫줄에 작성 (현재 커밋과 관련된 이슈 번호 추가 등)
# 예) Close #7
티켓: S11P21S102-
티켓: S11P31S102-
################
# feat : 새로운 기능 추가
# fix : 버그 수정
# docs : 문서 수정
# test : 테스트 코드 추가
# refact : 코드 리팩토링
# refactor : 코드 리팩토링
# style : 코드 의미에 영향을 주지 않는 변경사항
# chore : 빌드 부분 혹은 패키지 매니저 수정사항
################
# design: CSS 등 사용자 UI 디자인 변경
################
206 changes: 206 additions & 0 deletions AI/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
# Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode,python
# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode,python

### PyCharm ###
.idea

### Python ###
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/
cover/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
.pybuilder/
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
# For a library or package, you might want to ignore these files since the code is
# intended to run in multiple environments; otherwise, check them in:
# .python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# poetry
# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
# This is especially recommended for binary packages to ensure reproducibility, and is more
# commonly ignored for libraries.
# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
#poetry.lock

# pdm
# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
#pdm.lock
# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
# in version control.
# https://pdm.fming.dev/#use-with-ide
.pdm.toml

# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/

# pytype static type analyzer
.pytype/

# Cython debug symbols
cython_debug/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

### Python Patch ###
# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration
poetry.toml

# ruff
.ruff_cache/

# LSP config files
pyrightconfig.json

### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
!.vscode/*.code-snippets

# Local History for Visual Studio Code
.history/

# Built Visual Studio Code Extensions
*.vsix

### VisualStudioCode Patch ###
# Ignore all local history of files
.history
.ionide

# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,python

### vector db file
vector_store_path/
*.faiss
*.pkl

### local model
local_model/
16 changes: 16 additions & 0 deletions AI/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## Example code

### set up file

- chatGPT API를 사용하거나 langsmith에 프로젝트 로그를 남기기 위해서 아래와 같이 .env file을 구성해야 합니다.

- .env 파일을 chain 폴더 안에 위치합니다.

- .env 파일은 아래와 같이 구성합니다.
```
OPENAI_API_KEY=YOUR_OPENAI_API_KEY
LANGCHAIN_TRACING_V2=true
LANGCHAIN_ENDPOINT=https://api.smith.langchain.com
LANGCHAIN_API_KEY=YOUR_LANGCHAIN_API_KEY
LANGCHAIN_PROJECT=YOUR_PROJECT_NAME
```
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added AI/kisa_pdf/2_03_직제규정(240502).pdf
Binary file not shown.
Binary file not shown.
Binary file added AI/kisa_pdf/2_05_인사규정(240221).pdf
Binary file not shown.
Binary file added AI/kisa_pdf/2_06_급여규정(240221).pdf
Binary file not shown.
Binary file added AI/kisa_pdf/2_07_회계규정(220928).pdf
Binary file not shown.
Binary file not shown.
Binary file added AI/kisa_pdf/2_09_자산운용규정(170816).pdf
Binary file not shown.
Binary file not shown.
Binary file added AI/kisa_pdf/2_11_경영관리규정(191129).pdf
Binary file not shown.
Binary file added AI/kisa_pdf/3_01_직제규칙(240514).pdf
Binary file not shown.
Binary file not shown.
Binary file added AI/kisa_pdf/3_03_위임전결규칙(240702).pdf
Binary file not shown.
Binary file added AI/kisa_pdf/3_04_감사규칙(230605).pdf
Binary file not shown.
Binary file added AI/kisa_pdf/3_05_인사관리규칙(230706).pdf
Binary file not shown.
Binary file added AI/kisa_pdf/3_06_출장규칙(240214).pdf
Binary file not shown.
Binary file added AI/kisa_pdf/3_07_취업규칙(240214).pdf
Binary file not shown.
Binary file not shown.
Binary file added AI/kisa_pdf/3_09_급여지급규칙(240214).pdf
Binary file not shown.
Binary file added AI/kisa_pdf/3_10_회계규칙(180906).pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added AI/kisa_pdf/3_13_문서관리규칙(121101).pdf
Binary file not shown.
Binary file added AI/kisa_pdf/3_14_자료관리규칙(090727).pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added AI/kisa_pdf/3_17_정보공개규칙(221226).pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added AI/kisa_pdf/3_25_성과평가규칙(231228).pdf
Binary file not shown.
Binary file added AI/kisa_pdf/3_26_홍보업무규칙(240214).pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added AI/kisa_pdf/3_33_보안업무규칙(240702).pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added AI/kisa_pdf/4_03_교육훈련지침(240201).pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added AI/kisa_pdf/4_10_차량관리 지침(140721).pdf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
92 changes: 92 additions & 0 deletions AI/sembot/batch.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
# batch.py

import torch
from torch.nn.utils.rnn import pad_sequence
import asyncio
from prepare import load_prompt, format_docs, memory_retriever, filter_docs
from streamer import BatchTextStreamer

def make_generation_kwargs(input_ids, eos_token_id, streamer):
generation_kwargs = {
"input_ids": input_ids,
"max_new_tokens": 400,
"eos_token_id": eos_token_id,
"do_sample": True,
"temperature": 0.1,
"top_p": 0.9,
"streamer": streamer
}
return generation_kwargs


def generate_model(model, generation_kwargs):
with torch.no_grad():
model.generate(**generation_kwargs)
# 메모리 정리
torch.cuda.empty_cache()


# 배치 처리 백그라운드 태스크
async def process_queue(request_queue, batch_size, batch_lock, retriever_lock, event_loop, tokenizer, model, eos_token_id, embeddings, retriever):
while True:
# 최신 retriever 가져오기
async with retriever_lock:
current_retriever = retriever

async with batch_lock:
batch = []
response_queues = []


# 첫 번째 요청을 기다립니다.
try:
request = await request_queue.get()
input_data = {'question': request['question'], 'memory': request['memory'], 'level': request['level']}
batch.append(input_data)
response_queues.append(request['response_queue'])
except Exception as e:
continue # 예외 처리

# 추가 요청을 배치 사이즈만큼 수집합니다.
while len(batch) < batch_size:
try:
# 대기하지 않고 요청이 있으면 즉시 가져옵니다.
request = request_queue.get_nowait()
input_data = {'question': request['question'], 'memory': request['memory'], 'level': request['level']}
batch.append(input_data)
response_queues.append(request['response_queue'])
except asyncio.QueueEmpty:
break # 대기열이 비어 있으면 종료

if batch:
# 배치된 요청들에 대해 메시지 생성
messages = []
for input_data in batch:
message = []
message.append({"role": "system", "content": load_prompt()})
for qda in input_data["memory"]:
message.append({"role": "user", "content": qda.get("question", "")})
message.append({"role": "assistant", "content": qda.get("answer", "")})

# 사용자 레벨에 맞는 문서 필터링
filtered_docs = filter_docs(current_retriever.invoke(input_data['question']), input_data["level"])

message.append({"role": "user", "content": f"{format_docs(memory_retriever(input_data, embeddings))}\n\n {format_docs(filtered_docs)}\n\n {input_data['question']}"})
messages.append(message)

# 배치 입력 생성
input_ids = [
tokenizer.apply_chat_template(msg, add_generation_prompt=True, return_tensors="pt").to(model.device).squeeze(0)
for msg in messages
]
input_ids = pad_sequence(input_ids, batch_first=True, padding_value=tokenizer.pad_token_id)

# 커스텀 스트리머 생성
streamer = BatchTextStreamer(tokenizer, response_queues, event_loop, eos_token_id=eos_token_id, skip_prompt=True)

# 모델 배치 추론
generation_kwargs = make_generation_kwargs(input_ids, eos_token_id, streamer)

# 모델 생성을 비동기로 실행하고 완료될 때까지 기다립니다.
await asyncio.to_thread(generate_model, model, generation_kwargs)
# batch_lock은 여기까지 유지됩니다.
37 changes: 37 additions & 0 deletions AI/sembot/mongo_client.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
from pymongo import MongoClient

def singleton(class_):
class class_w(class_):
_instance = None
_sealed = False
def __new__(class_, *args, **kwargs):

if class_w._instance is None:
class_w._instance = super(class_w, class_).__new__(class_)
class_w._instance._sealed = False
return class_w._instance
def __init__(self, *args, **kwargs):
if self._sealed:
return
super(class_w, self).__init__(*args, **kwargs)
self._sealed = True
class_w.__name__ = class_.__name__
return class_w


# MongoDB 클라이언트와 데이터베이스 초기화
@singleton
class MongoDBClient:
def __init__(self, uri="mongodb://root:ssafy@k11s102.p.ssafy.io:27017/?authSource=admin", db_name="sembot", collection_name="regulations"):
self.client = MongoClient(uri)
self.db_name = db_name
self.collection_name = collection_name

def find_regulations(self):
# 모든 규정 데이터를 조회해서 리턴한다.
return self.client[self.db_name][self.collection_name].find()

def close(self):
# 애플리케이션 종료 시 호출하여 클라이언트 연결 종료
self.client.close()
print("MongoDB 클라이언트 연결이 종료되었습니다.")
Loading