Skip to content

Commit d66b6bb

Browse files
committed
Use direct-symbol imports for embeddings/query/podcast in mcp/server.py
mcp/server.py was the lone qualified-import user for these low-symbol modules while every other consumer imports them directly: - aitools.embeddings.IEmbeddingModel (vs. 21 files using direct import) - knowpro.query.QueryEvalContext (vs. 2 files) - podcasts.podcast.PodcastMessage/Podcast (vs. podcast_ingest.py) Brings this file in line with the prevailing convention for these modules. Found via a whole-project import-style scan, tracked in #298.
1 parent 6c2bd8b commit d66b6bb

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

‎src/typeagent/mcp/server.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@
2424
if coverage is not None:
2525
coverage.process_startup()
2626

27-
from typeagent.aitools import embeddings, utils
28-
from typeagent.knowpro import answers, query, searchlang
27+
from typeagent.aitools import utils
28+
from typeagent.aitools.embeddings import IEmbeddingModel
29+
from typeagent.knowpro import answers, searchlang
2930
from typeagent.knowpro.answer_response_schema import AnswerResponse
3031
from typeagent.knowpro.convsettings import ConversationSettings
32+
from typeagent.knowpro.query import QueryEvalContext
3133
from typeagent.knowpro.search_query_schema import SearchQuery
32-
from typeagent.podcasts import podcast
34+
from typeagent.podcasts.podcast import Podcast, PodcastMessage
3335
from typeagent.storage.memory.semrefindex import TermToSemanticRefIndex
3436
from typeagent.storage.utils import create_storage_provider
3537

@@ -103,10 +105,8 @@ async def complete(
103105
class ProcessingContext:
104106
lang_search_options: searchlang.LanguageSearchOptions
105107
answer_context_options: answers.AnswerContextOptions
106-
query_context: query.QueryEvalContext[
107-
podcast.PodcastMessage, TermToSemanticRefIndex
108-
]
109-
embedding_model: embeddings.IEmbeddingModel
108+
query_context: QueryEvalContext[PodcastMessage, TermToSemanticRefIndex]
109+
embedding_model: IEmbeddingModel
110110
query_translator: typechat.TypeChatJsonTranslator[SearchQuery]
111111
answer_translator: typechat.TypeChatJsonTranslator[AnswerResponse]
112112

@@ -136,7 +136,7 @@ async def make_context(
136136
settings.message_text_index_settings,
137137
settings.related_term_index_settings,
138138
dbname,
139-
podcast.PodcastMessage,
139+
PodcastMessage,
140140
)
141141

142142
lang_search_options = searchlang.LanguageSearchOptions(
@@ -175,20 +175,20 @@ async def load_podcast_database_or_index(
175175
settings: ConversationSettings,
176176
dbname: str | None = None,
177177
podcast_index: str | None = None,
178-
) -> query.QueryEvalContext[podcast.PodcastMessage, Any]:
178+
) -> QueryEvalContext[PodcastMessage, Any]:
179179
if dbname is not None:
180180
# Load from SQLite database
181-
conversation = await podcast.Podcast.create(settings)
181+
conversation = await Podcast.create(settings)
182182
elif podcast_index is not None:
183183
# Load from JSON index files
184-
conversation = await podcast.Podcast.read_from_file(podcast_index, settings)
184+
conversation = await Podcast.read_from_file(podcast_index, settings)
185185
else:
186186
raise ValueError(
187187
"Either --database or --podcast-index must be specified. "
188188
"Use --podcast-index to specify the path to podcast index files "
189189
f"(e.g., '{_EXAMPLE_PODCAST_INDEX}')."
190190
)
191-
return query.QueryEvalContext(conversation)
191+
return QueryEvalContext(conversation)
192192

193193

194194
# Create an MCP server

0 commit comments

Comments
 (0)