Update main_app.py
Browse files- main_app.py +9 -2
main_app.py
CHANGED
|
@@ -52,6 +52,7 @@ def _(os):
|
|
| 52 |
import tempfile
|
| 53 |
import importlib.util
|
| 54 |
import base64
|
|
|
|
| 55 |
import uuid
|
| 56 |
import time
|
| 57 |
import json
|
|
@@ -74,7 +75,8 @@ def _(os):
|
|
| 74 |
return requests.post(
|
| 75 |
'https://iam.cloud.ibm.com/identity/token',
|
| 76 |
headers={'Content-Type': 'application/x-www-form-urlencoded'},
|
| 77 |
-
data={'grant_type': 'urn:ibm:params:oauth:grant-type:apikey', 'apikey': api_key}
|
|
|
|
| 78 |
).json()['access_token']
|
| 79 |
|
| 80 |
def setup_task_credentials(client):
|
|
@@ -235,8 +237,13 @@ def _(
|
|
| 235 |
|
| 236 |
if project_client is not None:
|
| 237 |
task_credentials_details = setup_task_credentials(project_client)
|
|
|
|
|
|
|
|
|
|
|
|
|
| 238 |
else:
|
| 239 |
-
task_credentials_details =
|
|
|
|
| 240 |
|
| 241 |
else:
|
| 242 |
wx_credentials = None
|
|
|
|
| 52 |
import tempfile
|
| 53 |
import importlib.util
|
| 54 |
import base64
|
| 55 |
+
import certifi
|
| 56 |
import uuid
|
| 57 |
import time
|
| 58 |
import json
|
|
|
|
| 75 |
return requests.post(
|
| 76 |
'https://iam.cloud.ibm.com/identity/token',
|
| 77 |
headers={'Content-Type': 'application/x-www-form-urlencoded'},
|
| 78 |
+
data={'grant_type': 'urn:ibm:params:oauth:grant-type:apikey', 'apikey': api_key},
|
| 79 |
+
verify=certifi.where()
|
| 80 |
).json()['access_token']
|
| 81 |
|
| 82 |
def setup_task_credentials(client):
|
|
|
|
| 237 |
|
| 238 |
if project_client is not None:
|
| 239 |
task_credentials_details = setup_task_credentials(project_client)
|
| 240 |
+
elif deployment_client is not None:
|
| 241 |
+
task_credentials_details = setup_task_credentials(deployment_client)
|
| 242 |
+
elif project_client is not None and deployment_client is not None:
|
| 243 |
+
task_credentials_details = setup_task_credentials(project_client)
|
| 244 |
else:
|
| 245 |
+
task_credentials_details = None
|
| 246 |
+
|
| 247 |
|
| 248 |
else:
|
| 249 |
wx_credentials = None
|