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

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

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

{poetry_plugin_ivcap-0.5.0 → poetry_plugin_ivcap-0.5.2}/poetry_plugin_ivcap/constants.py

@@ -19,7 +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"
+DEF_IVCAP_URL = "https://develop.ivcap.net"
 
 DOCKER_BUILD_TEMPLATE = """
 docker buildx build
@@ -34,7 +34,8 @@ docker buildx build
 DOCKER_LAMBDA_RUN_TEMPLATE = """
 	docker run -it
         -p #PORT#:#PORT#
-        -e IVCAP_BASE_URL=#IVCAP_BASE_URL#
+        -e IVCAP_URL=#IVCAP_URL#
+        -e IVCAP_JWT=#IVCAP_JWT#
 		--platform=linux/#ARCH#
 		--rm \
 		#NAME#_#ARCH#:#TAG#
@@ -42,7 +43,7 @@ DOCKER_LAMBDA_RUN_TEMPLATE = """
 
 DOCKER_BATCH_RUN_TEMPLATE = """
 	docker run -it
-        -e IVCAP_BASE_URL=#IVCAP_BASE_URL#
+        -e IVCAP_URL=#IVCAP_URL#
 		--platform=linux/#ARCH#
         -v #PROJECT_DIR#:/data
 		--rm \

{poetry_plugin_ivcap-0.5.0 → poetry_plugin_ivcap-0.5.2}/poetry_plugin_ivcap/docker.py

@@ -8,20 +8,25 @@ import os
 import re
 import sys
 import tempfile
-from typing import Dict, List, Optional
-from pydantic import BaseModel, Field
+from typing import Any, Dict, List, Optional
+from pydantic import BaseModel, Field, SkipValidation
 import subprocess
 
-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 .constants import (
+    DEF_IVCAP_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
+from .types import BaseConfig
 
-class DockerConfig(BaseModel):
+class DockerConfig(BaseConfig):
     name: Optional[str] = Field(None)
     tag: Optional[str] = Field(None)
     arch: Optional[str] = Field(None)
     version: Optional[str] = Field(None)
     dockerfile: Optional[str] = Field("Dockerfile")
     project_dir: Optional[str] = Field(os.getcwd())
+    line: SkipValidation[Any]
 
     @property
     def docker_name(self) -> str:
@@ -66,10 +71,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("#IVCAP_URL#", self.ivcap_url)\
+            .replace("#IVCAP_JWT#", self.ivcap_jwt)\
             .replace("#NAME#", self.name)\
             .replace("#TAG#", self.tag)\
             .replace("#PORT#", port)\
@@ -84,7 +89,6 @@ class DockerConfig(BaseModel):
             cmd.extend(["--port", port])
         return cmd
 
-
 def docker_build(data: dict, line, arch = None) -> None:
     check_docker_cmd(line)
     config = docker_cfg(data, line, arch)
@@ -102,19 +106,26 @@ def docker_run(data: dict, args, line) -> None:
     check_docker_cmd(line)
     config = docker_cfg(data, line)
     build_run = config.from_run_template(data, args, line)
-    line(f"<info>INFO: {' '.join(build_run)}</info>")
+    log_run(build_run, line)
     process = subprocess.Popen(build_run, stdout=sys.stdout, stderr=sys.stderr)
+    print(">>>> 2")
     exit_code = process.wait()
+    print(">>>> 3")
     if exit_code != 0:
         line(f"<error>ERROR: Docker run failed with exit code {exit_code}</error>")
     else:
         line("<info>INFO: Docker run completed successfully</info>")
 
+mask_token = re.compile(r'''(?<!\w)(IVCAP_JWT=)(?:(["'])(.*?)\2|(\S+))''')
+def log_run(cmd, line):
+    masked_cmd = mask_token.sub("IVCAP_JWT=***", ' '.join(cmd))
+    line(f"<info>INFO: {masked_cmd}</info>")
+
 def docker_cfg(data: dict, line, arch = None) -> DockerConfig:
     name = get_name(data)
 
     pdata = data.get("tool", {}).get(PLUGIN_NAME, {})
-    config = DockerConfig(name=name, **pdata.get("docker", {}))
+    config = DockerConfig(name=name, line=line, **pdata.get("docker", {}))
     if arch:
         # override architecture if provided
         config.arch = arch

{poetry_plugin_ivcap-0.5.0 → poetry_plugin_ivcap-0.5.2}/poetry_plugin_ivcap/ivcap.py

@@ -16,8 +16,7 @@ import requests
 import time
 import json
 
-
-from .constants import DEF_POLICY, PLUGIN_NAME, POLICY_OPT, SERVICE_FILE_OPT, SERVICE_ID_OPT, DEF_IVCAP_BASE_URL
+from .constants import DEF_POLICY, PLUGIN_NAME, POLICY_OPT, SERVICE_FILE_OPT, SERVICE_ID_OPT, DEF_IVCAP_URL
 
 from .docker import docker_cfg, docker_build, docker_push
 from .util import command_exists, get_name, string_to_number
@@ -56,7 +55,7 @@ def service_register(data, line):
     cmd = ["poetry", "run", "python", service, "--print-service-description"]
     line(f"<debug>Running: {' '.join(cmd)} </debug>")
     env = os.environ.copy()
-    env.setdefault("IVCAP_BASE_URL", DEF_IVCAP_BASE_URL)
+    env.setdefault("IVCAP_URL", DEF_IVCAP_URL)
     svc = subprocess.check_output(cmd, env=env).decode()
 
     svc = svc.replace("#DOCKER_IMG#", pkg.strip())\
@@ -94,7 +93,7 @@ def tool_register(data, line):
     cmd = ["poetry", "run", "python", service, "--print-tool-description"]
     line(f"<debug>Running: {' '.join(cmd)} </debug>")
     env = os.environ.copy()
-    env.setdefault("IVCAP_BASE_URL", DEF_IVCAP_BASE_URL)
+    env.setdefault("IVCAP_URL", DEF_IVCAP_URL)
     svc = subprocess.check_output(cmd, env=env).decode()
 
     service_id = get_service_id(data, False, line)
@@ -158,13 +157,15 @@ def exec_job(data, args, is_silent, line):
     pa = p.parse_args(args)
     timeout = 0 if pa.stream else pa.timeout
     # Get access token using ivcap CLI
-    try:
-        token = subprocess.check_output(
-            ["ivcap", "--silent", "context", "get", "access-token", "--refresh-token"],
-            text=True
-        ).strip()
-    except Exception as e:
-        raise RuntimeError(f"Failed to get IVCAP access token: {e}")
+    token = pa.auth_token
+    if not token:
+        try:
+            token = subprocess.check_output(
+                ["ivcap", "--silent", "context", "get", "access-token", "--refresh-token"],
+                text=True
+            ).strip()
+        except Exception as e:
+            raise RuntimeError(f"Failed to get IVCAP access token: {e}")
 
    # Get IVCAP deployment URL
     try:
@@ -211,15 +212,14 @@ def exec_job(data, args, is_silent, line):
             location = f"{payload.get('location')}"
             job_id = payload.get("job-id")
             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>")
-            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>")
+
+        if  pa.stream:
+            stream_result(location, job_id, token, pa, is_silent, line)
+        else:
+            poll_for_result(location, job_id, retry_later, token, is_silent, line)
+
     else:
         handle_response(response, line)
 
@@ -248,7 +248,9 @@ def handle_response(resp, line):
         line(f"<warning>Headers: {str(resp.headers)}</warning>")
     return "unknown"
 
-def poll_for_result(location, retry_later, token, is_silent, line):
+def poll_for_result(location, job_id, retry_later, token, is_silent, line):
+    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 = {
@@ -273,35 +275,97 @@ def poll_for_result(location, retry_later, token, is_silent, line):
             else:
                 break
 
-def stream_result(location, token, pa):
+CONNECT_TIMEOUT = 5
+READ_TIMEOUT = 120  # ensure server sends heartbeat within this window
+
+def stream_result(location, job_id, token, pa, is_silent, line):
     """
     Stream the result content from the given location using the provided token.
     """
+    if not is_silent:
+        line(f"<debug>Job '{job_id}' accepted, Waiting for events now.</debug>")
     headers = {
         "Authorization": f"Bearer {token}",
-        "Accept": "text/event-stream"
+        "Accept": "text/event-stream",
+        "Cache-Control": "no-cache",
+        "Connection": "keep-alive",
     }
-    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):
+    url = location + "/events"
+    session = requests.Session()
+    last_event_id = None
+    backoff = 1.0
+    while True:
+        try:
+            if last_event_id:
+                headers["Last-Event-ID"] = last_event_id
+            with session.get(url, stream=True, headers=headers, timeout=(CONNECT_TIMEOUT, READ_TIMEOUT)) as r:
+                r.raise_for_status()
+                # Reset backoff on successful connect
+                backoff = 1.0
+                for row in r.iter_lines(decode_unicode=True, chunk_size=1):
+                    if row is None:
+                        continue
+                    if row.startswith(":"):
+                        # comment/heartbeat
+                        continue
+                    if row.startswith("id:"):
+                        last_event_id = row[3:].strip()
+                        continue
+                    if print_sse_row(row, pa, line):  # raw SSE lines (e.g., "data: {...}", "event: message")
+                        return # done
+
+        except (requests.exceptions.ChunkedEncodingError,
+                requests.exceptions.ConnectionError,
+                requests.exceptions.ReadTimeout) as e:
+            if not is_silent:
+                line(f"<debug>stream error: {e}; reconnecting in {backoff:.1f}s</debug>")
+            time.sleep(backoff)
+            backoff = min(backoff * 2, 30.0)  # cap backoff
+            continue
+        except requests.HTTPError as e:
+            # Non-200 or similar; backoff and retry
+            if not is_silent:
+                line(f"<debug>http error: {e}; reconnecting in {backoff:.1f}s</debug>")
+            time.sleep(backoff)
+            backoff = min(backoff * 2, 60.0)
+        except Exception:
+            line(f"<error>Failed to fetch events: {type(e)} - {e}</error>")
+            break
+
+#     except requests.exceptions.ChunkedEncodingError as ce:
+#         line(f"<error>Chunked encoding error: {ce}</error>")
+#     except Exception as e:
+#         line(f"<error>Failed to fetch events: {type(e)} - {e}</error>")
+
+def print_sse_row(row, pa, line) -> bool:
     if pa.raw_events:
         print(row)
+        return False  # continue streaming
     elif row.startswith("data: "):
         # JSON data
         print("----")
         try:
             data = json.loads(row[6:])
             print(json.dumps(data, indent=2, sort_keys=True))
+            return check_if_done(data)
         except json.JSONDecodeError as e:
-            print(f"Failed to decode JSON: {e}")
+            line(f"<error>Failed to decode JSON: {e}</error>")
+
+
+def check_if_done(data) -> bool:
+    # {
+    #     "Data": {
+    #         "job-urn": "urn:ivcap:job:3e466031-ec8b-44eb-aec6-dc2f8212bec3",
+    #         "status": "succeeded"
+    #     },
+    #     "Type": "ivcap.job.status"
+    # }
+    if "Type" in data and data["Type"] == "ivcap.job.status":
+        if "Data" in data and "status" in data["Data"]:
+            status = data["Data"]["status"]
+            if status in ["succeeded", "failed", "error"]:
+                return True
+    return False  # continue streaming
 
 def exec_parser():
     p = argparse.ArgumentParser(prog="poetry ivcap job-exec request_file --")
@@ -310,6 +374,7 @@ def exec_parser():
                    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")
+    p.add_argument("--auth-token", help="alternative auth token to use")
     return p
 
 def nonneg_int(s: str) -> int:

{poetry_plugin_ivcap-0.5.0 → poetry_plugin_ivcap-0.5.2}/poetry_plugin_ivcap/plugin.py

@@ -10,8 +10,9 @@ from cleo.helpers import argument, option
 import subprocess
 from importlib.metadata import version
 
-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 DEF_IVCAP_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.types import BaseConfig
 from poetry_plugin_ivcap.util import get_version
 
 from .ivcap import create_service_id, exec_job, get_service_id, service_register, tool_register
@@ -127,7 +128,9 @@ 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)
+        cfg = BaseConfig(line=line)
+        env.setdefault("IVCAP_URL", cfg.ivcap_url)
+        env.setdefault("IVCAP_JWT", cfg.ivcap_jwt)
 
         cmd = ["poetry", "run", "python", service]
         cmd.extend(args)

poetry_plugin_ivcap-0.5.2/poetry_plugin_ivcap/types.py

@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2025 Commonwealth Scientific and Industrial Research Organisation (CSIRO). All rights reserved.
+# 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 os
+import sys
+from typing import Any
+from pydantic import BaseModel, SkipValidation
+import subprocess
+
+from .constants import DEF_IVCAP_URL
+
+class BaseConfig(BaseModel):
+    line: SkipValidation[Any]
+
+    @property
+    def ivcap_url(self) -> str:
+        base_url = os.environ.get("IVCAP_URL")
+        if not base_url:
+            cmd = ["ivcap", "context", "get", "url"]
+            self.line(f"<debug>Running: {' '.join(cmd)} </debug>")
+            base_url = subprocess.check_output(cmd).decode().strip()
+        if not base_url:
+            base_url = DEF_IVCAP_URL
+        return base_url
+
+    @property
+    def ivcap_jwt(self) -> str:
+        jwt = os.environ.get("IVCAP_JWT")
+        if not jwt:
+            cmd = ["ivcap", "context", "get", "access-token", "--refresh-token"]
+            self.line(f"<debug>Running: {' '.join(cmd)} </debug>")
+            jwt = subprocess.check_output(cmd).decode().strip()
+        if not jwt:
+            self.line("<error>ERROR: IVCAP JWT is not set. Please run 'ivcap login' first.</error>")
+            sys.exit(1)
+        return jwt

{poetry_plugin_ivcap-0.5.0 → poetry_plugin_ivcap-0.5.2}/pyproject.toml

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