esgvoc 0.3.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

esgvoc/api/universe.py

@@ -1,183 +1,55 @@
-from typing import Sequence, Iterable
+from typing import Iterable, Sequence
 
-from esgvoc.api._utils import (get_universe_session,
-                               instantiate_pydantic_terms)
-from esgvoc.api.search import SearchSettings, _create_str_comparison_expression
-from esgvoc.api.data_descriptors.data_descriptor import DataDescriptor
-from esgvoc.core.db.models.universe import UDataDescriptor, UTerm
-from sqlmodel import Session, select
-
-
-def _find_terms_in_data_descriptor(data_descriptor_id: str,
-                                   term_id: str,
-                                   session: Session,
-                                   settings: SearchSettings|None) -> Sequence[UTerm]:
-    """Settings only apply on the term_id comparison."""
-    where_expression = _create_str_comparison_expression(field=UTerm.id,
-                                                         value=term_id,
-                                                         settings=settings)
-    statement = select(UTerm).join(UDataDescriptor).where(UDataDescriptor.id==data_descriptor_id,
-                                                         where_expression)
-    results = session.exec(statement)
-    result = results.all()
-    return result
-
-
-def find_terms_in_data_descriptor(data_descriptor_id: str,
-                                  term_id: str,
-                                  settings: SearchSettings|None = None) \
-                                     -> list[DataDescriptor]:
-    """
-    Finds one or more terms in the given data descriptor based on the specified search settings.
-    This function performs an exact match on the `data_descriptor_id` and 
-    does **not** search for similar or related descriptors.
-    The given `term_id` is searched according to the search type specified in 
-    the parameter `settings`,
-    which allows a flexible matching (e.g., `LIKE` may return multiple results).
-    If the parameter `settings` is `None`, this function performs an exact match on the `term_id`.
-    If any of the provided ids (`data_descriptor_id` or `term_id`) is not found, the function
-    returns an empty list.
+from sqlalchemy import text
+from sqlmodel import Session, col, select
 
-    Behavior based on search type:
-        - `EXACT` and absence of `settings`: returns zero or one term instance in the list.
-        - `REGEX`, `LIKE`, `STARTS_WITH` and `ENDS_WITH`: returns zero, one or more term \
-          instances in the list.
-
-    :param data_descriptor_id: A data descriptor id
-    :type data_descriptor_id: str
-    :param term_id: A term id to be found
-    :type term_id: str
-    :param settings: The search settings
-    :type settings: SearchSettings|None
-    :returns: A list of term instances. Returns an empty list if no matches are found.
-    :rtype: list[DataDescriptor]
-    """
-    result: list[DataDescriptor] = list()
-    with get_universe_session() as session:
-        terms = _find_terms_in_data_descriptor(data_descriptor_id, term_id, session, settings)
-        instantiate_pydantic_terms(terms, result, settings.selected_term_fields if settings else None)
-    return result
-
-
-def _find_terms_in_universe(term_id: str,
-                            session: Session,
-                            settings: SearchSettings|None) -> Sequence[UTerm]:
-    where_expression = _create_str_comparison_expression(field=UTerm.id,
-                                                         value=term_id,
-                                                         settings=settings)
-    statement = select(UTerm).where(where_expression)
-    results = session.exec(statement).all()
-    return results
-
-
-def find_terms_in_universe(term_id: str,
-                           settings: SearchSettings|None = None) \
-                              -> list[DataDescriptor]:
-    """
-    Finds one or more terms of the universe.
-    The given `term_id` is searched according to the search type specified in 
-    the parameter `settings`,
-    which allows a flexible matching (e.g., `LIKE` may return multiple results).
-    If the parameter `settings` is `None`, this function performs an exact match on the `term_id`.
-    Terms are unique within a data descriptor but may have some synonyms in the universe.
-    If the provided `term_id` is not found, the function returns an empty list.
-
-    :param term_id: A term id to be found
-    :type term_id: str
-    :param settings: The search settings
-    :type settings: SearchSettings|None
-    :returns: A list of term instances. Returns an empty list if no matches are found.
-    :rtype: list[DataDescriptor]
-    """
-    result: list[DataDescriptor] = list()
-    with get_universe_session() as session:
-        terms = _find_terms_in_universe(term_id, session, settings)
-        instantiate_pydantic_terms(terms, result, settings.selected_term_fields if settings else None)
-    return result
+from esgvoc.api.data_descriptors.data_descriptor import DataDescriptor
+from esgvoc.api.search import (
+    Item,
+    execute_find_item_statements,
+    execute_match_statement,
+    generate_matching_condition,
+    get_universe_session,
+    handle_rank_limit_offset,
+    instantiate_pydantic_term,
+    instantiate_pydantic_terms,
+)
+from esgvoc.core.db.models.universe import UDataDescriptor, UDataDescriptorFTS5, UTerm, UTermFTS5
 
 
 def _get_all_terms_in_data_descriptor(data_descriptor: UDataDescriptor,
-                                      selected_term_fields: Iterable[str]|None) -> list[DataDescriptor]:
+                                      selected_term_fields: Iterable[str] | None) -> list[DataDescriptor]:
     result: list[DataDescriptor] = list()
     instantiate_pydantic_terms(data_descriptor.terms, result, selected_term_fields)
     return result
 
 
-def _find_data_descriptors_in_universe(data_descriptor_id: str,
-                                       session: Session,
-                                       settings: SearchSettings|None) -> Sequence[UDataDescriptor]:
-    where_expression = _create_str_comparison_expression(field=UDataDescriptor.id,
-                                                         value=data_descriptor_id,
-                                                         settings=settings)
-    statement = select(UDataDescriptor).where(where_expression)
-    results = session.exec(statement)
-    result = results.all()      
-    return result
-
-
 def get_all_terms_in_data_descriptor(data_descriptor_id: str,
-                                     selected_term_fields: Iterable[str]|None = None) \
+                                     selected_term_fields: Iterable[str] | None = None) \
                                                                             -> list[DataDescriptor]:
     """
     Gets all the terms of the given data descriptor.
-    This function performs an exact match on the `data_descriptor_id` and does **not** search 
+    This function performs an exact match on the `data_descriptor_id` and does not search
     for similar or related descriptors.
     If the provided `data_descriptor_id` is not found, the function returns an empty list.
 
     :param data_descriptor_id: A data descriptor id
     :type data_descriptor_id: str
     :param selected_term_fields: A list of term fields to select or `None`. If `None`, all the \
-    fields of the terms are returned.
-    :type selected_term_fields: Iterable[str]|None
+    fields of the terms are returned. If empty, selects the id and type fields.
+    :type selected_term_fields: Iterable[str] | None
     :returns: a list of term instances. Returns an empty list if no matches are found.
     :rtype: list[DataDescriptor]
     """
     with get_universe_session() as session:
-        data_descriptors = _find_data_descriptors_in_universe(data_descriptor_id,
-                                                              session,
-                                                              None)
-        if data_descriptors:
-            data_descriptor = data_descriptors[0]
+        data_descriptor = _get_data_descriptor_in_universe(data_descriptor_id, session)
+        if data_descriptor:
             result = _get_all_terms_in_data_descriptor(data_descriptor, selected_term_fields)
         else:
             result = list()
     return result
 
 
-def find_data_descriptors_in_universe(data_descriptor_id: str,
-                                      settings: SearchSettings|None = None) \
-                                        -> list[dict]:
-    """
-    Finds one or more data descriptor of the universe, based on the specified search settings.
-    The given `data_descriptor_id` is searched according to the search type specified in 
-    the parameter `settings`,
-    which allows a flexible matching (e.g., `LIKE` may return multiple results).
-    If the parameter `settings` is `None`, this function performs an exact match on 
-    the `data_descriptor_id`.
-    If the provided `data_descriptor_id` is not found, the function returns an empty list.
-    
-    Behavior based on search type:
-        - `EXACT` and absence of `settings`: returns zero or one data descriptor context in the list.
-        - `REGEX`, `LIKE`, `STARTS_WITH` and `ENDS_WITH`: returns zero, one or more \
-          data descriptor contexts in the list.
-
-    :param data_descriptor_id: A data descriptor id to be found
-    :type data_descriptor_id: str
-    :param settings: The search settings
-    :type settings: SearchSettings|None
-    :returns: A list of data descriptor contexts. Returns an empty list if no matches are found.
-    :rtype: list[dict]
-    """
-    result = list()
-    with get_universe_session() as session:
-        data_descriptors = _find_data_descriptors_in_universe(data_descriptor_id,
-                                                              session,
-                                                              settings)
-        for data_descriptor in data_descriptors:
-            result.append(data_descriptor.context)
-    return result
-
-
 def _get_all_data_descriptors_in_universe(session: Session) -> Sequence[UDataDescriptor]:
     statement = select(UDataDescriptor)
     data_descriptors = session.exec(statement)
@@ -200,14 +72,14 @@ def get_all_data_descriptors_in_universe() -> list[str]:
     return result
 
 
-def get_all_terms_in_universe(selected_term_fields: Iterable[str]|None = None) -> list[DataDescriptor]:
+def get_all_terms_in_universe(selected_term_fields: Iterable[str] | None = None) -> list[DataDescriptor]:
     """
     Gets all the terms of the universe.
     Terms are unique within a data descriptor but may have some synonyms in the universe.
 
     :param selected_term_fields: A list of term fields to select or `None`. If `None`, all the \
-    fields of the terms are returned.
-    :type selected_term_fields: Iterable[str]|None
+    fields of the terms are returned. If empty, selects the id and type fields.
+    :type selected_term_fields: Iterable[str] | None
     :returns: A list of term instances.
     :rtype: list[DataDescriptor]
     """
@@ -221,7 +93,331 @@ def get_all_terms_in_universe(selected_term_fields: Iterable[str]|None = None) -
     return result
 
 
-if __name__ == "__main__":
-    settings = SearchSettings()
-    settings.selected_term_fields = ('id',)
-    print(find_terms_in_data_descriptor('institution', 'ipsl', settings))
+def _get_term_in_data_descriptor(data_descriptor_id: str, term_id: str, session: Session) \
+                                                                           -> UTerm | None:
+    statement = select(UTerm).join(UDataDescriptor).where(UDataDescriptor.id == data_descriptor_id,
+                                                          UTerm.id == term_id)
+    results = session.exec(statement)
+    result = results.one_or_none()
+    return result
+
+
+def get_term_in_data_descriptor(data_descriptor_id: str,
+                                term_id: str,
+                                selected_term_fields: Iterable[str] | None = None) \
+                                                                           -> DataDescriptor | None:
+    """
+    Returns the term, in the given data descriptor, whose id corresponds exactly to the given term id.
+    This function performs an exact match on the `term_id` and the `data_descriptor_id` and does
+    not search for similar or related terms and data descriptors.
+    If the provided `term_id` is not found, the function returns `None`.
+
+    :param data_descriptor_id: The id of the given data descriptor.
+    :type data_descriptor_id: str
+    :param term_id: The id of a term to be found.
+    :type term_id: str
+    :param selected_term_fields: A list of term fields to select or `None`. If `None`, all the \
+    fields of the terms are returned. If empty, selects the id and type fields.
+    :type selected_term_fields: Iterable[str] | None
+    :returns: A term instance. Returns `None` if no match is found.
+    :rtype: DataDescriptor | None
+    """
+    with get_universe_session() as session:
+        term_found = _get_term_in_data_descriptor(data_descriptor_id, term_id, session)
+        if term_found:
+            result = instantiate_pydantic_term(term_found, selected_term_fields)
+        else:
+            result = None
+    return result
+
+
+def _get_term_in_universe(term_id: str, session: Session) -> UTerm | None:
+    statement = select(UTerm).where(UTerm.id == term_id)
+    results = session.exec(statement)
+    result = results.first()  # Term ids are not supposed to be unique within the universe.
+    return result
+
+
+def get_term_in_universe(term_id: str,
+                         selected_term_fields: Iterable[str] | None = None) -> DataDescriptor | None:
+    """
+    Returns the first occurrence of the terms, in the universe, whose id corresponds exactly to
+    the given term id.
+    Terms are unique within a data descriptor but may have some synonyms in the universe.
+    This function performs an exact match on the `term_id` and does not search
+    for similar or related terms. If the provided `term_id` is not found, the function returns `None`.
+
+    :param term_id: The id of a term to be found.
+    :type term_id: str
+    :param selected_term_fields: A list of term fields to select or `None`. If `None`, all the \
+    fields of the terms are returned. If empty, selects the id and type fields.
+    :type selected_term_fields: Iterable[str] | None
+    :returns: A term instance. Returns `None` if no match is found.
+    :rtype: DataDescriptor | None
+    """
+    with get_universe_session() as session:
+        term_found = _get_term_in_universe(term_id, session)
+        if term_found:
+            result = instantiate_pydantic_term(term_found, selected_term_fields)
+        else:
+            result = None
+    return result
+
+
+def _get_data_descriptor_in_universe(data_descriptor_id: str, session: Session) -> UDataDescriptor | None:
+    statement = select(UDataDescriptor).where(UDataDescriptor.id == data_descriptor_id)
+    results = session.exec(statement)
+    result = results.one_or_none()
+    return result
+
+
+def get_data_descriptor_in_universe(data_descriptor_id: str) -> tuple[str, dict] | None:
+    """
+    Returns the id and the context of the data descriptor, in the universe whose, id corresponds
+    exactly to the given data descriptor id.
+    This function performs an exact match on the `data_descriptor_id` and does not
+    search for similar or related data descriptors.
+    If the provided `data_descriptor_id` is not found, the function returns `None`.
+
+    :param data_descriptor_id: An id of a data descriptor to be found.
+    :type data_descriptor_id: str
+    :returns: The data descriptor id and context. Returns `None` if no match is found.
+    :rtype: tuple[str, dict] | None
+    """
+    with get_universe_session() as session:
+        data_descriptor_found = _get_data_descriptor_in_universe(data_descriptor_id, session)
+        if data_descriptor_found:
+            result = data_descriptor_found.id, data_descriptor_found.context
+        else:
+            result = None
+    return result
+
+
+def _find_data_descriptors_in_universe(expression: str,
+                                       session: Session,
+                                       only_id: bool = False,
+                                       limit: int | None = None,
+                                       offset: int | None = None) -> Sequence[UDataDescriptor]:
+    matching_condition = generate_matching_condition(UDataDescriptorFTS5, expression, only_id)
+    tmp_statement = select(UDataDescriptorFTS5).where(matching_condition)
+    statement = select(UDataDescriptor).from_statement(handle_rank_limit_offset(tmp_statement,
+                                                                                limit, offset))
+    return execute_match_statement(expression, statement, session)
+
+
+def find_data_descriptors_in_universe(expression: str,
+                                      only_id: bool = False,
+                                      limit: int | None = None,
+                                      offset: int | None = None) -> list[tuple[str, dict]]:
+    """
+    Find data descriptors in the universe based on a full text search defined by the given `expression`.
+    The `expression` comes from the powerful
+    `SQLite FTS extension <https://sqlite.org/fts5.html#full_text_query_syntax>`_
+    and corresponds to the expression of the `MATCH` operator.
+    It can be composed of one or multiple keywords combined with boolean
+    operators (`NOT`, `AND`, `^`, etc. default is `OR`). Keywords can define prefixes or postfixes
+    with the wildcard `*`.
+    The function returns a list of data descriptor ids and contexts, sorted according to the
+    bm25 ranking metric (list index `0` has the highest rank).
+    If the provided `expression` does not hit any data descriptor, the function returns an empty list.
+    The function searches for the `expression` in the data descriptor specifications.
+    However, if `only_id` is `True` (default is `False`), the search is restricted to the id of the
+    data descriptors. **At the moment, `only_id` is set to `True` as the data descriptors
+    haven't got any description.**
+
+    :param expression: The full text search expression.
+    :type expression: str
+    :param only_id: Performs the search only on ids, otherwise on all the specifications.
+    :type only_id: bool
+    :param limit: Limit the number of returned items found. Returns all items found the if \
+    `limit` is either `None`, zero or negative.
+    :type limit: int | None
+    :param offset: Skips `offset` number of items found. Ignored if `offset` is \
+    either `None`, zero or negative.
+    :type offset: int | None
+    :returns: A list of data descriptor ids and contexts. Returns an empty list if no matches are found.
+    :rtype: list[tuple[str, dict]]
+    :raises EsgvocValueError: If the `expression` cannot be interpreted.
+    """
+    result: list[tuple[str, dict]] = list()
+    with get_universe_session() as session:
+        data_descriptors_found = _find_data_descriptors_in_universe(expression, session, only_id,
+                                                                    limit, offset)
+        if data_descriptors_found:
+            for data_descriptor_found in data_descriptors_found:
+                result.append((data_descriptor_found.id, data_descriptor_found.context))
+    return result
+
+
+def _find_terms_in_universe(expression: str, session: Session,
+                            only_id: bool = False,
+                            limit: int | None = None,
+                            offset: int | None = None) -> Sequence[UTerm]:
+    matching_condition = generate_matching_condition(UTermFTS5, expression, only_id)
+    tmp_statement = select(UTermFTS5).where(matching_condition)
+    statement = select(UTerm).from_statement(handle_rank_limit_offset(tmp_statement, limit, offset))
+    return execute_match_statement(expression, statement, session)
+
+
+def find_terms_in_universe(expression: str,
+                           only_id: bool = False,
+                           limit: int | None = None,
+                           offset: int | None = None,
+                           selected_term_fields: Iterable[str] | None = None) -> list[DataDescriptor]:
+    """
+    Find terms in the universe based on a full-text search defined by the given `expression`.
+    The `expression` comes from the powerful
+    `SQLite FTS extension <https://sqlite.org/fts5.html#full_text_query_syntax>`_
+    and corresponds to the expression of the `MATCH` operator.
+    It can be composed of one or multiple keywords combined with boolean
+    operators (`NOT`, `AND`, `^`, etc. default is `OR`). Keywords can define prefixes or postfixes
+    with the wildcard `*`.
+    The function returns a list of term instances sorted according to the
+    bm25 ranking metric (list index `0` has the highest rank).
+    If the provided `expression` does not hit any term, the function returns an empty list.
+    The function searches for the `expression` in the term specifications.
+    However, if `only_id` is `True` (default is `False`), the search is restricted to the id of the terms.
+
+    :param expression: The full text search expression.
+    :type expression: str
+    :param only_id: Performs the search only on ids, otherwise on all the specifications.
+    :type only_id: bool
+    :param limit: Limit the number of returned items found. Returns all items found the if \
+    `limit` is either `None`, zero or negative.
+    :type limit: int | None
+    :param offset: Skips `offset` number of items found. Ignored if `offset` is \
+    either `None`, zero or negative.
+    :type offset: int | None
+    :param selected_term_fields: A list of term fields to select or `None`. If `None`, all the \
+    fields of the terms are returned. If empty, selects the id and type fields.
+    :type selected_term_fields: Iterable[str] | None
+    :returns: A list of term instances. Returns an empty list if no matches are found.
+    :rtype: list[DataDescriptor]
+    :raises EsgvocValueError: If the `expression` cannot be interpreted.
+    """
+    result: list[DataDescriptor] = list()
+    with get_universe_session() as session:
+        uterms_found = _find_terms_in_universe(expression, session, only_id, limit, offset)
+        if uterms_found:
+            instantiate_pydantic_terms(uterms_found, result, selected_term_fields)
+    return result
+
+
+def _find_terms_in_data_descriptor(expression: str, data_descriptor_id: str,
+                                   session: Session,
+                                   only_id: bool = False,
+                                   limit: int | None = None,
+                                   offset: int | None = None) -> Sequence[UTerm]:
+    matching_condition = generate_matching_condition(UTermFTS5, expression, only_id)
+    where_condition = UDataDescriptor.id == data_descriptor_id, matching_condition
+    tmp_statement = select(UTermFTS5).join(UDataDescriptor).where(*where_condition)
+    statement = select(UTerm).from_statement(handle_rank_limit_offset(tmp_statement, limit, offset))
+    return execute_match_statement(expression, statement, session)
+
+
+def find_terms_in_data_descriptor(expression: str, data_descriptor_id: str,
+                                  only_id: bool = False,
+                                  limit: int | None = None,
+                                  offset: int | None = None,
+                                  selected_term_fields: Iterable[str] | None = None) \
+                                                                            -> list[DataDescriptor]:
+    """
+    Find terms in the given data descriptor based on a full-text search defined by the given `expression`.
+    The `expression` comes from the powerful
+    `SQLite FTS extension <https://sqlite.org/fts5.html#full_text_query_syntax>`_
+    and corresponds to the expression of the `MATCH` operator.
+    It can be composed of one or multiple keywords combined with boolean
+    operators (`NOT`, `AND`, `^`, etc. default is `OR`). Keywords can define prefixes or postfixes
+    with the wildcard `*`.
+    The function returns a list of term instances sorted according to the
+    bm25 ranking metric (list index `0` has the highest rank).
+    This function performs an exact match on the `data_descriptor_id`,
+    and does not search for similar or related data descriptor.
+    If the provided `expression` does not hit any term or the given `data_descriptor_id` does not
+    match exactly to an id of a data descriptor, the function returns an empty list.
+    The function searches for the `expression` in the term specifications.
+    However, if `only_id` is `True` (default is `False`), the search is restricted to the id of the terms.
+
+    :param expression: The full text search expression.
+    :type expression: str
+    :param only_id: Performs the search only on ids, otherwise on all the specifications.
+    :type only_id: bool
+    :param limit: Limit the number of returned items found. Returns all items found the if \
+    `limit` is either `None`, zero or negative.
+    :type limit: int | None
+    :param offset: Skips `offset` number of items found. Ignored if `offset` is \
+    either `None`, zero or negative.
+    :type offset: int | None
+    :param selected_term_fields: A list of term fields to select or `None`. If `None`, all the \
+    fields of the terms are returned. If empty, selects the id and type fields.
+    :type selected_term_fields: Iterable[str] | None
+    :returns: A list of term instances. Returns an empty list if no matches are found.
+    :rtype: list[DataDescriptor]
+    :raises EsgvocValueError: If the `expression` cannot be interpreted.
+    """
+    result: list[DataDescriptor] = list()
+    with get_universe_session() as session:
+        uterms_found = _find_terms_in_data_descriptor(expression, data_descriptor_id,
+                                                      session, only_id, limit, offset)
+        if uterms_found:
+            instantiate_pydantic_terms(uterms_found, result, selected_term_fields)
+    return result
+
+
+def find_items_in_universe(expression: str,
+                           only_id: bool = False,
+                           limit: int | None = None,
+                           offset: int | None = None) -> list[Item]:
+    """
+    Find items, at the moment terms and data descriptors, in the universe based on a full-text
+    search defined by the given `expression`. The `expression` comes from the powerful
+    `SQLite FTS extension <https://sqlite.org/fts5.html#full_text_query_syntax>`_
+    and corresponds to the expression of the `MATCH` operator.
+    It can be composed of one or multiple keywords combined with boolean
+    operators (`NOT`, `AND`, `^`, etc. default is `OR`). Keywords can define prefixes or postfixes
+    with the wildcard `*`.
+    The function returns a list of item instances sorted according to the
+    bm25 ranking metric (list index `0` has the highest rank).
+    If the provided `expression` does not hit any item, the function returns an empty list.
+    The function searches for the `expression` in the term and data descriptor specifications.
+    However, if `only_id` is `True` (default is `False`), the search is restricted to the id of the
+    terms and data descriptors. **At the moment, `only_id` is set to `True` for the data descriptors
+    because they haven't got any description.**
+
+    :param expression: The full text search expression.
+    :type expression: str
+    :param only_id: Performs the search only on ids, otherwise on all the specifications.
+    :type only_id: bool
+    :param limit: Limit the number of returned items found. Returns all items found the if \
+    `limit` is either `None`, zero or negative.
+    :type limit: int | None
+    :param offset: Skips `offset` number of items found. Ignored if `offset` is \
+    either `None`, zero or negative.
+    :type offset: int | None
+    :returns: A list of item instances. Returns an empty list if no matches are found.
+    :rtype: list[Item]
+    :raises EsgvocValueError: If the `expression` cannot be interpreted.
+    """
+    # TODO: execute union query when it will be possible to compute parent of terms and data descriptors.
+    result = list()
+    with get_universe_session() as session:
+        if only_id:
+            dd_column = col(UDataDescriptorFTS5.id)
+            term_column = col(UTermFTS5.id)
+        else:
+            dd_column = col(UDataDescriptorFTS5.id)  # TODO: use specs when implemented!
+            term_column = col(UTermFTS5.specs)  # type: ignore
+        dd_where_condition = dd_column.match(expression)
+        dd_statement = select(UDataDescriptorFTS5.id,
+                              text("'data_descriptor' AS TYPE"),
+                              text("'universe' AS TYPE"),
+                              text('rank')).where(dd_where_condition)
+        term_where_condition = term_column.match(expression)
+        term_statement = select(UTermFTS5.id,
+                                text("'term' AS TYPE"),
+                                UDataDescriptor.id,
+                                text('rank')).join(UDataDescriptor) \
+                                             .where(term_where_condition)
+        result = execute_find_item_statements(session, expression, dd_statement,
+                                              term_statement, limit, offset)
+        return result

esgvoc/apps/drs/constants.py

@@ -1,2 +1,2 @@
 FILE_NAME_EXTENSION_KEY = 'extension'
-FILE_NAME_EXTENSION_SEPARATOR_KEY = 'extension_separator'
+FILE_NAME_EXTENSION_SEPARATOR_KEY = 'extension_separator'