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

refactor:[BE] location template modify #133

Merged
merged 59 commits into from
Dec 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
373c1f6
fix: [FE] 라우팅 수정
HyunJong00 Dec 5, 2024
9990896
Merge branch 'CSID-DGU:main' into main
HyunJong00 Dec 5, 2024
0c271ae
Merge pull request #115 from CSID-DGU/15-feat-BE-agent-persona
SuHyunKKim Dec 5, 2024
432b2c2
refactor: [FE] 마이페이지 이미지 렌더링 로직 수정
YeRimmm-Cho Dec 5, 2024
ed4dfc8
Merge branch 'main' of https://github.com/YeRimmm-Cho/jjambbong_FE
YeRimmm-Cho Dec 5, 2024
6c17679
Merge pull request #116 from YeRimmm-Cho/main
YeRimmm-Cho Dec 5, 2024
4b6a2cb
feat: 저장한 일정 상세 조회 기능 구현
YeRimmm-Cho Dec 6, 2024
3604fdd
Merge branch 'main' of https://github.com/YeRimmm-Cho/jjambbong_FE
YeRimmm-Cho Dec 6, 2024
7282b80
Merge pull request #117 from YeRimmm-Cho/main
YeRimmm-Cho Dec 6, 2024
577e936
refactor:[BE] template, RAG db index_name modify
SuHyunKKim Dec 6, 2024
a350f9f
Merge branch 'CSID-DGU:main' into main
SuHyunKKim Dec 6, 2024
2477f29
Merge pull request #118 from SuHyunKKim/main
SuHyunKKim Dec 6, 2024
0937160
Update db.py
SuHyunKKim Dec 6, 2024
b38cec5
Update db.py
SuHyunKKim Dec 6, 2024
a91de00
fix: [FE] 상세 일정 오류 해결
YeRimmm-Cho Dec 6, 2024
692c8e6
Merge branch 'main' of https://github.com/YeRimmm-Cho/jjambbong_FE
YeRimmm-Cho Dec 6, 2024
1196709
Merge pull request #119 from YeRimmm-Cho/main
YeRimmm-Cho Dec 6, 2024
f4e2b94
fix: [FE] 여행 요약 렌더링 오류 해결
YeRimmm-Cho Dec 6, 2024
5f6cd9f
Merge pull request #120 from YeRimmm-Cho/main
YeRimmm-Cho Dec 6, 2024
a956b94
feat: [FE] 채팅에 마크다운 적용
YeRimmm-Cho Dec 6, 2024
54fd0bb
Merge pull request #121 from YeRimmm-Cho/main
YeRimmm-Cho Dec 6, 2024
a26c2ec
css: [FE] 채팅 버블 스타일 수정
YeRimmm-Cho Dec 6, 2024
d08d07a
Merge branch 'main' of https://github.com/YeRimmm-Cho/jjambbong_FE
YeRimmm-Cho Dec 6, 2024
241bc22
Merge pull request #122 from YeRimmm-Cho/main
YeRimmm-Cho Dec 6, 2024
f6ade92
refactor:[BE] modify api modify
SuHyunKKim Dec 6, 2024
55027c9
Merge branch 'CSID-DGU:main' into main
SuHyunKKim Dec 6, 2024
0aea842
Merge pull request #123 from SuHyunKKim/main
SuHyunKKim Dec 6, 2024
6fc1fc0
Update template2.py
SuHyunKKim Dec 6, 2024
640c4f8
Update template2.py
SuHyunKKim Dec 6, 2024
ecf8894
fix: [FE] 라우팅 수정
HyunJong00 Dec 6, 2024
dc1a1f3
merge
HyunJong00 Dec 6, 2024
336a85a
fix: [FE] modify 로직 수정
YeRimmm-Cho Dec 6, 2024
6f4412c
Merge branch 'main' of https://github.com/YeRimmm-Cho/jjambbong_FE
YeRimmm-Cho Dec 6, 2024
d5f0464
Merge pull request #124 from YeRimmm-Cho/main
YeRimmm-Cho Dec 6, 2024
7674c0b
Merge branch 'main' of https://github.com/HyunJong00/JJAMBBONG
HyunJong00 Dec 6, 2024
c89e4a4
Merge branch 'CSID-DGU:main' into main
HyunJong00 Dec 6, 2024
cee358b
feat: [FE] 저장된 일정에서 버튼 숨김
YeRimmm-Cho Dec 6, 2024
0fc235b
Merge pull request #125 from YeRimmm-Cho/main
YeRimmm-Cho Dec 6, 2024
e7f658d
feat: [FE] googleApi 연결 후 이미지 받기
HyunJong00 Dec 6, 2024
ded864f
fix: [FE] 유튜브 오류 수정
HyunJong00 Dec 6, 2024
73394e6
Merge remote-tracking branch 'upstream/main'
HyunJong00 Dec 6, 2024
40bfbe1
design: [FE] 달력 디자인 수정
HyunJong00 Dec 6, 2024
ff2d27f
Merge pull request #126 from HyunJong00/main
HyunJong00 Dec 6, 2024
28d6a0b
feat : [BE] pinecone DB llm 연동
gaaaani Dec 6, 2024
0cdd1c1
css: [FE] 채팅 버블 css 수정
YeRimmm-Cho Dec 7, 2024
0c7652e
Merge pull request #127 from YeRimmm-Cho/main
YeRimmm-Cho Dec 7, 2024
f1fdbec
feat : [BE] pinecone DB llm 연동
gaaaani Dec 7, 2024
efe270d
Merge remote-tracking branch 'origin/main'
gaaaani Dec 7, 2024
773cd3f
Merge pull request #128 from gaaaani/main
gaaaani Dec 7, 2024
b2dbafd
Merge pull request #129 from CSID-DGU/12-feat-BE-DB
gaaaani Dec 7, 2024
3a89dcc
feat: [FE] 이미지 저장 재구현
HyunJong00 Dec 7, 2024
3bd5436
feat: [FE] 이미지 랜더링 기능 추가
HyunJong00 Dec 7, 2024
05e20de
design [FE] 달력 재수정
HyunJong00 Dec 7, 2024
f3c80ae
Merge branch '130-fix-fe-오류-수정' into old
HyunJong00 Dec 7, 2024
8e68c61
Merge pull request #131 from HyunJong00/old
HyunJong00 Dec 7, 2024
f4a1d07
Merge pull request #13 from CSID-DGU/main
SuHyunKKim Dec 8, 2024
b304d73
Merge pull request #132 from CSID-DGU/130-fix-fe-오류-수정
HyunJong00 Dec 8, 2024
0bb3b79
refactor:[BE] template2 location template modify
SuHyunKKim Dec 8, 2024
b9eebf4
Merge branch 'CSID-DGU:main' into main
SuHyunKKim Dec 8, 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
Binary file modified agentPersona/__pycache__/db.cpython-311.pyc
Binary file not shown.
Binary file modified agentPersona/__pycache__/routes.cpython-311.pyc
Binary file not shown.
51 changes: 25 additions & 26 deletions agentPersona/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,51 @@
from langchain_openai import OpenAIEmbeddings
from pinecone import Pinecone, Index
from langchain_pinecone import PineconeVectorStore
# from langchain.vectorstores import PineconeVectorStore
import os
from dotenv import load_dotenv
from sentence_transformers import SentenceTransformer

# sql DB 초기화
db = SQLAlchemy()

# pinecone 초기화
load_dotenv()
# Pinecone 초기화
pinecone_api_key = os.getenv("PINECONE_API_KEY")
pinecone = Pinecone(api_key=pinecone_api_key, environment="us-east-1")

# Pinecone 인덱스 이름
index_name = "tamtam2"
index = pinecone.Index(index_name) # Pinecone 인덱스 정의

pinecone_api_key = os.getenv("PINECONE_API_KEY")
pinecone = Pinecone(
api_key=pinecone_api_key,
environment="us-east-1"
)
index_name = "tamtam"
embeddings = OpenAIEmbeddings(
model="text-embedding-ada-002"
)
vectorstore = PineconeVectorStore(
index_name=index_name,
embedding=embeddings
)
retriever = vectorstore.as_retriever()
# OpenAI Embeddings 및 PineconeVectorStore 설정
embeddings = OpenAIEmbeddings(model="text-embedding-ada-002")
vectorstore = PineconeVectorStore(index_name=index_name, embedding=embeddings)

# Pinecone retriever 설정
retriever = vectorstore.as_retriever()

# 임베딩 모델 초기화 (Pinecone와 동일한 모델 사용)
# 임베딩 모델 로딩 (Pinecone와 동일한 모델 사용)
model = SentenceTransformer('all-MiniLM-L6-v2')
def search_theme_in_pinecone(query, top_k=5):
"""
PineconeVectorStore에서 쿼리를 검색하여 관련 데이터를 반환합니다.
:param query: 검색할 텍스트
Pinecone에서 관련된 데이터를 검색하여 반환합니다.
:param query: 검색할 텍스트 (여행 테마)
:param top_k: 반환할 상위 결과 수
:return: 검색된 결과 리스트
"""
# similarity_search 메서드 사용
results = vectorstore.similarity_search(query, k=top_k)
# LangChain retriever 사용하여 Pinecone에서 관련된 항목 검색
results = retriever.get_relevant_documents(query)

# 검색 결과 정리
# 검색된 결과 정리하여 반환
return [
{
"question": result.page_content, # 질문 내용
"theme": result.metadata.get("theme", "N/A"), # 테마
# "location": result.metadata.get("location", "N/A"), # 장소
"restaurants": result.metadata.get("restaurants", []) # 음식점 정보
"name": result.metadata.get("name", "N/A"),
"address": result.metadata.get("address", "N/A"),
"rating": result.metadata.get("rating", "N/A"),
"category": result.metadata.get("category", "N/A"),
"review": result.metadata.get("review", ""),
"latitude": result.metadata.get("latitude", "N/A"),
"longitude": result.metadata.get("longitude", "N/A")
}
for result in results
]
Binary file modified agentPersona/requirements.txt
Binary file not shown.
Loading