From 5c263caf5cdd52f45c3d2e2890973eb487ce6ee6 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 13 Dec 2024 13:08:04 +0000 Subject: [PATCH 1/3] ci: update common-requirements.txt --- requirements/common-requirements.txt | 88 ++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 requirements/common-requirements.txt diff --git a/requirements/common-requirements.txt b/requirements/common-requirements.txt new file mode 100644 index 0000000..7ae27a9 --- /dev/null +++ b/requirements/common-requirements.txt @@ -0,0 +1,88 @@ +# +# This file is autogenerated by pip-compile with Python 3.9 +# by the following command: +# +# pip-compile --output-file=/home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/common-requirements.txt requirements/common-requirements.in +# +annotated-types==0.7.0 + # via pydantic +anyio==4.7.0 + # via starlette +boto3==1.25.0 + # via -r requirements/common-requirements.in +botocore==1.28.5 + # via + # boto3 + # s3transfer +certifi==2024.8.30 + # via + # minio + # requests +charset-normalizer==3.4.0 + # via requests +click==8.1.7 + # via uvicorn +exceptiongroup==1.2.2 + # via anyio +fastapi==0.115.2 + # via -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/submodules/parent-images/requirements/mini-requirements.in +greenlet==3.1.1 + # via sqlalchemy +h11==0.14.0 + # via uvicorn +idna==3.10 + # via + # anyio + # requests +jmespath==1.0.1 + # via + # boto3 + # botocore +minio==7.1.12 + # via -r requirements/common-requirements.in +numpy==1.23.5 + # via + # -r requirements/common-requirements.in + # pandas +pandas==1.5.1 + # via -r requirements/common-requirements.in +psycopg2-binary==2.9.9 + # via -r requirements/common-requirements.in +pydantic==2.7.4 + # via + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/submodules/parent-images/requirements/mini-requirements.in + # fastapi +pydantic-core==2.18.4 + # via pydantic +python-dateutil==2.9.0.post0 + # via + # botocore + # pandas +pytz==2024.2 + # via pandas +requests==2.31.0 + # via -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/submodules/parent-images/requirements/mini-requirements.in +s3transfer==0.6.2 + # via boto3 +six==1.17.0 + # via python-dateutil +sniffio==1.3.1 + # via anyio +sqlalchemy==1.4.42 + # via -r requirements/common-requirements.in +starlette==0.40.0 + # via fastapi +typing-extensions==4.12.2 + # via + # anyio + # fastapi + # pydantic + # pydantic-core + # starlette +urllib3==1.26.20 + # via + # botocore + # minio + # requests +uvicorn==0.22.0 + # via -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/submodules/parent-images/requirements/mini-requirements.in From 3cadc530d84d9acfb9d23be05cd1aa666b68f93f Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 13 Dec 2024 13:08:30 +0000 Subject: [PATCH 2/3] ci: update requirements.txt --- requirements.txt | 106 ++++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 52 deletions(-) diff --git a/requirements.txt b/requirements.txt index d11c302..acdb27f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,11 +12,11 @@ aiosignal==1.3.1 # via aiohttp annotated-types==0.7.0 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # pydantic anyio==4.6.2.post1 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # httpx # starlette async-timeout==4.0.3 @@ -26,10 +26,10 @@ attrs==23.2.0 blis==0.7.11 # via thinc boto3==1.25.0 - # via -r requirements/torch-cpu-requirements.txt + # via -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt botocore==1.28.5 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # boto3 # s3transfer catalogue==2.0.10 @@ -39,18 +39,18 @@ catalogue==2.0.10 # thinc certifi==2024.8.30 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # httpcore # httpx # minio # requests charset-normalizer==3.4.0 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # requests click==8.1.7 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # nltk # typer # uvicorn @@ -71,15 +71,15 @@ embedders==0.1.8 # via -r requirements/requirements.in exceptiongroup==1.2.2 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # anyio fastapi==0.115.2 - # via -r requirements/torch-cpu-requirements.txt + # via -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt fastavro==1.9.4 # via cohere filelock==3.16.1 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # huggingface-hub # torch # transformers @@ -89,12 +89,14 @@ frozenlist==1.4.1 # aiosignal fsspec==2024.10.0 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # huggingface-hub # torch +greenlet==3.1.1 + # via sqlalchemy h11==0.14.0 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # httpcore # uvicorn httpcore==1.0.5 @@ -111,24 +113,24 @@ huggingface-hub==0.25.2 # transformers idna==3.10 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # anyio # httpx # requests # yarl jinja2==3.1.4 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # spacy # torch jmespath==1.0.1 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # boto3 # botocore joblib==1.4.2 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # nltk # scikit-learn # scikit-optimize @@ -142,15 +144,15 @@ markdown-it-py==3.0.0 # via rich markupsafe==3.0.2 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # jinja2 mdurl==0.1.2 # via markdown-it-py minio==7.1.12 - # via -r requirements/torch-cpu-requirements.txt + # via -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt mpmath==1.3.0 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # sympy multidict==6.0.5 # via @@ -163,13 +165,13 @@ murmurhash==1.0.10 # thinc networkx==3.2.1 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # torch nltk==3.8.1 # via sentence-transformers numpy==1.23.4 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # blis # embedders # pandas @@ -187,14 +189,14 @@ openai==0.28.1 # embedders packaging==24.2 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # huggingface-hub # spacy # thinc # transformers # weasel pandas==1.5.1 - # via -r requirements/torch-cpu-requirements.txt + # via -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt pillow==10.3.0 # via torchvision preshed==3.0.9 @@ -202,15 +204,15 @@ preshed==3.0.9 # spacy # thinc psycopg2-binary==2.9.9 - # via -r requirements/torch-cpu-requirements.txt + # via -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt pyaml==24.9.0 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # scikit-optimize pydantic==2.7.4 # via + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # -r requirements/requirements.in - # -r requirements/torch-cpu-requirements.txt # cohere # confection # fastapi @@ -219,33 +221,33 @@ pydantic==2.7.4 # weasel pydantic-core==2.18.4 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # pydantic pygments==2.18.0 # via rich python-dateutil==2.9.0.post0 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # botocore # pandas pytz==2024.2 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # pandas pyyaml==6.0.2 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # huggingface-hub # pyaml # transformers regex==2024.11.6 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # nltk # transformers requests==2.31.0 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # cohere # huggingface-hub # openai @@ -257,23 +259,23 @@ rich==13.7.1 # via typer s3transfer==0.6.2 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # boto3 safetensors==0.4.5 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # transformers scikit-learn==1.1.2 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # embedders # scikit-optimize # sentence-transformers scikit-optimize==0.9.0 - # via -r requirements/torch-cpu-requirements.txt + # via -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt scipy==1.13.1 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # scikit-learn # scikit-optimize # sentence-transformers @@ -287,13 +289,13 @@ shellingham==1.5.4 # via typer six==1.16.0 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # python-dateutil smart-open==7.0.4 # via weasel sniffio==1.3.1 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # anyio # httpx spacy==3.7.5 @@ -305,7 +307,7 @@ spacy-legacy==3.0.12 spacy-loggers==1.0.5 # via spacy sqlalchemy==1.4.42 - # via -r requirements/torch-cpu-requirements.txt + # via -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt srsly==2.4.8 # via # confection @@ -314,36 +316,36 @@ srsly==2.4.8 # weasel starlette==0.40.0 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # fastapi sympy==1.13.3 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # torch thinc==8.2.5 # via spacy threadpoolctl==3.5.0 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # scikit-learn tokenizers==0.19.1 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # cohere # transformers -torch==2.2.0 +torch==2.2.0+cpu # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # embedders # sentence-transformers # torchvision -torchvision==0.17.0 +torchvision==0.17.0+cpu # via # -r requirements/requirements.in # sentence-transformers tqdm==4.67.1 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # embedders # huggingface-hub # nltk @@ -353,7 +355,7 @@ tqdm==4.67.1 # transformers transformers==4.41.2 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # embedders # sentence-transformers typer==0.12.3 @@ -366,7 +368,7 @@ types-urllib3==1.26.25.14 # via types-requests typing-extensions==4.12.2 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # anyio # cloudpathlib # cohere @@ -379,12 +381,12 @@ typing-extensions==4.12.2 # typer urllib3==1.26.20 # via - # -r requirements/torch-cpu-requirements.txt + # -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt # botocore # minio # requests uvicorn==0.22.0 - # via -r requirements/torch-cpu-requirements.txt + # via -r /home/runner/work/refinery-submodule-parent-images/refinery-submodule-parent-images/refinery-embedder/requirements/torch-cpu-requirements.txt wasabi==1.1.3 # via # spacy From 07f970b3ffe3c46b16b1d6f9cda9463717307001 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 13 Dec 2024 13:27:30 +0000 Subject: [PATCH 3/3] ci: update common-requirements.txt and Dockerfile --- Dockerfile | 2 +- dev.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 486e2ab..d204e15 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM kernai/refinery-parent-images:v1.20.0-torch-cpu +FROM kernai/refinery-parent-images:update-numpy-common WORKDIR /program diff --git a/dev.Dockerfile b/dev.Dockerfile index 80b9032..cee6783 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM kernai/refinery-parent-images:v1.20.0-torch-cpu +FROM kernai/refinery-parent-images:update-numpy-common WORKDIR /app