poetry-plugin-ivcap 0.4.1__tar.gz → 0.5.0__tar.gz

{poetry_plugin_ivcap-0.4.1 → poetry_plugin_ivcap-0.5.0}/PKG-INFO

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

{poetry_plugin_ivcap-0.4.1 → poetry_plugin_ivcap-0.5.0}/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.1 → poetry_plugin_ivcap-0.5.0}/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.1 → poetry_plugin_ivcap-0.5.0}/poetry_plugin_ivcap/ivcap.py

@@ -3,6 +3,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file. See the AUTHORS file for names of contributors.
 #
+import argparse
 import os
 import re
 import subprocess
@@ -12,8 +13,11 @@ import uuid
 import humanize
 import subprocess
 import requests
+import time
+import json
 
-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 +55,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 +93,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)
@@ -139,20 +147,16 @@ def exec_job(data, args, is_silent, line):
         requests.Response: The response object from the API call.
     """
     # Parse 'args' for run options
+    p = exec_parser()
     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
-    if len(args) == 1:
-        pass  # only file_name provided
-    elif len(args) == 3 and args[1] == '--timeout':
-        try:
-            timeout = int(args[2])
-        except ValueError:
-            raise Exception("Timeout value must be an integer")
-    else:
-        raise Exception("args must be [file_name] or [file_name, '--timeout', value]")
-
+        p.error("missing request file name")
+        # raise Exception("args must be a list with at least one element")
+    file_name = args.pop(0)
+    if file_name == "-h" or file_name == "--help":
+        p.print_help()
+        return
+    pa = p.parse_args(args)
+    timeout = 0 if pa.stream else pa.timeout
     # Get access token using ivcap CLI
     try:
         token = subprocess.check_output(
@@ -198,29 +202,6 @@ def exec_job(data, args, is_silent, line):
     except Exception as e:
         raise RuntimeError(f"Job submission failed: {e}")
 
-    # Handle response according to requirements
-    import time
-    import json
-
-    def handle_response(resp):
-        content_type = resp.headers.get("content-type", "")
-        if resp.status_code >= 300:
-            line(f"<warning>WARNING: Received status code {resp.status_code}</warning>")
-            line(f"<info>Headers: {str(resp.headers)}</info>")
-            line(f"<info>Body: {str(resp.text)}</info>")
-        elif resp.status_code == 200:
-            if "application/json" in content_type:
-                try:
-                    parsed = resp.json()
-                    print(json.dumps(parsed, indent=2, sort_keys=True))
-                except Exception as e:
-                    line(f"<warning>Failed to parse JSON response: {e}</warning>")
-                    line(f"<warning>Headers: {str(resp.headers)}</warning>")
-            else:
-                line(f"<info>Headers: {str(resp.headers)}</info>")
-        else:
-            line(f"<warning>Received status code {resp.status_code}</warning>")
-            line(f"<warning>Headers: {str(resp.headers)}</warning>")
 
     if response.status_code == 202:
         try:
@@ -229,32 +210,113 @@ 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:
-                time.sleep(retry_later)
-                poll_headers = {
-                    "Authorization": f"Bearer {token}"
-                }
-                poll_resp = requests.get(location, headers=poll_headers)
-                if poll_resp.status_code == 202:
-                    try:
-                        poll_payload = poll_resp.json()
-                        location = poll_payload.get("location", location)
-                        retry_later = poll_payload.get("retry-later", retry_later)
-                        if not is_silent:
-                            line(f"<debug>Still processing. Next poll in {retry_later} seconds.</debug>")
-                    except Exception as e:
-                        line(f"<error>Failed to parse polling response: {e}</error>")
-                        break
-                else:
-                    handle_response(poll_resp)
-                    break
+            if  pa.stream:
+                stream_result(location, token, pa)
+            else:
+                poll_for_result(location, retry_later, token, is_silent, line)
+
         except Exception as e:
             line(f"<error>Failed to handle 202 response: {e}</error>")
     else:
-        handle_response(response)
+        handle_response(response, line)
+
+def handle_response(resp, line):
+    content_type = resp.headers.get("content-type", "")
+    if resp.status_code >= 300:
+        line(f"<warning>WARNING: Received status code {resp.status_code}</warning>")
+        line(f"<info>Headers: {str(resp.headers)}</info>")
+        line(f"<info>Body: {str(resp.text)}</info>")
+    elif resp.status_code == 200:
+        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>")
+        else:
+            line(f"<info>Headers: {str(resp.headers)}</info>")
+    else:
+        line(f"<warning>Received status code {resp.status_code}</warning>")
+        line(f"<warning>Headers: {str(resp.headers)}</warning>")
+    return "unknown"
+
+def poll_for_result(location, retry_later, token, is_silent, line):
+    while True:
+        time.sleep(retry_later)
+        poll_headers = {
+            "Authorization": f"Bearer {token}"
+        }
+        poll_resp = requests.get(location, headers=poll_headers)
+        if poll_resp.status_code == 202:
+            try:
+                poll_payload = poll_resp.json()
+                location = poll_payload.get("location", location)
+                retry_later = poll_payload.get("retry-later", retry_later)
+                if not is_silent:
+                    line(f"<debug>Still processing. Next poll in {retry_later} seconds.</debug>")
+            except Exception as e:
+                line(f"<error>Failed to parse polling response: {e}</error>")
+                break
+        else:
+            status = handle_response(poll_resp, line)
+            if status:
+                if not is_silent:
+                    line(f"<debug>Status: '{status}'. Next poll in {retry_later} seconds.</debug>")
+            else:
+                break
+
+def stream_result(location, token, pa):
+    """
+    Stream the result content from the given location using the provided token.
+    """
+    headers = {
+        "Authorization": f"Bearer {token}",
+        "Accept": "text/event-stream"
+    }
+    with requests.get(location + "/events", stream=True, headers=headers, timeout=(5, 65)) as r:
+        r.raise_for_status()
+        for row in r.iter_lines(decode_unicode=True, chunk_size=1):
+            if row is None:
+                continue
+            if row.startswith(":"):
+                # comment/heartbeat
+                continue
+            print_sse_row(row, pa)  # raw SSE lines (e.g., "data: {...}", "event: message")
+
+def print_sse_row(row, pa):
+    if pa.raw_events:
+        print(row)
+    elif row.startswith("data: "):
+        # JSON data
+        print("----")
+        try:
+            data = json.loads(row[6:])
+            print(json.dumps(data, indent=2, sort_keys=True))
+        except json.JSONDecodeError as e:
+            print(f"Failed to decode JSON: {e}")
+
+def exec_parser():
+    p = argparse.ArgumentParser(prog="poetry ivcap job-exec request_file --")
+    p.add_argument("--timeout", type=nonneg_int, default=5, help="[5] seconds; 0 allowed")
+    p.add_argument("--with-result-content", dest="with_result_content", action="store_true",
+                   help="include result content in the response")
+    p.add_argument("--stream", action="store_true", help="stream the result content")
+    p.add_argument("--raw-events", action="store_true", help="print raw SSE events")
+    return p
+
+def nonneg_int(s: str) -> int:
+    v = int(s)
+    if v < 0:
+        raise argparse.ArgumentTypeError("timeout must be >= 0")
+    return v
 
 def get_account_id(data, line, is_silent=False):
     check_ivcap_cmd(line)

{poetry_plugin_ivcap-0.4.1 → poetry_plugin_ivcap-0.5.0}/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
 
@@ -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.1 → poetry_plugin_ivcap-0.5.0}/pyproject.toml

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