[APPLS-2081] Fixed issue with starting app when ee version is not rea…

…dy (#28)

* [APPLS-2081] Fixed issue with starting app when ee version is not ready

* moved waiting to separate function

bin/drapps

@@ -8,6 +8,5 @@
 #
 from drapps.__main__ import drapps
 
-
 if __name__ == "__main__":
     drapps()

drapps/create.py

@@ -34,10 +34,13 @@
 )
 from .helpers.exceptions import ClientResponseError
 from .helpers.execution_environments_functions import (
+    IMAGE_BUILD_FAILED_STATUSES,
+    IMAGE_BUILD_FINAL_STATUSES,
     create_execution_environment,
     create_execution_environment_version,
     get_execution_environment_by_id,
     get_execution_environment_by_name,
+    get_execution_environment_version_by_id,
 )
 from .helpers.wrappers import api_endpoint, api_token
 
@@ -171,6 +174,23 @@ def create_app_from_project(
     return create_custom_app(session, endpoint, app_payload)
 
 
+def wait_for_execution_environment_version_ready(
+    session: Session, endpoint: str, base_env_id: str, version_id: str
+) -> None:
+    with click.progressbar(iterable=repeat(0), label='Waiting till image is ready:') as progress:
+        while True:
+            response = get_execution_environment_version_by_id(
+                session=session, endpoint=endpoint, base_env_id=base_env_id, version_id=version_id
+            )
+            img_status = response.get('buildStatus')
+            if img_status in IMAGE_BUILD_FINAL_STATUSES:
+                break
+            progress.update(1)
+            sleep(CHECK_STATUS_WAIT_TIME)
+    if img_status in IMAGE_BUILD_FAILED_STATUSES:
+        raise Exception("Image build failed")
+
+
 def send_docker_image_with_progress(
     session: Session, endpoint: str, base_env_id: str, docker_image: Path
 ) -> None:
@@ -188,12 +208,15 @@ def monitor_callback(monitor: MultipartEncoderMonitor):
 
             multipart_monitor.callback = monitor_callback
 
-            create_execution_environment_version(
+            response = create_execution_environment_version(
                 session=session,
                 endpoint=endpoint,
                 base_env_id=base_env_id,
                 multipart_data=multipart_monitor,
             )
+    wait_for_execution_environment_version_ready(
+        session=session, endpoint=endpoint, base_env_id=base_env_id, version_id=response['id']
+    )
 
 
 def create_app_from_docker_image(

drapps/helpers/execution_environments_functions.py

@@ -14,6 +14,10 @@
 from .exceptions import ClientResponseError
 from .handle_dr_response import handle_dr_response
 
+IMAGE_BUILD_SUCCESS_STATUSES = {'success'}
+IMAGE_BUILD_FAILED_STATUSES = {'failed'}
+IMAGE_BUILD_FINAL_STATUSES = IMAGE_BUILD_SUCCESS_STATUSES | IMAGE_BUILD_FAILED_STATUSES
+
 
 def create_execution_environment(
     session: Session, endpoint: str, env_name: str, description: Optional[str] = None
@@ -84,3 +88,13 @@ def create_execution_environment_version(
     )
     handle_dr_response(response)
     return response.json()
+
+
+def get_execution_environment_version_by_id(
+    session: Session, endpoint: str, base_env_id: str, version_id: str
+) -> Dict[str, Any]:
+    """Get a execution environment version by environment ID and version ID."""
+    url = posixpath.join(endpoint, f"executionEnvironments/{base_env_id}/versions/{version_id}/")
+    response = session.get(url)
+    handle_dr_response(response)
+    return response.json()

tests/cli/test_create.py

@@ -58,11 +58,18 @@ def test_create_from_docker_image(api_endpoint_env, api_token_env, wait_till_rea
     )
 
     # request for uploading docker image to execution environment version
+    ee_environment_version_id = str(ObjectId())
     responses.post(
         f'{api_endpoint_env}/executionEnvironments/{ee_environment_id}/versions/',
-        json={'id': str(ObjectId())},
+        json={'id': ee_environment_version_id},
         match=[auth_matcher],
     )
+    # requests for checking image readiness
+    ee_environment_version_url = f'{api_endpoint_env}/executionEnvironments/{ee_environment_id}/versions/{ee_environment_version_id}/'
+    responses.get(
+        ee_environment_version_url, json={'buildStatus': 'processing'}, match=[auth_matcher]
+    )
+    responses.get(ee_environment_version_url, json={'buildStatus': 'success'}, match=[auth_matcher])
 
     # request for creating custom app
     status_check_url = 'http://ho.st/status/status_id'
@@ -88,6 +95,7 @@ def test_create_from_docker_image(api_endpoint_env, api_token_env, wait_till_rea
     expected_output = (
         f'Uploading {image_name} to Data Robot.\n'
         'Upload progress:\n'
+        'Waiting till image is ready:\n'
         f'Starting {app_name} custom application.\n'
     )
     if wait_till_ready: