Merge pull request #67 from lightspeed-core/revert-65-hermetic

Revert "LCORE-791: konflux hermetic build"

Author: tisnik

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

@@ -30,42 +30,8 @@ spec:
   - name: build-platforms
     value:
     - linux/x86_64
-    - linux-c6gd2xlarge/arm64
   - name: dockerfile
     value: Containerfile
-  - name: build-source-image
-    value: 'true'
-  - name: prefetch-input
-    # no source available: torch, faiss-cpu
-    # hermeto prefetch problems: uv, pip, jiter, tiktoken,
-    # those need cmake to build: pyarrow
-    # those need cargo to build: jiter, tiktoken, cryptography, fastuuid, hf_xet, maturin, pydantic_core, rpds_py, safetensors, tokenizers
-    # to accelerate build:numpy, scipy, pandas, pillow, scikit_learn
-    value: |
-     [
-        {
-          "type": "rpm",
-          "path": "."
-        },
-        {
-          "type": "pip",
-          "path": ".",
-          "requirements_files": [
-            "requirements.hashes.wheel.txt",
-            "requirements.hashes.source.txt",
-            "requirements.hermetic.txt"
-          ],
-          "requirements_build_files": ["requirements-build.txt"],
-          "binary": {
-            "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-ibm-models,einops,et-xmlfile,faiss-cpu,filetype,fire,frozenlist,googleapis-common-protos,greenlet,h11,hf-xet,httpcore,httpx,huggingface-hub,idna,jinja2,jiter,joblib,jsonlines,jsonref,jsonschema-specifications,latex2mathml,llama-stack-client,lxml,markdown-it-py,markupsafe,mdurl,mpire,mpmath,multidict,mypy-extensions,nest-asyncio,networkx,nltk,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,pyaml,pycparser,pydantic,pydantic-core,pydantic-settings,pygments,pyjwt,pylatexenc,python-dateutil,python-docx,python-dotenv,python-multipart,python-pptx,pytz,pyyaml,referencing,requests,rich,rpds-py,rtree,safetensors,scikit-learn,scipy,semchunk,sentence-transformers,shapely,shellingham,six,sniffio,sqlalchemy,starlette,sympy,tabulate,tenacity,threadpoolctl,tiktoken,tokenizers,torch,torchvision,tqdm,transformers,triton,typer,typing-extensions,typing-inspect,typing-inspection,tzdata,wcwidth,wrapt,xlsxwriter,yarl,zipp,uv-build,uv,pip,maturin,opencv-python,rapidocr,sqlite-vec",
-            "os": "linux",
-            "arch": "x86_64,aarch64",
-            "py_version": "312"
-          }
-        }
-      ]
-  - name: hermetic
-    value: 'true'
   pipelineSpec:
     description: |
       This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.

.tekton/rag-tool-push.yaml

@@ -29,39 +29,6 @@ spec:
     - linux/x86_64
   - name: dockerfile
     value: Containerfile
-  - name: build-source-image
-    value: 'true'
-  - name: prefetch-input
-    # no source available: torch, faiss-cpu
-    # hermeto prefetch problems: uv, pip, jiter, tiktoken,
-    # those need cmake to build: pyarrow
-    # those need cargo to build: jiter, tiktoken, cryptography, fastuuid, hf_xet, maturin, pydantic_core, rpds_py, safetensors, tokenizers
-    # to accelerate build:numpy, scipy, pandas, pillow, scikit_learn
-    value: |
-     [
-        {
-          "type": "rpm",
-          "path": "."
-        },
-        {
-          "type": "pip",
-          "path": ".",
-          "requirements_files": [
-            "requirements.hashes.wheel.txt",
-            "requirements.hashes.source.txt",
-            "requirements.hermetic.txt"
-          ],
-          "requirements_build_files": ["requirements-build.txt"],
-          "binary": {
-            "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-ibm-models,einops,et-xmlfile,faiss-cpu,filetype,fire,frozenlist,googleapis-common-protos,greenlet,h11,hf-xet,httpcore,httpx,huggingface-hub,idna,jinja2,jiter,joblib,jsonlines,jsonref,jsonschema-specifications,latex2mathml,llama-stack-client,lxml,markdown-it-py,markupsafe,mdurl,mpire,mpmath,multidict,mypy-extensions,nest-asyncio,networkx,nltk,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,pyaml,pycparser,pydantic,pydantic-core,pydantic-settings,pygments,pyjwt,pylatexenc,python-dateutil,python-docx,python-dotenv,python-multipart,python-pptx,pytz,pyyaml,referencing,requests,rich,rpds-py,rtree,safetensors,scikit-learn,scipy,semchunk,sentence-transformers,shapely,shellingham,six,sniffio,sqlalchemy,starlette,sympy,tabulate,tenacity,threadpoolctl,tiktoken,tokenizers,torch,torchvision,tqdm,transformers,triton,typer,typing-extensions,typing-inspect,typing-inspection,tzdata,wcwidth,wrapt,xlsxwriter,yarl,zipp,uv-build,uv,pip,maturin,opencv-python,rapidocr,sqlite-vec",
-            "os": "linux",
-            "arch": "x86_64,aarch64",
-            "py_version": "312"
-          }
-        }
-      ]
-  - name: hermetic
-    value: 'true'
   pipelineSpec:
     description: |
       This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.

Containerfile

@@ -9,9 +9,8 @@ RUN microdnf install -y --nodocs --setopt=keepcache=0 --setopt=tsflags=nodocs \
 RUN microdnf install -y rubygems && \
     microdnf clean all && \
     gem install asciidoctor
-
 # Install uv package manager
-RUN pip3.12 install uv>=0.7.20
+RUN pip3.12 install uv==0.7.20
 
 WORKDIR /rag-content
 
@@ -22,11 +21,8 @@ COPY scripts ./scripts
 
 # Configure UV environment variables for optimal performance
 # Pytorch backend - cpu. `uv` contains convenient way to specify the backend.
-# MATURIN_NO_INSTALL_RUST=1 : Disable installation of Rust dependencies by Maturin.
 ENV UV_COMPILE_BYTECODE=0 \
-    UV_LINK_MODE=copy \
-    UV_PYTHON_DOWNLOADS=0 \
-    MATURIN_NO_INSTALL_RUST=1
+    UV_PYTHON_DOWNLOADS=0
 
 # Install Python dependencies
 RUN uv sync --locked --no-install-project
@@ -47,12 +43,4 @@ RUN python ./scripts/download_embeddings_model.py \
 # Reset the entrypoint.
 ENTRYPOINT []
 
-LABEL vendor="Red Hat, Inc." \
-    name="lightspeed-core/rag-tool-rhel9" \
-    com.redhat.component="lightspeed-core/rag-tool" \
-    cpe="cpe:/a:redhat:lightspeed_core:0.4::el9" \
-    io.k8s.display-name="Lightspeed RAG Tool" \
-    summary="RAG tool containing embedding model and dependencies needed to generate a vector database." \
-    description="RAG Tool provides a shared codebase for generating vector databases. It serves as the core framework for Lightspeed-related projects (e.g., OpenShift Lightspeed, OpenStack Lightspeed, etc.) to generate their own vector databases that can be used for RAG." \
-    io.k8s.description="RAG Tool provides a shared codebase for generating vector databases. It serves as the core framework for Lightspeed-related projects (e.g., OpenShift Lightspeed, OpenStack Lightspeed, etc.) to generate their own vector databases that can be used for RAG." \
-    io.openshift.tags="lightspeed-core,lightspeed-rag-tool,lightspeed"
+LABEL description="Contains embedding model and dependencies needed to generate a vector database"

Makefile

@@ -101,9 +101,6 @@ start-postgres-debug: ## Start postgresql from the pgvector container image with
 	 -v ./postgresql/data:/var/lib/postgresql/data:Z pgvector/pgvector:pg16 \
 	 postgres -c log_statement=all -c log_destination=stderr
 
-konflux-requirements:	## generate hermetic requirements.*.txt file for konflux build
-	./scripts/konflux_requirements.sh
-
 .PHONY: help
 help: ## Show this help screen
 	@echo 'Usage: make <OPTIONS> ... <TARGETS>'

pyproject.toml

@@ -47,8 +47,8 @@ dependencies = [
     "llama-index-vector-stores-postgres>=0.5.4",
     # Pin torch/torchvision to versions available as CPU wheels
     # torch 2.5.x pairs with torchvision 0.20.x
-    "torch>=2.8.0,<2.9.0",
-    "torchvision>=0.23.0,<0.24.0",
+    "torch>=2.5.0,<2.6.0",
+    "torchvision>=0.20.0,<0.21.0",
     "llama-stack==0.3.5",
     "llama-stack-client==0.3.5",
     "aiosqlite>=0.21.0",
@@ -87,8 +87,6 @@ dev = [
     "pytest>=8.3.4",
     "pytest-cov>=6.0.0",
     "pytest-mock>=3.15.1",
-    "pybuild-deps>=0.5.0",
-    "pip==24.3.1",
 ]
 
 [tool.pylint."MESSAGES CONTROL"]