Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33094 from openedx/saleem-latif/upgrade-edx-enterprise-fc4b9e3

Browse Source 
feat: Upgrade Python dependency edx-enterprise
This commit is contained in:
Saleem Latif
2023-08-25 16:03:25 +05:00
committed by GitHub
parent ff03d5920b 4136147d58
commit ad894ac41d
9 changed files with 67 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cms/envs/common.py
View File

@@ -780,6 +780,13 @@ ENTERPRISE_API_URL = LMS_INTERNAL_ROOT_URL + '/enterprise/api/v1/'
ENTERPRISE_CONSENT_API_URL = LMS_INTERNAL_ROOT_URL + '/consent/api/v1/'
ENTERPRISE_MARKETING_FOOTER_QUERY_PARAMS = {}
# Setting for Open API key and prompts used by edx-enterprise.
OPENAI_API_KEY = ''
LEARNER_ENGAGEMENT_PROMPT_FOR_ACTIVE_CONTRACT = ''
LEARNER_ENGAGEMENT_PROMPT_FOR_NON_ACTIVE_CONTRACT = ''
LEARNER_PROGRESS_PROMPT_FOR_ACTIVE_CONTRACT = ''
LEARNER_PROGRESS_PROMPT_FOR_NON_ACTIVE_CONTRACT = ''
# Public domain name of Studio (should be resolvable from the end-user's browser)
CMS_BASE = 'localhost:18010'

8
cms/envs/production.py
View File

@@ -166,6 +166,14 @@ ENTERPRISE_API_URL = ENV_TOKENS.get('ENTERPRISE_API_URL', LMS_INTERNAL_ROOT_URL
ENTERPRISE_CONSENT_API_URL = ENV_TOKENS.get('ENTERPRISE_CONSENT_API_URL', LMS_INTERNAL_ROOT_URL + '/consent/api/v1/')
# Note that FEATURES['PREVIEW_LMS_BASE'] gets read in from the environment file.
OPENAI_API_KEY = ENV_TOKENS.get('OPENAI_API_KEY', '')
LEARNER_ENGAGEMENT_PROMPT_FOR_ACTIVE_CONTRACT = ENV_TOKENS.get('LEARNER_ENGAGEMENT_PROMPT_FOR_ACTIVE_CONTRACT', '')
LEARNER_ENGAGEMENT_PROMPT_FOR_NON_ACTIVE_CONTRACT = ENV_TOKENS.get(
'LEARNER_ENGAGEMENT_PROMPT_FOR_NON_ACTIVE_CONTRACT',
''
)
LEARNER_PROGRESS_PROMPT_FOR_ACTIVE_CONTRACT = ENV_TOKENS.get('LEARNER_PROGRESS_PROMPT_FOR_ACTIVE_CONTRACT', '')
LEARNER_PROGRESS_PROMPT_FOR_NON_ACTIVE_CONTRACT = ENV_TOKENS.get('LEARNER_PROGRESS_PROMPT_FOR_NON_ACTIVE_CONTRACT', '')
# List of logout URIs for each IDA that the learner should be logged out of when they logout of
# Studio. Only applies to IDA for which the social auth flow uses DOT (Django OAuth Toolkit).

7
lms/envs/common.py
View File

@@ -4616,6 +4616,13 @@ ENTERPRISE_ALL_SERVICE_USERNAMES = [
'subscriptions_worker'
]
# Setting for Open API key and prompts used by edx-enterprise.
OPENAI_API_KEY = ''
LEARNER_ENGAGEMENT_PROMPT_FOR_ACTIVE_CONTRACT = ''
LEARNER_ENGAGEMENT_PROMPT_FOR_NON_ACTIVE_CONTRACT = ''
LEARNER_PROGRESS_PROMPT_FOR_ACTIVE_CONTRACT = ''
LEARNER_PROGRESS_PROMPT_FOR_NON_ACTIVE_CONTRACT = ''
############## ENTERPRISE SERVICE LMS CONFIGURATION ##################################
# The LMS has some features embedded that are related to the Enterprise service, but

9
lms/envs/production.py
View File

@@ -926,6 +926,15 @@ ENTERPRISE_CATALOG_INTERNAL_ROOT_URL = ENV_TOKENS.get(
ENTERPRISE_CATALOG_INTERNAL_ROOT_URL
)
OPENAI_API_KEY = ENV_TOKENS.get('OPENAI_API_KEY', '')
LEARNER_ENGAGEMENT_PROMPT_FOR_ACTIVE_CONTRACT = ENV_TOKENS.get('LEARNER_ENGAGEMENT_PROMPT_FOR_ACTIVE_CONTRACT', '')
LEARNER_ENGAGEMENT_PROMPT_FOR_NON_ACTIVE_CONTRACT = ENV_TOKENS.get(
'LEARNER_ENGAGEMENT_PROMPT_FOR_NON_ACTIVE_CONTRACT',
''
)
LEARNER_PROGRESS_PROMPT_FOR_ACTIVE_CONTRACT = ENV_TOKENS.get('LEARNER_PROGRESS_PROMPT_FOR_ACTIVE_CONTRACT', '')
LEARNER_PROGRESS_PROMPT_FOR_NON_ACTIVE_CONTRACT = ENV_TOKENS.get('LEARNER_PROGRESS_PROMPT_FOR_NON_ACTIVE_CONTRACT', '')
############## ENTERPRISE SERVICE LMS CONFIGURATION ##################################
# The LMS has some features embedded that are related to the Enterprise service, but
# which are not provided by the Enterprise service. These settings override the

2
requirements/constraints.txt
View File

@@ -28,7 +28,7 @@ django-storages==1.9.1
# The team that owns this package will manually bump this package rather than having it pulled in automatically.
# This is to allow them to better control its deployment and to do it in a process that works better
# for them.
edx-enterprise==4.0.18
edx-enterprise==4.1.0
# 1. django-oauth-toolkit version >=2.0.0 has breaking changes. More details
# mentioned on this issue https://github.com/openedx/edx-platform/issues/32884

13
requirements/edx/base.txt
View File

@@ -7,7 +7,9 @@
acid-xblock==0.2.1
# via -r requirements/edx/kernel.in
aiohttp==3.8.5
# via geoip2
# via
# geoip2
# openai
aiosignal==1.3.1
# via aiohttp
algoliasearch==2.6.3
@@ -479,7 +481,7 @@ edx-drf-extensions==8.9.1
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.0.18
edx-enterprise==4.1.0
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
@@ -751,6 +753,8 @@ oauthlib==3.2.2
# social-auth-core
olxcleaner==0.2.1
# via -r requirements/edx/kernel.in
openai==0.27.9
# via edx-enterprise
openedx-blockstore==1.4.0
# via -r requirements/edx/kernel.in
openedx-calc==3.0.1
@@ -987,6 +991,7 @@ requests==2.31.0
# edx-rest-api-client
# geoip2
# mailsnake
# openai
# optimizely-sdk
# pyjwkest
# pylti1p3
@@ -1121,7 +1126,9 @@ tinycss2==1.1.1
tomlkit==0.12.1
# via snowflake-connector-python
tqdm==4.66.1
# via nltk
# via
# nltk
# openai
typing-extensions==4.7.1
# via
# -r requirements/edx/paver.txt

10
requirements/edx/development.txt
View File

@@ -17,6 +17,7 @@ aiohttp==3.8.5
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# geoip2
# openai
aiosignal==1.3.1
# via
# -r requirements/edx/doc.txt
@@ -746,7 +747,7 @@ edx-drf-extensions==8.9.1
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.0.18
edx-enterprise==4.1.0
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt
@@ -1268,6 +1269,11 @@ olxcleaner==0.2.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
openai==0.27.9
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# edx-enterprise
openedx-blockstore==1.4.0
# via
# -r requirements/edx/doc.txt
@@ -1728,6 +1734,7 @@ requests==2.31.0
# edx-rest-api-client
# geoip2
# mailsnake
# openai
# optimizely-sdk
# pact-python
# pyjwkest
@@ -2035,6 +2042,7 @@ tqdm==4.66.1
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
# nltk
# openai
types-pytz==2023.3.0.1
# via django-stubs
types-pyyaml==6.0.12.11

9
requirements/edx/doc.txt
View File

@@ -12,6 +12,7 @@ aiohttp==3.8.5
# via
# -r requirements/edx/base.txt
# geoip2
# openai
aiosignal==1.3.1
# via
# -r requirements/edx/base.txt
@@ -554,7 +555,7 @@ edx-drf-extensions==8.9.1
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.0.18
edx-enterprise==4.1.0
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
@@ -890,6 +891,10 @@ oauthlib==3.2.2
# social-auth-core
olxcleaner==0.2.1
# via -r requirements/edx/base.txt
openai==0.27.9
# via
# -r requirements/edx/base.txt
# edx-enterprise
openedx-blockstore==1.4.0
# via -r requirements/edx/base.txt
openedx-calc==3.0.1
@@ -1171,6 +1176,7 @@ requests==2.31.0
# edx-rest-api-client
# geoip2
# mailsnake
# openai
# optimizely-sdk
# pyjwkest
# pylti1p3
@@ -1377,6 +1383,7 @@ tqdm==4.66.1
# via
# -r requirements/edx/base.txt
# nltk
# openai
typing-extensions==4.7.1
# via
# -r requirements/edx/base.txt

9
requirements/edx/testing.txt
View File

@@ -10,6 +10,7 @@ aiohttp==3.8.5
# via
# -r requirements/edx/base.txt
# geoip2
# openai
aiosignal==1.3.1
# via
# -r requirements/edx/base.txt
@@ -583,7 +584,7 @@ edx-drf-extensions==8.9.1
# edx-when
# edxval
# openedx-learning
edx-enterprise==4.0.18
edx-enterprise==4.1.0
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
@@ -959,6 +960,10 @@ oauthlib==3.2.2
# social-auth-core
olxcleaner==0.2.1
# via -r requirements/edx/base.txt
openai==0.27.9
# via
# -r requirements/edx/base.txt
# edx-enterprise
openedx-blockstore==1.4.0
# via -r requirements/edx/base.txt
openedx-calc==3.0.1
@@ -1305,6 +1310,7 @@ requests==2.31.0
# edx-rest-api-client
# geoip2
# mailsnake
# openai
# optimizely-sdk
# pact-python
# pyjwkest
@@ -1504,6 +1510,7 @@ tqdm==4.66.1
# via
# -r requirements/edx/base.txt
# nltk
# openai
typing-extensions==4.7.1
# via
# -r requirements/edx/base.txt