Skip to content

배포 v1.9.5 #242

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

Merged
skqorrla merged 4 commits into from
Jun 25, 2025
Merged

배포 v1.9.5 #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ca4960
feat: 색인 과정에서 copy_to 추가 및 인덱스 이름 업데이트 (place_data_v2)
skqorrla Jun 25, 2025
bbe6b2b
feat: 장소 검색 기능 고도화 및 인덱스 이름을 place_data_v2로 변경
skqorrla Jun 25, 2025
ad9b0f2
feat: 장소 검색 쿼리 개선 가중치 부여 및 llm search tool 랜덤 점수 추가
skqorrla Jun 25, 2025
87aae79
Feat/es 검색엔진 고도화
skqorrla Jun 25, 2025
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
57 changes: 38 additions & 19 deletions ELK/app/services/elasticsearch_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def __init__(self):
raise ValueError("ES_PORT 환경 변수는 반드시 숫자여야 합니다.")

self.es = Elasticsearch([{'host': host, 'port': port, 'scheme': 'http'}])
self.index_name = "place_data"
self.index_name = "place_data_v2"
self.log_index_name = "chatbot_log"
self.click_log_index_name = "click_log"
self.search_log_index_name = "search_log"
Expand All @@ -79,14 +79,19 @@ def is_connected(self) -> bool:
return False

def search_places(self, query: str, max_results: int = 23, user_id: Optional[str] = None) -> List[Dict[str, Any]]:
"""장소 검색"""
"""장소 검색 (copy_to 필드와 multi_match로 고도화)"""
search_body = {
"query": {
"match": {
"name": {
"query": query,
"fuzziness": "AUTO"
}
"multi_match": {
"query": query,
"fields": [
"name^4",
"alias^3",
"categories^2",
"addresses^2",
"content"
],
"fuzziness": "AUTO"
}
},
"sort": [{"_score": {"order": "desc"}}],
Expand Down Expand Up @@ -124,28 +129,24 @@ def search_places_for_llm_tool(self, region: str, categories: List[str], user_id
LLM 도구를 위한 장소 검색.
지역과 카테고리 정보를 바탕으로 장소 uuid 목록과 총 개수를 반환합니다.
"""
query_body = {
"query": {
"bool": {
"must": [],
"filter": []
}
},
"size": 100,
"_source": ["uuid"],
"track_total_hits": True
# 1. bool 쿼리를 기본 쿼리로 정의
base_query = {
"bool": {
"must": [],
"filter": []
}
}

if region:
query_body["query"]["bool"]["must"].append({
base_query["bool"]["must"].append({
"multi_match": {
"query": region,
"fields": ["gu", "dong", "ro", "station", "address"]
}
})

if categories:
query_body["query"]["bool"]["filter"].append({
base_query["bool"]["filter"].append({
"bool": {
"should": [
{"terms": {"category.keyword": categories}},
Expand All @@ -155,6 +156,24 @@ def search_places_for_llm_tool(self, region: str, categories: List[str], user_id
}
})

# 2. function_score 쿼리로 기본 쿼리를 감싸고, random_score 함수를 추가
query_body = {
"query": {
"function_score": {
"query": base_query,
"functions": [
{
"random_score": {}
}
],
"boost_mode": "multiply" # 원래 점수와 랜덤 점수를 곱하여 자연스럽게 섞음
}
},
"size": 100,
"_source": ["uuid"],
"track_total_hits": True
}

response = self.es.search(index=self.index_name, body=query_body)

uuids = [hit['_source']['uuid'] for hit in response['hits']['hits']]
Expand Down
8 changes: 7 additions & 1 deletion data/src/utils/es_place_upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ def create_korean_content_index(self, index_name: str) -> bool:
"type": "text",
"analyzer": "my_nori_analyzer",
"search_analyzer": "my_nori_analyzer",
"copy_to": "categories",
"fields": {
"keyword": {
"type": "keyword",
Expand All @@ -106,6 +107,7 @@ def create_korean_content_index(self, index_name: str) -> bool:
"type": "text",
"analyzer": "my_nori_analyzer",
"search_analyzer": "my_nori_analyzer",
"copy_to": "categories",
"fields": {
"keyword": {
"type": "keyword",
Expand All @@ -117,21 +119,25 @@ def create_korean_content_index(self, index_name: str) -> bool:
"type": "text",
"analyzer": "my_nori_analyzer",
"search_analyzer": "my_nori_analyzer",
"copy_to": "addresses",
},
"dong": {
"type": "text",
"analyzer": "my_nori_analyzer",
"search_analyzer": "my_nori_analyzer",
"copy_to": "addresses",
},
"ro": {
"type": "text",
"analyzer": "my_nori_analyzer",
"search_analyzer": "my_nori_analyzer",
"copy_to": "addresses",
},
"station": {
"type": "text",
"analyzer": "my_nori_analyzer",
"search_analyzer": "my_nori_analyzer",
"copy_to": "addresses",
"fields": {
"keyword": {
"type": "keyword",
Expand Down Expand Up @@ -311,7 +317,7 @@ def insert_data_from_json(self, index_name: str, json_file_path: str) -> bool:
es_client = KoreanContentElasticsearch()

# 인덱스 이름 설정
INDEX_NAME = "place_data"
INDEX_NAME = "place_data_v2"

# JSON 파일 경로 설정
JSON_FILE_PATH = "data/place_json_preprocessing.json"
Expand Down