Merge branch 'main' into zc/package-upgrades

Makefile

@@ -91,7 +91,7 @@ gocd: ## Build GoCD pipelines
 .PHONY: gocd
 
 upgrade-package-versions:
-	pip-compile requirements-constraints.txt -o requirements.txt
+	pip-compile --upgrade --strip-extras --quiet requirements-constraints.txt -o requirements.txt
 
 HEAD_SHA:=$(shell git rev-parse --short HEAD)
 TIME:=$(shell date +%F.%T)

requirements-constraints.txt

@@ -1,20 +1,19 @@
-# Packages that are only effectively used by production models can be
-# added to model.requirements.txt (in addition to this file).
-# They will not be built in PR test runs (but they will be built in master)
+# Ideally, move to using open constraints, such as 1.* or >=2.3,<3
+# when specifying packages, so that we can update them on a regular basis.
 
-certifi==2023.7.22
-charset-normalizer==2.0.12
-click==8.1.7
-contourpy==1.1.0
+certifi
+charset-normalizer==2.*
+click==8.1.*
+contourpy==1.1.*
 convertdate==2.4.0
 cycler==0.11.0
 Cython==3.0.2
 ephem==4.1.4
 filelock==3.12.2
-Flask==2.2.5
+Flask==2.2.*
 fonttools==4.43.0
 fsspec==2023.6.0
-gunicorn==22.0.0
+gunicorn==22.*
 holidays==0.31
 idna
 importlib-resources==6.0.1
@@ -62,7 +61,7 @@ tree_sitter_languages==1.10.2
 urllib3==1.26.19
 Werkzeug==3.0.3
 pytest==7.4.3
-pydantic==2.6.2
+pydantic==2.6.*
 mypy==1.8.0
 mypy-extensions==1.0.0
 openapi-core==0.18.2
@@ -93,20 +92,20 @@ Flask-Migrate==4.0.5
 Flask-SQLAlchemy==3.1.1
 types-Flask-Migrate==4.0.0.20240205
 pytest-asyncio==0.23.5
-aiohttp==3.9.4
+aiohttp==3.*
 types-python-dateutil==2.8.19.20240106
-johen==0.1.5
+johen==0.1.*
 pydantic-xml==2.9.0
 chromadb==0.4.14
-google-cloud-storage==2.16.0
-google-cloud-aiplatform==1.67.0
-google-cloud-secret-manager==2.20.2
+google-cloud-storage==2.*
+google-cloud-aiplatform==1.*
+google-cloud-secret-manager==2.*
 anthropic[vertex]==0.31.2
 langfuse @ git+https://github.com/jennmueng/langfuse-python.git@9d9350de1e4e84fa548fe84f82c1b826be17956e
 watchdog
 stumpy==1.13.0
 pytest_alembic==0.11.1
-cryptography==43.0.1
+cryptography==43.*
 pip-tools==7.4.1
 sentry-protos>=0.1.21
 protobuf>=5.27.3

requirements.txt

@@ -2,9 +2,11 @@
 # This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
-#    pip-compile --output-file=requirements.txt requirements-constraints.txt
+#    pip-compile --output-file=requirements.txt --strip-extras requirements-constraints.txt
 #
-aiohttp==3.9.4
+aiohappyeyeballs==2.4.0
+    # via aiohttp
+aiohttp==3.10.5
     # via
     #   -r requirements-constraints.txt
     #   datasets
@@ -19,7 +21,7 @@ amqp==5.2.0
     # via kombu
 annotated-types==0.7.0
     # via pydantic
-anthropic[vertex]==0.31.2
+anthropic==0.31.2
     # via -r requirements-constraints.txt
 anyio==4.4.0
     # via
@@ -54,7 +56,7 @@ celery==5.3.6
     # via -r requirements-constraints.txt
 celery-stubs==0.1.3
     # via -r requirements-constraints.txt
-certifi==2023.7.22
+certifi==2024.8.30
     # via
     #   -r requirements-constraints.txt
     #   httpcore
@@ -66,7 +68,7 @@ cffi==1.17.1
     # via
     #   cryptography
     #   pynacl
-charset-normalizer==2.0.12
+charset-normalizer==2.1.1
     # via
     #   -r requirements-constraints.txt
     #   requests
@@ -96,15 +98,15 @@ coloredlogs==15.0.1
     # via
     #   onnxruntime
     #   optimum
-contourpy==1.1.0
+contourpy==1.1.1
     # via
     #   -r requirements-constraints.txt
     #   matplotlib
 convertdate==2.4.0
     # via -r requirements-constraints.txt
 covdefaults==2.3.0
     # via -r requirements-constraints.txt
-coverage[toml]==7.6.1
+coverage==7.6.1
     # via
     #   covdefaults
     #   pytest-cov
@@ -169,13 +171,13 @@ frozenlist==1.4.1
     # via
     #   aiohttp
     #   aiosignal
-fsspec[http]==2023.6.0
+fsspec==2023.6.0
     # via
     #   -r requirements-constraints.txt
     #   datasets
     #   huggingface-hub
     #   torch
-google-api-core[grpc]==2.19.2
+google-api-core==2.19.2
     # via
     #   google-cloud-aiplatform
     #   google-cloud-bigquery
@@ -193,7 +195,7 @@ google-auth==2.34.0
     #   google-cloud-resource-manager
     #   google-cloud-secret-manager
     #   google-cloud-storage
-google-cloud-aiplatform==1.67.0
+google-cloud-aiplatform==1.67.1
     # via -r requirements-constraints.txt
 google-cloud-bigquery==3.25.0
     # via google-cloud-aiplatform
@@ -205,7 +207,7 @@ google-cloud-resource-manager==1.12.5
     # via google-cloud-aiplatform
 google-cloud-secret-manager==2.20.2
     # via -r requirements-constraints.txt
-google-cloud-storage==2.16.0
+google-cloud-storage==2.18.2
     # via
     #   -r requirements-constraints.txt
     #   google-cloud-aiplatform
@@ -217,7 +219,7 @@ google-resumable-media==2.7.2
     # via
     #   google-cloud-bigquery
     #   google-cloud-storage
-googleapis-common-protos[grpc]==1.65.0
+googleapis-common-protos==1.65.0
     # via
     #   google-api-core
     #   grpc-google-iam-v1
@@ -504,7 +506,7 @@ pyasn1-modules==0.4.1
     # via google-auth
 pycparser==2.22
     # via cffi
-pydantic==2.6.2
+pydantic==2.6.4
     # via
     #   -r requirements-constraints.txt
     #   anthropic
@@ -525,7 +527,7 @@ pygithub==2.1.1
     # via -r requirements-constraints.txt
 pygments==2.18.0
     # via rich
-pyjwt[crypto]==2.9.0
+pyjwt==2.9.0
     # via pygithub
 pymeeus==0.5.12
     # via
@@ -642,7 +644,7 @@ sentencepiece==0.2.0
     #   transformers
 sentry-protos==0.1.21
     # via -r requirements-constraints.txt
-sentry-sdk[flask]==2.11.0
+sentry-sdk==2.11.0
     # via -r requirements-constraints.txt
 shapely==2.0.6
     # via google-cloud-aiplatform
@@ -708,7 +710,7 @@ tqdm==4.66.3
     #   openai
     #   sentence-transformers
     #   transformers
-transformers[sentencepiece]==4.37.2
+transformers==4.37.2
     # via
     #   -r requirements-constraints.txt
     #   optimum
@@ -780,7 +782,7 @@ urllib3==1.26.19
     #   pygithub
     #   requests
     #   sentry-sdk
-uvicorn[standard]==0.30.6
+uvicorn==0.30.6
     # via chromadb
 uvloop==0.20.0
     # via uvicorn