2025-04-24 16:03:31 +08:00
|
|
|
#
|
|
|
|
|
# Copyright 2025 The InfiniFlow Authors. All Rights Reserved.
|
|
|
|
|
#
|
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
|
# you may not use this file except in compliance with the License.
|
|
|
|
|
# You may obtain a copy of the License at
|
|
|
|
|
#
|
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
#
|
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
|
# See the License for the specific language governing permissions and
|
|
|
|
|
# limitations under the License.
|
|
|
|
|
#
|
|
|
|
|
|
|
|
|
|
import logging
|
|
|
|
|
import re
|
|
|
|
|
import json
|
|
|
|
|
import time
|
|
|
|
|
import os
|
|
|
|
|
|
|
|
|
|
import copy
|
|
|
|
|
from opensearchpy import OpenSearch, NotFoundError
|
|
|
|
|
from opensearchpy import UpdateByQuery, Q, Search, Index
|
|
|
|
|
from opensearchpy import ConnectionTimeout
|
2025-11-02 12:24:08 +08:00
|
|
|
from common.decorator import singleton
|
2025-11-02 21:05:28 +08:00
|
|
|
from common.file_utils import get_project_base_directory
|
2025-12-29 12:01:18 +08:00
|
|
|
from common.doc_store.doc_store_base import DocStoreConnection, MatchExpr, OrderByExpr, MatchTextExpr, MatchDenseExpr, \
|
|
|
|
|
FusionExpr
|
2025-04-24 16:03:31 +08:00
|
|
|
from rag.nlp import is_english, rag_tokenizer
|
2025-11-06 09:36:38 +08:00
|
|
|
from common.constants import PAGERANK_FLD, TAG_FLD
|
|
|
|
|
from common import settings
|
2025-04-24 16:03:31 +08:00
|
|
|
|
|
|
|
|
ATTEMPT_TIME = 2
|
|
|
|
|
|
2026-04-07 18:52:18 -07:00
|
|
|
_PAGERANK_FEA_ADJUST_SCRIPT = """
|
|
|
|
|
double cur = 0.0;
|
|
|
|
|
if (ctx._source.containsKey(params.pf)) {
|
|
|
|
|
Object v = ctx._source[params.pf];
|
|
|
|
|
if (v != null) {
|
|
|
|
|
if (v instanceof Number) {
|
|
|
|
|
cur = ((Number)v).doubleValue();
|
|
|
|
|
} else {
|
|
|
|
|
try { cur = Double.parseDouble(v.toString()); } catch (Exception e) { cur = 0.0; }
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
double nw = cur + params.delta;
|
|
|
|
|
if (nw < params.min_w) { nw = params.min_w; }
|
|
|
|
|
if (nw > params.max_w) { nw = params.max_w; }
|
|
|
|
|
if (nw <= 0.0) {
|
|
|
|
|
if (ctx._source.containsKey(params.pf)) {
|
|
|
|
|
ctx._source.remove(params.pf);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
ctx._source[params.pf] = nw;
|
|
|
|
|
}
|
|
|
|
|
"""
|
|
|
|
|
|
2025-04-24 16:03:31 +08:00
|
|
|
logger = logging.getLogger('ragflow.opensearch_conn')
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@singleton
|
|
|
|
|
class OSConnection(DocStoreConnection):
|
|
|
|
|
def __init__(self):
|
|
|
|
|
self.info = {}
|
2025-11-06 09:36:38 +08:00
|
|
|
logger.info(f"Use OpenSearch {settings.OS['hosts']} as the doc engine.")
|
2025-04-24 16:03:31 +08:00
|
|
|
for _ in range(ATTEMPT_TIME):
|
|
|
|
|
try:
|
|
|
|
|
self.os = OpenSearch(
|
2025-11-06 09:36:38 +08:00
|
|
|
settings.OS["hosts"].split(","),
|
|
|
|
|
http_auth=(settings.OS["username"], settings.OS[
|
|
|
|
|
"password"]) if "username" in settings.OS and "password" in settings.OS else None,
|
2025-04-24 16:03:31 +08:00
|
|
|
verify_certs=False,
|
|
|
|
|
timeout=600
|
|
|
|
|
)
|
|
|
|
|
if self.os:
|
|
|
|
|
self.info = self.os.info()
|
|
|
|
|
break
|
|
|
|
|
except Exception as e:
|
2025-11-06 09:36:38 +08:00
|
|
|
logger.warning(f"{str(e)}. Waiting OpenSearch {settings.OS['hosts']} to be healthy.")
|
2025-04-24 16:03:31 +08:00
|
|
|
time.sleep(5)
|
|
|
|
|
if not self.os.ping():
|
2025-11-06 09:36:38 +08:00
|
|
|
msg = f"OpenSearch {settings.OS['hosts']} is unhealthy in 120s."
|
2025-04-24 16:03:31 +08:00
|
|
|
logger.error(msg)
|
|
|
|
|
raise Exception(msg)
|
|
|
|
|
v = self.info.get("version", {"number": "2.18.0"})
|
|
|
|
|
v = v["number"].split(".")[0]
|
|
|
|
|
if int(v) < 2:
|
|
|
|
|
msg = f"OpenSearch version must be greater than or equal to 2, current version: {v}"
|
|
|
|
|
logger.error(msg)
|
|
|
|
|
raise Exception(msg)
|
|
|
|
|
fp_mapping = os.path.join(get_project_base_directory(), "conf", "os_mapping.json")
|
|
|
|
|
if not os.path.exists(fp_mapping):
|
|
|
|
|
msg = f"OpenSearch mapping file not found at {fp_mapping}"
|
|
|
|
|
logger.error(msg)
|
|
|
|
|
raise Exception(msg)
|
2026-01-30 01:07:51 -05:00
|
|
|
with open(fp_mapping, "r") as f:
|
|
|
|
|
self.mapping = json.load(f)
|
2025-11-06 09:36:38 +08:00
|
|
|
logger.info(f"OpenSearch {settings.OS['hosts']} is healthy.")
|
fix(opensearch): keep the BM25 leg in hybrid search (#15760)
### What problem does this PR solve?
Fixes the OpenSearch side of #10747: hybrid search drops the keyword
(BM25) leg and
ends up doing plain vector search.
When a search has both a text and a vector leg, `OSConnection.search()`
throws the text
query away:
del q["query"]
q["query"] = {"knn": knn_query}
The text clause only stays on as a filter inside the knn query, so it
narrows the
candidate set but doesn't count towards scoring. So hybrid search on
OpenSearch behaves
like plain vector search, unlike the Elasticsearch backend.
What I changed:
- when both legs are present, send a real hybrid query
`{"hybrid": {"queries": [bm25, {"knn": ...}]}}` and let a
normalization-processor
search pipeline score and combine the two legs
- only the actual filters (kb_id, available_int, ...) go in the knn
filter, not the
text must clause
- create the pipeline on startup if it's missing, so there's no separate
provisioning
step. name and weights can be set under `os:` in service_conf.yaml, or
via
`OS_HYBRID_PIPELINE`; defaults are `ragflow_hybrid_pipeline` and `[0.5,
0.5]`
- normalization-processor needs OpenSearch 2.10+. on older clusters, or
when the
pipeline can't be created, log a warning and fall back to vector-only
instead of
pointing at a pipeline that doesn't exist
This is only the hybrid-search fix; `create_doc_meta_idx` is already on
main.
Testing (there's no OpenSearch path in CI): added a unit test
(`test/unit_test/rag/utils/test_opensearch_hybrid_search.py`, no
services needed) that
checks the query built in each case — hybrid + pipeline param for
text+vector, plain knn
for vector-only, plain bool for text-only, the knn filter never carrying
the text
query_string, and the vector-only fallback when the pipeline isn't
available. Also ran
it against a real OpenSearch 2.19.1 container with a doc that matches
the keyword but
sits outside the knn top-k: pure knn returns `['D1','D2','D5']` (keyword
doc missing),
the hybrid query returns `['A','D1','D2','D5']` (keyword doc present).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
Signed-off-by: Danut Matei <matei.danut.dm@gmail.com>
2026-06-08 11:17:47 +03:00
|
|
|
self._init_hybrid_search()
|
|
|
|
|
|
|
|
|
|
# normalization-processor (needed to merge the BM25 and KNN scores) only
|
|
|
|
|
# exists on OpenSearch 2.10+.
|
|
|
|
|
HYBRID_MIN_VERSION = (2, 10)
|
|
|
|
|
|
|
|
|
|
def _init_hybrid_search(self):
|
|
|
|
|
"""Create the hybrid-search pipeline if it isn't there yet.
|
|
|
|
|
|
|
|
|
|
A {"hybrid": {...}} query is scored by a normalization-processor that has
|
|
|
|
|
to live on a search pipeline, otherwise OpenSearch rejects the query. We
|
|
|
|
|
create it once at startup (PUT _search/pipeline is idempotent) so there's
|
|
|
|
|
no extra setup step to run.
|
|
|
|
|
|
|
|
|
|
Sets self.hybrid_search_enabled. If the pipeline can't be created
|
|
|
|
|
(OpenSearch < 2.10, or no permission to manage pipelines) we log a
|
|
|
|
|
warning, leave it off, and search() keeps doing vector-only.
|
|
|
|
|
"""
|
|
|
|
|
self.hybrid_search_enabled = False
|
|
|
|
|
self._hybrid_pipeline = os.environ.get("OS_HYBRID_PIPELINE") \
|
|
|
|
|
or settings.OS.get("hybrid_search_pipeline") or "ragflow_hybrid_pipeline"
|
|
|
|
|
|
|
|
|
|
version_number = self.info.get("version", {}).get("number", "")
|
|
|
|
|
try:
|
|
|
|
|
version = tuple(int(p) for p in version_number.split(".")[:2])
|
|
|
|
|
except (ValueError, AttributeError):
|
|
|
|
|
version = (0, 0)
|
|
|
|
|
if version < self.HYBRID_MIN_VERSION:
|
|
|
|
|
logger.warning(f"OpenSearch {version_number or 'unknown'} does not support the "
|
|
|
|
|
f"normalization-processor (requires >= {self.HYBRID_MIN_VERSION[0]}."
|
|
|
|
|
f"{self.HYBRID_MIN_VERSION[1]}); hybrid search is disabled and "
|
|
|
|
|
f"queries fall back to vector-only.")
|
|
|
|
|
return
|
|
|
|
|
|
|
|
|
|
weights = settings.OS.get("hybrid_search_weights", [0.5, 0.5])
|
|
|
|
|
pipeline_body = {
|
|
|
|
|
"description": "RAGFlow hybrid search normalization pipeline (BM25 + KNN).",
|
|
|
|
|
"phase_results_processors": [
|
|
|
|
|
{"normalization-processor": {
|
|
|
|
|
"normalization": {"technique": "min_max"},
|
|
|
|
|
"combination": {"technique": "arithmetic_mean",
|
|
|
|
|
"parameters": {"weights": weights}}}}
|
|
|
|
|
],
|
|
|
|
|
}
|
|
|
|
|
try:
|
|
|
|
|
self.os.transport.perform_request(
|
|
|
|
|
"PUT", f"/_search/pipeline/{self._hybrid_pipeline}", body=pipeline_body)
|
|
|
|
|
self.hybrid_search_enabled = True
|
|
|
|
|
logger.info(f"OpenSearch hybrid search enabled via pipeline "
|
|
|
|
|
f"'{self._hybrid_pipeline}' (weights {weights}).")
|
|
|
|
|
except Exception:
|
|
|
|
|
logger.warning(f"Could not create OpenSearch search pipeline '{self._hybrid_pipeline}'; "
|
|
|
|
|
f"hybrid search is disabled and queries fall back to vector-only. "
|
|
|
|
|
f"Creating a search pipeline needs the "
|
|
|
|
|
f"'cluster:admin/search/pipeline/put' privilege (relevant on "
|
|
|
|
|
f"locked-down or managed OpenSearch).", exc_info=True)
|
2025-04-24 16:03:31 +08:00
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
Database operations
|
|
|
|
|
"""
|
|
|
|
|
|
2025-12-25 21:18:13 +08:00
|
|
|
def db_type(self) -> str:
|
2025-04-24 16:03:31 +08:00
|
|
|
return "opensearch"
|
|
|
|
|
|
|
|
|
|
def health(self) -> dict:
|
|
|
|
|
health_dict = dict(self.os.cluster.health())
|
|
|
|
|
health_dict["type"] = "opensearch"
|
|
|
|
|
return health_dict
|
|
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
Table operations
|
|
|
|
|
"""
|
|
|
|
|
|
2026-01-28 12:41:01 +08:00
|
|
|
def create_idx(self, indexName: str, knowledgebaseId: str, vectorSize: int, parser_id: str = None):
|
2025-12-25 21:18:13 +08:00
|
|
|
if self.index_exist(indexName, knowledgebaseId):
|
2025-04-24 16:03:31 +08:00
|
|
|
return True
|
|
|
|
|
try:
|
|
|
|
|
from opensearchpy.client import IndicesClient
|
|
|
|
|
return IndicesClient(self.os).create(index=indexName,
|
|
|
|
|
body=self.mapping)
|
|
|
|
|
except Exception:
|
|
|
|
|
logger.exception("OSConnection.createIndex error %s" % (indexName))
|
|
|
|
|
|
fix(opensearch): implement doc-meta dispatch surface on OSConnection (#14577)
### What problem does this PR solve?
Fixes #14570. On OpenSearch backends (`DOC_ENGINE=opensearch`) every
document-metadata write failed with `'OSConnection' object has no
attribute 'create_doc_meta_idx'`, so both `PATCH
/api/v1/datasets/{ds}/documents/{doc}` with `meta_fields` and `POST
/api/v1/datasets/{ds}/metadata/update` were unusable while every other
document operation (retrieval, parsing, name update, chunk management)
worked correctly on the same OpenSearch cluster.
The bug runs deeper than the missing method name in the error message
suggests. `DocMetadataService` also reached into
`settings.docStoreConn.es.*` directly for the index refresh, the
scripted partial update, and the count call, which means that even after
adding `create_doc_meta_idx` to `OSConnection` the very next call in the
same metadata flow would still raise `AttributeError` because
`OSConnection` exposes `self.os` rather than `self.es`. Fixing only the
reported symptom would have moved the failure one line down without
restoring the feature.
This PR adds a uniform document-metadata dispatch surface to both
connection classes so they present the same abstract API, and routes the
service layer through that surface via `getattr` guards instead of
poking at backend-specific attributes. The four new methods on
`OSConnection` and `ESConnectionBase` are `create_doc_meta_idx`,
`refresh_idx`, `count_idx`, and `replace_meta_fields`.
`OSConnection.create_doc_meta_idx` reuses the existing
`conf/doc_meta_es_mapping.json` schema in the OpenSearch `body=` form
because OpenSearch and Elasticsearch share the same index-creation
payload, and `replace_meta_fields` emits a full scripted assignment
(`ctx._source.meta_fields = params.meta_fields`) on both backends so
removed keys actually disappear instead of being preserved by deep-merge
semantics.
The `getattr`-guarded dispatch in `DocMetadataService` keeps the
existing fall-through paths intact for Infinity and OceanBase, which
continue to rely on their search-based count fallback and on the
delete-then-insert metadata replacement they used before, so this change
is strictly additive for those two backends.
Verification: `pytest
test/unit_test/rag/utils/test_opensearch_doc_meta.py` runs 16 new unit
tests that pass locally and pin the `OSConnection` dispatch surface, the
`create_doc_meta_idx` short-circuit when the index already exists, the
mapping-file payload routing, the `IndicesClient.create` failure path,
the `refresh_idx` and `count_idx` success and error sentinels, and the
full-assignment script emitted by `replace_meta_fields`. The test module
stubs `common.settings` and `rag.nlp` at import time so the suite runs
without the heavy backend SDKs that the rest of the repository pulls in
transitively.
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
---------
Co-authored-by: tmimmanuel <tmimmanuel@users.noreply.github.com>
2026-05-10 23:04:28 -10:00
|
|
|
def create_doc_meta_idx(self, index_name: str):
|
|
|
|
|
"""
|
|
|
|
|
Create a per-tenant document metadata index on OpenSearch.
|
|
|
|
|
|
|
|
|
|
Mirrors ESConnectionBase.create_doc_meta_idx so that the
|
|
|
|
|
DocMetadataService dispatches uniformly across ES and OS backends.
|
|
|
|
|
Index name pattern: ragflow_doc_meta_{tenant_id}
|
|
|
|
|
"""
|
|
|
|
|
if self.index_exist(index_name, ""):
|
|
|
|
|
return True
|
|
|
|
|
try:
|
|
|
|
|
fp_mapping = os.path.join(get_project_base_directory(), "conf", "doc_meta_es_mapping.json")
|
|
|
|
|
if not os.path.exists(fp_mapping):
|
|
|
|
|
logger.error(f"Document metadata mapping file not found at {fp_mapping}")
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
with open(fp_mapping, "r") as f:
|
|
|
|
|
doc_meta_mapping = json.load(f)
|
|
|
|
|
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
mappings = doc_meta_mapping["mappings"]
|
|
|
|
|
# `conf/doc_meta_es_mapping.json` declares a top-level
|
|
|
|
|
# `"dynamic": "runtime"`. Runtime fields are an Elasticsearch-only
|
|
|
|
|
# feature; OpenSearch cannot parse the value and rejects index
|
|
|
|
|
# creation with `mapper_parsing_exception: Could not convert
|
|
|
|
|
# [dynamic.dynamic] to boolean`. Fall back to standard dynamic
|
|
|
|
|
# mapping (`true`) on OpenSearch so dynamic field discovery is kept
|
|
|
|
|
# without the ES-specific runtime semantics. The shared mapping file
|
|
|
|
|
# is left untouched so the Elasticsearch backend still gets runtime
|
|
|
|
|
# fields.
|
|
|
|
|
if mappings.get("dynamic") == "runtime":
|
|
|
|
|
mappings = {**mappings, "dynamic": True}
|
|
|
|
|
|
fix(opensearch): implement doc-meta dispatch surface on OSConnection (#14577)
### What problem does this PR solve?
Fixes #14570. On OpenSearch backends (`DOC_ENGINE=opensearch`) every
document-metadata write failed with `'OSConnection' object has no
attribute 'create_doc_meta_idx'`, so both `PATCH
/api/v1/datasets/{ds}/documents/{doc}` with `meta_fields` and `POST
/api/v1/datasets/{ds}/metadata/update` were unusable while every other
document operation (retrieval, parsing, name update, chunk management)
worked correctly on the same OpenSearch cluster.
The bug runs deeper than the missing method name in the error message
suggests. `DocMetadataService` also reached into
`settings.docStoreConn.es.*` directly for the index refresh, the
scripted partial update, and the count call, which means that even after
adding `create_doc_meta_idx` to `OSConnection` the very next call in the
same metadata flow would still raise `AttributeError` because
`OSConnection` exposes `self.os` rather than `self.es`. Fixing only the
reported symptom would have moved the failure one line down without
restoring the feature.
This PR adds a uniform document-metadata dispatch surface to both
connection classes so they present the same abstract API, and routes the
service layer through that surface via `getattr` guards instead of
poking at backend-specific attributes. The four new methods on
`OSConnection` and `ESConnectionBase` are `create_doc_meta_idx`,
`refresh_idx`, `count_idx`, and `replace_meta_fields`.
`OSConnection.create_doc_meta_idx` reuses the existing
`conf/doc_meta_es_mapping.json` schema in the OpenSearch `body=` form
because OpenSearch and Elasticsearch share the same index-creation
payload, and `replace_meta_fields` emits a full scripted assignment
(`ctx._source.meta_fields = params.meta_fields`) on both backends so
removed keys actually disappear instead of being preserved by deep-merge
semantics.
The `getattr`-guarded dispatch in `DocMetadataService` keeps the
existing fall-through paths intact for Infinity and OceanBase, which
continue to rely on their search-based count fallback and on the
delete-then-insert metadata replacement they used before, so this change
is strictly additive for those two backends.
Verification: `pytest
test/unit_test/rag/utils/test_opensearch_doc_meta.py` runs 16 new unit
tests that pass locally and pin the `OSConnection` dispatch surface, the
`create_doc_meta_idx` short-circuit when the index already exists, the
mapping-file payload routing, the `IndicesClient.create` failure path,
the `refresh_idx` and `count_idx` success and error sentinels, and the
full-assignment script emitted by `replace_meta_fields`. The test module
stubs `common.settings` and `rag.nlp` at import time so the suite runs
without the heavy backend SDKs that the rest of the repository pulls in
transitively.
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
---------
Co-authored-by: tmimmanuel <tmimmanuel@users.noreply.github.com>
2026-05-10 23:04:28 -10:00
|
|
|
from opensearchpy.client import IndicesClient
|
|
|
|
|
body = {
|
|
|
|
|
"settings": doc_meta_mapping["settings"],
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
"mappings": mappings,
|
fix(opensearch): implement doc-meta dispatch surface on OSConnection (#14577)
### What problem does this PR solve?
Fixes #14570. On OpenSearch backends (`DOC_ENGINE=opensearch`) every
document-metadata write failed with `'OSConnection' object has no
attribute 'create_doc_meta_idx'`, so both `PATCH
/api/v1/datasets/{ds}/documents/{doc}` with `meta_fields` and `POST
/api/v1/datasets/{ds}/metadata/update` were unusable while every other
document operation (retrieval, parsing, name update, chunk management)
worked correctly on the same OpenSearch cluster.
The bug runs deeper than the missing method name in the error message
suggests. `DocMetadataService` also reached into
`settings.docStoreConn.es.*` directly for the index refresh, the
scripted partial update, and the count call, which means that even after
adding `create_doc_meta_idx` to `OSConnection` the very next call in the
same metadata flow would still raise `AttributeError` because
`OSConnection` exposes `self.os` rather than `self.es`. Fixing only the
reported symptom would have moved the failure one line down without
restoring the feature.
This PR adds a uniform document-metadata dispatch surface to both
connection classes so they present the same abstract API, and routes the
service layer through that surface via `getattr` guards instead of
poking at backend-specific attributes. The four new methods on
`OSConnection` and `ESConnectionBase` are `create_doc_meta_idx`,
`refresh_idx`, `count_idx`, and `replace_meta_fields`.
`OSConnection.create_doc_meta_idx` reuses the existing
`conf/doc_meta_es_mapping.json` schema in the OpenSearch `body=` form
because OpenSearch and Elasticsearch share the same index-creation
payload, and `replace_meta_fields` emits a full scripted assignment
(`ctx._source.meta_fields = params.meta_fields`) on both backends so
removed keys actually disappear instead of being preserved by deep-merge
semantics.
The `getattr`-guarded dispatch in `DocMetadataService` keeps the
existing fall-through paths intact for Infinity and OceanBase, which
continue to rely on their search-based count fallback and on the
delete-then-insert metadata replacement they used before, so this change
is strictly additive for those two backends.
Verification: `pytest
test/unit_test/rag/utils/test_opensearch_doc_meta.py` runs 16 new unit
tests that pass locally and pin the `OSConnection` dispatch surface, the
`create_doc_meta_idx` short-circuit when the index already exists, the
mapping-file payload routing, the `IndicesClient.create` failure path,
the `refresh_idx` and `count_idx` success and error sentinels, and the
full-assignment script emitted by `replace_meta_fields`. The test module
stubs `common.settings` and `rag.nlp` at import time so the suite runs
without the heavy backend SDKs that the rest of the repository pulls in
transitively.
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
---------
Co-authored-by: tmimmanuel <tmimmanuel@users.noreply.github.com>
2026-05-10 23:04:28 -10:00
|
|
|
}
|
|
|
|
|
return IndicesClient(self.os).create(index=index_name, body=body)
|
|
|
|
|
except Exception as e:
|
|
|
|
|
logger.exception(f"OSConnection.create_doc_meta_idx error creating {index_name}: {e}")
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
def refresh_idx(self, index_name: str) -> bool:
|
|
|
|
|
"""
|
|
|
|
|
Refresh an index so that recently inserted documents become searchable.
|
|
|
|
|
|
|
|
|
|
DocMetadataService used to call ``settings.docStoreConn.es.indices.refresh``
|
|
|
|
|
directly, which raised AttributeError on the OpenSearch backend because
|
|
|
|
|
OSConnection exposes ``self.os`` rather than ``self.es``. This wrapper
|
|
|
|
|
gives both backends a uniform abstract entry point.
|
|
|
|
|
"""
|
|
|
|
|
try:
|
|
|
|
|
self.os.indices.refresh(index=index_name)
|
|
|
|
|
return True
|
|
|
|
|
except NotFoundError:
|
|
|
|
|
return False
|
|
|
|
|
except Exception as e:
|
|
|
|
|
logger.warning(f"OSConnection.refresh_idx({index_name}) failed: {e}")
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
def count_idx(self, index_name: str) -> int:
|
|
|
|
|
"""
|
|
|
|
|
Return the document count for an index, or -1 if the call fails.
|
|
|
|
|
|
|
|
|
|
Used by DocMetadataService._drop_empty_metadata_table to decide whether
|
|
|
|
|
a per-tenant metadata index is empty without paying a full search.
|
|
|
|
|
"""
|
|
|
|
|
try:
|
|
|
|
|
response = self.os.count(index=index_name)
|
|
|
|
|
return int(response.get("count", 0))
|
|
|
|
|
except NotFoundError:
|
|
|
|
|
return 0
|
|
|
|
|
except Exception as e:
|
|
|
|
|
logger.warning(f"OSConnection.count_idx({index_name}) failed: {e}")
|
|
|
|
|
return -1
|
|
|
|
|
|
|
|
|
|
def replace_meta_fields(self, index_name: str, doc_id: str, meta_fields: dict) -> bool:
|
|
|
|
|
"""
|
|
|
|
|
Replace the ``meta_fields`` object on a single document.
|
|
|
|
|
|
|
|
|
|
ES.update with a ``doc`` body deep-merges object fields, which retains
|
|
|
|
|
old keys that should be removed. The fix in ESConnection is a script
|
|
|
|
|
that fully assigns the new meta_fields. We provide the same primitive
|
|
|
|
|
on OpenSearch so the service layer never reaches into ``self.es`` or
|
|
|
|
|
``self.os`` directly.
|
|
|
|
|
"""
|
|
|
|
|
body = {
|
|
|
|
|
"script": {
|
|
|
|
|
"source": "ctx._source.meta_fields = params.meta_fields",
|
|
|
|
|
"params": {"meta_fields": meta_fields},
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
for _ in range(ATTEMPT_TIME):
|
|
|
|
|
try:
|
|
|
|
|
self.os.update(index=index_name, id=doc_id, body=body, refresh=True)
|
|
|
|
|
return True
|
|
|
|
|
except NotFoundError:
|
|
|
|
|
return False
|
|
|
|
|
except Exception as e:
|
|
|
|
|
logger.warning(f"OSConnection.replace_meta_fields({index_name}, {doc_id}) failed: {e}")
|
|
|
|
|
if re.search(r"(timeout|connection)", str(e).lower()):
|
|
|
|
|
time.sleep(1)
|
|
|
|
|
continue
|
|
|
|
|
return False
|
|
|
|
|
return False
|
|
|
|
|
|
2025-12-25 21:18:13 +08:00
|
|
|
def delete_idx(self, indexName: str, knowledgebaseId: str):
|
2025-04-24 16:03:31 +08:00
|
|
|
if len(knowledgebaseId) > 0:
|
|
|
|
|
# The index need to be alive after any kb deletion since all kb under this tenant are in one index.
|
|
|
|
|
return
|
|
|
|
|
try:
|
|
|
|
|
self.os.indices.delete(index=indexName, allow_no_indices=True)
|
|
|
|
|
except NotFoundError:
|
|
|
|
|
pass
|
|
|
|
|
except Exception:
|
|
|
|
|
logger.exception("OSConnection.deleteIdx error %s" % (indexName))
|
|
|
|
|
|
2025-12-25 21:18:13 +08:00
|
|
|
def index_exist(self, indexName: str, knowledgebaseId: str = None) -> bool:
|
2025-04-24 16:03:31 +08:00
|
|
|
s = Index(indexName, self.os)
|
|
|
|
|
for i in range(ATTEMPT_TIME):
|
|
|
|
|
try:
|
|
|
|
|
return s.exists()
|
|
|
|
|
except Exception as e:
|
|
|
|
|
logger.exception("OSConnection.indexExist got exception")
|
|
|
|
|
if str(e).find("Timeout") > 0 or str(e).find("Conflict") > 0:
|
|
|
|
|
continue
|
|
|
|
|
break
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
CRUD operations
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
def search(
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
self, select_fields: list[str],
|
|
|
|
|
highlight_fields: list[str],
|
2025-04-24 16:03:31 +08:00
|
|
|
condition: dict,
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
match_expressions: list[MatchExpr],
|
|
|
|
|
order_by: OrderByExpr,
|
2025-04-24 16:03:31 +08:00
|
|
|
offset: int,
|
|
|
|
|
limit: int,
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
index_names: str | list[str],
|
|
|
|
|
knowledgebase_ids: list[str],
|
|
|
|
|
agg_fields: list[str] = [],
|
2025-04-24 16:03:31 +08:00
|
|
|
rank_feature: dict | None = None
|
|
|
|
|
):
|
|
|
|
|
"""
|
|
|
|
|
Refers to https://github.com/opensearch-project/opensearch-py/blob/main/guides/dsl.md
|
|
|
|
|
"""
|
|
|
|
|
use_knn = False
|
fix(opensearch): keep the BM25 leg in hybrid search (#15760)
### What problem does this PR solve?
Fixes the OpenSearch side of #10747: hybrid search drops the keyword
(BM25) leg and
ends up doing plain vector search.
When a search has both a text and a vector leg, `OSConnection.search()`
throws the text
query away:
del q["query"]
q["query"] = {"knn": knn_query}
The text clause only stays on as a filter inside the knn query, so it
narrows the
candidate set but doesn't count towards scoring. So hybrid search on
OpenSearch behaves
like plain vector search, unlike the Elasticsearch backend.
What I changed:
- when both legs are present, send a real hybrid query
`{"hybrid": {"queries": [bm25, {"knn": ...}]}}` and let a
normalization-processor
search pipeline score and combine the two legs
- only the actual filters (kb_id, available_int, ...) go in the knn
filter, not the
text must clause
- create the pipeline on startup if it's missing, so there's no separate
provisioning
step. name and weights can be set under `os:` in service_conf.yaml, or
via
`OS_HYBRID_PIPELINE`; defaults are `ragflow_hybrid_pipeline` and `[0.5,
0.5]`
- normalization-processor needs OpenSearch 2.10+. on older clusters, or
when the
pipeline can't be created, log a warning and fall back to vector-only
instead of
pointing at a pipeline that doesn't exist
This is only the hybrid-search fix; `create_doc_meta_idx` is already on
main.
Testing (there's no OpenSearch path in CI): added a unit test
(`test/unit_test/rag/utils/test_opensearch_hybrid_search.py`, no
services needed) that
checks the query built in each case — hybrid + pipeline param for
text+vector, plain knn
for vector-only, plain bool for text-only, the knn filter never carrying
the text
query_string, and the vector-only fallback when the pipeline isn't
available. Also ran
it against a real OpenSearch 2.19.1 container with a doc that matches
the keyword but
sits outside the knn top-k: pure knn returns `['D1','D2','D5']` (keyword
doc missing),
the hybrid query returns `['A','D1','D2','D5']` (keyword doc present).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
Signed-off-by: Danut Matei <matei.danut.dm@gmail.com>
2026-06-08 11:17:47 +03:00
|
|
|
use_text = False
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
if isinstance(index_names, str):
|
|
|
|
|
index_names = index_names.split(",")
|
|
|
|
|
assert isinstance(index_names, list) and len(index_names) > 0
|
2025-04-24 16:03:31 +08:00
|
|
|
assert "_id" not in condition
|
|
|
|
|
|
|
|
|
|
bqry = Q("bool", must=[])
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
condition["kb_id"] = knowledgebase_ids
|
2025-04-24 16:03:31 +08:00
|
|
|
for k, v in condition.items():
|
|
|
|
|
if k == "available_int":
|
|
|
|
|
if v == 0:
|
|
|
|
|
bqry.filter.append(Q("range", available_int={"lt": 1}))
|
|
|
|
|
else:
|
|
|
|
|
bqry.filter.append(
|
|
|
|
|
Q("bool", must_not=Q("range", available_int={"lt": 1})))
|
|
|
|
|
continue
|
|
|
|
|
if not v:
|
|
|
|
|
continue
|
|
|
|
|
if isinstance(v, list):
|
|
|
|
|
bqry.filter.append(Q("terms", **{k: v}))
|
|
|
|
|
elif isinstance(v, str) or isinstance(v, int):
|
|
|
|
|
bqry.filter.append(Q("term", **{k: v}))
|
|
|
|
|
else:
|
|
|
|
|
raise Exception(
|
|
|
|
|
f"Condition `{str(k)}={str(v)}` value type is {str(type(v))}, expected to be int, str or list.")
|
|
|
|
|
|
|
|
|
|
s = Search()
|
|
|
|
|
vector_similarity_weight = 0.5
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
for m in match_expressions:
|
2025-04-24 16:03:31 +08:00
|
|
|
if isinstance(m, FusionExpr) and m.method == "weighted_sum" and "weights" in m.fusion_params:
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
assert len(match_expressions) == 3 and isinstance(match_expressions[0], MatchTextExpr) and isinstance(match_expressions[1],
|
2025-04-24 16:03:31 +08:00
|
|
|
MatchDenseExpr) and isinstance(
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
match_expressions[2], FusionExpr)
|
2025-04-24 16:03:31 +08:00
|
|
|
weights = m.fusion_params["weights"]
|
|
|
|
|
vector_similarity_weight = float(weights.split(",")[1])
|
|
|
|
|
knn_query = {}
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
for m in match_expressions:
|
2025-04-24 16:03:31 +08:00
|
|
|
if isinstance(m, MatchTextExpr):
|
fix(opensearch): keep the BM25 leg in hybrid search (#15760)
### What problem does this PR solve?
Fixes the OpenSearch side of #10747: hybrid search drops the keyword
(BM25) leg and
ends up doing plain vector search.
When a search has both a text and a vector leg, `OSConnection.search()`
throws the text
query away:
del q["query"]
q["query"] = {"knn": knn_query}
The text clause only stays on as a filter inside the knn query, so it
narrows the
candidate set but doesn't count towards scoring. So hybrid search on
OpenSearch behaves
like plain vector search, unlike the Elasticsearch backend.
What I changed:
- when both legs are present, send a real hybrid query
`{"hybrid": {"queries": [bm25, {"knn": ...}]}}` and let a
normalization-processor
search pipeline score and combine the two legs
- only the actual filters (kb_id, available_int, ...) go in the knn
filter, not the
text must clause
- create the pipeline on startup if it's missing, so there's no separate
provisioning
step. name and weights can be set under `os:` in service_conf.yaml, or
via
`OS_HYBRID_PIPELINE`; defaults are `ragflow_hybrid_pipeline` and `[0.5,
0.5]`
- normalization-processor needs OpenSearch 2.10+. on older clusters, or
when the
pipeline can't be created, log a warning and fall back to vector-only
instead of
pointing at a pipeline that doesn't exist
This is only the hybrid-search fix; `create_doc_meta_idx` is already on
main.
Testing (there's no OpenSearch path in CI): added a unit test
(`test/unit_test/rag/utils/test_opensearch_hybrid_search.py`, no
services needed) that
checks the query built in each case — hybrid + pipeline param for
text+vector, plain knn
for vector-only, plain bool for text-only, the knn filter never carrying
the text
query_string, and the vector-only fallback when the pipeline isn't
available. Also ran
it against a real OpenSearch 2.19.1 container with a doc that matches
the keyword but
sits outside the knn top-k: pure knn returns `['D1','D2','D5']` (keyword
doc missing),
the hybrid query returns `['A','D1','D2','D5']` (keyword doc present).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
Signed-off-by: Danut Matei <matei.danut.dm@gmail.com>
2026-06-08 11:17:47 +03:00
|
|
|
use_text = True
|
2025-04-24 16:03:31 +08:00
|
|
|
minimum_should_match = m.extra_options.get("minimum_should_match", 0.0)
|
|
|
|
|
if isinstance(minimum_should_match, float):
|
|
|
|
|
minimum_should_match = str(int(minimum_should_match * 100)) + "%"
|
|
|
|
|
bqry.must.append(Q("query_string", fields=m.fields,
|
|
|
|
|
type="best_fields", query=m.matching_text,
|
|
|
|
|
minimum_should_match=minimum_should_match,
|
|
|
|
|
boost=1))
|
|
|
|
|
bqry.boost = 1.0 - vector_similarity_weight
|
2025-12-29 12:01:18 +08:00
|
|
|
|
2025-04-24 16:03:31 +08:00
|
|
|
# Elasticsearch has the encapsulation of KNN_search in python sdk
|
|
|
|
|
# while the Python SDK for OpenSearch does not provide encapsulation for KNN_search,
|
|
|
|
|
# the following codes implement KNN_search in OpenSearch using DSL
|
|
|
|
|
# Besides, Opensearch's DSL for KNN_search query syntax differs from that in Elasticsearch, I also made some adaptions for it
|
|
|
|
|
elif isinstance(m, MatchDenseExpr):
|
|
|
|
|
assert (bqry is not None)
|
|
|
|
|
similarity = 0.0
|
|
|
|
|
if "similarity" in m.extra_options:
|
|
|
|
|
similarity = m.extra_options["similarity"]
|
|
|
|
|
use_knn = True
|
|
|
|
|
vector_column_name = m.vector_column_name
|
|
|
|
|
knn_query[vector_column_name] = {}
|
|
|
|
|
knn_query[vector_column_name]["vector"] = list(m.embedding_data)
|
|
|
|
|
knn_query[vector_column_name]["k"] = m.topn
|
fix(opensearch): keep the BM25 leg in hybrid search (#15760)
### What problem does this PR solve?
Fixes the OpenSearch side of #10747: hybrid search drops the keyword
(BM25) leg and
ends up doing plain vector search.
When a search has both a text and a vector leg, `OSConnection.search()`
throws the text
query away:
del q["query"]
q["query"] = {"knn": knn_query}
The text clause only stays on as a filter inside the knn query, so it
narrows the
candidate set but doesn't count towards scoring. So hybrid search on
OpenSearch behaves
like plain vector search, unlike the Elasticsearch backend.
What I changed:
- when both legs are present, send a real hybrid query
`{"hybrid": {"queries": [bm25, {"knn": ...}]}}` and let a
normalization-processor
search pipeline score and combine the two legs
- only the actual filters (kb_id, available_int, ...) go in the knn
filter, not the
text must clause
- create the pipeline on startup if it's missing, so there's no separate
provisioning
step. name and weights can be set under `os:` in service_conf.yaml, or
via
`OS_HYBRID_PIPELINE`; defaults are `ragflow_hybrid_pipeline` and `[0.5,
0.5]`
- normalization-processor needs OpenSearch 2.10+. on older clusters, or
when the
pipeline can't be created, log a warning and fall back to vector-only
instead of
pointing at a pipeline that doesn't exist
This is only the hybrid-search fix; `create_doc_meta_idx` is already on
main.
Testing (there's no OpenSearch path in CI): added a unit test
(`test/unit_test/rag/utils/test_opensearch_hybrid_search.py`, no
services needed) that
checks the query built in each case — hybrid + pipeline param for
text+vector, plain knn
for vector-only, plain bool for text-only, the knn filter never carrying
the text
query_string, and the vector-only fallback when the pipeline isn't
available. Also ran
it against a real OpenSearch 2.19.1 container with a doc that matches
the keyword but
sits outside the knn top-k: pure knn returns `['D1','D2','D5']` (keyword
doc missing),
the hybrid query returns `['A','D1','D2','D5']` (keyword doc present).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
Signed-off-by: Danut Matei <matei.danut.dm@gmail.com>
2026-06-08 11:17:47 +03:00
|
|
|
# The knn filter holds only the structural filters (kb_id,
|
|
|
|
|
# available_int, ...). The text query is deliberately kept out of it:
|
|
|
|
|
# it's scored as its own leg in the hybrid query below, not used to
|
|
|
|
|
# pre-filter knn candidates.
|
|
|
|
|
bool_inner = bqry.to_dict().get("bool", {})
|
|
|
|
|
if bool_inner.get("filter"):
|
|
|
|
|
knn_query[vector_column_name]["filter"] = {"bool": {"filter": bool_inner["filter"]}}
|
2025-04-24 16:03:31 +08:00
|
|
|
knn_query[vector_column_name]["boost"] = similarity
|
|
|
|
|
|
|
|
|
|
if bqry and rank_feature:
|
|
|
|
|
for fld, sc in rank_feature.items():
|
|
|
|
|
if fld != PAGERANK_FLD:
|
|
|
|
|
fld = f"{TAG_FLD}.{fld}"
|
|
|
|
|
bqry.should.append(Q("rank_feature", field=fld, linear={}, boost=sc))
|
|
|
|
|
|
|
|
|
|
if bqry:
|
|
|
|
|
s = s.query(bqry)
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
for field in highlight_fields:
|
2025-12-29 12:01:18 +08:00
|
|
|
s = s.highlight(field, force_source=True, no_match_size=30, require_field_match=False)
|
2025-04-24 16:03:31 +08:00
|
|
|
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
if order_by:
|
2025-04-24 16:03:31 +08:00
|
|
|
orders = list()
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
for field, order in order_by.fields:
|
2025-04-24 16:03:31 +08:00
|
|
|
order = "asc" if order == 0 else "desc"
|
|
|
|
|
if field in ["page_num_int", "top_int"]:
|
|
|
|
|
order_info = {"order": order, "unmapped_type": "float",
|
|
|
|
|
"mode": "avg", "numeric_type": "double"}
|
|
|
|
|
elif field.endswith("_int") or field.endswith("_flt"):
|
|
|
|
|
order_info = {"order": order, "unmapped_type": "float"}
|
|
|
|
|
else:
|
|
|
|
|
order_info = {"order": order, "unmapped_type": "text"}
|
|
|
|
|
orders.append({field: order_info})
|
|
|
|
|
s = s.sort(*orders)
|
|
|
|
|
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
for fld in agg_fields:
|
2025-04-24 16:03:31 +08:00
|
|
|
s.aggs.bucket(f'aggs_{fld}', 'terms', field=fld, size=1000000)
|
|
|
|
|
|
|
|
|
|
if limit > 0:
|
|
|
|
|
s = s[offset:offset + limit]
|
|
|
|
|
q = s.to_dict()
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
logger.debug(f"OSConnection.search {str(index_names)} query: " + json.dumps(q))
|
2025-12-29 12:01:18 +08:00
|
|
|
|
fix(opensearch): keep the BM25 leg in hybrid search (#15760)
### What problem does this PR solve?
Fixes the OpenSearch side of #10747: hybrid search drops the keyword
(BM25) leg and
ends up doing plain vector search.
When a search has both a text and a vector leg, `OSConnection.search()`
throws the text
query away:
del q["query"]
q["query"] = {"knn": knn_query}
The text clause only stays on as a filter inside the knn query, so it
narrows the
candidate set but doesn't count towards scoring. So hybrid search on
OpenSearch behaves
like plain vector search, unlike the Elasticsearch backend.
What I changed:
- when both legs are present, send a real hybrid query
`{"hybrid": {"queries": [bm25, {"knn": ...}]}}` and let a
normalization-processor
search pipeline score and combine the two legs
- only the actual filters (kb_id, available_int, ...) go in the knn
filter, not the
text must clause
- create the pipeline on startup if it's missing, so there's no separate
provisioning
step. name and weights can be set under `os:` in service_conf.yaml, or
via
`OS_HYBRID_PIPELINE`; defaults are `ragflow_hybrid_pipeline` and `[0.5,
0.5]`
- normalization-processor needs OpenSearch 2.10+. on older clusters, or
when the
pipeline can't be created, log a warning and fall back to vector-only
instead of
pointing at a pipeline that doesn't exist
This is only the hybrid-search fix; `create_doc_meta_idx` is already on
main.
Testing (there's no OpenSearch path in CI): added a unit test
(`test/unit_test/rag/utils/test_opensearch_hybrid_search.py`, no
services needed) that
checks the query built in each case — hybrid + pipeline param for
text+vector, plain knn
for vector-only, plain bool for text-only, the knn filter never carrying
the text
query_string, and the vector-only fallback when the pipeline isn't
available. Also ran
it against a real OpenSearch 2.19.1 container with a doc that matches
the keyword but
sits outside the knn top-k: pure knn returns `['D1','D2','D5']` (keyword
doc missing),
the hybrid query returns `['A','D1','D2','D5']` (keyword doc present).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
Signed-off-by: Danut Matei <matei.danut.dm@gmail.com>
2026-06-08 11:17:47 +03:00
|
|
|
hybrid_search = use_knn and use_text and getattr(self, "hybrid_search_enabled", False)
|
2025-04-24 16:03:31 +08:00
|
|
|
if use_knn:
|
fix(opensearch): keep the BM25 leg in hybrid search (#15760)
### What problem does this PR solve?
Fixes the OpenSearch side of #10747: hybrid search drops the keyword
(BM25) leg and
ends up doing plain vector search.
When a search has both a text and a vector leg, `OSConnection.search()`
throws the text
query away:
del q["query"]
q["query"] = {"knn": knn_query}
The text clause only stays on as a filter inside the knn query, so it
narrows the
candidate set but doesn't count towards scoring. So hybrid search on
OpenSearch behaves
like plain vector search, unlike the Elasticsearch backend.
What I changed:
- when both legs are present, send a real hybrid query
`{"hybrid": {"queries": [bm25, {"knn": ...}]}}` and let a
normalization-processor
search pipeline score and combine the two legs
- only the actual filters (kb_id, available_int, ...) go in the knn
filter, not the
text must clause
- create the pipeline on startup if it's missing, so there's no separate
provisioning
step. name and weights can be set under `os:` in service_conf.yaml, or
via
`OS_HYBRID_PIPELINE`; defaults are `ragflow_hybrid_pipeline` and `[0.5,
0.5]`
- normalization-processor needs OpenSearch 2.10+. on older clusters, or
when the
pipeline can't be created, log a warning and fall back to vector-only
instead of
pointing at a pipeline that doesn't exist
This is only the hybrid-search fix; `create_doc_meta_idx` is already on
main.
Testing (there's no OpenSearch path in CI): added a unit test
(`test/unit_test/rag/utils/test_opensearch_hybrid_search.py`, no
services needed) that
checks the query built in each case — hybrid + pipeline param for
text+vector, plain knn
for vector-only, plain bool for text-only, the knn filter never carrying
the text
query_string, and the vector-only fallback when the pipeline isn't
available. Also ran
it against a real OpenSearch 2.19.1 container with a doc that matches
the keyword but
sits outside the knn top-k: pure knn returns `['D1','D2','D5']` (keyword
doc missing),
the hybrid query returns `['A','D1','D2','D5']` (keyword doc present).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
Signed-off-by: Danut Matei <matei.danut.dm@gmail.com>
2026-06-08 11:17:47 +03:00
|
|
|
if hybrid_search:
|
|
|
|
|
# both legs + a pipeline available: send a real hybrid query so the
|
|
|
|
|
# keyword (BM25) and vector (knn) legs are scored separately and
|
|
|
|
|
# merged by the pipeline.
|
|
|
|
|
keyword_query = q.get("query")
|
|
|
|
|
q["query"] = {"hybrid": {"queries": [keyword_query, {"knn": knn_query}]}}
|
|
|
|
|
else:
|
|
|
|
|
# vector-only, or no pipeline available: fall back to a plain knn query.
|
|
|
|
|
del q["query"]
|
|
|
|
|
q["query"] = {"knn": knn_query}
|
|
|
|
|
|
|
|
|
|
search_kwargs = {}
|
|
|
|
|
if hybrid_search:
|
|
|
|
|
search_kwargs["params"] = {"search_pipeline": self._hybrid_pipeline}
|
2025-04-24 16:03:31 +08:00
|
|
|
|
|
|
|
|
for i in range(ATTEMPT_TIME):
|
|
|
|
|
try:
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
res = self.os.search(index=index_names,
|
2025-04-24 16:03:31 +08:00
|
|
|
body=q,
|
|
|
|
|
timeout=600,
|
|
|
|
|
# search_type="dfs_query_then_fetch",
|
|
|
|
|
track_total_hits=True,
|
fix(opensearch): keep the BM25 leg in hybrid search (#15760)
### What problem does this PR solve?
Fixes the OpenSearch side of #10747: hybrid search drops the keyword
(BM25) leg and
ends up doing plain vector search.
When a search has both a text and a vector leg, `OSConnection.search()`
throws the text
query away:
del q["query"]
q["query"] = {"knn": knn_query}
The text clause only stays on as a filter inside the knn query, so it
narrows the
candidate set but doesn't count towards scoring. So hybrid search on
OpenSearch behaves
like plain vector search, unlike the Elasticsearch backend.
What I changed:
- when both legs are present, send a real hybrid query
`{"hybrid": {"queries": [bm25, {"knn": ...}]}}` and let a
normalization-processor
search pipeline score and combine the two legs
- only the actual filters (kb_id, available_int, ...) go in the knn
filter, not the
text must clause
- create the pipeline on startup if it's missing, so there's no separate
provisioning
step. name and weights can be set under `os:` in service_conf.yaml, or
via
`OS_HYBRID_PIPELINE`; defaults are `ragflow_hybrid_pipeline` and `[0.5,
0.5]`
- normalization-processor needs OpenSearch 2.10+. on older clusters, or
when the
pipeline can't be created, log a warning and fall back to vector-only
instead of
pointing at a pipeline that doesn't exist
This is only the hybrid-search fix; `create_doc_meta_idx` is already on
main.
Testing (there's no OpenSearch path in CI): added a unit test
(`test/unit_test/rag/utils/test_opensearch_hybrid_search.py`, no
services needed) that
checks the query built in each case — hybrid + pipeline param for
text+vector, plain knn
for vector-only, plain bool for text-only, the knn filter never carrying
the text
query_string, and the vector-only fallback when the pipeline isn't
available. Also ran
it against a real OpenSearch 2.19.1 container with a doc that matches
the keyword but
sits outside the knn top-k: pure knn returns `['D1','D2','D5']` (keyword
doc missing),
the hybrid query returns `['A','D1','D2','D5']` (keyword doc present).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
Signed-off-by: Danut Matei <matei.danut.dm@gmail.com>
2026-06-08 11:17:47 +03:00
|
|
|
_source=True,
|
|
|
|
|
**search_kwargs)
|
2025-04-24 16:03:31 +08:00
|
|
|
if str(res.get("timed_out", "")).lower() == "true":
|
|
|
|
|
raise Exception("OpenSearch Timeout.")
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
logger.debug(f"OSConnection.search {str(index_names)} res: " + str(res))
|
2025-04-24 16:03:31 +08:00
|
|
|
return res
|
|
|
|
|
except Exception as e:
|
fix(opensearch): repair document-metadata path broken by #14577 (#15393)
### What problem does this PR solve?
Document metadata is completely broken on the OpenSearch backend
(`DOC_ENGINE=opensearch`). Both failures were introduced by #14577,
which added
a doc-metadata dispatch surface but only validated it against
Elasticsearch.
**1. Index creation rejected (`mapper_parsing_exception`).**
`OSConnection.create_doc_meta_idx` feeds `conf/doc_meta_es_mapping.json`
verbatim to OpenSearch. That file declares a top-level `"dynamic":
"runtime"`.
Runtime fields are Elasticsearch-only; OpenSearch cannot parse the
value:
mapper_parsing_exception: Could not convert [dynamic.dynamic] to boolean
(400)
**2. `search()` signature mismatch (`TypeError`).**
`DocMetadataService` (added by #14577) calls `docStoreConn.search(...)`
with
snake_case kwargs (`select_fields=`, `index_names=`,
`knowledgebase_ids=`, …),
matching `ESConnection.search`. But `OSConnection.search` still uses
camelCase
parameters (`selectFields`, `indexNames`, `knowledgebaseIds`, …):
TypeError: OSConnection.search() got an unexpected keyword argument
'select_fields'
The UI then shows "0 fields" for every document on OpenSearch.
### Fix
1. In `OSConnection.create_doc_meta_idx`, normalize a top-level
`"dynamic": "runtime"` to `True` **for the OpenSearch request only**.
The
shared mapping file is left untouched, so the Elasticsearch backend
keeps its
runtime-field behavior. Dynamic field discovery is preserved on
OpenSearch.
2. Rename the `OSConnection.search()` parameters (and their in-method
local
uses) from camelCase to snake_case so they match `ESConnection.search()`
and
the `DocMetadataService` call sites. The change is confined to
`search()`;
`get/insert/update/delete` keep their existing positional signatures
(they
are called positionally from `rag/nlp/search.py`).
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch, Infinity and OceanBase are untouched.
### How to reproduce
1. `DOC_ENGINE=opensearch`, restart the stack.
2. Upload/parse a document, then open the dataset's document list / set
metadata.
- Before: index creation 400s (`Could not convert [dynamic.dynamic]`),
and/or
`TypeError ... 'select_fields'`; document metadata shows 0 fields.
### Risk & backward compatibility
- ES default deployment: no change. `doc_meta_es_mapping.json` is not
modified,
so ES still receives `"dynamic": "runtime"`.
- `search()` rename is internal; the only kwarg caller
(`DocMetadataService`)
already uses the snake_case names this PR aligns to.
### Test plan
- [ ] `DOC_ENGINE=opensearch`: per-tenant `ragflow_doc_meta_*` index is
created
(no `mapper_parsing_exception`); document metadata reads/writes work.
- [ ] `DOC_ENGINE=elasticsearch` regression: doc-meta index still
created with
runtime mapping; metadata unchanged.
2026-05-29 22:49:36 +09:00
|
|
|
logger.exception(f"OSConnection.search {str(index_names)} query: " + str(q))
|
2025-04-24 16:03:31 +08:00
|
|
|
if str(e).find("Timeout") > 0:
|
|
|
|
|
continue
|
|
|
|
|
raise e
|
2025-07-01 10:49:43 +08:00
|
|
|
logger.error(f"OSConnection.search timeout for {ATTEMPT_TIME} times!")
|
2025-04-24 16:03:31 +08:00
|
|
|
raise Exception("OSConnection.search timeout.")
|
|
|
|
|
|
|
|
|
|
def get(self, chunkId: str, indexName: str, knowledgebaseIds: list[str]) -> dict | None:
|
|
|
|
|
for i in range(ATTEMPT_TIME):
|
|
|
|
|
try:
|
|
|
|
|
res = self.os.get(index=(indexName),
|
2025-05-26 16:57:58 +08:00
|
|
|
id=chunkId, _source=True, )
|
2025-04-24 16:03:31 +08:00
|
|
|
if str(res.get("timed_out", "")).lower() == "true":
|
|
|
|
|
raise Exception("Es Timeout.")
|
|
|
|
|
chunk = res["_source"]
|
|
|
|
|
chunk["id"] = chunkId
|
|
|
|
|
return chunk
|
|
|
|
|
except NotFoundError:
|
|
|
|
|
return None
|
|
|
|
|
except Exception as e:
|
|
|
|
|
logger.exception(f"OSConnection.get({chunkId}) got exception")
|
|
|
|
|
if str(e).find("Timeout") > 0:
|
|
|
|
|
continue
|
|
|
|
|
raise e
|
2025-07-01 10:49:43 +08:00
|
|
|
logger.error(f"OSConnection.get timeout for {ATTEMPT_TIME} times!")
|
2025-04-24 16:03:31 +08:00
|
|
|
raise Exception("OSConnection.get timeout.")
|
|
|
|
|
|
|
|
|
|
def insert(self, documents: list[dict], indexName: str, knowledgebaseId: str = None) -> list[str]:
|
|
|
|
|
# Refers to https://opensearch.org/docs/latest/api-reference/document-apis/bulk/
|
|
|
|
|
operations = []
|
|
|
|
|
for d in documents:
|
|
|
|
|
assert "_id" not in d
|
|
|
|
|
assert "id" in d
|
|
|
|
|
d_copy = copy.deepcopy(d)
|
fix(opensearch): keep "id" in _source on insert so document metadata isn't empty (#15473)
### What problem does this PR solve?
Follow-up to #15393. After #15393 fixed the OpenSearch `search()`
signature and
the doc-meta mapping, document metadata still renders as **"0 fields"**
for every
document on the OpenSearch backend (`DOC_ENGINE=opensearch`).
**Root cause.** `OSConnection.insert()` pops `id` out of the document
before
indexing:
meta_id = d_copy.pop("id", "") # id used as _id, then DROPPED from
_source
so the stored `_source` never contains an `id` field. But the doc-meta
read path
filters and sorts on that field:
- `DocMetadataService.get_metadata_for_documents()` builds
`condition = {"kb_id": kb_id, "id": doc_ids}` -> `OSConnection.search()`
emits
`Q("terms", id=doc_ids)` (a term query on the `id` field), and
- `_search_metadata()` sorts with `order_by.asc("id")`.
With `id` absent from `_source`, the terms filter matches nothing, so
`get_metadata_for_documents()` returns an empty map and the UI shows "0
fields"
-- even though the metadata was written correctly (it is visible via a
kb_id-only query).
`ESConnection.insert()` already keeps `id` (`d_copy.get("id", "")`) with
the
comment *"also keep 'id' as a regular field for sorting"*. This is a
plain
OpenSearch-only divergence (`pop()` vs `get()`).
### Fix
Mirror Elasticsearch: use `get("id")` instead of `pop("id")` so `id`
survives in
`_source`. The doc-meta mapping already declares `id` as `keyword`, so
the field
is searchable/sortable once populated.
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch already keeps `id`; Infinity / OceanBase
unaffected.
### How to reproduce
1. `DOC_ENGINE=opensearch`, create a KB, upload/parse a document, set
metadata.
2. Open the document list -> every document shows "0 fields" (the
metadata exists
in the `ragflow_doc_meta_*` index but its `_source` has no `id` field).
### Risk & backward compatibility
`insert()` is shared with the main chunk index; keeping `id` in
`_source` brings
OpenSearch in line with Elasticsearch (which already does this), so it
is parity,
not new behavior. No default / ES / Infinity / OceanBase behavior
change.
Note: affects new inserts only. Existing `ragflow_doc_meta_*` indices
created
before this change have no `id` in `_source`; re-sync metadata, or
backfill once
with `_update_by_query` (`ctx._source.id = ctx._id`).
### Test plan
- [ ] OpenSearch: after the fix the document list shows correct metadata
field
counts (not "0 fields"); metadata filter/sort by id works.
- [ ] Elasticsearch regression: unchanged.
2026-06-08 18:31:04 +09:00
|
|
|
# Use id as _id for uniqueness, but keep "id" in the document so the
|
|
|
|
|
# doc-meta read path (DocMetadataService filters on / sorts by the
|
|
|
|
|
# "id" field) can find it, mirroring ESConnection.insert().
|
|
|
|
|
meta_id = d_copy.get("id", "")
|
2025-04-24 16:03:31 +08:00
|
|
|
operations.append(
|
|
|
|
|
{"index": {"_index": indexName, "_id": meta_id}})
|
|
|
|
|
operations.append(d_copy)
|
|
|
|
|
|
|
|
|
|
res = []
|
|
|
|
|
for _ in range(ATTEMPT_TIME):
|
|
|
|
|
try:
|
|
|
|
|
res = []
|
|
|
|
|
r = self.os.bulk(index=(indexName), body=operations,
|
2026-05-11 10:04:08 +02:00
|
|
|
refresh="wait_for", timeout=60)
|
2025-04-24 16:03:31 +08:00
|
|
|
if re.search(r"False", str(r["errors"]), re.IGNORECASE):
|
|
|
|
|
return res
|
|
|
|
|
|
|
|
|
|
for item in r["items"]:
|
|
|
|
|
for action in ["create", "delete", "index", "update"]:
|
|
|
|
|
if action in item and "error" in item[action]:
|
|
|
|
|
res.append(str(item[action]["_id"]) + ":" + str(item[action]["error"]))
|
|
|
|
|
return res
|
|
|
|
|
except Exception as e:
|
|
|
|
|
res.append(str(e))
|
|
|
|
|
logger.warning("OSConnection.insert got exception: " + str(e))
|
|
|
|
|
res = []
|
|
|
|
|
if re.search(r"(Timeout|time out)", str(e), re.IGNORECASE):
|
|
|
|
|
res.append(str(e))
|
|
|
|
|
time.sleep(3)
|
|
|
|
|
continue
|
|
|
|
|
return res
|
|
|
|
|
|
|
|
|
|
def update(self, condition: dict, newValue: dict, indexName: str, knowledgebaseId: str) -> bool:
|
|
|
|
|
doc = copy.deepcopy(newValue)
|
|
|
|
|
doc.pop("id", None)
|
|
|
|
|
if "id" in condition and isinstance(condition["id"], str):
|
|
|
|
|
# update specific single document
|
|
|
|
|
chunkId = condition["id"]
|
|
|
|
|
for i in range(ATTEMPT_TIME):
|
2026-04-07 18:52:18 -07:00
|
|
|
doc_part = copy.deepcopy(doc)
|
|
|
|
|
remove_value = doc_part.pop("remove", None)
|
|
|
|
|
remove_field = remove_value if isinstance(remove_value, str) else None
|
|
|
|
|
remove_dict = remove_value if isinstance(remove_value, dict) else None
|
2025-04-24 16:03:31 +08:00
|
|
|
try:
|
2026-04-07 18:52:18 -07:00
|
|
|
if remove_field is not None:
|
|
|
|
|
self.os.update(
|
|
|
|
|
index=indexName,
|
|
|
|
|
id=chunkId,
|
|
|
|
|
body={"script": {"source": f"ctx._source.remove('{remove_field}');"}},
|
|
|
|
|
)
|
|
|
|
|
if remove_dict is not None:
|
|
|
|
|
scripts = []
|
|
|
|
|
params = {}
|
|
|
|
|
for kk, vv in remove_dict.items():
|
|
|
|
|
scripts.append(
|
|
|
|
|
f"if (ctx._source.containsKey('{kk}') && ctx._source.{kk} != null) "
|
|
|
|
|
f"{{ int i = ctx._source.{kk}.indexOf(params.p_{kk}); "
|
|
|
|
|
f"if (i >= 0) {{ ctx._source.{kk}.remove(i); }} }}"
|
|
|
|
|
)
|
|
|
|
|
params[f"p_{kk}"] = vv
|
|
|
|
|
if scripts:
|
|
|
|
|
self.os.update(
|
|
|
|
|
index=indexName,
|
|
|
|
|
id=chunkId,
|
|
|
|
|
body={"script": {"source": "".join(scripts), "params": params}},
|
|
|
|
|
)
|
|
|
|
|
if doc_part:
|
|
|
|
|
self.os.update(index=indexName, id=chunkId, body={"doc": doc_part})
|
|
|
|
|
if remove_field is not None or remove_dict is not None or doc_part:
|
|
|
|
|
return True
|
2025-04-24 16:03:31 +08:00
|
|
|
except Exception as e:
|
|
|
|
|
logger.exception(
|
|
|
|
|
f"OSConnection.update(index={indexName}, id={id}, doc={json.dumps(condition, ensure_ascii=False)}) got exception")
|
|
|
|
|
if re.search(r"(timeout|connection)", str(e).lower()):
|
|
|
|
|
continue
|
|
|
|
|
break
|
|
|
|
|
return False
|
|
|
|
|
|
|
|
|
|
# update unspecific maybe-multiple documents
|
|
|
|
|
bqry = Q("bool")
|
|
|
|
|
for k, v in condition.items():
|
|
|
|
|
if not isinstance(k, str) or not v:
|
|
|
|
|
continue
|
|
|
|
|
if k == "exists":
|
|
|
|
|
bqry.filter.append(Q("exists", field=v))
|
|
|
|
|
continue
|
|
|
|
|
if isinstance(v, list):
|
|
|
|
|
bqry.filter.append(Q("terms", **{k: v}))
|
|
|
|
|
elif isinstance(v, str) or isinstance(v, int):
|
|
|
|
|
bqry.filter.append(Q("term", **{k: v}))
|
|
|
|
|
else:
|
|
|
|
|
raise Exception(
|
|
|
|
|
f"Condition `{str(k)}={str(v)}` value type is {str(type(v))}, expected to be int, str or list.")
|
|
|
|
|
scripts = []
|
|
|
|
|
params = {}
|
|
|
|
|
for k, v in newValue.items():
|
|
|
|
|
if k == "remove":
|
|
|
|
|
if isinstance(v, str):
|
|
|
|
|
scripts.append(f"ctx._source.remove('{v}');")
|
|
|
|
|
if isinstance(v, dict):
|
|
|
|
|
for kk, vv in v.items():
|
|
|
|
|
scripts.append(f"int i=ctx._source.{kk}.indexOf(params.p_{kk});ctx._source.{kk}.remove(i);")
|
|
|
|
|
params[f"p_{kk}"] = vv
|
|
|
|
|
continue
|
|
|
|
|
if k == "add":
|
|
|
|
|
if isinstance(v, dict):
|
|
|
|
|
for kk, vv in v.items():
|
|
|
|
|
scripts.append(f"ctx._source.{kk}.add(params.pp_{kk});")
|
|
|
|
|
params[f"pp_{kk}"] = vv.strip()
|
|
|
|
|
continue
|
|
|
|
|
if (not isinstance(k, str) or not v) and k != "available_int":
|
|
|
|
|
continue
|
|
|
|
|
if isinstance(v, str):
|
|
|
|
|
v = re.sub(r"(['\n\r]|\\.)", " ", v)
|
|
|
|
|
params[f"pp_{k}"] = v
|
|
|
|
|
scripts.append(f"ctx._source.{k}=params.pp_{k};")
|
|
|
|
|
elif isinstance(v, int) or isinstance(v, float):
|
|
|
|
|
scripts.append(f"ctx._source.{k}={v};")
|
|
|
|
|
elif isinstance(v, list):
|
|
|
|
|
scripts.append(f"ctx._source.{k}=params.pp_{k};")
|
|
|
|
|
params[f"pp_{k}"] = json.dumps(v, ensure_ascii=False)
|
|
|
|
|
else:
|
|
|
|
|
raise Exception(
|
|
|
|
|
f"newValue `{str(k)}={str(v)}` value type is {str(type(v))}, expected to be int, str.")
|
|
|
|
|
ubq = UpdateByQuery(
|
|
|
|
|
index=indexName).using(
|
|
|
|
|
self.os).query(bqry)
|
|
|
|
|
ubq = ubq.script(source="".join(scripts), params=params)
|
|
|
|
|
ubq = ubq.params(refresh=True)
|
|
|
|
|
ubq = ubq.params(slices=5)
|
|
|
|
|
ubq = ubq.params(conflicts="proceed")
|
|
|
|
|
|
|
|
|
|
for _ in range(ATTEMPT_TIME):
|
|
|
|
|
try:
|
|
|
|
|
_ = ubq.execute()
|
|
|
|
|
return True
|
|
|
|
|
except Exception as e:
|
|
|
|
|
logger.error("OSConnection.update got exception: " + str(e) + "\n".join(scripts))
|
|
|
|
|
if re.search(r"(timeout|connection|conflict)", str(e).lower()):
|
|
|
|
|
continue
|
|
|
|
|
break
|
|
|
|
|
return False
|
|
|
|
|
|
2026-04-07 18:52:18 -07:00
|
|
|
def adjust_chunk_pagerank_fea(
|
|
|
|
|
self,
|
|
|
|
|
chunk_id: str,
|
|
|
|
|
indexName: str,
|
|
|
|
|
knowledgebaseId: str,
|
|
|
|
|
delta: float,
|
|
|
|
|
min_w: float = 0.0,
|
|
|
|
|
max_w: float = 100.0,
|
|
|
|
|
row_id: int | None = None,
|
|
|
|
|
) -> bool:
|
|
|
|
|
"""Atomically adjust pagerank_fea on one chunk (painless script)."""
|
|
|
|
|
_ = row_id
|
|
|
|
|
try:
|
|
|
|
|
self.os.update(
|
|
|
|
|
index=indexName,
|
|
|
|
|
id=chunk_id,
|
|
|
|
|
retry_on_conflict=3,
|
|
|
|
|
body={
|
|
|
|
|
"script": {
|
|
|
|
|
"source": _PAGERANK_FEA_ADJUST_SCRIPT.strip(),
|
|
|
|
|
"lang": "painless",
|
|
|
|
|
"params": {
|
|
|
|
|
"pf": PAGERANK_FLD,
|
|
|
|
|
"delta": float(delta),
|
|
|
|
|
"min_w": float(min_w),
|
|
|
|
|
"max_w": float(max_w),
|
|
|
|
|
},
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
)
|
|
|
|
|
logger.debug(
|
|
|
|
|
"OSConnection.adjust_chunk_pagerank_fea(index=%s, id=%s, delta=%s) succeeded",
|
|
|
|
|
indexName,
|
|
|
|
|
chunk_id,
|
|
|
|
|
delta,
|
|
|
|
|
)
|
|
|
|
|
return True
|
|
|
|
|
except Exception as e:
|
|
|
|
|
logger.exception(
|
|
|
|
|
"OSConnection.adjust_chunk_pagerank_fea(index=%s, id=%s): %s",
|
|
|
|
|
indexName,
|
|
|
|
|
chunk_id,
|
|
|
|
|
e,
|
|
|
|
|
)
|
|
|
|
|
return False
|
|
|
|
|
|
2025-04-24 16:03:31 +08:00
|
|
|
def delete(self, condition: dict, indexName: str, knowledgebaseId: str) -> int:
|
|
|
|
|
assert "_id" not in condition
|
2026-01-15 12:15:55 +05:30
|
|
|
condition["kb_id"] = knowledgebaseId
|
|
|
|
|
|
|
|
|
|
# Build a bool query that combines id filter with other conditions
|
|
|
|
|
bool_query = Q("bool")
|
|
|
|
|
|
|
|
|
|
# Handle chunk IDs if present
|
2025-04-24 16:03:31 +08:00
|
|
|
if "id" in condition:
|
|
|
|
|
chunk_ids = condition["id"]
|
|
|
|
|
if not isinstance(chunk_ids, list):
|
|
|
|
|
chunk_ids = [chunk_ids]
|
2026-01-15 12:15:55 +05:30
|
|
|
if chunk_ids:
|
|
|
|
|
# Filter by specific chunk IDs
|
|
|
|
|
bool_query.filter.append(Q("ids", values=chunk_ids))
|
|
|
|
|
# If chunk_ids is empty, we don't add an ids filter - rely on other conditions
|
|
|
|
|
|
|
|
|
|
# Add all other conditions as filters
|
|
|
|
|
for k, v in condition.items():
|
|
|
|
|
if k == "id":
|
|
|
|
|
continue # Already handled above
|
|
|
|
|
if k == "exists":
|
|
|
|
|
bool_query.filter.append(Q("exists", field=v))
|
|
|
|
|
elif k == "must_not":
|
|
|
|
|
if isinstance(v, dict):
|
|
|
|
|
for kk, vv in v.items():
|
|
|
|
|
if kk == "exists":
|
|
|
|
|
bool_query.must_not.append(Q("exists", field=vv))
|
|
|
|
|
elif isinstance(v, list):
|
|
|
|
|
bool_query.must.append(Q("terms", **{k: v}))
|
|
|
|
|
elif isinstance(v, str) or isinstance(v, int):
|
|
|
|
|
bool_query.must.append(Q("term", **{k: v}))
|
|
|
|
|
elif v is not None:
|
|
|
|
|
raise Exception("Condition value must be int, str or list.")
|
|
|
|
|
|
|
|
|
|
# If no filters were added, use match_all (for tenant-wide operations)
|
|
|
|
|
if not bool_query.filter and not bool_query.must and not bool_query.must_not:
|
|
|
|
|
qry = Q("match_all")
|
2025-04-24 16:03:31 +08:00
|
|
|
else:
|
2026-01-15 12:15:55 +05:30
|
|
|
qry = bool_query
|
2025-04-24 16:03:31 +08:00
|
|
|
logger.debug("OSConnection.delete query: " + json.dumps(qry.to_dict()))
|
|
|
|
|
for _ in range(ATTEMPT_TIME):
|
|
|
|
|
try:
|
2025-12-29 12:01:18 +08:00
|
|
|
# print(Search().query(qry).to_dict(), flush=True)
|
2025-04-24 16:03:31 +08:00
|
|
|
res = self.os.delete_by_query(
|
|
|
|
|
index=indexName,
|
|
|
|
|
body=Search().query(qry).to_dict(),
|
|
|
|
|
refresh=True)
|
|
|
|
|
return res["deleted"]
|
|
|
|
|
except Exception as e:
|
|
|
|
|
logger.warning("OSConnection.delete got exception: " + str(e))
|
|
|
|
|
if re.search(r"(timeout|connection)", str(e).lower()):
|
|
|
|
|
time.sleep(3)
|
|
|
|
|
continue
|
|
|
|
|
if re.search(r"(not_found)", str(e), re.IGNORECASE):
|
|
|
|
|
return 0
|
|
|
|
|
return 0
|
|
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
Helper functions for search result
|
|
|
|
|
"""
|
|
|
|
|
|
2025-11-12 19:00:15 +08:00
|
|
|
def get_total(self, res):
|
2025-04-24 16:03:31 +08:00
|
|
|
if isinstance(res["hits"]["total"], type({})):
|
|
|
|
|
return res["hits"]["total"]["value"]
|
|
|
|
|
return res["hits"]["total"]
|
|
|
|
|
|
2025-12-25 21:18:13 +08:00
|
|
|
def get_doc_ids(self, res):
|
2025-04-24 16:03:31 +08:00
|
|
|
return [d["_id"] for d in res["hits"]["hits"]]
|
|
|
|
|
|
fix(opensearch): implement get_scores for KNN second-pass scoring (#15390)
### What problem does this PR solve?
On the OpenSearch backend (`DOC_ENGINE=opensearch`), every retrieval
that
performs the KNN second-pass scoring crashes with:
AttributeError: 'OSConnection' object has no attribute 'get_scores'
**Root cause.** #14970 ("Refactor: Drop the vector fetch for ES") added
a
`get_scores()` helper to `ESConnectionBase`
(`common/doc_store/es_conn_base.py`)
and introduced `Dealer._knn_scores()` in `rag/nlp/search.py`, which
calls
`self.dataStore.get_scores(res)`. `search.py` routes Infinity and
OceanBase to
their own similarity paths via `DOC_ENGINE_INFINITY` /
`DOC_ENGINE_OCEANBASE`,
but OpenSearch sets neither flag, so it falls into the Elasticsearch
branch and
calls `get_scores`. `OSConnection` (which subclasses
`DocStoreConnection`
directly, not `ESConnectionBase`) never received that method, so any
vector-search hit triggers the crash. It reproduces with any normal
embedding
(e.g. 1024-dim mistral-embed) as soon as a KNN query returns hits.
### Fix
Add `OSConnection.get_scores()`, mirroring
`ESConnectionBase.get_scores()`.
OpenSearch hit headers expose `_score` exactly like Elasticsearch (the
existing
`OSConnection.__getSource` already reads `d["_score"]`), so the
implementation
is identical.
Scope note: Infinity and OceanBase deliberately do not use `get_scores`
(#14970 routes them elsewhere), so this fix is intentionally limited to
the
OpenSearch backend, which is the only one reaching the ES KNN-score
path.
### Type of change
- [x] Bug Fix (non-breaking change which fixes an issue)
### Affected backends
OpenSearch only. Elasticsearch already implements `get_scores`; Infinity
/
OceanBase are routed away from it.
### How to reproduce
1. `DOC_ENGINE=opensearch` (docker `.env`), restart the stack.
2. Create a knowledge base with any dense embedding model and parse a
document.
3. Run a retrieval / chat over that KB -> 500 with the AttributeError
above.
### Risk & backward compatibility
None for the default Elasticsearch deployment -- the change only adds a
method
to `OSConnection`. No default values or ES/Infinity/OceanBase behavior
change.
### Test plan
- [ ] With `DOC_ENGINE=opensearch`, retrieval over a KB returns scored
chunks
(no AttributeError).
- [ ] `DOC_ENGINE=elasticsearch` regression: retrieval unchanged.
- [ ] Empty-result path: `_knn_scores` early-returns `{}` (guarded),
get_scores
handles an empty `hits` list gracefully.
2026-05-29 22:49:15 +09:00
|
|
|
def get_scores(self, res) -> dict[str, float]:
|
|
|
|
|
"""
|
|
|
|
|
Map hit `_id` to its raw `_score`. Used by rag/nlp/search.py:_knn_scores()
|
|
|
|
|
to recover the cosine similarity returned by a KNN-only second-pass search
|
|
|
|
|
without pulling the chunk vectors out of the index. OpenSearch hit headers
|
|
|
|
|
carry `_score` exactly like Elasticsearch, so this mirrors
|
|
|
|
|
ESConnectionBase.get_scores.
|
|
|
|
|
"""
|
|
|
|
|
out = {}
|
|
|
|
|
for d in res.get("hits", {}).get("hits", []):
|
|
|
|
|
doc_id = d.get("_id")
|
|
|
|
|
if doc_id is None:
|
|
|
|
|
continue
|
|
|
|
|
score = d.get("_score")
|
|
|
|
|
out[doc_id] = float(score) if score is not None else 0.0
|
|
|
|
|
return out
|
|
|
|
|
|
2025-04-24 16:03:31 +08:00
|
|
|
def __getSource(self, res):
|
|
|
|
|
rr = []
|
|
|
|
|
for d in res["hits"]["hits"]:
|
|
|
|
|
d["_source"]["id"] = d["_id"]
|
|
|
|
|
d["_source"]["_score"] = d["_score"]
|
|
|
|
|
rr.append(d["_source"])
|
|
|
|
|
return rr
|
|
|
|
|
|
2025-11-12 19:00:15 +08:00
|
|
|
def get_fields(self, res, fields: list[str]) -> dict[str, dict]:
|
2025-04-24 16:03:31 +08:00
|
|
|
res_fields = {}
|
|
|
|
|
if not fields:
|
|
|
|
|
return {}
|
|
|
|
|
for d in self.__getSource(res):
|
|
|
|
|
m = {n: d.get(n) for n in fields if d.get(n) is not None}
|
|
|
|
|
for n, v in m.items():
|
|
|
|
|
if isinstance(v, list):
|
|
|
|
|
m[n] = v
|
|
|
|
|
continue
|
|
|
|
|
if not isinstance(v, str):
|
|
|
|
|
m[n] = str(m[n])
|
|
|
|
|
# if n.find("tks") > 0:
|
2025-10-28 09:46:32 +08:00
|
|
|
# m[n] = remove_redundant_spaces(m[n])
|
2025-04-24 16:03:31 +08:00
|
|
|
|
|
|
|
|
if m:
|
|
|
|
|
res_fields[d["id"]] = m
|
|
|
|
|
return res_fields
|
|
|
|
|
|
2025-11-12 19:00:15 +08:00
|
|
|
def get_highlight(self, res, keywords: list[str], fieldnm: str):
|
2025-04-24 16:03:31 +08:00
|
|
|
ans = {}
|
|
|
|
|
for d in res["hits"]["hits"]:
|
|
|
|
|
hlts = d.get("highlight")
|
|
|
|
|
if not hlts:
|
|
|
|
|
continue
|
|
|
|
|
txt = "...".join([a for a in list(hlts.items())[0][1]])
|
|
|
|
|
if not is_english(txt.split()):
|
|
|
|
|
ans[d["_id"]] = txt
|
|
|
|
|
continue
|
|
|
|
|
|
|
|
|
|
txt = d["_source"][fieldnm]
|
|
|
|
|
txt = re.sub(r"[\r\n]", " ", txt, flags=re.IGNORECASE | re.MULTILINE)
|
|
|
|
|
txts = []
|
|
|
|
|
for t in re.split(r"[.?!;\n]", txt):
|
|
|
|
|
for w in keywords:
|
|
|
|
|
t = re.sub(r"(^|[ .?/'\"\(\)!,:;-])(%s)([ .?/'\"\(\)!,:;-])" % re.escape(w), r"\1<em>\2</em>\3", t,
|
|
|
|
|
flags=re.IGNORECASE | re.MULTILINE)
|
|
|
|
|
if not re.search(r"<em>[^<>]+</em>", t, flags=re.IGNORECASE | re.MULTILINE):
|
|
|
|
|
continue
|
|
|
|
|
txts.append(t)
|
|
|
|
|
ans[d["_id"]] = "...".join(txts) if txts else "...".join([a for a in list(hlts.items())[0][1]])
|
|
|
|
|
|
|
|
|
|
return ans
|
|
|
|
|
|
2025-11-12 19:00:15 +08:00
|
|
|
def get_aggregation(self, res, fieldnm: str):
|
2025-04-24 16:03:31 +08:00
|
|
|
agg_field = "aggs_" + fieldnm
|
|
|
|
|
if "aggregations" not in res or agg_field not in res["aggregations"]:
|
|
|
|
|
return list()
|
|
|
|
|
bkts = res["aggregations"][agg_field]["buckets"]
|
|
|
|
|
return [(b["key"], b["doc_count"]) for b in bkts]
|
|
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
SQL
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
def sql(self, sql: str, fetch_size: int, format: str):
|
|
|
|
|
logger.debug(f"OSConnection.sql get sql: {sql}")
|
|
|
|
|
sql = re.sub(r"[ `]+", " ", sql)
|
|
|
|
|
sql = sql.replace("%", "")
|
|
|
|
|
replaces = []
|
|
|
|
|
for r in re.finditer(r" ([a-z_]+_l?tks)( like | ?= ?)'([^']+)'", sql):
|
|
|
|
|
fld, v = r.group(1), r.group(3)
|
|
|
|
|
match = " MATCH({}, '{}', 'operator=OR;minimum_should_match=30%') ".format(
|
|
|
|
|
fld, rag_tokenizer.fine_grained_tokenize(rag_tokenizer.tokenize(v)))
|
|
|
|
|
replaces.append(
|
|
|
|
|
("{}{}'{}'".format(
|
|
|
|
|
r.group(1),
|
|
|
|
|
r.group(2),
|
|
|
|
|
r.group(3)),
|
|
|
|
|
match))
|
|
|
|
|
|
|
|
|
|
for p, r in replaces:
|
|
|
|
|
sql = sql.replace(p, r, 1)
|
|
|
|
|
logger.debug(f"OSConnection.sql to os: {sql}")
|
|
|
|
|
|
|
|
|
|
for i in range(ATTEMPT_TIME):
|
|
|
|
|
try:
|
|
|
|
|
res = self.os.sql.query(body={"query": sql, "fetch_size": fetch_size}, format=format,
|
|
|
|
|
request_timeout="2s")
|
|
|
|
|
return res
|
|
|
|
|
except ConnectionTimeout:
|
|
|
|
|
logger.exception("OSConnection.sql timeout")
|
|
|
|
|
continue
|
|
|
|
|
except Exception:
|
|
|
|
|
logger.exception("OSConnection.sql got exception")
|
|
|
|
|
return None
|
2025-07-01 10:49:43 +08:00
|
|
|
logger.error(f"OSConnection.sql timeout for {ATTEMPT_TIME} times!")
|
2025-04-24 16:03:31 +08:00
|
|
|
return None
|