Skip to content

Commit 88daf87

Browse files
committed
Merge and forma
1 parent 723dc5a commit 88daf87

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

tools/test_email.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,7 @@
1919
import typechat
2020

2121
from typeagent.aitools import utils
22-
from typeagent.knowpro import (
23-
kplib,
24-
searchlang,
25-
search_query_schema,
26-
convknowledge
27-
)
22+
from typeagent.knowpro import kplib, searchlang, search_query_schema, convknowledge
2823
from typeagent.knowpro.interfaces import IConversation
2924
from typeagent.emails.email_import import import_email_from_file, import_emails_from_dir
3025
from typeagent.emails.email_memory import EmailMemory
@@ -44,9 +39,8 @@ def __init__(
4439
self.db_path = base_path.joinpath(db_name)
4540
self.conversation = conversation
4641
self.query_translator: (
47-
typechat.TypeChatJsonTranslator[search_query_schema.SearchQuery] | None
48-
) = None
49-
42+
typechat.TypeChatJsonTranslator[search_query_schema.SearchQuery] | None
43+
) = None
5044

5145
def get_translator(self):
5246
if self.query_translator is None:
@@ -55,7 +49,7 @@ def get_translator(self):
5549
model, search_query_schema.SearchQuery
5650
)
5751
return self.query_translator
58-
52+
5953
async def load_conversation(self, db_name: str, create_new: bool = False):
6054
await self.conversation.settings.storage_provider.close()
6155
self.db_path = self.base_path.joinpath(db_name)
@@ -103,7 +97,7 @@ async def main():
10397
print("Email Memory Demo")
10498
print("Type @help for a list of commands")
10599

106-
default_db = "gmail.db" # "pyEmails.db"
100+
default_db = "gmail.db" # "pyEmails.db"
107101
db_path = str(base_path.joinpath(default_db))
108102
context = EmailContext(
109103
base_path,
@@ -197,8 +191,8 @@ async def add_messages(context: EmailContext, args: list[str]):
197191

198192
conversation = context.conversation
199193
for email in emails:
200-
#print_email(email)
201-
#print()
194+
# print_email(email)
195+
# print()
202196
# knowledge = email.metadata.get_knowledge()
203197
# print_knowledge(knowledge)
204198

@@ -231,8 +225,8 @@ async def search_index(context: EmailContext, args: list[str]):
231225
debug_context = searchlang.LanguageSearchDebugContext()
232226
results = await context.conversation.query_debug(
233227
search_text=search_text,
234-
query_translator=context.get_translator(),
235-
debug_context=debug_context
228+
query_translator=context.get_translator(),
229+
debug_context=debug_context,
236230
)
237231
await print_search_results(context.conversation, debug_context, results)
238232

typeagent/emails/email_memory.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ async def query(
106106
async def query_debug(
107107
self,
108108
search_text: str,
109-
query_translator: typechat.TypeChatJsonTranslator[search_query_schema.SearchQuery],
109+
query_translator: typechat.TypeChatJsonTranslator[
110+
search_query_schema.SearchQuery
111+
],
110112
debug_context: searchlang.LanguageSearchDebugContext | None = None,
111113
) -> typechat.Result[list[searchlang.ConversationSearchResult]]:
112114
return await searchlang.search_conversation_with_language(
@@ -148,15 +150,15 @@ def _is_searchable_term(self, term: str) -> bool:
148150
is_searchable = term not in self.noise_terms
149151
return is_searchable
150152

153+
151154
#
152155
# TODO: Migrate some variation of these into a shared API
153156
#
154157

155158

156159
# Load synonyms from a file and add them as aliases
157160
async def _add_synonyms_file_as_aliases(
158-
conversation: ConversationBase, file_name: str,
159-
clean: bool
161+
conversation: ConversationBase, file_name: str, clean: bool
160162
) -> None:
161163
secondary_indexes = conversation.secondary_indexes
162164
assert secondary_indexes is not None
@@ -186,7 +188,8 @@ async def _add_synonyms_file_as_aliases(
186188
except:
187189
await storage_provider.rollback_transaction()
188190
raise
189-
191+
192+
190193
def _add_noise_words_from_file(
191194
noise: set[str],
192195
file_name: str,
@@ -201,4 +204,3 @@ def _add_noise_words_from_file(
201204
word = word.strip()
202205
if len(word) > 0:
203206
noise.add(word)
204-

0 commit comments

Comments
 (0)