diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 43b54af2b2cd..566e7292a5ef 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -114,3 +114,6 @@ openedx-learning==0.3.5 # existing custom parameter configurations unusable. # https://github.com/openedx/xblock-lti-consumer/issues/410 has been opened to track a fix lti-consumer-xblock==9.6.1 + +# Open AI version 1.0.0 dropped support for openai.ChatCompletion which is currently in use in enterprise. +openai<=0.28.1 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 9433b43507ab..3bb0a62217f5 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -9,7 +9,9 @@ acid-xblock==0.2.1 # via -r requirements/edx/kernel.in aiohttp==3.8.6 - # via geoip2 + # via + # geoip2 + # openai aiosignal==1.3.1 # via aiohttp algoliasearch==3.0.0 @@ -20,12 +22,6 @@ analytics-python==1.4.post1 # via -r requirements/edx/kernel.in aniso8601==9.0.1 # via edx-tincan-py35 -annotated-types==0.6.0 - # via pydantic -anyio==3.7.1 - # via - # httpx - # openai appdirs==1.4.4 # via fs asgiref==3.7.2 @@ -106,8 +102,6 @@ certifi==2023.7.22 # via # -r requirements/edx/paver.txt # elasticsearch - # httpcore - # httpx # py2neo # requests # snowflake-connector-python @@ -182,8 +176,6 @@ defusedxml==0.7.1 # social-auth-core deprecated==1.2.14 # via jwcrypto -distro==1.8.0 - # via openai django==3.2.23 # via # -c requirements/edx/../common_constraints.txt @@ -571,8 +563,6 @@ event-tracking==2.2.0 # edx-completion # edx-proctoring # edx-search -exceptiongroup==1.1.3 - # via anyio fastavro==1.9.0 # via openedx-events filelock==3.13.1 @@ -599,25 +589,17 @@ glob2==0.7 # via -r requirements/edx/kernel.in gunicorn==21.2.0 # via -r requirements/edx/kernel.in -h11==0.14.0 - # via httpcore help-tokens==2.3.0 # via -r requirements/edx/kernel.in html5lib==1.1 # via # -r requirements/edx/kernel.in # ora2 -httpcore==1.0.2 - # via httpx -httpx==0.25.1 - # via openai icalendar==5.0.11 # via -r requirements/edx/kernel.in idna==3.4 # via # -r requirements/edx/paver.txt - # anyio - # httpx # optimizely-sdk # requests # snowflake-connector-python @@ -774,8 +756,10 @@ oauthlib==3.2.2 # social-auth-core olxcleaner==0.2.1 # via -r requirements/edx/kernel.in -openai==1.3.2 - # via edx-enterprise +openai==0.28.1 + # via + # -c requirements/edx/../constraints.txt + # edx-enterprise openedx-atlas==0.5.0 # via -r requirements/edx/kernel.in openedx-blockstore==1.4.0 @@ -874,10 +858,6 @@ pycryptodomex==3.19.0 # edx-proctoring # lti-consumer-xblock # pyjwkest -pydantic==2.5.1 - # via openai -pydantic-core==2.14.3 - # via pydantic pygments==2.16.1 # via # -r requirements/edx/bundled.in @@ -1016,6 +996,7 @@ requests==2.31.0 # edx-rest-api-client # geoip2 # mailsnake + # openai # optimizely-sdk # pyjwkest # pylti1p3 @@ -1098,10 +1079,6 @@ slumber==0.7.1 # edx-bulk-grades # edx-enterprise # edx-rest-api-client -sniffio==1.3.0 - # via - # anyio - # httpx snowflake-connector-python==3.5.0 # via edx-enterprise social-auth-app-django==5.0.0 @@ -1160,14 +1137,10 @@ tqdm==4.66.1 typing-extensions==4.8.0 # via # -r requirements/edx/paver.txt - # annotated-types # asgiref # django-countries # edx-opaque-keys # kombu - # openai - # pydantic - # pydantic-core # pylti1p3 # snowflake-connector-python tzdata==2023.3 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 10982950a8fe..72bc57a6e310 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -21,6 +21,7 @@ aiohttp==3.8.6 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # geoip2 + # openai aiosignal==1.3.1 # via # -r requirements/edx/doc.txt @@ -50,16 +51,12 @@ aniso8601==9.0.1 # edx-tincan-py35 annotated-types==0.6.0 # via - # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # pydantic anyio==3.7.1 # via - # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # fastapi - # httpx - # openai # starlette appdirs==1.4.4 # via @@ -190,8 +187,6 @@ certifi==2023.7.22 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # elasticsearch - # httpcore - # httpx # py2neo # requests # snowflake-connector-python @@ -349,11 +344,6 @@ distlib==0.3.7 # via # -r requirements/edx/testing.txt # virtualenv -distro==1.8.0 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # openai django==3.2.23 # via # -c requirements/edx/../common_constraints.txt @@ -900,7 +890,6 @@ event-tracking==2.2.0 # edx-search exceptiongroup==1.1.3 # via - # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # anyio # pytest @@ -979,9 +968,7 @@ gunicorn==21.2.0 # -r requirements/edx/testing.txt h11==0.14.0 # via - # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt - # httpcore # uvicorn help-tokens==2.3.0 # via @@ -992,18 +979,8 @@ html5lib==1.1 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # ora2 -httpcore==1.0.2 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # httpx httpretty==1.1.4 # via -r requirements/edx/testing.txt -httpx==0.25.1 - # via - # -r requirements/edx/doc.txt - # -r requirements/edx/testing.txt - # openai icalendar==5.0.11 # via # -r requirements/edx/doc.txt @@ -1013,7 +990,6 @@ idna==3.4 # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # anyio - # httpx # optimizely-sdk # requests # snowflake-connector-python @@ -1295,8 +1271,9 @@ olxcleaner==0.2.1 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt -openai==1.3.2 +openai==0.28.1 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # edx-enterprise @@ -1491,13 +1468,10 @@ pycryptodomex==3.19.0 # pyjwkest pydantic==2.5.1 # via - # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # fastapi - # openai pydantic-core==2.14.3 # via - # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # pydantic pydata-sphinx-theme==0.14.3 @@ -1767,6 +1741,7 @@ requests==2.31.0 # edx-rest-api-client # geoip2 # mailsnake + # openai # optimizely-sdk # pact-python # pyjwkest @@ -1889,10 +1864,8 @@ smmap==5.0.1 # gitdb sniffio==1.3.0 # via - # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt # anyio - # httpx snowballstemmer==2.2.0 # via # -r requirements/edx/doc.txt @@ -2092,7 +2065,6 @@ typing-extensions==4.8.0 # import-linter # kombu # mypy - # openai # pydantic # pydantic-core # pydata-sphinx-theme diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 2bdc24492cc0..aebce21c1789 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -14,6 +14,7 @@ aiohttp==3.8.6 # via # -r requirements/edx/base.txt # geoip2 + # openai aiosignal==1.3.1 # via # -r requirements/edx/base.txt @@ -32,15 +33,6 @@ aniso8601==9.0.1 # via # -r requirements/edx/base.txt # edx-tincan-py35 -annotated-types==0.6.0 - # via - # -r requirements/edx/base.txt - # pydantic -anyio==3.7.1 - # via - # -r requirements/edx/base.txt - # httpx - # openai appdirs==1.4.4 # via # -r requirements/edx/base.txt @@ -139,8 +131,6 @@ certifi==2023.7.22 # via # -r requirements/edx/base.txt # elasticsearch - # httpcore - # httpx # py2neo # requests # snowflake-connector-python @@ -236,10 +226,6 @@ deprecated==1.2.14 # via # -r requirements/edx/base.txt # jwcrypto -distro==1.8.0 - # via - # -r requirements/edx/base.txt - # openai django==3.2.23 # via # -c requirements/edx/../common_constraints.txt @@ -665,10 +651,6 @@ event-tracking==2.2.0 # edx-completion # edx-proctoring # edx-search -exceptiongroup==1.1.3 - # via - # -r requirements/edx/base.txt - # anyio fastavro==1.9.0 # via # -r requirements/edx/base.txt @@ -706,31 +688,17 @@ glob2==0.7 # via -r requirements/edx/base.txt gunicorn==21.2.0 # via -r requirements/edx/base.txt -h11==0.14.0 - # via - # -r requirements/edx/base.txt - # httpcore help-tokens==2.3.0 # via -r requirements/edx/base.txt html5lib==1.1 # via # -r requirements/edx/base.txt # ora2 -httpcore==1.0.2 - # via - # -r requirements/edx/base.txt - # httpx -httpx==0.25.1 - # via - # -r requirements/edx/base.txt - # openai icalendar==5.0.11 # via -r requirements/edx/base.txt idna==3.4 # via # -r requirements/edx/base.txt - # anyio - # httpx # optimizely-sdk # requests # snowflake-connector-python @@ -929,8 +897,9 @@ oauthlib==3.2.2 # social-auth-core olxcleaner==0.2.1 # via -r requirements/edx/base.txt -openai==1.3.2 +openai==0.28.1 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-enterprise openedx-atlas==0.5.0 @@ -1052,14 +1021,6 @@ pycryptodomex==3.19.0 # edx-proctoring # lti-consumer-xblock # pyjwkest -pydantic==2.5.1 - # via - # -r requirements/edx/base.txt - # openai -pydantic-core==2.14.3 - # via - # -r requirements/edx/base.txt - # pydantic pydata-sphinx-theme==0.14.3 # via sphinx-book-theme pygments==2.16.1 @@ -1220,6 +1181,7 @@ requests==2.31.0 # edx-rest-api-client # geoip2 # mailsnake + # openai # optimizely-sdk # pyjwkest # pylti1p3 @@ -1318,11 +1280,6 @@ slumber==0.7.1 # edx-rest-api-client smmap==5.0.1 # via gitdb -sniffio==1.3.0 - # via - # -r requirements/edx/base.txt - # anyio - # httpx snowballstemmer==2.2.0 # via sphinx snowflake-connector-python==3.5.0 @@ -1435,14 +1392,10 @@ tqdm==4.66.1 typing-extensions==4.8.0 # via # -r requirements/edx/base.txt - # annotated-types # asgiref # django-countries # edx-opaque-keys # kombu - # openai - # pydantic - # pydantic-core # pydata-sphinx-theme # pylti1p3 # snowflake-connector-python diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 356e5cc513b1..5f9329c94df5 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -12,6 +12,7 @@ aiohttp==3.8.6 # via # -r requirements/edx/base.txt # geoip2 + # openai aiosignal==1.3.1 # via # -r requirements/edx/base.txt @@ -29,15 +30,10 @@ aniso8601==9.0.1 # -r requirements/edx/base.txt # edx-tincan-py35 annotated-types==0.6.0 - # via - # -r requirements/edx/base.txt - # pydantic + # via pydantic anyio==3.7.1 # via - # -r requirements/edx/base.txt # fastapi - # httpx - # openai # starlette appdirs==1.4.4 # via @@ -141,8 +137,6 @@ certifi==2023.7.22 # via # -r requirements/edx/base.txt # elasticsearch - # httpcore - # httpx # py2neo # requests # snowflake-connector-python @@ -265,10 +259,6 @@ dill==0.3.7 # via pylint distlib==0.3.7 # via virtualenv -distro==1.8.0 - # via - # -r requirements/edx/base.txt - # openai django==3.2.23 # via # -c requirements/edx/../common_constraints.txt @@ -693,7 +683,6 @@ event-tracking==2.2.0 # edx-search exceptiongroup==1.1.3 # via - # -r requirements/edx/base.txt # anyio # pytest execnet==2.0.2 @@ -744,33 +733,21 @@ grimp==3.1 gunicorn==21.2.0 # via -r requirements/edx/base.txt h11==0.14.0 - # via - # -r requirements/edx/base.txt - # httpcore - # uvicorn + # via uvicorn help-tokens==2.3.0 # via -r requirements/edx/base.txt html5lib==1.1 # via # -r requirements/edx/base.txt # ora2 -httpcore==1.0.2 - # via - # -r requirements/edx/base.txt - # httpx httpretty==1.1.4 # via -r requirements/edx/testing.in -httpx==0.25.1 - # via - # -r requirements/edx/base.txt - # openai icalendar==5.0.11 # via -r requirements/edx/base.txt idna==3.4 # via # -r requirements/edx/base.txt # anyio - # httpx # optimizely-sdk # requests # snowflake-connector-python @@ -979,8 +956,9 @@ oauthlib==3.2.2 # social-auth-core olxcleaner==0.2.1 # via -r requirements/edx/base.txt -openai==1.3.2 +openai==0.28.1 # via + # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt # edx-enterprise openedx-atlas==0.5.0 @@ -1122,14 +1100,9 @@ pycryptodomex==3.19.0 # lti-consumer-xblock # pyjwkest pydantic==2.5.1 - # via - # -r requirements/edx/base.txt - # fastapi - # openai + # via fastapi pydantic-core==2.14.3 - # via - # -r requirements/edx/base.txt - # pydantic + # via pydantic pygments==2.16.1 # via # -r requirements/edx/base.txt @@ -1336,6 +1309,7 @@ requests==2.31.0 # edx-rest-api-client # geoip2 # mailsnake + # openai # optimizely-sdk # pact-python # pyjwkest @@ -1436,10 +1410,7 @@ slumber==0.7.1 # edx-enterprise # edx-rest-api-client sniffio==1.3.0 - # via - # -r requirements/edx/base.txt - # anyio - # httpx + # via anyio snowflake-connector-python==3.5.0 # via # -r requirements/edx/base.txt @@ -1538,7 +1509,6 @@ typing-extensions==4.8.0 # grimp # import-linter # kombu - # openai # pydantic # pydantic-core # pylint