Skip to content

Commit 24bf9ff

Browse files
authored
Merge pull request #115 from ansible/TamiTakamiya/AAP-52825/CVE-2025-6984-rework
Rework CVE-2025-6984
2 parents 6b31ce3 + b031053 commit 24bf9ff

File tree

3 files changed

+80
-78
lines changed

3 files changed

+80
-78
lines changed

pdm.lock

Lines changed: 46 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,30 +76,30 @@ dependencies = [
7676
"langchain-ibm>=0.3.10",
7777
"llama-index>=0.12.28",
7878
"llama-index-core>=0.12.28",
79-
"llama-index-vector-stores-faiss>=0.3.0",
80-
"llama-index-embeddings-huggingface>=0.4.0",
79+
"llama-index-vector-stores-faiss==0.3.0",
80+
"llama-index-embeddings-huggingface==0.4.0",
8181
"uvicorn==0.32.1",
8282
"redis==5.2.0",
8383
"faiss-cpu==1.9.0.post1",
8484
"sentence-transformers==3.1.1",
8585
"openai>=1.77.0",
8686
"pyarrow==18.0.0",
8787
"ibm-generative-ai==3.0.0",
88-
"ibm-cos-sdk>=2.13.6",
88+
"ibm-cos-sdk==2.13.6",
8989
"langchain-openai>=0.3.16",
9090
"pydantic==2.9.2",
9191
"setuptools==78.1.1",
9292
"prometheus-client==0.20.0",
9393
"kubernetes==30.1.0",
9494
"psycopg2-binary==2.9.9",
9595
"azure-identity==1.18.0",
96-
"langchain-community>=0.3.29",
96+
"langchain-community>=0.3.27",
9797
"SQLAlchemy==2.0.35",
9898
"huggingface-hub>=0.33.1",
9999
"ibm-watsonx-ai>=1.3.3",
100100
"certifi==2024.8.30",
101101
"cryptography==44.0.1",
102-
"urllib3>=2.2.3",
102+
"urllib3==2.2.3",
103103
"nltk==3.9.1",
104104
"aiohttp==3.11.11",
105105
"zipp==3.20.1",
@@ -114,6 +114,8 @@ dependencies = [
114114
"msgpack==1.1.0",
115115
"llama-index-vector-stores-postgres>=0.4.0",
116116
"h11>=0.16.0",
117+
# need to pin to avoid deadlock
118+
"requests==2.32.2",
117119
]
118120
requires-python = ">=3.11.1,<=3.12.8"
119121
readme = "README.md"

requirements.txt

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -320,12 +320,12 @@ httpx[socks]==0.27.2 \
320320
huggingface-hub[inference]==0.33.1 \
321321
--hash=sha256:589b634f979da3ea4b8bdb3d79f97f547840dc83715918daf0b64209c0844c7b \
322322
--hash=sha256:ec8d7444628210c0ba27e968e3c4c973032d44dcea59ca0d78ef3f612196f095
323-
ibm-cos-sdk==2.14.3 \
324-
--hash=sha256:643b6f2aa1683adad7f432df23407d11ae5adb9d9ad01214115bee77dc64364a
325-
ibm-cos-sdk-core==2.14.3 \
326-
--hash=sha256:85dee7790c92e8db69bf39dae4c02cac211e3c1d81bb86e64fa2d1e929674623
327-
ibm-cos-sdk-s3transfer==2.14.3 \
328-
--hash=sha256:2251ebfc4a46144401e431f4a5d9f04c262a0d6f95c88a8e71071da056e55f72
323+
ibm-cos-sdk==2.13.6 \
324+
--hash=sha256:171cf2ae4ab662a4b8ab58dcf4ac994b0577d6c92d78490295fd7704a83978f6
325+
ibm-cos-sdk-core==2.13.6 \
326+
--hash=sha256:dd41fb789eeb65546501afabcd50e78846ab4513b6ad4042e410b6a14ff88413
327+
ibm-cos-sdk-s3transfer==2.13.6 \
328+
--hash=sha256:e0acce6f380c47d11e07c6765b684b4ababbf5c66cc0503bc246469a1e2b9790
329329
ibm-generative-ai==3.0.0 \
330330
--hash=sha256:0d86297371a5bb7c41d143a8c770e068f37489b5ca88e6bd56dca61a4f6dc1a8 \
331331
--hash=sha256:e0c39a5c84356f7408de31988ee055349a4ab7ec7030f313fa1c19d76b2b6d85
@@ -385,24 +385,24 @@ jsonpointer==3.0.0 \
385385
kubernetes==30.1.0 \
386386
--hash=sha256:41e4c77af9f28e7a6c314e3bd06a8c6229ddd787cad684e0ab9f69b498e98ebc \
387387
--hash=sha256:e212e8b7579031dd2e512168b617373bc1e03888d41ac4e04039240a292d478d
388-
langchain==0.3.27 \
389-
--hash=sha256:7b20c4f338826acb148d885b20a73a16e410ede9ee4f19bb02011852d5f98798 \
390-
--hash=sha256:aa6f1e6274ff055d0fd36254176770f356ed0a8994297d1df47df341953cec62
391-
langchain-community==0.3.29 \
392-
--hash=sha256:1f3d37973b10458052bb3cc02dce9773a8ffbd02961698c6d395b8c8d7f9e004 \
393-
--hash=sha256:c876ec7ef40b46353af164197f4e08e157650e8a02c9fb9d49351cdc16c839fe
394-
langchain-core==0.3.76 \
395-
--hash=sha256:46e0eb48c7ac532432d51f8ca1ece1804c82afe9ae3dcf027b867edadf82b3ec \
396-
--hash=sha256:71136a122dd1abae2c289c5809d035cf12b5f2bb682d8a4c1078cd94feae7419
388+
langchain==0.3.26 \
389+
--hash=sha256:361bb2e61371024a8c473da9f9c55f4ee50f269c5ab43afdb2b1309cb7ac36cf \
390+
--hash=sha256:8ff034ee0556d3e45eff1f1e96d0d745ced57858414dba7171c8ebdbeb5580c9
391+
langchain-community==0.3.27 \
392+
--hash=sha256:581f97b795f9633da738ea95da9cb78f8879b538090c9b7a68c0aed49c828f0d \
393+
--hash=sha256:e1037c3b9da0c6d10bf06e838b034eb741e016515c79ef8f3f16e53ead33d882
394+
langchain-core==0.3.66 \
395+
--hash=sha256:350c92e792ec1401f4b740d759b95f297710a50de29e1be9fbfff8676ef62117 \
396+
--hash=sha256:65cd6c3659afa4f91de7aa681397a0c53ff9282425c281e53646dd7faf16099e
397397
langchain-ibm==0.3.13 \
398398
--hash=sha256:61f3ece7c665bb37da6809f60824a521420eeda84d00927414e76d9221340cc6 \
399399
--hash=sha256:ca68cbb4338b50fdffd08926e8901fa96ebe12e07422193decc2f46c32ab5ea1
400400
langchain-openai==0.3.26 \
401401
--hash=sha256:2f216b92195e43fc30a28af8842cf704e72abe3b0ae2cbf85004ca75c5274575 \
402402
--hash=sha256:6f8420f164095834477d13715bc08a7553cdc229df30110d390c3d8880b728f3
403-
langchain-text-splitters==0.3.11 \
404-
--hash=sha256:7a50a04ada9a133bbabb80731df7f6ddac51bc9f1b9cab7fa09304d71d38a6cc \
405-
--hash=sha256:cf079131166a487f1372c8ab5d0bfaa6c0a4291733d9c43a34a16ac9bcd6a393
403+
langchain-text-splitters==0.3.8 \
404+
--hash=sha256:116d4b9f2a22dda357d0b79e30acf005c5518177971c66a9f1ab0edfdb0f912e \
405+
--hash=sha256:e75cc0f4ae58dcf07d9f18776400cf8ade27fadd4ff6d264df6278bb302f6f02
406406
langsmith==0.4.3 \
407407
--hash=sha256:151d8cbf3d26a49f67bd720462eae20d3282196958f86b59d1ac1aad484c52f1 \
408408
--hash=sha256:b8ed57fb21fb3370bc7e4e8c4a3003017040336df694a66a34afe6f9872e68da
@@ -454,9 +454,9 @@ llama-index-readers-llama-parse==0.4.0 \
454454
llama-index-vector-stores-faiss==0.3.0 \
455455
--hash=sha256:2148163dba1222c855bd367a7b796bc35d46dc2e77d57bafd321ba14aac00177 \
456456
--hash=sha256:c9df99dd00fe7058606ef4fce113535fa30b73edd650136be87c9b5b240df3f9
457-
llama-index-vector-stores-postgres==0.5.4 \
458-
--hash=sha256:40fa6757c7ddccc1a23f5413f6676e339583c5bfb3364dbf7e371aab5d94ed07 \
459-
--hash=sha256:df6f05ffd7c148e4d3663ab386cf059a76fb59b3c9b34110add97fc154a16e2a
457+
llama-index-vector-stores-postgres==0.5.2 \
458+
--hash=sha256:51926e4e350f814ca10c4615b0e153980e411ef71a6bec83bc547e740d424ff9 \
459+
--hash=sha256:a70b4db043ac590f772b316ff59e3937d39da5e17bb9d3f4422fbaa96e066e53
460460
llama-parse==0.6.34 \
461461
--hash=sha256:395174c3c4d22dc372ab310727de2b3fc4e268e36f11fe9959a95bfa9cf63d66 \
462462
--hash=sha256:a228619806687ff7b3fb44f21210e98c337f7e05f19374f0fb52196158caae0d
@@ -894,9 +894,9 @@ regex==2024.11.6 \
894894
--hash=sha256:e5364a4502efca094731680e80009632ad6624084aff9a23ce8c8c6820de3e51 \
895895
--hash=sha256:f2a19f302cd1ce5dd01a9099aaa19cae6173306d1302a43b627f62e21cf18ac0 \
896896
--hash=sha256:fdd6028445d2460f33136c55eeb1f601ab06d74cb3347132e1c24250187500d9
897-
requests==2.32.5 \
898-
--hash=sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6 \
899-
--hash=sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf
897+
requests==2.32.2 \
898+
--hash=sha256:dd951ff5ecf3e3b3aa26b40703ba77495dab41da839ae72ef3c8e5d8e2433289 \
899+
--hash=sha256:fc06670dd0ed212426dfeb94fc1b983d917c4f9847c863f313c9dfaaffb7c23c
900900
requests-oauthlib==2.0.0 \
901901
--hash=sha256:7dd8a5c40426b779b0868c404bdef9768deccf22749cde15852df527e6269b36 \
902902
--hash=sha256:b3dffaebd884d8cd778494369603a9e7b58d29111bf6b41bdc2dcd87203af4e9
@@ -1079,9 +1079,9 @@ tzdata==2025.2 \
10791079
unearth==0.17.5 \
10801080
--hash=sha256:9963e66b14f0484644c9b45b517e530befb2de6a8da4b06a9a38bed2d086dfe6 \
10811081
--hash=sha256:a19e1c02e64b40518d088079c7416fc41b45a648b81a4128aac02597234ee6ba
1082-
urllib3==2.5.0 \
1083-
--hash=sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 \
1084-
--hash=sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc
1082+
urllib3==2.2.3 \
1083+
--hash=sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac \
1084+
--hash=sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9
10851085
uvicorn==0.32.1 \
10861086
--hash=sha256:82ad92fd58da0d12af7482ecdb5f2470a04c9c9a53ced65b9bbb4a205377602e \
10871087
--hash=sha256:ee9519c246a72b1c084cea8d3b44ed6026e78a4a309cbedae9c37e4cb9fbb175

0 commit comments

Comments
 (0)