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

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

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

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

@@ -158,13 +158,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 +213,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 +249,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 +276,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 +375,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.1}/pyproject.toml

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