Skip to content

Commit

Permalink
Update to the latest Psychic python library version (#6804)
Browse files Browse the repository at this point in the history
Update the Psychic document loader to use the latest `psychicapi` python
library version: `0.8.0`
  • Loading branch information
Ayan-Bandyopadhyay committed Jun 28, 2023
1 parent f3d178f commit f92ccf7
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 23 deletions.
16 changes: 10 additions & 6 deletions langchain/document_loaders/psychic.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""Loader that loads documents from Psychic.dev."""
from typing import List
from typing import List, Optional

from langchain.docstore.document import Document
from langchain.document_loaders.base import BaseLoader
Expand All @@ -8,8 +8,10 @@
class PsychicLoader(BaseLoader):
"""Loader that loads documents from Psychic.dev."""

def __init__(self, api_key: str, connector_id: str, connection_id: str):
"""Initialize with API key, connector id, and connection id."""
def __init__(
self, api_key: str, account_id: str, connector_id: Optional[str] = None
):
"""Initialize with API key, connector id, and account id."""

try:
from psychicapi import ConnectorId, Psychic # noqa: F401
Expand All @@ -19,16 +21,18 @@ def __init__(self, api_key: str, connector_id: str, connection_id: str):
)
self.psychic = Psychic(secret_key=api_key)
self.connector_id = ConnectorId(connector_id)
self.connection_id = connection_id
self.account_id = account_id

def load(self) -> List[Document]:
"""Load documents."""

psychic_docs = self.psychic.get_documents(self.connector_id, self.connection_id)
psychic_docs = self.psychic.get_documents(
connector_id=self.connector_id, account_id=self.account_id
)
return [
Document(
page_content=doc["content"],
metadata={"title": doc["title"], "source": doc["uri"]},
)
for doc in psychic_docs
for doc in psychic_docs.documents
]
46 changes: 34 additions & 12 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ gql = {version = "^3.4.1", optional = true}
pandas = {version = "^2.0.1", optional = true}
telethon = {version = "^1.28.5", optional = true}
neo4j = {version = "^5.8.1", optional = true}
psychicapi = {version = "^0.5", optional = true}
zep-python = {version=">=0.31", optional=true}
langkit = {version = ">=0.0.1.dev3, <0.1.0", optional = true}
chardet = {version="^5.1.0", optional=true}
Expand All @@ -112,6 +111,7 @@ azure-search-documents = {version = "11.4.0a20230509004", source = "azure-sdk-de
esprima = {version = "^4.0.1", optional = true}
openllm = {version = ">=0.1.6", optional = true}
streamlit = {version = "^1.18.0", optional = true, python = ">=3.8.1,<3.9.7 || >3.9.7,<4.0"}
psychicapi = {version = "^0.8.0", optional = true}

[tool.poetry.group.docs.dependencies]
autodoc_pydantic = "^1.8.0"
Expand Down
12 changes: 8 additions & 4 deletions tests/unit_tests/document_loaders/test_psychic.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,25 +23,29 @@ def mock_connector_id(): # type: ignore
class TestPsychicLoader:
MOCK_API_KEY = "api_key"
MOCK_CONNECTOR_ID = "notion"
MOCK_CONNECTION_ID = "connection_id"
MOCK_ACCOUNT_ID = "account_id"

def test_psychic_loader_initialization(
self, mock_psychic: MagicMock, mock_connector_id: MagicMock
) -> None:
PsychicLoader(
api_key=self.MOCK_API_KEY,
connector_id=self.MOCK_CONNECTOR_ID,
connection_id=self.MOCK_CONNECTION_ID,
account_id=self.MOCK_ACCOUNT_ID,
)

mock_psychic.assert_called_once_with(secret_key=self.MOCK_API_KEY)
mock_connector_id.assert_called_once_with(self.MOCK_CONNECTOR_ID)

def test_psychic_loader_load_data(self, mock_psychic: MagicMock) -> None:
mock_psychic.get_documents.return_value = [
mock_get_documents_response = MagicMock()
mock_get_documents_response.documents = [
self._get_mock_document("123"),
self._get_mock_document("456"),
]
mock_get_documents_response.next_page_cursor = None

mock_psychic.get_documents.return_value = mock_get_documents_response

psychic_loader = self._get_mock_psychic_loader(mock_psychic)

Expand All @@ -57,7 +61,7 @@ def _get_mock_psychic_loader(self, mock_psychic: MagicMock) -> PsychicLoader:
psychic_loader = PsychicLoader(
api_key=self.MOCK_API_KEY,
connector_id=self.MOCK_CONNECTOR_ID,
connection_id=self.MOCK_CONNECTION_ID,
account_id=self.MOCK_ACCOUNT_ID,
)
psychic_loader.psychic = mock_psychic
return psychic_loader
Expand Down

0 comments on commit f92ccf7

Please sign in to comment.