From a4187557b89889690439b21c62b4a2d4a2716dee Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Wed, 20 Mar 2024 08:10:43 -0600 Subject: [PATCH 01/17] fix gh actions location of run examples --- .github/workflows/run_examples.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_examples.yml b/.github/workflows/run_examples.yml index 75988193..5c8d8f9a 100644 --- a/.github/workflows/run_examples.yml +++ b/.github/workflows/run_examples.yml @@ -31,4 +31,4 @@ jobs: - name: Make Script Executable and Run run: | chmod +x ./swarms/scripts/run_examples.sh - ./swarms/scripts/run_examples.sh + ./scripts/run_examples.sh From e4e4070ece1432219afa83b3360dba5f9ca9f5f4 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Wed, 20 Mar 2024 08:14:55 -0600 Subject: [PATCH 02/17] add permissions run examples --- .github/workflows/run_examples.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_examples.yml b/.github/workflows/run_examples.yml index 5c8d8f9a..bf747e88 100644 --- a/.github/workflows/run_examples.yml +++ b/.github/workflows/run_examples.yml @@ -30,5 +30,5 @@ jobs: - name: Make Script Executable and Run run: | - chmod +x ./swarms/scripts/run_examples.sh + chmod +x ./scripts/run_examples.sh ./scripts/run_examples.sh From ebcc63e6b0942f253a69d109489545a14ea6c0cf Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Wed, 20 Mar 2024 08:16:10 -0600 Subject: [PATCH 03/17] remove schedule for testing run examples --- .github/workflows/run_examples.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run_examples.yml b/.github/workflows/run_examples.yml index bf747e88..ae453c8d 100644 --- a/.github/workflows/run_examples.yml +++ b/.github/workflows/run_examples.yml @@ -5,9 +5,9 @@ on: branches: [ main ] pull_request: branches: [ main ] - schedule: - # Runs at 3:00 AM UTC every day - - cron: '0 3 * * *' + # schedule: + # # Runs at 3:00 AM UTC every day + # - cron: '0 3 * * *' jobs: run-examples: From 4f58322630c4c74cbc43af0bc6b6fa13d7c29e67 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Wed, 20 Mar 2024 08:18:57 -0600 Subject: [PATCH 04/17] run examples on push for testing workflow --- .github/workflows/run_examples.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run_examples.yml b/.github/workflows/run_examples.yml index ae453c8d..294630f2 100644 --- a/.github/workflows/run_examples.yml +++ b/.github/workflows/run_examples.yml @@ -1,10 +1,11 @@ name: Run Examples Script -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] +on: [push] +# on: +# push: +# branches: [ main ] +# pull_request: +# branches: [ main ] # schedule: # # Runs at 3:00 AM UTC every day # - cron: '0 3 * * *' From 8ac2137d7acfbd4f8c3edeb42df9684a5d59a5bf Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Thu, 21 Mar 2024 18:18:11 -0600 Subject: [PATCH 05/17] bump tenacity to resolve chromadb conflict --- pyproject.toml | 2 +- requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index d92aa27d..f41b3db3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,7 @@ ratelimit = "2.2.1" loguru = "0.7.2" huggingface-hub = "*" pydantic = "2.6.4" -tenacity = "8.2.2" +tenacity = "8.2.3" Pillow = "9.4.0" chromadb = "0.4.24" termcolor = "2.2.0" diff --git a/requirements.txt b/requirements.txt index b8d654c3..c7ac8bcb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,4 +30,5 @@ mkdocs-material mkdocs-glightbox pre-commit==3.6.2 psutil -black \ No newline at end of file +black +tenacity \ No newline at end of file From 14313b5fb4b51f0abef378a680a15f0af12c43f1 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Thu, 21 Mar 2024 18:25:11 -0600 Subject: [PATCH 06/17] fix langchain deps see (https://github.com/langchain-ai/langchain/issues/18996) --- pyproject.toml | 7 ++++--- requirements.txt | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f41b3db3..2c3c2e63 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,14 +30,15 @@ transformers = "*" asyncio = ">=3.4.3,<4.0" einops = "0.7.0" google-generativeai = "0.3.1" -langchain-experimental = "0.0.10" -langchain-community = "0.0.29" +langchain-core==0.1.22 +langchain-community==0.0.20 +langsmith==0.0.87 +langchain-openai==0.0.5 faiss-cpu = "1.7.4" backoff = "2.2.1" datasets = "*" optimum = "1.15.0" diffusers = "*" -langchain = "0.1.7" toml = "*" pypdf = "4.0.1" accelerate = "*" diff --git a/requirements.txt b/requirements.txt index c7ac8bcb..b5301e7f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,10 @@ torch==2.1.1 transformers pandas -langchain==0.1.7 -langchain-experimental +langchain-core==0.1.22 +langchain-community==0.0.20 +langsmith==0.0.87 +langchain-openai==0.0.5 httpx==0.24.1 Pillow==9.4.0 datasets==2.14.5 @@ -21,7 +23,6 @@ addict backoff==2.2.1 ratelimit==2.2.1 termcolor==2.2.0 -langchain-community timm torchvision==0.16.1 rich==13.5.2 From 15717b79c7d5f890271e338799cc90d396cf1a44 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Thu, 21 Mar 2024 18:29:28 -0600 Subject: [PATCH 07/17] fix typo in pyproject.toml --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 2c3c2e63..0a925e1f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,10 +30,10 @@ transformers = "*" asyncio = ">=3.4.3,<4.0" einops = "0.7.0" google-generativeai = "0.3.1" -langchain-core==0.1.22 -langchain-community==0.0.20 -langsmith==0.0.87 -langchain-openai==0.0.5 +langchain-core = 0.1.22 +langchain-community = 0.0.20 +langsmith = 0.0.87 +langchain-openai = 0.0.5 faiss-cpu = "1.7.4" backoff = "2.2.1" datasets = "*" From b9b505d126ec12c7d3b2f7cf15285fafa6935386 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Thu, 21 Mar 2024 18:32:32 -0600 Subject: [PATCH 08/17] typo --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 0a925e1f..10f35081 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -30,10 +30,10 @@ transformers = "*" asyncio = ">=3.4.3,<4.0" einops = "0.7.0" google-generativeai = "0.3.1" -langchain-core = 0.1.22 -langchain-community = 0.0.20 -langsmith = 0.0.87 -langchain-openai = 0.0.5 +langchain-core = "0.1.22" +langchain-community = "0.0.20" +langsmith = "0.0.87" +langchain-openai = "0.0.5" faiss-cpu = "1.7.4" backoff = "2.2.1" datasets = "*" From 803a70254d633f9ee83fe87d2e0609725c00a721 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Thu, 21 Mar 2024 18:35:18 -0600 Subject: [PATCH 09/17] bump tiktoken --- pyproject.toml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 10f35081..497b1a7f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,7 @@ pypdf = "4.0.1" accelerate = "*" sentencepiece = "0.1.98" httpx = "0.24.1" -tiktoken = "0.4.0" +tiktoken = "0.5.2" ratelimit = "2.2.1" loguru = "0.7.2" huggingface-hub = "*" diff --git a/requirements.txt b/requirements.txt index b5301e7f..c44dc8fc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,7 @@ loguru==0.7.2 optimum diffusers toml -tiktoken==0.4.0 +tiktoken==0.5.2 colored addict backoff==2.2.1 From f63f7a48d66bf9cfd625d9afb89d8b0e4101237c Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Thu, 21 Mar 2024 18:42:07 -0600 Subject: [PATCH 10/17] add supervision to deps --- pyproject.toml | 1 + requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 497b1a7f..5dec5964 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -60,6 +60,7 @@ sentence-transformers = "*" peft = "*" psutil = "*" timm = "*" +supervision = "*" [tool.poetry.dev-dependencies] black = "23.3.0" diff --git a/requirements.txt b/requirements.txt index c44dc8fc..82236888 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,4 +32,5 @@ mkdocs-glightbox pre-commit==3.6.2 psutil black -tenacity \ No newline at end of file +tenacity +supervision \ No newline at end of file From c1762468c8ed5829c9b0aecd9f8e1d3e4e755167 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Thu, 21 Mar 2024 18:53:01 -0600 Subject: [PATCH 11/17] bump python to 3.10 to resolve langchain.schema issue from langchain.schema import BaseOutputParser (https://github.com/langchain-ai/langchain/issues/1936) --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5dec5964..4b409e2e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ classifiers = [ [tool.poetry.dependencies] -python = ">=3.9,<4.0" +python = ">=3.10,<4.0" torch = ">=2.1.1,<3.0" transformers = "*" asyncio = ">=3.4.3,<4.0" From 7f8d712522946d2471865a951bdaa125ffe5ca39 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Thu, 21 Mar 2024 19:02:41 -0600 Subject: [PATCH 12/17] langchain dep, revert python bump --- pyproject.toml | 3 ++- requirements.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 4b409e2e..66e99b7f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,12 +24,13 @@ classifiers = [ [tool.poetry.dependencies] -python = ">=3.10,<4.0" +python = ">=3.9,<4.0" torch = ">=2.1.1,<3.0" transformers = "*" asyncio = ">=3.4.3,<4.0" einops = "0.7.0" google-generativeai = "0.3.1" +langchain = "0.1.13" langchain-core = "0.1.22" langchain-community = "0.0.20" langsmith = "0.0.87" diff --git a/requirements.txt b/requirements.txt index 82236888..c702cf6c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,7 @@ torch==2.1.1 transformers pandas +langchain==0.1.13 langchain-core==0.1.22 langchain-community==0.0.20 langsmith==0.0.87 From e8d1a0ddf41023a901b6a4108c002122955d94af Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Thu, 21 Mar 2024 19:20:10 -0600 Subject: [PATCH 13/17] add sentry-sdk to deps --- pyproject.toml | 1 + requirements.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 66e99b7f..cae6835c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,6 +62,7 @@ peft = "*" psutil = "*" timm = "*" supervision = "*" +sentry-sdk = "*" [tool.poetry.dev-dependencies] black = "23.3.0" diff --git a/requirements.txt b/requirements.txt index c702cf6c..edecd05e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,4 +34,5 @@ pre-commit==3.6.2 psutil black tenacity -supervision \ No newline at end of file +supervision +sentry-sdk \ No newline at end of file From 9013f085eea7ee0f6129f2b83ba34dfc9641a1ef Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Thu, 21 Mar 2024 19:24:01 -0600 Subject: [PATCH 14/17] bump langchain-community --- pyproject.toml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index cae6835c..1303d1ce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,7 @@ einops = "0.7.0" google-generativeai = "0.3.1" langchain = "0.1.13" langchain-core = "0.1.22" -langchain-community = "0.0.20" +langchain-community = "0.0.29" langsmith = "0.0.87" langchain-openai = "0.0.5" faiss-cpu = "1.7.4" diff --git a/requirements.txt b/requirements.txt index edecd05e..0d63ed5e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ transformers pandas langchain==0.1.13 langchain-core==0.1.22 -langchain-community==0.0.20 +langchain-community==0.0.29 langsmith==0.0.87 langchain-openai==0.0.5 httpx==0.24.1 From e689539908326bcd734fd59c01d3f313e74a39f5 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Thu, 21 Mar 2024 19:30:08 -0600 Subject: [PATCH 15/17] langchain-core bump --- pyproject.toml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1303d1ce..175a2358 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ asyncio = ">=3.4.3,<4.0" einops = "0.7.0" google-generativeai = "0.3.1" langchain = "0.1.13" -langchain-core = "0.1.22" +langchain-core = "0.1.33" langchain-community = "0.0.29" langsmith = "0.0.87" langchain-openai = "0.0.5" diff --git a/requirements.txt b/requirements.txt index 0d63ed5e..3f404d8e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ torch==2.1.1 transformers pandas langchain==0.1.13 -langchain-core==0.1.22 +langchain-core==0.1.33 langchain-community==0.0.29 langsmith==0.0.87 langchain-openai==0.0.5 From 5fce9cc779cf66d8772ab095355aa886e025410b Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Thu, 21 Mar 2024 19:33:47 -0600 Subject: [PATCH 16/17] langsmith bump --- pyproject.toml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 175a2358..f7489310 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ google-generativeai = "0.3.1" langchain = "0.1.13" langchain-core = "0.1.33" langchain-community = "0.0.29" -langsmith = "0.0.87" +langsmith = "0.1.17" langchain-openai = "0.0.5" faiss-cpu = "1.7.4" backoff = "2.2.1" diff --git a/requirements.txt b/requirements.txt index 3f404d8e..12c3a7a7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ pandas langchain==0.1.13 langchain-core==0.1.33 langchain-community==0.0.29 -langsmith==0.0.87 +langsmith==0.1.17 langchain-openai==0.0.5 httpx==0.24.1 Pillow==9.4.0 From c8d6ee90c31211a1619a5fca0e6d4ec292dff558 Mon Sep 17 00:00:00 2001 From: evelynmitchell Date: Thu, 21 Mar 2024 19:59:19 -0600 Subject: [PATCH 17/17] revert run examples --- .github/workflows/run_examples.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/run_examples.yml b/.github/workflows/run_examples.yml index 294630f2..ea07b0f3 100644 --- a/.github/workflows/run_examples.yml +++ b/.github/workflows/run_examples.yml @@ -1,14 +1,13 @@ name: Run Examples Script -on: [push] -# on: -# push: -# branches: [ main ] -# pull_request: -# branches: [ main ] - # schedule: - # # Runs at 3:00 AM UTC every day - # - cron: '0 3 * * *' +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + schedule: + # Runs at 3:00 AM UTC every day + - cron: '0 3 * * *' jobs: run-examples: @@ -31,5 +30,5 @@ jobs: - name: Make Script Executable and Run run: | - chmod +x ./scripts/run_examples.sh - ./scripts/run_examples.sh + chmod +x ./swarms/scripts/run_examples.sh + ./swarms/scripts/run_examples.sh \ No newline at end of file