Skip to content

Commit ad35f66

Browse files
authored
Merge pull request #101 from are-ces/fix-deps
Konflux: Fixed deps issues, compatibility for MacOS konflux scripts
2 parents 707b52f + 1f3c7ab commit ad35f66

11 files changed

+618
-310
lines changed

.tekton/rag-tool-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
],
6464
"requirements_build_files": ["requirements-build.txt"],
6565
"binary": {
66-
"packages": "accelerate,aiohappyeyeballs,aiohttp,aiosignal,aiosqlite,annotated-doc,annotated-types,anyio,asyncpg,attrs,beautifulsoup4,cffi,chardet,charset-normalizer,click,colorama,cryptography,dataclasses-json,defusedxml,distro,docling-parse,et-xmlfile,faiss-cpu,filetype,fire,frozenlist,googleapis-common-protos,greenlet,h11,hf-xet,httpcore,httpx,idna,jinja2,jiter,joblib,jsonlines,jsonref,jsonschema-specifications,latex2mathml,lxml,markdown-it-py,markupsafe,mdurl,mpire,mpmath,mypy-extensions,nest-asyncio,networkx,nltk,numpy,openpyxl,opentelemetry-api,opentelemetry-exporter-otlp-proto-common,opentelemetry-exporter-otlp-proto-http,opentelemetry-proto,opentelemetry-sdk,opentelemetry-semantic-conventions,packaging,pandas,pillow,platformdirs,pluggy,prompt-toolkit,propcache,psycopg2-binary,pydantic,pydantic-core,pydantic-settings,pygments,pylatexenc,pypdfium2,python-dateutil,python-docx,python-dotenv,python-pptx,pytz,pyyaml,referencing,requests,rpds-py,rtree,safetensors,scikit-learn,scipy,semchunk,setuptools,shapely,shellingham,six,sniffio,sympy,tabulate,threadpoolctl,tiktoken,tokenizers,torch,torchvision,tornado,transformers,triton,typing-extensions,typing-inspect,typing-inspection,tzdata,wrapt,xlsxwriter,yarl,zipp,uv-build,uv,pip,maturin,opencv-python,omegaconf,rapidocr,sqlite-vec,griffe,griffecli,griffelib,pyclipper,tree-sitter-typescript",
66+
"packages": "aiohappyeyeballs,aiohttp,aiosignal,aiosqlite,annotated-doc,annotated-types,anyio,asyncpg,attrs,beautifulsoup4,cffi,click,colorama,cryptography,dataclasses-json,defusedxml,distro,docling-parse,et-xmlfile,faiss-cpu,filetype,fire,frozenlist,greenlet,h11,hf-xet,httpcore,httpx,idna,jinja2,jiter,joblib,jsonlines,jsonref,jsonschema-specifications,latex2mathml,lxml,markdown-it-py,markupsafe,mdurl,mpire,mpmath,mypy-extensions,nest-asyncio,networkx,numpy,openpyxl,packaging,pandas,pillow,pluggy,prompt-toolkit,propcache,psycopg2-binary,pydantic,pydantic-core,pygments,pylatexenc,pypdfium2,python-dateutil,python-docx,python-pptx,pyyaml,referencing,requests,rpds-py,rtree,safetensors,scikit-learn,scipy,setuptools,shapely,shellingham,six,sniffio,sympy,threadpoolctl,tiktoken,tokenizers,torch,torchvision,transformers,triton,typing-extensions,typing-inspect,typing-inspection,tzdata,wrapt,xlsxwriter,zipp,uv-build,uv,pip,maturin,opencv-python,omegaconf,rapidocr,sqlite-vec,griffe,griffecli,griffelib,pyclipper,tree-sitter-typescript",
6767
"os": "linux",
6868
"arch": "x86_64,aarch64",
6969
"py_version": 312

.tekton/rag-tool-push.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ spec:
5959
],
6060
"requirements_build_files": ["requirements-build.txt"],
6161
"binary": {
62-
"packages": "accelerate,aiohappyeyeballs,aiohttp,aiosignal,aiosqlite,annotated-doc,annotated-types,anyio,asyncpg,attrs,beautifulsoup4,cffi,chardet,charset-normalizer,click,colorama,cryptography,dataclasses-json,defusedxml,distro,docling-parse,et-xmlfile,faiss-cpu,filetype,fire,frozenlist,googleapis-common-protos,greenlet,h11,hf-xet,httpcore,httpx,idna,jinja2,jiter,joblib,jsonlines,jsonref,jsonschema-specifications,latex2mathml,lxml,markdown-it-py,markupsafe,mdurl,mpire,mpmath,mypy-extensions,nest-asyncio,networkx,nltk,numpy,openpyxl,opentelemetry-api,opentelemetry-exporter-otlp-proto-common,opentelemetry-exporter-otlp-proto-http,opentelemetry-proto,opentelemetry-sdk,opentelemetry-semantic-conventions,packaging,pandas,pillow,platformdirs,pluggy,prompt-toolkit,propcache,psycopg2-binary,pydantic,pydantic-core,pydantic-settings,pygments,pylatexenc,pypdfium2,python-dateutil,python-docx,python-dotenv,python-pptx,pytz,pyyaml,referencing,requests,rpds-py,rtree,safetensors,scikit-learn,scipy,semchunk,setuptools,shapely,shellingham,six,sniffio,sympy,tabulate,threadpoolctl,tiktoken,tokenizers,torch,torchvision,tornado,transformers,triton,typing-extensions,typing-inspect,typing-inspection,tzdata,wrapt,xlsxwriter,yarl,zipp,uv-build,uv,pip,maturin,opencv-python,omegaconf,rapidocr,sqlite-vec,griffe,griffecli,griffelib,pyclipper,tree-sitter-typescript",
62+
"packages": "aiohappyeyeballs,aiohttp,aiosignal,aiosqlite,annotated-doc,annotated-types,anyio,asyncpg,attrs,beautifulsoup4,cffi,click,colorama,cryptography,dataclasses-json,defusedxml,distro,docling-parse,et-xmlfile,faiss-cpu,filetype,fire,frozenlist,greenlet,h11,hf-xet,httpcore,httpx,idna,jinja2,jiter,joblib,jsonlines,jsonref,jsonschema-specifications,latex2mathml,lxml,markdown-it-py,markupsafe,mdurl,mpire,mpmath,mypy-extensions,nest-asyncio,networkx,numpy,openpyxl,packaging,pandas,pillow,pluggy,prompt-toolkit,propcache,psycopg2-binary,pydantic,pydantic-core,pygments,pylatexenc,pypdfium2,python-dateutil,python-docx,python-pptx,pyyaml,referencing,requests,rpds-py,rtree,safetensors,scikit-learn,scipy,setuptools,shapely,shellingham,six,sniffio,sympy,threadpoolctl,tiktoken,tokenizers,torch,torchvision,transformers,triton,typing-extensions,typing-inspect,typing-inspection,tzdata,wrapt,xlsxwriter,zipp,uv-build,uv,pip,maturin,opencv-python,omegaconf,rapidocr,sqlite-vec,griffe,griffecli,griffelib,pyclipper,tree-sitter-typescript",
6363
"os": "linux",
6464
"arch": "x86_64,aarch64",
6565
"py_version": 312

Gemfile.lock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ GEM
55

66
PLATFORMS
77
aarch64-linux
8-
x86_64-linux-gnu
8+
universal-darwin-25
9+
x86_64-linux
910

1011
DEPENDENCIES
1112
asciidoctor

pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,19 @@ dependencies = [
4848
# Pin torch/torchvision to versions available as CPU wheels
4949
# torch 2.9.x pairs with torchvision 0.24.x
5050
"llama-stack==0.4.3",
51+
# User 0.4.4 instead of 0.4.3 to include CVE fix
52+
"llama-stack-api==0.4.4",
5153
"llama-stack-client==0.4.3",
5254
"torch>=2.9.0,<2.10.0",
5355
"torchvision>=0.24.0,<0.25.0",
5456
"aiosqlite>=0.21.0",
5557
"sqlite-vec>=0.1.6",
5658
"tomlkit",
5759
"chardet>=5.2.0",
60+
"hf-xet>=1.2.0",
5861
"einops>=0.8.1",
5962
# For HTML to Markdown conversion in BYOK workflows
60-
"docling>=2.68.0",
63+
"docling>=2.68.0,<2.73.0",
6164
"certifi>=2025.10.5",
6265
]
6366
requires-python = "==3.12.*"

requirements-build.txt

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@ coherent-licensed==0.5.2
1010
# via importlib-metadata
1111
cython==3.2.4
1212
# via sqlalchemy
13+
expandvars==1.1.2
14+
# via yarl
1315
flit-core==3.12.0
1416
# via
1517
# coherent-licensed
1618
# marshmallow
1719
# packaging
1820
# pathspec
1921
# pypdf
22+
# tinytag
2023
# wheel
2124
hatch-fancy-pypi-readme==25.1.0
2225
# via
@@ -25,20 +28,24 @@ hatch-fancy-pypi-readme==25.1.0
2528
# openai
2629
hatch-vcs==0.5.0
2730
# via
31+
# chardet
2832
# filelock
2933
# fsspec
3034
# jsonschema
35+
# platformdirs
3136
# termcolor
3237
# urllib3
3338
hatchling==1.26.3
3439
# via
3540
# hatch-fancy-pypi-readme
3641
# llama-stack-client
3742
# openai
38-
hatchling==1.28.0
43+
hatchling==1.29.0
3944
# via
4045
# banks
46+
# chardet
4147
# einops
48+
# expandvars
4249
# filelock
4350
# fsspec
4451
# hatch-fancy-pypi-readme
@@ -58,8 +65,17 @@ hatchling==1.28.0
5865
# llama-index-vector-stores-faiss
5966
# llama-index-vector-stores-postgres
6067
# llama-parse
68+
# opentelemetry-api
69+
# opentelemetry-exporter-otlp-proto-common
70+
# opentelemetry-exporter-otlp-proto-http
71+
# opentelemetry-proto
72+
# opentelemetry-sdk
73+
# opentelemetry-semantic-conventions
74+
# platformdirs
6175
# polyfactory
76+
# pydantic-settings
6277
# python-multipart
78+
# semchunk
6379
# soupsieve
6480
# starlette
6581
# termcolor
@@ -98,6 +114,7 @@ setuptools-scm==9.2.2
98114
# llama-stack-api
99115
# pluggy
100116
# setuptools-rust
117+
# tabulate
101118
# tenacity
102119
# tqdm
103120
# urllib3
@@ -109,17 +126,21 @@ wheel==0.46.3
109126
# via
110127
# pycparser
111128
# sentence-transformers
129+
# tornado
112130
# tree-sitter-c
113131
# tree-sitter-javascript
114132
# tree-sitter-python
115133

116134
# The following packages are considered to be unsafe in a requirements file:
117135
setuptools==82.0.0
136+
# via charset-normalizer
137+
setuptools==82.0.1
118138
# via
119139
# calver
120140
# certifi
121141
# colorlog
122142
# dill
143+
# googleapis-common-protos
123144
# importlib-metadata
124145
# llama-stack
125146
# llama-stack-api
@@ -132,15 +153,19 @@ setuptools==82.0.0
132153
# psutil
133154
# pycparser
134155
# pyjwt
156+
# python-dotenv
135157
# regex
136158
# sentence-transformers
137159
# setuptools-rust
138160
# setuptools-scm
139161
# sqlalchemy
162+
# tabulate
140163
# tenacity
164+
# tornado
141165
# tqdm
142166
# tree-sitter
143167
# tree-sitter-c
144168
# tree-sitter-javascript
145169
# tree-sitter-python
146170
# trove-classifiers
171+
# yarl

0 commit comments

Comments
 (0)