Merge pull request #30 from matysek/lcore-239

LCORE-239: Update packages torch, llama-index, fais-cpu, huggingface-hub

Author: tisnik

.github/workflows/unit_tests.yml

@@ -29,5 +29,4 @@ jobs:
         run: uv pip install pdm
       - name: Run unit tests
         run: |
-          uv run coverage run --source=src/lightspeed_rag_content -m unittest discover tests --verbose
-          uv run coverage report -m --fail-under 90
+          uv run pytest tests --cov=src/lightspeed_rag_content --cov=runner --cov-report term-missing --cov-fail-under=90

Makefile

@@ -1,4 +1,5 @@
 NUM_WORKERS ?= $$(( $(shell nproc --all) / 2))
+ARTIFACT_DIR := $(if $(ARTIFACT_DIR),$(ARTIFACT_DIR),tests/test_results)
 
 # Define arguments for pgvector support
 POSTGRES_USER ?= postgres
@@ -7,6 +8,13 @@ POSTGRES_HOST ?= localhost
 POSTGRES_PORT ?= 15432
 POSTGRES_DATABASE ?= postgres
 
+
+.PHONY: unit-test
+test-unit: ## Run the unit tests
+	@echo "Running unit tests..."
+	@echo "Reports will be written to ${ARTIFACT_DIR}"
+	COVERAGE_FILE="${ARTIFACT_DIR}/.coverage.unit" uv run pytest tests --cov=src/lightspeed_rag_content --cov-report term-missing --cov-report "json:${ARTIFACT_DIR}/coverage_unit.json" --junit-xml="${ARTIFACT_DIR}/junit_unit.xml" --cov-fail-under=60
+
 .PHONY: install-tools
 install-tools: ## Install required utilities/tools
 	@command -v uv > /dev/null || { echo >&2 "uv is not installed. Installing..."; pip3.11 install --upgrade pip uv; }

pyproject.toml

@@ -29,15 +29,15 @@ version = "0.1.0"
 description = "RAG content for OpenShift LightSpeed."
 authors = []
 dependencies = [
-    "PyYAML==6.0.1",
-    "huggingface_hub>=0.23.4",
-    "llama-index==0.10.62",
-    "llama-index-vector-stores-faiss==0.1.2",
-    "llama-index-embeddings-huggingface==0.2.2",
-    "llama-index-readers-file==0.1.30",
-    "faiss-cpu==1.8.0.post1",
-    "llama-index-vector-stores-postgres>=0.1.14",
-    "torch==2.3.1",
+    "PyYAML==6.0.2",
+    "huggingface_hub>=0.33.4",
+    "llama-index==0.12.51",
+    "llama-index-vector-stores-faiss==0.3.0",
+    "llama-index-embeddings-huggingface==0.4.0",
+    "llama-index-readers-file==0.4.11",
+    "faiss-cpu==1.11.0.post1",
+    "llama-index-vector-stores-postgres>=0.5.4",
+    "torch==2.7.0",
 ]
 requires-python = "==3.11.*"
 dynamic = ["license", "readme"]
@@ -54,16 +54,18 @@ torchvision = [{ index = "pytorch-cpu" }]
 
 [dependency-groups]
 dev = [
-    "black==24.10.0",
-    "mypy==1.12.0",
-    "ruff==0.6.9",
-    "types-requests==2.32.0.20240622",
-    "pre-commit==4.0.1",
+    "black>=25.1.0",
+    "mypy>=1.15.0",
+    "ruff>=0.12.4",
+    "types-requests>=2.32.0.20240622",
+    "pre-commit>=4.2.0",
     "coverage>=7.6.12",
-    "huggingface-hub>=0.23.4",
+    "huggingface-hub>=0.33.4",
     "radon>=6.0.1",
     "pyright>=1.1.401",
     "pylint>=3.3.7",
+    "pytest>=8.3.4",
+    "pytest-cov>=6.0.0",
 ]
 
 [tool.pylint."MESSAGES CONTROL"]

tests/test_document_processor.py

@@ -22,11 +22,13 @@
 from llama_index.core import Document
 from lightspeed_rag_content import document_processor
 
+from llama_index.core.embeddings.mock_embed_model import MockEmbedding
+
 
 # Mock class for HuggingFaceEmbedding
-class MockEmbedding:
+class RagMockEmbedding(MockEmbedding):
     def __init__(self, model_name="ABC"):
-        pass
+        super().__init__(embed_dim=256)
 
     def get_text_embedding(self, text):
         return "ABC"
@@ -207,7 +209,7 @@ def test_save(self):
     )
     @mock.patch(
         "lightspeed_rag_content.document_processor.HuggingFaceEmbedding",
-        new=MockEmbedding,
+        new=RagMockEmbedding,
     )
     def test_pgvector(self):
         self.patcher.stop()  # Remove the mock on the _get_settings() method
@@ -223,7 +225,7 @@ def test_pgvector(self):
 
     @mock.patch(
         "lightspeed_rag_content.document_processor.HuggingFaceEmbedding",
-        new=MockEmbedding,
+        new=RagMockEmbedding,
     )
     def test_invalid_vector_store_type(self):
         self.patcher.stop()  # Remove the mock on the _get_settings() method