poetry-plugin-ivcap 0.5.1__py3-none-any.whl → 0.5.2__py3-none-any.whl

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/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/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)

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/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.1.dist-info → poetry_plugin_ivcap-0.5.2.dist-info}/METADATA

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

poetry_plugin_ivcap-0.5.2.dist-info/RECORD

@@ -0,0 +1,12 @@
+poetry_plugin_ivcap/constants.py,sha256=jD8j_kBwo0i-IupEGBJRvI_Uwyfde_IaRghYASxf4tA,1326
+poetry_plugin_ivcap/docker.py,sha256=QR3DJRn6l3RFxCiAvn8Kai_6e_mJ3YVuR_Pmnd1szqY,7714
+poetry_plugin_ivcap/ivcap.py,sha256=yRS_mhS5P8sbIEofE9f7PRfsuZNGeyRrfjSNRg8shFY,15464
+poetry_plugin_ivcap/plugin.py,sha256=hBsJaQzOlYnTjoBcS7AVSpsD2v0MtzcAabP70-cG2cs,5627
+poetry_plugin_ivcap/types.py,sha256=gpoMnKZgO8JV-RFJs67cymuSj3d1RrLDJ8160_7NsKY,1351
+poetry_plugin_ivcap/util.py,sha256=bcjjbKoV_pAgeuC7Ws9XbJa3phFpNVyrRAlFJ1VubRg,3429
+poetry_plugin_ivcap-0.5.2.dist-info/AUTHORS.md,sha256=s9xR4_HAHQgbNlj505LViebt5AtACQmhPf92aJvNYgg,88
+poetry_plugin_ivcap-0.5.2.dist-info/LICENSE,sha256=dsQrDPPwW7iJs9pxahgJKDW8RNPf5FyXG70MFUlxcuk,1587
+poetry_plugin_ivcap-0.5.2.dist-info/METADATA,sha256=wUm9lrn8ZZokYRXBXp603XVEGHvG-B0AXcIsudrhSrY,3032
+poetry_plugin_ivcap-0.5.2.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+poetry_plugin_ivcap-0.5.2.dist-info/entry_points.txt,sha256=3xagEFBkGgrVe8WyjmhlHLr4JDEWPN_W4DwxnIBWbNY,74
+poetry_plugin_ivcap-0.5.2.dist-info/RECORD,,

poetry_plugin_ivcap-0.5.1.dist-info/RECORD

@@ -1,11 +0,0 @@
-poetry_plugin_ivcap/constants.py,sha256=zsUnw-cS3uTqRlkAsWPYBeMpn5Wpz7r4ByjYaFZQFUo,1318
-poetry_plugin_ivcap/docker.py,sha256=Pny5uF7juKy8Jld7D-5euAtgzguDZ8E2SRn-romk-Sg,7409
-poetry_plugin_ivcap/ivcap.py,sha256=K-wZES-7EIViTnUZ4fklVqIr_uV-6KuQXM2ziNAwFHw,15490
-poetry_plugin_ivcap/plugin.py,sha256=NWYdqjvlw3cqg4DVcEcZLGAVuL1aa9o0GmQGNZ6wfbI,5506
-poetry_plugin_ivcap/util.py,sha256=bcjjbKoV_pAgeuC7Ws9XbJa3phFpNVyrRAlFJ1VubRg,3429
-poetry_plugin_ivcap-0.5.1.dist-info/AUTHORS.md,sha256=s9xR4_HAHQgbNlj505LViebt5AtACQmhPf92aJvNYgg,88
-poetry_plugin_ivcap-0.5.1.dist-info/LICENSE,sha256=dsQrDPPwW7iJs9pxahgJKDW8RNPf5FyXG70MFUlxcuk,1587
-poetry_plugin_ivcap-0.5.1.dist-info/METADATA,sha256=_USNLVLTjHMkREPWR3CXnsuYSeWvRZJFT7JAJhtnePg,3032
-poetry_plugin_ivcap-0.5.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-poetry_plugin_ivcap-0.5.1.dist-info/entry_points.txt,sha256=3xagEFBkGgrVe8WyjmhlHLr4JDEWPN_W4DwxnIBWbNY,74
-poetry_plugin_ivcap-0.5.1.dist-info/RECORD,,