poetry-plugin-ivcap 0.2.2__tar.gz → 0.2.4__tar.gz

{poetry_plugin_ivcap-0.2.2 → poetry_plugin_ivcap-0.2.4}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.3
 Name: poetry-plugin-ivcap
-Version: 0.2.2
+Version: 0.2.4
 Summary: A custom Poetry command for IVCAP deployments
 License: MIT
 Author: Max Ott
 Author-email: max.ott@csiro.au
-Requires-Python: >=3.9,<4.0
+Requires-Python: >=3.9
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
@@ -47,7 +47,7 @@ poetry ivcap docker-build
 poetry ivcap docker-run
 poetry ivcap docker-publish
 poetry ivcap service-register
-poetry ivcap create-service-id
+poetry ivcap create-service-idget
 poetry ivcap tool-register
 ```
 

{poetry_plugin_ivcap-0.2.2 → poetry_plugin_ivcap-0.2.4}/README.md

@@ -28,7 +28,7 @@ poetry ivcap docker-build
 poetry ivcap docker-run
 poetry ivcap docker-publish
 poetry ivcap service-register
-poetry ivcap create-service-id
+poetry ivcap create-service-idget
 poetry ivcap tool-register
 ```
 

{poetry_plugin_ivcap-0.2.2 → poetry_plugin_ivcap-0.2.4}/poetry_plugin_ivcap/ivcap.py

@@ -108,16 +108,16 @@ def tool_register(data, line):
         if os.path.exists(tmp_path):
             os.remove(tmp_path)
 
-def get_service_id(data, line):
+def get_service_id(data, is_silent, line):
     service_id = data.get("tool", {}).get("poetry-plugin-ivcap", {}).get("service-id")
     if not service_id:
-        service_id = create_service_id(data, line)
+        service_id = create_service_id(data, is_silent, line)
     return service_id
 
-def create_service_id(data, line):
-    check_ivcap_cmd(line)
+def create_service_id(data, is_silent, line):
+    check_ivcap_cmd(line, is_silent)
     name = get_name(data)
-    account_id = get_account_id(data, line)
+    account_id = get_account_id(data, line, is_silent)
     id = uuid.uuid5(uuid.NAMESPACE_DNS, f"{name}{account_id}")
     return f"urn:ivcap:service:{id}"
 
@@ -127,10 +127,11 @@ def get_policy(data, line):
         policy = "urn:ivcap:policy:ivcap.open.metadata"
     return policy
 
-def get_account_id(data, line):
+def get_account_id(data, line, is_silent=False):
     check_ivcap_cmd(line)
     cmd = ["ivcap", "context", "get", "account-id"]
-    line(f"<debug>Running: {' '.join(cmd)} </debug>")
+    if not is_silent:
+        line(f"<debug>Running: {' '.join(cmd)} </debug>")
     try:
         account_id = subprocess.check_output(cmd).decode().strip()
         return account_id
@@ -138,7 +139,7 @@ def get_account_id(data, line):
         line(f"<error>Error retrieving account ID: {e}</error>")
         sys.exit(1)
 
-def check_ivcap_cmd(line):
+def check_ivcap_cmd(line, is_silent=False):
     if not command_exists("ivcap"):
         line("<error>'ivcap' command not found. Please install the IVCAP CLI tool.</error>")
         line("<error>... see https://github.com/ivcap-works/ivcap-cli?tab=readme-ov-file#install-released-binaries for instructions</error>")

{poetry_plugin_ivcap-0.2.2 → poetry_plugin_ivcap-0.2.4}/poetry_plugin_ivcap/plugin.py

@@ -6,12 +6,12 @@
 import os
 from poetry.plugins.application_plugin import ApplicationPlugin
 from cleo.commands.command import Command
-from cleo.helpers import argument
+from cleo.helpers import argument, option
 import subprocess
 
 from poetry_plugin_ivcap.util import get_version
 
-from .ivcap import create_service_id, service_register, tool_register
+from .ivcap import create_service_id, get_service_id, service_register, tool_register
 from .docker import docker_build, docker_run
 from .ivcap import docker_publish
 
@@ -31,6 +31,7 @@ Available subcommands:
     docker-publish      Publish the service's docker image to IVCAP
     service-register    Register the service with IVCAP
     create-service-id   Create a unique service ID for the service
+    get-service-id      Return the service ID for the service
     tool-register       Register the service as an AI Tool with IVCAP
 
 Example:
@@ -50,6 +51,9 @@ Configurable options in pyproject.toml:
         argument("subcommand", optional=True, description="Subcommand: run, deploy, etc."),
         argument("args", optional=True, multiple=True, description="Additional arguments for subcommand"),
     ]
+    options = [
+        option("silent", None, "Run silently (no output)", flag=True),
+    ]
 
     allow_extra_args = True
     ignore_validation_errors = True
@@ -60,6 +64,7 @@ Configurable options in pyproject.toml:
 
         sub = self.argument("subcommand")
         args = self.argument("args")
+        is_silent = self.option("silent")
 
         if sub == "run":
             self.run_service(data, args, self.line)
@@ -74,6 +79,9 @@ Configurable options in pyproject.toml:
         elif sub == "create-service-id":
             sid = create_service_id(data, self.line)
             print(sid)
+        elif sub == "get-service-id":
+            sid = get_service_id(data, is_silent, self.line)
+            print(sid)
         elif sub == "tool-register":
             tool_register(data, self.line)
         else:

{poetry_plugin_ivcap-0.2.2 → poetry_plugin_ivcap-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poetry-plugin-ivcap"
-version = "0.2.2"
+version = "0.2.4"
 description = "A custom Poetry command for IVCAP deployments"
 authors = ["Max Ott <max.ott@csiro.au>"]
 license = "MIT"
@@ -8,7 +8,7 @@ readme = "README.md"
 packages = [{ include = "poetry_plugin_ivcap" }]
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = ">=3.9"
 pydantic = "^2.11.5"
 humanize = "^4.12.3"