Skip to content

Use module-qualified imports for storage.memory.semrefindex #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bernhard Merkle (bmerkle) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use module-qualified imports for storage.memory.semrefindex #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/typeagent/knowpro/add_messages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

from . import knowledge_schema as kplib
from ..aitools.embeddings import IEmbeddingModel, NormalizedEmbedding
from ..storage.memory.semrefindex import collect_action_terms, collect_entity_terms
from ..storage.memory import semrefindex
from .interfaces import AddMessagesResult
from .interfaces_core import IKnowledgeExtractor, IMessage, MessageOrdinal, TextLocation

Expand Down Expand Up @@ -251,11 +251,11 @@ def _add_term(term: str) -> None:
related_terms.append(canonical)

for entity in knowledge.entities:
for term in collect_entity_terms(entity):
for term in semrefindex.collect_entity_terms(entity):
_add_term(term)

for action in chain(knowledge.actions, knowledge.inverse_actions):
for term in collect_action_terms(action):
for term in semrefindex.collect_action_terms(action):
_add_term(term)

for topic in knowledge.topics:
Expand Down
4 changes: 2 additions & 2 deletions src/typeagent/mcp/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from typeagent.knowpro.convsettings import ConversationSettings
from typeagent.knowpro.search_query_schema import SearchQuery
from typeagent.podcasts import podcast
from typeagent.storage.memory.semrefindex import TermToSemanticRefIndex
from typeagent.storage.memory import semrefindex
from typeagent.storage.utils import create_storage_provider

# Example podcast index path for documentation and error messages
Expand Down Expand Up @@ -104,7 +104,7 @@ class ProcessingContext:
lang_search_options: searchlang.LanguageSearchOptions
answer_context_options: answers.AnswerContextOptions
query_context: query.QueryEvalContext[
podcast.PodcastMessage, TermToSemanticRefIndex
podcast.PodcastMessage, semrefindex.TermToSemanticRefIndex
]
embedding_model: embeddings.IEmbeddingModel
query_translator: typechat.TypeChatJsonTranslator[SearchQuery]
Expand Down
6 changes: 3 additions & 3 deletions src/typeagent/storage/memory/provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

from datetime import datetime, timezone

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


Expand All @@ -34,7 +34,7 @@ class MemoryStorageProvider[TMessage: IMessage](IStorageProvider[TMessage]):
_message_collection: MemoryMessageCollection[TMessage]
_semantic_ref_collection: MemorySemanticRefCollection

_conversation_index: TermToSemanticRefIndex
_conversation_index: semrefindex.TermToSemanticRefIndex
_property_index: PropertyIndex
_timestamp_index: TimestampToTextRangeIndex
_message_text_index: MessageTextIndex
Expand All @@ -57,7 +57,7 @@ def __init__(
)
self._semantic_ref_collection = MemorySemanticRefCollection()

self._conversation_index = TermToSemanticRefIndex()
self._conversation_index = semrefindex.TermToSemanticRefIndex()
self._property_index = PropertyIndex()
self._timestamp_index = TimestampToTextRangeIndex()
self._related_terms_index = RelatedTermsIndex(related_terms_settings)
Expand Down
Loading