discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

reorg-code
Some checks failed
Deploy to core / deploy (push) Failing after 1m32s
Details

Browse Source
This commit is contained in:
Untone 2024-01-29 11:09:10 +03:00
parent b975e174ca
commit 774a5ee596
1 changed files with 55 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
services/search.py
View File

@ -26,6 +26,43 @@ ELASTIC_URL = os.environ.get(
REDIS_TTL = 86400 # 1 day in seconds REDIS_TTL = 86400 # 1 day in seconds
index_settings = {
'settings': {
'index': {
'number_of_shards': 1,
'auto_expand_replicas': '0-all',
},
'analysis': {
'analyzer': {
'ru': {
'tokenizer': 'standard',
'filter': ['lowercase', 'ru_stop', 'ru_stemmer'],
}
},
'filter': {
'ru_stemmer': {
'type': 'stemmer',
'language': 'russian',
},
'ru_stop': {
'type': 'stop',
'stopwords': '_russian_',
},
},
},
},
'mappings': {
'properties': {
'body': {'type': 'text', 'analyzer': 'ru'},
'title': {'type': 'text', 'analyzer': 'ru'},
# 'author': {'type': 'text'},
}
},
}
expected_mapping = index_settings['mappings']
class SearchService: class SearchService:
def __init__(self, index_name='search_index'): def __init__(self, index_name='search_index'):
self.index_name = index_name self.index_name = index_name
@ -73,68 +110,28 @@ class SearchService:
self.client.indices.delete(index=self.index_name, ignore_unavailable=True) self.client.indices.delete(index=self.index_name, ignore_unavailable=True)
def create_index(self): def create_index(self):
index_settings = { if self.client:
'settings': { if self.lock.acquire(blocking=False):
'index': { try:
'number_of_shards': 1, logger.debug(f' Создаём новый индекс: {self.index_name} ')
'auto_expand_replicas': '0-all', self.client.indices.create(
}, index=self.index_name, body=index_settings
'analysis': { )
'analyzer': { self.client.indices.close(index=self.index_name)
'ru': { self.client.indices.open(index=self.index_name)
'tokenizer': 'standard', except Exception as _exc: # noqa: S110
'filter': ['lowercase', 'ru_stop', 'ru_stemmer'], pass
} finally:
}, self.lock.release()
'filter': { else:
'ru_stemmer': { logger.debug(' ..')
'type': 'stemmer',
'language': 'russian',
},
'ru_stop': {
'type': 'stop',
'stopwords': '_russian_',
},
},
},
},
'mappings': {
'properties': {
'body': {'type': 'text', 'analyzer': 'ru'},
'title': {'type': 'text', 'analyzer': 'ru'},
# 'author': {'type': 'text'},
}
},
}
try:
if self.client:
if self.lock.acquire(blocking=False):
try:
logger.debug(f' Создаём новый индекс: {self.index_name} ')
self.client.indices.create(
index=self.index_name, body=index_settings
)
self.client.indices.close(index=self.index_name)
self.client.indices.open(index=self.index_name)
finally:
self.lock.release()
else:
logger.debug(' ..')
except Exception as _error: # noqa: S110
# logging.warning(f' {error}')
pass
def put_mapping(self): def put_mapping(self):
mapping = {
'properties': {
'body': {'type': 'text', 'analyzer': 'ru'},
'title': {'type': 'text', 'analyzer': 'ru'},
# 'author': {'type': 'text'},
}
}
if self.client: if self.client:
logger.debug(f' Разметка индекации {self.index_name}') logger.debug(f' Разметка индекации {self.index_name}')
self.client.indices.put_mapping(index=self.index_name, body=mapping) self.client.indices.put_mapping(
index=self.index_name, body=expected_mapping
)
def check_index(self): def check_index(self):
if self.client: if self.client:
@ -144,13 +141,6 @@ class SearchService:
else: else:
# Check if the mapping is correct, and recreate the index if needed # Check if the mapping is correct, and recreate the index if needed
mapping = self.client.indices.get_mapping(index=self.index_name) mapping = self.client.indices.get_mapping(index=self.index_name)
expected_mapping = {
'properties': {
'body': {'type': 'text', 'analyzer': 'ru'},
'title': {'type': 'text', 'analyzer': 'ru'},
# 'author': {'type': 'text'},
}
}
if mapping != expected_mapping: if mapping != expected_mapping:
self.recreate_index() self.recreate_index()