Updating config format.

This commit is contained in:
David Tippett 2024-11-04 15:14:53 -05:00
parent afca48028f
commit 705e3129b6

View File

@ -3,17 +3,21 @@ from typing import Optional
from open_webui.apps.rag.vector.main import VectorItem, SearchResult, GetResult from open_webui.apps.rag.vector.main import VectorItem, SearchResult, GetResult
from open_webui.config import ( from open_webui.config import (
OPENSEARCH_URI, # Assuming you define OPENSEARCH_URI in config OPENSEARCH_URI,
OPENSEARCH_SSL,
OPENSEARCH_CERT_VERIFY,
OPENSEARCH_USERNAME,
OPENSEARCH_PASSWORD
) )
class OpenSearchClient: class OpenSearchClient:
def __init__(self): def __init__(self):
self.index_prefix = "open_webui" self.index_prefix = "open_webui"
self.client = OpenSearch( self.client = OpenSearch(
hosts=[config["OPENSEARCH_URI"]], hosts=[OPENSEARCH_URI],
use_ssl=OPENSEARCH_SSL, use_ssl=OPENSEARCH_SSL,
verify_certs=OPENSEARCH_CERT_VERIFY, verify_certs=OPENSEARCH_CERT_VERIFY,
http_auth=(OPENSEARCH_USERNAME,OPENSEARCH_PASSWORD), http_auth=(OPENSEARCH_USERNAME, OPENSEARCH_PASSWORD),
) )
def _result_to_get_result(self, result) -> GetResult: def _result_to_get_result(self, result) -> GetResult:
@ -103,12 +107,10 @@ class OpenSearchClient:
return self._result_to_search_result(result) return self._result_to_search_result(result)
def get_or_create_index(self, index_name: str, dimension: int): def get_or_create_index(self, index_name: str, dimension: int):
if not self.has_index(index_name): if not self.has_index(index_name):
self._create_index(index_name, dimension) self._create_index(index_name, dimension)
def get(self, index_name: str) -> Optional[GetResult]: def get(self, index_name: str) -> Optional[GetResult]:
query = { query = {
"query": {"match_all": {}}, "query": {"match_all": {}},