Skip to content
Merged
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
2 changes: 1 addition & 1 deletion src/typeagent/emails/email_message.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from pydantic import Field
from pydantic.dataclasses import dataclass as pydantic_dataclass

from ..knowpro import kplib
from ..knowpro import knowledge_schema as kplib
from ..knowpro.field_helpers import CamelCaseField
from ..knowpro.interfaces import IKnowledgeSource, IMessage, IMessageMetadata

Expand Down
2 changes: 1 addition & 1 deletion src/typeagent/knowpro/answers.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
TextRange,
Topic,
)
from .kplib import ConcreteEntity, Facet
from .knowledge_schema import ConcreteEntity, Facet
from .search import ConversationSearchResult


Expand Down
2 changes: 1 addition & 1 deletion src/typeagent/knowpro/conversation_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
answer_response_schema,
answers,
convknowledge,
kplib,
knowledge_schema as kplib,
search_query_schema,
searchlang,
secindex,
Expand Down
2 changes: 1 addition & 1 deletion src/typeagent/knowpro/convknowledge.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import typechat

from . import kplib
from . import knowledge_schema as kplib
from ..aitools.model_adapters import create_chat_model


Expand Down
2 changes: 1 addition & 1 deletion src/typeagent/knowpro/interfaces_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from pydantic.dataclasses import dataclass
import typechat

from . import kplib
from . import knowledge_schema as kplib
from .field_helpers import CamelCaseField

__all__ = [
Expand Down
2 changes: 1 addition & 1 deletion src/typeagent/knowpro/knowledge.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from typechat import Result, TypeChatLanguageModel

from . import convknowledge, kplib
from . import convknowledge, knowledge_schema as kplib
from ..aitools import model_adapters
from .interfaces import IKnowledgeExtractor

Expand Down
2 changes: 1 addition & 1 deletion src/typeagent/knowpro/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
TextRange,
Thread,
)
from .kplib import ConcreteEntity
from .knowledge_schema import ConcreteEntity
from .utils import aenumerate

# TODO: Move to compilelib.py
Expand Down
2 changes: 1 addition & 1 deletion src/typeagent/knowpro/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
Term,
WhenFilter,
)
from .kplib import ConcreteEntity
from .knowledge_schema import ConcreteEntity
from .query import (
BooleanOp,
CompiledSearchTerm,
Expand Down
2 changes: 1 addition & 1 deletion src/typeagent/knowpro/serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

from pydantic.alias_generators import to_camel

from . import kplib
from . import knowledge_schema as kplib
from ..aitools.embeddings import NormalizedEmbeddings
from .interfaces import ConversationDataWithIndexes, SearchTermGroupTypes, Tag, Topic

Expand Down
2 changes: 1 addition & 1 deletion src/typeagent/knowpro/universal_message.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

from pydantic import AliasChoices, Field

from . import kplib
from . import knowledge_schema as kplib
from .dataclasses import dataclass as pydantic_dataclass
from .field_helpers import CamelCaseField
from .interfaces import IKnowledgeSource, IMessage, IMessageMetadata
Expand Down
2 changes: 1 addition & 1 deletion src/typeagent/storage/memory/propindex.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import enum
from typing import assert_never

from ...knowpro import kplib
from ...knowpro import knowledge_schema as kplib
from ...knowpro.collections import TextRangesInScope
from ...knowpro.interfaces import (
IConversation,
Expand Down
2 changes: 1 addition & 1 deletion src/typeagent/storage/memory/semrefindex.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from typechat import Failure

from ...knowpro import convknowledge, kplib, secindex
from ...knowpro import convknowledge, knowledge_schema as kplib, secindex
from ...knowpro.convsettings import ConversationSettings, SemanticRefIndexSettings
from ...knowpro.interfaces import ( # Interfaces.; Other imports.
IConversation,
Expand Down
2 changes: 1 addition & 1 deletion tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
SemanticRef,
TextLocation,
)
from typeagent.knowpro.kplib import KnowledgeResponse
from typeagent.knowpro.knowledge_schema import KnowledgeResponse
from typeagent.knowpro.secindex import ConversationSecondaryIndexes
from typeagent.storage import SqliteStorageProvider
from typeagent.storage.memory import MemoryStorageProvider
Expand Down
2 changes: 1 addition & 1 deletion tests/test_answers.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
text_range_from_message_range,
)
from typeagent.knowpro.interfaces import TextLocation, TextRange
from typeagent.knowpro.kplib import Facet
from typeagent.knowpro.knowledge_schema import Facet

from conftest import FakeMessage, FakeMessageCollection

Expand Down
2 changes: 1 addition & 1 deletion tests/test_collections.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
TextLocation,
TextRange,
)
from typeagent.knowpro.kplib import Action, ConcreteEntity
from typeagent.knowpro.knowledge_schema import Action, ConcreteEntity
from typeagent.storage.memory.collections import MemorySemanticRefCollection


Expand Down
2 changes: 1 addition & 1 deletion tests/test_conversation_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
RelatedTermIndexSettings,
)
from typeagent.knowpro.interfaces import ConversationMetadata, IMessage
from typeagent.knowpro.kplib import KnowledgeResponse
from typeagent.knowpro.knowledge_schema import KnowledgeResponse
from typeagent.storage.sqlite.provider import SqliteStorageProvider
from typeagent.transcripts.transcript import (
Transcript,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_interfaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
Thread,
WhenFilter,
)
from typeagent.knowpro.kplib import ConcreteEntity
from typeagent.knowpro.knowledge_schema import ConcreteEntity


def test_text_location_serialization():
Expand Down
4 changes: 2 additions & 2 deletions tests/test_knowledge.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

from typechat import Failure, Result, Success

from typeagent.knowpro import convknowledge, kplib
from typeagent.knowpro import convknowledge, knowledge_schema as kplib
from typeagent.knowpro.knowledge import (
create_knowledge_extractor,
extract_knowledge_from_text,
extract_knowledge_from_text_batch,
merge_concrete_entities,
merge_topics,
)
from typeagent.knowpro.kplib import ConcreteEntity, Facet
from typeagent.knowpro.knowledge_schema import ConcreteEntity, Facet


class MockKnowledgeExtractor:
Expand Down
2 changes: 1 addition & 1 deletion tests/test_kplib.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

from typeagent.knowpro.kplib import (
from typeagent.knowpro.knowledge_schema import (
Action,
ActionParam,
ConcreteEntity,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_property_index_population.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from typeagent.aitools.model_adapters import create_test_embedding_model
from typeagent.aitools.vectorbase import TextEmbeddingIndexSettings
from typeagent.knowpro import kplib
from typeagent.knowpro import knowledge_schema as kplib
from typeagent.knowpro.convsettings import (
MessageTextIndexSettings,
RelatedTermIndexSettings,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_propindex.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from typeagent.knowpro.collections import TextRangeCollection, TextRangesInScope
from typeagent.knowpro.interfaces import SemanticRef, Tag, TextLocation, TextRange
from typeagent.knowpro.kplib import Action, ConcreteEntity, Facet
from typeagent.knowpro.knowledge_schema import Action, ConcreteEntity, Facet
from typeagent.storage.memory import MemorySemanticRefCollection
from typeagent.storage.memory.propindex import (
add_action_properties_to_index,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ async def test_lookup_knowledge_type():
TextRange,
Topic,
)
from typeagent.knowpro.kplib import ConcreteEntity
from typeagent.knowpro.knowledge_schema import ConcreteEntity
from typeagent.knowpro.query import lookup_knowledge_type

# Create valid TextRange and knowledge objects
Expand Down
2 changes: 1 addition & 1 deletion tests/test_related_terms_fast.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from typeagent.aitools.model_adapters import create_test_embedding_model
from typeagent.knowpro.convsettings import ConversationSettings
from typeagent.knowpro.interfaces import SemanticRef, TextLocation, TextRange
from typeagent.knowpro.kplib import ConcreteEntity
from typeagent.knowpro.knowledge_schema import ConcreteEntity
from typeagent.podcasts.podcast import Podcast, PodcastMessage, PodcastMessageMeta
from typeagent.storage import SqliteStorageProvider

Expand Down
2 changes: 1 addition & 1 deletion tests/test_related_terms_index_population.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from typeagent.aitools.model_adapters import create_test_embedding_model
from typeagent.aitools.vectorbase import TextEmbeddingIndexSettings
from typeagent.knowpro import kplib
from typeagent.knowpro import knowledge_schema as kplib
from typeagent.knowpro.convsettings import (
MessageTextIndexSettings,
RelatedTermIndexSettings,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_reltermsindex.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
RelatedTermIndexSettings,
)
from typeagent.knowpro.interfaces import IMessage, ITermToRelatedTermsIndex, Term
from typeagent.knowpro.kplib import KnowledgeResponse
from typeagent.knowpro.knowledge_schema import KnowledgeResponse
from typeagent.knowpro.query import CompiledSearchTerm, CompiledTermGroup
from typeagent.storage import SqliteStorageProvider
from typeagent.storage.memory import MemoryStorageProvider
Expand Down
2 changes: 1 addition & 1 deletion tests/test_semrefindex.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
ITermToSemanticRefIndex,
Topic,
)
from typeagent.knowpro.kplib import Action, ConcreteEntity, Facet, KnowledgeResponse
from typeagent.knowpro.knowledge_schema import Action, ConcreteEntity, Facet, KnowledgeResponse
from typeagent.storage import SqliteStorageProvider
from typeagent.storage.memory import MemoryStorageProvider
from typeagent.storage.memory.semrefindex import (
Expand Down
2 changes: 1 addition & 1 deletion tests/test_serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
TermsToRelatedTermsIndexData,
TextToTextLocationIndexData,
)
from typeagent.knowpro.kplib import ConcreteEntity, Quantity
from typeagent.knowpro.knowledge_schema import ConcreteEntity, Quantity
from typeagent.knowpro.serialization import (
create_file_header,
DeserializationError,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_sqlitestore.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
TextRange,
Topic,
)
from typeagent.knowpro.kplib import KnowledgeResponse
from typeagent.knowpro.knowledge_schema import KnowledgeResponse
from typeagent.storage import SqliteStorageProvider


Expand Down
4 changes: 2 additions & 2 deletions tests/test_storage_providers_unified.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

from typeagent.aitools.embeddings import IEmbeddingModel
from typeagent.aitools.vectorbase import TextEmbeddingIndexSettings
from typeagent.knowpro import kplib
from typeagent.knowpro import knowledge_schema as kplib
from typeagent.knowpro.convsettings import (
MessageTextIndexSettings,
RelatedTermIndexSettings,
Expand All @@ -36,7 +36,7 @@
TextRange,
Topic,
)
from typeagent.knowpro.kplib import KnowledgeResponse
from typeagent.knowpro.knowledge_schema import KnowledgeResponse
from typeagent.storage import SqliteStorageProvider
from typeagent.storage.memory import MemoryStorageProvider

Expand Down
2 changes: 1 addition & 1 deletion tools/query.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
from typeagent.knowpro import (
answer_response_schema,
answers,
kplib,
knowledge_schema as kplib,
query,
search,
search_query_schema,
Expand Down
Loading