poetry-plugin-ivcap 0.2.7__py3-none-any.whl → 0.3.0__py3-none-any.whl

poetry_plugin_ivcap/constants.py

@@ -11,6 +11,7 @@ SERVICE_ID_OPT = "service-id"
 SERVICE_FILE_OPT = "service-file"
 SERVICE_TYPE_OPT = "service-type"
 PORT_OPT = "port"
+POLICY_OPT = "policy"
 
 DOCKER_RUN_TEMPLATE_OPT = "docker-run-template"
 DOCKER_RUN_OPT = "docker-run-opts"

poetry_plugin_ivcap/docker.py

@@ -44,11 +44,11 @@ class DockerConfig(BaseModel):
     def from_run_template(self, data, args, line) -> List[any]:
         pdata = data.get("tool", {}).get(PLUGIN_NAME, {})
         template = pdata.get(DOCKER_RUN_TEMPLATE_OPT)
+        smode = pdata.get(SERVICE_TYPE_OPT)
+        if smode is None:
+            line(f"<error>ERROR: 'service-type' is not defined in [{PLUGIN_NAME}]</error>")
+            sys.exit(1)
         if template is None:
-            smode = pdata.get(SERVICE_TYPE_OPT)
-            if smode is None:
-                line(f"<error>ERROR: 'service-type' is not defined in [{PLUGIN_NAME}]</error>")
-                sys.exit(1)
             if smode == "lambda":
                 template = DOCKER_LAMBDA_RUN_TEMPLATE
             elif smode == "batch":

poetry_plugin_ivcap/ivcap.py

@@ -11,7 +11,7 @@ import tempfile
 import uuid
 import humanize
 
-from .constants import DEF_POLICY, PLUGIN_NAME, SERVICE_FILE_OPT, SERVICE_ID_OPT
+from .constants import DEF_POLICY, PLUGIN_NAME, POLICY_OPT, SERVICE_FILE_OPT, SERVICE_ID_OPT
 
 from .docker import docker_cfg, docker_build, docker_push
 from .util import command_exists, get_name, string_to_number
@@ -124,7 +124,7 @@ def create_service_id(data, is_silent, line):
     return f"urn:ivcap:service:{id}"
 
 def get_policy(data, line):
-    policy = data.get("tool", {}).get(PLUGIN_NAME, {}).get("policy")
+    policy = data.get("tool", {}).get(PLUGIN_NAME, {}).get(POLICY_OPT)
     if not policy:
         policy = DEF_POLICY
     return policy

poetry_plugin_ivcap/plugin.py

@@ -29,7 +29,8 @@ Supporting the development of services and tools for the IVCAP platform
 Available subcommands:
     run                 Run the service locally
     docker-build        Build the docker image for this service
-    docker-run          Run the service's docker image locally
+    docker-run          Run the service's docker image locally for testing
+    deploy              Deploy the service to IVCAP (calls docker-publish, service-register and tool-register)
     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
@@ -49,7 +50,7 @@ Configurable options in pyproject.toml:
 
   # Optional
   {DOCKER_BUILD_TEMPLATE_OPT} = "docker buildx build -t #DOCKER_NAME#  ."
-  {DOCKER_RUN_TEMPLATE_OPT} = "docker run -rm -p #PORT#:#PORT#"
+  {DOCKER_RUN_TEMPLATE_OPT} = "docker run --rm -p #PORT#:#PORT# #DOCKER_NAME#"
 """
     arguments = [
         argument("subcommand", optional=True, description="Subcommand: run, deploy, etc."),
@@ -83,6 +84,10 @@ Configurable options in pyproject.toml:
             docker_build(data, self.line)
         elif sub == "docker-run":
             docker_run(data, args, self.line)
+        elif sub == "deploy" or sub == "publish":
+            docker_publish(data, self.line)
+            service_register(data, self.line)
+            tool_register(data, self.line)
         elif sub == "docker-publish":
             docker_publish(data, self.line)
         elif sub == "service-register":

{poetry_plugin_ivcap-0.2.7.dist-info → poetry_plugin_ivcap-0.3.0.dist-info}/METADATA

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

poetry_plugin_ivcap-0.3.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+poetry_plugin_ivcap/constants.py,sha256=lW5K-iNdlYMXTdxRWlSQOfbqbU8PHfZ066JMcsM_jr0,1183
+poetry_plugin_ivcap/docker.py,sha256=q86wl5Y-yzRdzeDI8RoBHx-ZWSJFvIVdzQzPdvnbkHs,7208
+poetry_plugin_ivcap/ivcap.py,sha256=sheKyHnkDOd6MOEOF8OIELhvLut7eopJLqQQa_aYxoc,5742
+poetry_plugin_ivcap/plugin.py,sha256=f1vadDtxgCZUZaBV4otkbWXf4wTMzRNKrLN2gTCF31k,5044
+poetry_plugin_ivcap/util.py,sha256=bcjjbKoV_pAgeuC7Ws9XbJa3phFpNVyrRAlFJ1VubRg,3429
+poetry_plugin_ivcap-0.3.0.dist-info/AUTHORS.md,sha256=s9xR4_HAHQgbNlj505LViebt5AtACQmhPf92aJvNYgg,88
+poetry_plugin_ivcap-0.3.0.dist-info/LICENSE,sha256=dsQrDPPwW7iJs9pxahgJKDW8RNPf5FyXG70MFUlxcuk,1587
+poetry_plugin_ivcap-0.3.0.dist-info/METADATA,sha256=pYFOVj7onIjC94XceqkBPPv0835EBumyVjOvC5bKdvc,3032
+poetry_plugin_ivcap-0.3.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+poetry_plugin_ivcap-0.3.0.dist-info/entry_points.txt,sha256=3xagEFBkGgrVe8WyjmhlHLr4JDEWPN_W4DwxnIBWbNY,74
+poetry_plugin_ivcap-0.3.0.dist-info/RECORD,,

poetry_plugin_ivcap-0.2.7.dist-info/RECORD

@@ -1,11 +0,0 @@
-poetry_plugin_ivcap/constants.py,sha256=SzPWjsVq3RHy5YWXM1rXxF1glCywxRdsKcTR2XJeOZU,1161
-poetry_plugin_ivcap/docker.py,sha256=T7yQDk39fm4_KTnA84UYcadyRt-94vAHy79BZplSt5s,7224
-poetry_plugin_ivcap/ivcap.py,sha256=xIabTtQVeFXMHBrq-dKSdAMxbKX5SsVlxTUbBfmgm84,5728
-poetry_plugin_ivcap/plugin.py,sha256=QIMurRBJE8cG7mVE9P46ckjF6Gjhku3l-U5H2KQo_Rg,4723
-poetry_plugin_ivcap/util.py,sha256=bcjjbKoV_pAgeuC7Ws9XbJa3phFpNVyrRAlFJ1VubRg,3429
-poetry_plugin_ivcap-0.2.7.dist-info/AUTHORS.md,sha256=s9xR4_HAHQgbNlj505LViebt5AtACQmhPf92aJvNYgg,88
-poetry_plugin_ivcap-0.2.7.dist-info/LICENSE,sha256=dsQrDPPwW7iJs9pxahgJKDW8RNPf5FyXG70MFUlxcuk,1587
-poetry_plugin_ivcap-0.2.7.dist-info/METADATA,sha256=a6L3AlCYxO_V6s7gu_qI3ROuKnP-IB3tZiDOcKRVrRc,3032
-poetry_plugin_ivcap-0.2.7.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-poetry_plugin_ivcap-0.2.7.dist-info/entry_points.txt,sha256=3xagEFBkGgrVe8WyjmhlHLr4JDEWPN_W4DwxnIBWbNY,74
-poetry_plugin_ivcap-0.2.7.dist-info/RECORD,,