Skip to content

Commit 63a9939

Browse files
Revert all langchain migration changes - back to morning state (330a1dc)
1 parent b6b2a3b commit 63a9939

File tree

7 files changed

+12
-106
lines changed

7 files changed

+12
-106
lines changed

backend/Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@ RUN uv sync --frozen
1414

1515
COPY . /app/
1616

17-
# Run import test on container start and log results
18-
RUN uv run python test_langchain_imports.py || true
19-
2017
ENV PYTHONUNBUFFERED='1'
2118
ENV PYTHONPATH="/app"
2219

backend/pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ classifiers = [
2727

2828
dependencies = [
2929
"numpy >=2.0.0,<3.0", # Pin to 2.x - requires regenerating graph.pkl.gz
30-
"pydantic >=2.0.0", # Keep v2 for decentriq-platform compatibility
3130
"decentriq-platform ==0.39.1",
3231
"thefuzz",
3332
"curies",
@@ -43,6 +42,7 @@ dependencies = [
4342
"oxrdflib",
4443
"SPARQLWrapper",
4544
"python-dotenv",
45+
# "pydantic >=2.0.0",
4646
# "pydantic-settings",
4747
# NOTE: dependencies for mapping-generation are below
4848
"tqdm",
@@ -52,6 +52,7 @@ dependencies = [
5252
"qdrant-client",
5353
"langchain",
5454
"langchain_openai",
55+
"pydantic",
5556
"langchain_qdrant",
5657
"typing-extensions",
5758
"openai",

backend/src/mapping_generation/compress.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
from typing import Any, List
2-
from langchain_community.retrievers import ContextualCompressionRetriever
2+
from langchain.retrievers import ContextualCompressionRetriever
33
from langchain_core.callbacks import (
44
AsyncCallbackManagerForRetrieverRun,
55
CallbackManagerForRetrieverRun,
66
)
77
from langchain_core.documents import Document
8-
from langchain_community.retrievers import MergerRetriever
8+
from langchain.retrievers import MergerRetriever
99
from langchain_core.retrievers import BaseRetriever
1010
import asyncio
1111

backend/src/mapping_generation/embeddingfilter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
from typing import List, Optional
33

44
import numpy as np
5-
from langchain_core.embeddings import Embeddings
6-
from langchain_community.retrievers.document_compressors import EmbeddingsFilter
5+
from langchain.embeddings.base import Embeddings
6+
from langchain.retrievers.document_compressors import EmbeddingsFilter
77
from langchain_community.document_transformers.embeddings_redundant_filter import _DocumentWithState
88
from langchain_core.callbacks.manager import Callbacks
99
from langchain_core.documents import Document

backend/src/mapping_generation/llm_chain.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
)
88
from .utils import load_mapping
99
from .utils import global_logger as logger
10-
from pydantic import ValidationError
10+
from pydantic.v1 import ValidationError
1111
from langchain_core.output_parsers import JsonOutputParser
12-
# Note: OutputFixingParser not available in langchain 0.3.15, using fallback
12+
from langchain.output_parsers import OutputFixingParser
1313
from typing import List, Dict, Any
1414
import time
1515
from langchain_core.callbacks.base import BaseCallbackHandler
@@ -22,8 +22,9 @@
2222

2323
parsing_llm = LLMManager.get_instance("llama3.1")
2424
parser = JsonOutputParser()
25-
# Fallback: use parser directly since OutputFixingParser is not available
26-
fixing_parser = parser
25+
fixing_parser = OutputFixingParser.from_llm(
26+
parser=parser, llm=parsing_llm, max_retries=3
27+
)
2728
REQUEST_LIMIT = 30
2829
TIME_WINDOW = 60
2930
# from langchain_core.tracers.stdout import ConsoleCallbackHandler

backend/src/mapping_generation/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# import psutil
1010
import pandas as pd
1111
from json_repair import repair_json
12-
from langchain_core.documents import Document
12+
from langchain.schema import Document
1313
from simstring.database.dict import DictDatabase
1414
from simstring.feature_extractor.character_ngram import CharacterNgramFeatureExtractor
1515
from simstring.measure.cosine import CosineMeasure

backend/test_langchain_imports.py

Lines changed: 0 additions & 93 deletions
This file was deleted.

0 commit comments

Comments
 (0)