Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
197fca0
use uv tool freeze the requirement version
chensuyue Jun 11, 2025
a342a88
update requirements.txt
chensuyue Jun 11, 2025
5195a44
1. Update pip install in Dockerfile with uv pip install.
chensuyue Jun 11, 2025
a5f07a0
update cpu requirements
chensuyue Jun 11, 2025
824da9b
Update torch and torchvision installation for cpu test
chensuyue Jun 12, 2025
24e5d3f
update pip compile after rebase main branch
chensuyue Jun 12, 2025
460c6b6
add --system for uv install
chensuyue Jun 12, 2025
1a4c863
Update requirements.txt for comps/guardrails/src/toxicity_detection
chensuyue Jun 12, 2025
e20bb67
fix typo
chensuyue Jun 12, 2025
814e900
run mega ut with uv tool
chensuyue Jun 13, 2025
5aca927
update req name
chensuyue Jun 13, 2025
6df2a50
update requirements in linux python 3.11 env.
chensuyue Jun 13, 2025
07ae409
update req name
chensuyue Jun 13, 2025
dadfdbc
refresh partial req files
chensuyue Jun 13, 2025
7f24220
fix issue
chensuyue Jun 13, 2025
624c49d
fix ut env
chensuyue Jun 13, 2025
6715d7e
fix hadolint issue
chensuyue Jun 13, 2025
a32d08e
install torch cpu separately
chensuyue Jun 13, 2025
09526cf
freeze graspologic>=3.4.1 to keep scipy==1.12.0
chensuyue Jun 16, 2025
4cf3127
update dataprep requirements
chensuyue Jun 16, 2025
5fbc8dd
align comps/guardrails/src/pii_detection/requirements.i with main
chensuyue Jun 16, 2025
9d75cd2
update pii_detection/requirements.txt
chensuyue Jun 16, 2025
a9c9902
add venv for ut docker env
chensuyue Jun 17, 2025
d8d9a2d
update pinecone
chensuyue Jun 17, 2025
0d1497a
update ut base image into python:3.11-slim
chensuyue Jun 17, 2025
2281624
Merge branch 'main' into suyue/uv
chensuyue Jun 17, 2025
c73410b
update requirements compatible with python3.10
chensuyue Jun 18, 2025
b7215e3
update dockerfiles for bug fix
chensuyue Jun 18, 2025
b48b326
install fixed version deps first, then flexable version deps
chensuyue Jun 18, 2025
bfe0ab0
bug fix
chensuyue Jun 19, 2025
a576c79
Revert "install fixed version deps first, then flexable version deps"
chensuyue Jun 19, 2025
1eaf0f2
bug fix
chensuyue Jun 19, 2025
11c7b89
update some deps
chensuyue Jun 19, 2025
2845d0a
support uv case minimal test
chensuyue Jun 20, 2025
47ce601
Merge branch 'main' into suyue/uv
chensuyue Jun 20, 2025
f2f1790
support uv case minimal test
chensuyue Jun 20, 2025
97aadb5
bug fix for uv dependency version control (#1807)
chensuyue Jun 23, 2025
1f7ec2d
bug issues left in #1807
chensuyue Jun 23, 2025
6d8e67c
fix language_detection and lvms_llama_vision (#1812)
chensuyue Jun 23, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions .github/workflows/docker/ut.dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

ARG UBUNTU_VER=22.04
FROM ubuntu:${UBUNTU_VER} as devel
FROM python:3.11-slim

ENV LANG=C.UTF-8

Expand All @@ -11,13 +10,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends --fix-missing \
aspell-en \
build-essential \
git \
python3 \
python3-dev \
python3-distutils \
python3-pip \
wget

RUN ln -sf $(which python3) /usr/bin/python
RUN python -m pip install --no-cache-dir pytest pytest-cov
RUN python -m pip install --no-cache-dir pytest pytest-cov uv

WORKDIR /
2 changes: 1 addition & 1 deletion .github/workflows/mix-megaservice-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:

- name: Install Dependencies
run: |
docker exec ${{ env.CONTAINER_NAME }} bash -c "cd /GenAIComps && pip install --no-cache-dir -r requirements.txt && python setup.py install"
docker exec ${{ env.CONTAINER_NAME }} bash -c "cd /GenAIComps && uv pip install --system --no-cache-dir -r requirements.txt && python setup.py install"

- name: Run UT
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-examples-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Example-test

on:
pull_request_target:
branches: [main]
branches: ["main", "**uv"]
types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped
paths:
- .github/workflows/pr-examples-test.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-microservice-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: MicroService-test

on:
pull_request_target:
branches: ["main", "*rc", "pre-ci"]
branches: ["main", "*rc", "pre-ci", "**uv"]
types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped
paths:
- comps/**
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ WORKDIR $HOME

COPY *.toml *.py *.txt *.md LICENSE ./

RUN pip install --no-cache-dir --upgrade pip setuptools && \
pip install --no-cache-dir -r requirements.txt
ARG uvpip='uv pip install --system --no-cache-dir'
RUN pip install --no-cache-dir --upgrade pip setuptools uv && \
$uvpip -r requirements.txt

COPY comps/ comps/

Expand Down
10 changes: 3 additions & 7 deletions comps/agent/src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
FROM python:3.11-slim

ENV LANG=C.UTF-8
ARG ARCH=cpu

RUN apt-get update -y && apt-get install -y --no-install-recommends --fix-missing \
build-essential \
Expand All @@ -17,12 +16,9 @@ RUN useradd -m -s /bin/bash user && \

COPY comps /home/user/comps

RUN pip install --no-cache-dir --upgrade pip setuptools && \
if [ ${ARCH} = "cpu" ]; then \
pip install --no-cache-dir --extra-index-url https://download.pytorch.org/whl/cpu -r /home/user/comps/agent/src/requirements.txt; \
else \
pip install --no-cache-dir -r /home/user/comps/agent/src/requirements.txt; \
fi
ARG uvpip='uv pip install --system --no-cache-dir'
RUN pip install --no-cache-dir --upgrade pip setuptools uv && \
$uvpip -r /home/user/comps/agent/src/requirements.txt
Comment on lines +20 to +21
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this drops pytorch CPU version override, don't indirect deps bring it in any more?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This docker image does not include torch in its dependency, so I remove this --extra-index-url.


ENV PYTHONPATH=/home/user

Expand Down
54 changes: 54 additions & 0 deletions comps/agent/src/requirements.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# used by microservice
docarray[full]
fastapi

# get data source
finnhub-python==2.4.22
huggingface_hub
langchain

#used by tools
langchain-google-community
langchain-huggingface
langchain-openai
langchain-redis
langchain_community
langchainhub
langgraph
langsmith
mysql-connector-python
numpy

# used by cloud native
opentelemetry-api
opentelemetry-exporter-otlp
opentelemetry-sdk
pandas
prometheus_fastapi_instrumentator
pyarrow
pydantic #==1.10.13
rank_bm25

# used by document loader
# beautifulsoup4
# easyocr
# Pillow
# pymupdf
# python-docx

# used by embedding
# sentence_transformers

# used by Ray
# ray
# virtualenv

redis
shortuuid
tavily-python

# used by agents
transformers
transformers[sentencepiece]

uvicorn
Loading
Loading