Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/typeagent/knowpro/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from collections.abc import Callable
from typing import cast, TypeGuard

from ..storage.memory import reltermsindex
from ..storage.memory.messageindex import IMessageTextEmbeddingIndex
from ..storage.memory.reltermsindex import resolve_related_terms
from .collections import MessageAccumulator, SemanticRefAccumulator
from .dataclasses import dataclass
from .field_helpers import CamelCaseField
Expand Down Expand Up @@ -507,7 +507,7 @@ async def resolve_related_terms(
self.secondary_indexes is not None
and self.secondary_indexes.term_to_related_terms_index is not None
):
await resolve_related_terms(
await reltermsindex.resolve_related_terms(
self.secondary_indexes.term_to_related_terms_index,
compiled_terms,
dedupe,
Expand Down
4 changes: 2 additions & 2 deletions src/typeagent/knowpro/secindex.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

from ..storage.memory import reltermsindex
from ..storage.memory.messageindex import build_message_index
from ..storage.memory.propindex import build_property_index
from ..storage.memory.reltermsindex import build_related_terms_index
from ..storage.memory.timestampindex import build_timestamp_index
from .convsettings import ConversationSettings, RelatedTermIndexSettings
from .interfaces import (
Expand Down Expand Up @@ -45,7 +45,7 @@ async def build_secondary_indexes[
else:
storage_provider = await conversation_settings.get_storage_provider()
await build_transient_secondary_indexes(conversation, conversation_settings)
await build_related_terms_index(
await reltermsindex.build_related_terms_index(
conversation, conversation_settings.related_term_index_settings
)
if conversation.secondary_indexes is not None:
Expand Down
8 changes: 5 additions & 3 deletions src/typeagent/storage/memory/provider.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from datetime import datetime, timezone

from . import reltermsindex
from ...knowpro.convsettings import MessageTextIndexSettings, RelatedTermIndexSettings
from ...knowpro.interfaces import (
ChunkFailure,
Expand All @@ -23,7 +24,6 @@
from .convthreads import ConversationThreads
from .messageindex import MessageTextIndex
from .propindex import PropertyIndex
from .reltermsindex import RelatedTermsIndex
from .semrefindex import TermToSemanticRefIndex
from .timestampindex import TimestampToTextRangeIndex

Expand All @@ -38,7 +38,7 @@ class MemoryStorageProvider[TMessage: IMessage](IStorageProvider[TMessage]):
_property_index: PropertyIndex
_timestamp_index: TimestampToTextRangeIndex
_message_text_index: MessageTextIndex
_related_terms_index: RelatedTermsIndex
_related_terms_index: reltermsindex.RelatedTermsIndex
_conversation_threads: ConversationThreads
_ingested_sources: set[str]
_chunk_failures: dict[tuple[int, int], ChunkFailure]
Expand All @@ -60,7 +60,9 @@ def __init__(
self._conversation_index = TermToSemanticRefIndex()
self._property_index = PropertyIndex()
self._timestamp_index = TimestampToTextRangeIndex()
self._related_terms_index = RelatedTermsIndex(related_terms_settings)
self._related_terms_index = reltermsindex.RelatedTermsIndex(
related_terms_settings
)
thread_settings = message_text_settings.embedding_index_settings
self._conversation_threads = ConversationThreads(thread_settings)
self._ingested_sources = set()
Expand Down
Loading