poetry-plugin-ivcap 0.4.0__tar.gz → 0.4.2__tar.gz

{poetry_plugin_ivcap-0.4.0 → poetry_plugin_ivcap-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: poetry-plugin-ivcap
-Version: 0.4.0
+Version: 0.4.2
 Summary: A custom Poetry command for IVCAP deployments
 License: MIT
 Author: Max Ott

{poetry_plugin_ivcap-0.4.0 → poetry_plugin_ivcap-0.4.2}/poetry_plugin_ivcap/constants.py

@@ -19,6 +19,7 @@ DOCKER_BUILD_TEMPLATE_OPT = "docker-build-template"
 
 DEF_POLICY = "urn:ivcap:policy:ivcap.base.metadata"
 DEF_PORT = 8000
+DEF_IVCAP_BASE_URL = "https://develop.ivcap.net"
 
 DOCKER_BUILD_TEMPLATE = """
 docker buildx build
@@ -33,6 +34,7 @@ docker buildx build
 DOCKER_LAMBDA_RUN_TEMPLATE = """
 	docker run -it
         -p #PORT#:#PORT#
+        -e IVCAP_BASE_URL=#IVCAP_BASE_URL#
 		--platform=linux/#ARCH#
 		--rm \
 		#NAME#_#ARCH#:#TAG#
@@ -40,6 +42,7 @@ DOCKER_LAMBDA_RUN_TEMPLATE = """
 
 DOCKER_BATCH_RUN_TEMPLATE = """
 	docker run -it
+        -e IVCAP_BASE_URL=#IVCAP_BASE_URL#
 		--platform=linux/#ARCH#
         -v #PROJECT_DIR#:/data
 		--rm \

{poetry_plugin_ivcap-0.4.0 → poetry_plugin_ivcap-0.4.2}/poetry_plugin_ivcap/docker.py

@@ -12,7 +12,7 @@ from typing import Dict, List, Optional
 from pydantic import BaseModel, Field
 import subprocess
 
-from .constants import DEF_PORT, DOCKER_BATCH_RUN_TEMPLATE, DOCKER_BUILD_TEMPLATE, DOCKER_BUILD_TEMPLATE_OPT, DOCKER_LAMBDA_RUN_TEMPLATE, DOCKER_RUN_OPT, DOCKER_RUN_TEMPLATE_OPT, PLUGIN_NAME, SERVICE_TYPE_OPT
+from .constants import DEF_IVCAP_BASE_URL, DEF_PORT, DOCKER_BATCH_RUN_TEMPLATE, DOCKER_BUILD_TEMPLATE, DOCKER_BUILD_TEMPLATE_OPT, DOCKER_LAMBDA_RUN_TEMPLATE, DOCKER_RUN_OPT, DOCKER_RUN_TEMPLATE_OPT, PLUGIN_NAME, SERVICE_TYPE_OPT
 from .util import command_exists, get_name, get_version
 
 class DockerConfig(BaseModel):
@@ -66,8 +66,10 @@ class DockerConfig(BaseModel):
             port_in_args = False
             port = str(pdata.get("port", DEF_PORT))
 
+        base_url = os.environ.get("IVCAP_BASE_URL", DEF_IVCAP_BASE_URL)
         t = template.strip()\
             .replace("#DOCKER_NAME#", self.docker_name)\
+            .replace("#IVCAP_BASE_URL#", base_url)\
             .replace("#NAME#", self.name)\
             .replace("#TAG#", self.tag)\
             .replace("#PORT#", port)\

{poetry_plugin_ivcap-0.4.0 → poetry_plugin_ivcap-0.4.2}/poetry_plugin_ivcap/ivcap.py

@@ -13,7 +13,7 @@ import humanize
 import subprocess
 import requests
 
-from .constants import DEF_POLICY, PLUGIN_NAME, POLICY_OPT, SERVICE_FILE_OPT, SERVICE_ID_OPT
+from .constants import DEF_POLICY, PLUGIN_NAME, POLICY_OPT, SERVICE_FILE_OPT, SERVICE_ID_OPT, DEF_IVCAP_BASE_URL
 
 from .docker import docker_cfg, docker_build, docker_push
 from .util import command_exists, get_name, string_to_number
@@ -51,7 +51,9 @@ def service_register(data, line):
 
     cmd = ["poetry", "run", "python", service, "--print-service-description"]
     line(f"<debug>Running: {' '.join(cmd)} </debug>")
-    svc = subprocess.check_output(cmd).decode()
+    env = os.environ.copy()
+    env.setdefault("IVCAP_BASE_URL", DEF_IVCAP_BASE_URL)
+    svc = subprocess.check_output(cmd, env=env).decode()
 
     svc = svc.replace("#DOCKER_IMG#", pkg.strip())\
             .replace("#SERVICE_ID#", service_id)
@@ -87,7 +89,9 @@ def tool_register(data, line):
 
     cmd = ["poetry", "run", "python", service, "--print-tool-description"]
     line(f"<debug>Running: {' '.join(cmd)} </debug>")
-    svc = subprocess.check_output(cmd).decode()
+    env = os.environ.copy()
+    env.setdefault("IVCAP_BASE_URL", DEF_IVCAP_BASE_URL)
+    svc = subprocess.check_output(cmd, env=env).decode()
 
     service_id = get_service_id(data, False, line)
     svc = svc.replace("#SERVICE_ID#", service_id)
@@ -142,7 +146,7 @@ def exec_job(data, args, is_silent, line):
     if not isinstance(args, list) or len(args) < 1:
         raise Exception("args must be a list with at least one element")
     file_name = args[0]
-    timeout = 20 # default timeout
+    timeout = 5 # default timeout
     if len(args) == 1:
         pass  # only file_name provided
     elif len(args) == 3 and args[1] == '--timeout':
@@ -212,7 +216,11 @@ def exec_job(data, args, is_silent, line):
             if "application/json" in content_type:
                 try:
                     parsed = resp.json()
+                    status = parsed.get("status")
+                    if status and (not status in ["succeeded", "failed", "error"]):
+                        return status
                     print(json.dumps(parsed, indent=2, sort_keys=True))
+                    return None
                 except Exception as e:
                     line(f"<warning>Failed to parse JSON response: {e}</warning>")
                     line(f"<warning>Headers: {str(resp.headers)}</warning>")
@@ -221,6 +229,7 @@ def exec_job(data, args, is_silent, line):
         else:
             line(f"<warning>Received status code {resp.status_code}</warning>")
             line(f"<warning>Headers: {str(resp.headers)}</warning>")
+        return "unknown"
 
     if response.status_code == 202:
         try:
@@ -229,7 +238,7 @@ def exec_job(data, args, is_silent, line):
             # location = f"{payload.get('location')}/output"
             location = f"{payload.get('location')}"
             job_id = payload.get("job-id")
-            retry_later = payload.get("retry-later", 10)
+            retry_later = payload.get("retry-later", 5)
             if not is_silent:
                 line(f"<debug>Job '{job_id}' accepted, but no result yet. Polling in {retry_later} seconds.</debug>")
             while True:
@@ -249,8 +258,13 @@ def exec_job(data, args, is_silent, line):
                         line(f"<error>Failed to parse polling response: {e}</error>")
                         break
                 else:
-                    handle_response(poll_resp)
-                    break
+                    status = handle_response(poll_resp)
+                    if status:
+                        if not is_silent:
+                            line(f"<debug>Status: '{status}'. Next poll in {retry_later} seconds.</debug>")
+                    else:
+                        break
+
         except Exception as e:
             line(f"<error>Failed to handle 202 response: {e}</error>")
     else:

{poetry_plugin_ivcap-0.4.0 → poetry_plugin_ivcap-0.4.2}/poetry_plugin_ivcap/plugin.py

@@ -10,7 +10,7 @@ from cleo.helpers import argument, option
 import subprocess
 from importlib.metadata import version
 
-from poetry_plugin_ivcap.constants import DOCKER_BUILD_TEMPLATE_OPT, DOCKER_RUN_TEMPLATE_OPT, PLUGIN_CMD, PLUGIN_NAME
+from poetry_plugin_ivcap.constants import DEF_IVCAP_BASE_URL, DOCKER_BUILD_TEMPLATE_OPT, DOCKER_RUN_TEMPLATE_OPT, PLUGIN_CMD, PLUGIN_NAME
 from poetry_plugin_ivcap.constants import PORT_OPT, SERVICE_FILE_OPT, SERVICE_ID_OPT, SERVICE_TYPE_OPT, POLICY_OPT
 from poetry_plugin_ivcap.util import get_version
 
@@ -99,7 +99,7 @@ Configurable options in pyproject.toml:
         elif sub == "service-register":
             service_register(data, self.line)
         elif sub == "create-service-id":
-            sid = create_service_id(data, self.line)
+            sid = create_service_id(data, is_silent, self.line)
             print(sid)
         elif sub == "get-service-id":
             sid = get_service_id(data, is_silent, self.line)
@@ -127,6 +127,7 @@ Configurable options in pyproject.toml:
 
         env = os.environ.copy()
         env["VERSION"] = get_version(data, None, line)
+        env.setdefault("IVCAP_BASE_URL", DEF_IVCAP_BASE_URL)
 
         cmd = ["poetry", "run", "python", service]
         cmd.extend(args)

{poetry_plugin_ivcap-0.4.0 → poetry_plugin_ivcap-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poetry-plugin-ivcap"
-version = "0.4.0"
+version = "0.4.2"
 description = "A custom Poetry command for IVCAP deployments"
 authors = ["Max Ott <max.ott@csiro.au>"]
 license = "MIT"