Skip to content
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.

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

Upgrade dependencies #287

Merged
merged 3 commits into from
Apr 29, 2024
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
4 changes: 2 additions & 2 deletions docs/source/apis.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
},
"outputs": [],
"source": [
"from langchain.chat_models import ChatOpenAI\n",
"from kor import create_extraction_chain, Object, Text, Number"
"from kor import create_extraction_chain, Object, Text, Number\n",
"from langchain_openai import ChatOpenAI"
]
},
{
Expand Down
8 changes: 4 additions & 4 deletions docs/source/document_extraction.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@
"from pydantic import BaseModel, Field, validator\n",
"from kor import extract_from_documents, from_pydantic, create_extraction_chain\n",
"from kor.documents.html import MarkdownifyHTMLProcessor\n",
"from langchain.chat_models import ChatOpenAI\n",
"from langchain.schema import Document\n",
"from langchain.text_splitter import RecursiveCharacterTextSplitter"
"from langchain_core.documents import Document\n",
"from langchain_text_splitters import RecursiveCharacterTextSplitter\n",
"from langchain_openai import ChatOpenAI"
]
},
{
Expand Down Expand Up @@ -458,7 +458,7 @@
},
"outputs": [],
"source": [
"from langchain.callbacks import get_openai_callback"
"from langchain_community.callbacks import get_openai_callback"
]
},
{
Expand Down
3 changes: 1 addition & 2 deletions docs/source/nested_objects.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@
"source": [
"from kor.extraction import create_extraction_chain\n",
"from kor.nodes import Object, Text, Number\n",
"from langchain.chat_models import ChatOpenAI\n",
"from langchain.llms import OpenAI"
"from langchain_openai import ChatOpenAI, OpenAI"
]
},
{
Expand Down
3 changes: 1 addition & 2 deletions docs/source/objects.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
"source": [
"from kor.extraction import create_extraction_chain\n",
"from kor.nodes import Object, Text, Number\n",
"from langchain.chat_models import ChatOpenAI\n",
"from langchain.llms import OpenAI"
"from langchain_openai import ChatOpenAI, OpenAI"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions docs/source/prompt.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"source": [
"from kor.extraction import create_extraction_chain\n",
"from kor.nodes import Object, Text, Number\n",
"from langchain.chat_models import ChatOpenAI\n",
"from langchain.prompts import PromptTemplate"
"from langchain_core.prompts import PromptTemplate\n",
"from langchain_openai import ChatOpenAI"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion docs/source/schema_serialization.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
"outputs": [],
"source": [
"from kor.extraction import create_extraction_chain\n",
"from langchain.chat_models import ChatOpenAI"
"from langchain_openai import ChatOpenAI"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions docs/source/tutorial.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"source": [
"from kor.extraction import create_extraction_chain\n",
"from kor.nodes import Object, Text, Number\n",
"from langchain.chat_models import ChatOpenAI"
"from langchain_openai import ChatOpenAI"
]
},
{
Expand Down Expand Up @@ -123,7 +123,7 @@
},
"outputs": [],
"source": [
"from langchain.llms import OpenAI"
"from langchain_openai import OpenAI"
]
},
{
Expand Down
3 changes: 1 addition & 2 deletions docs/source/untyped_objects.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
"source": [
"from kor.extraction import create_extraction_chain\n",
"from kor.nodes import Object, Text, Number\n",
"from langchain.chat_models import ChatOpenAI\n",
"from langchain.llms import OpenAI"
"from langchain_openai import ChatOpenAI, OpenAI"
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions docs/source/validation.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@
"outputs": [],
"source": [
"import enum\n",
"from langchain.chat_models import ChatOpenAI\n",
"from kor import create_extraction_chain, Object, Text, Number\n",
"import pydantic\n",
"from typing import List\n",
"from kor import from_pydantic\n",
"from pydantic import BaseModel, Field\n",
"from typing import Optional"
"from typing import Optional\n",
"from langchain_openai import ChatOpenAI"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion kor/documents/html.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import re
from typing import Tuple

from langchain.schema import Document
from langchain_core.documents import Document

from kor.documents.typedefs import AbstractDocumentProcessor

Expand Down
2 changes: 1 addition & 1 deletion kor/documents/typedefs.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import abc

from langchain.schema import Document
from langchain_core.documents import Document


class AbstractDocumentProcessor(abc.ABC):
Expand Down
13 changes: 4 additions & 9 deletions kor/extraction/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,12 @@
from typing import Any, Callable, List, Optional, Sequence, Type, Union, cast

from langchain.chains import LLMChain
from langchain.docstore.document import Document
from langchain.prompts import PromptTemplate

from kor.extraction.parser import KorParser

try: # Handle breaking change in langchain
from langchain.base_language import BaseLanguageModel
except ImportError:
from langchain.schema import BaseLanguageModel # type: ignore
from langchain_core.documents import Document
from langchain_core.language_models import BaseLanguageModel
from langchain_core.prompts import PromptTemplate

from kor.encoders import Encoder, InputFormatter, initialize_encoder
from kor.extraction.parser import KorParser
from kor.extraction.typedefs import DocumentExtraction, Extraction
from kor.nodes import Object
from kor.prompts import create_langchain_prompt
Expand Down
6 changes: 1 addition & 5 deletions kor/extraction/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from typing import List, Optional

from langchain_core.output_parsers import BaseOutputParser
from pydantic import Extra

from kor.encoders import Encoder
Expand All @@ -10,11 +11,6 @@
from kor.nodes import Object
from kor.validators import Validator

try:
from langchain.output_parsers.base import BaseOutputParser
except ImportError:
from langchain.schema import BaseOutputParser # type: ignore


class KorParser(BaseOutputParser):
"""A Kor langchain parser integration.
Expand Down
11 changes: 3 additions & 8 deletions kor/prompts.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,9 @@

from typing import Any, List, Optional, Tuple

from langchain.prompts import BasePromptTemplate, PromptTemplate
from langchain.schema import (
AIMessage,
BaseMessage,
HumanMessage,
PromptValue,
SystemMessage,
)
from langchain_core.messages import AIMessage, BaseMessage, HumanMessage, SystemMessage
from langchain_core.prompt_values import PromptValue
from langchain_core.prompts import BasePromptTemplate, PromptTemplate

from kor.encoders import Encoder
from kor.encoders.encode import InputFormatter, encode_examples, format_text
Expand Down
Loading
Loading