workpeg 0.4.1__tar.gz → 0.4.3__tar.gz

{workpeg-0.4.1/src/workpeg.egg-info → workpeg-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workpeg
-Version: 0.4.1
+Version: 0.4.3
 Summary: Workpeg function runtime and SDK
 Author-email: Workpeg <support@workpeg.com>
 License: MIT

{workpeg-0.4.1 → workpeg-0.4.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "workpeg"
-version = "0.4.1"
+version = "0.4.3"
 description = "Workpeg function runtime and SDK"
 readme = "README.md"
 requires-python = ">=3.10"

{workpeg-0.4.1 → workpeg-0.4.3}/src/workpeg/run.py

@@ -27,7 +27,7 @@ def run_with_docker(
         cfg.get("build", {}).get("image") or project_path.name
     )
 
-    cmd = ["docker", "run", "--rm"]
+    cmd = ["docker", "run", "-d"]
 
     if name:
         cmd += ["--name", name]
@@ -38,6 +38,8 @@ def run_with_docker(
     if network:
         cmd += ["--network", network]
 
+    cmd += ["--restart", "unless-stopped"]
+
     cmd.append(image)
 
     subprocess.run(cmd, check=True)

{workpeg-0.4.1 → workpeg-0.4.3}/src/workpeg/submit.py

@@ -106,7 +106,7 @@ def submit_bundle(
     api_base: str,
     peg_id: str,
     token: str,
-    function_id: str,
+    branch_id: str,
     version: str,
     bundle_bytes: bytes,
     timeout_s: int = 60,
@@ -117,7 +117,7 @@ def submit_bundle(
         "bundle": ("bundle.tar.gz", bundle_bytes, "application/gzip"),
     }
     data = {
-        "function_id": function_id,
+        "branch_id": branch_id,
         "version": version,
     }
     headers = {
@@ -144,7 +144,7 @@ def main(argv=None) -> None:
     parser.add_argument(
         "ref",
         help="Function reference in the form <branch_name>:<version>"
-        " (e.g., fn_echo:1.0.0)")
+        " (e.g., main:1.0.0)")
     parser.add_argument("--api", default=os.environ.get(API_ENV,
                         DEFAULT_API_BASE), help="API base URL")
     parser.add_argument("--path", default=os.environ.get(PATH_ENV,
@@ -173,7 +173,7 @@ def main(argv=None) -> None:
         api_base=args.api,
         peg_id=str(peg_id),
         token=token,
-        function_id=branch_name,
+        branch_id=branch_name,
         version=version,
         bundle_bytes=bundle_bytes,
         timeout_s=args.timeout,

workpeg-0.4.3/src/workpeg/utils.py

@@ -0,0 +1,10 @@
+def get_hook_urn(hook_name: str) -> str:
+    # move to workpeg SDK
+    """Convert a hook name to a valid Python method name."""
+    # remove "custom." prefix if it exists
+    urn = hook_name[len("custom."):] if str(
+        hook_name).startswith("custom.") else str(hook_name)
+
+    urn = urn.replace(":", "_").lower()
+
+    return f"http://{urn}:8000"

{workpeg-0.4.1 → workpeg-0.4.3/src/workpeg.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: workpeg
-Version: 0.4.1
+Version: 0.4.3
 Summary: Workpeg function runtime and SDK
 Author-email: Workpeg <support@workpeg.com>
 License: MIT

{workpeg-0.4.1 → workpeg-0.4.3}/src/workpeg.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ src/workpeg/create_new.py
 src/workpeg/run.py
 src/workpeg/runtime.py
 src/workpeg/submit.py
+src/workpeg/utils.py
 src/workpeg.egg-info/PKG-INFO
 src/workpeg.egg-info/SOURCES.txt
 src/workpeg.egg-info/dependency_links.txt
@@ -30,4 +31,5 @@ tests/test_context.py
 tests/test_create_new.py
 tests/test_run.py
 tests/test_runtime.py
-tests/test_submit.py
+tests/test_submit.py
+tests/test_utils.py

{workpeg-0.4.1 → workpeg-0.4.3}/tests/test_run.py

@@ -38,14 +38,19 @@ def test_run_with_docker_builds_first(monkeypatch, tmp_path):
 
     monkeypatch.setattr(run.subprocess, "run", fake_run)
 
-    run.run_with_docker(path=str(project), build_first=True, network="workpeg_net")
+    run.run_with_docker(
+        path=str(project),
+        build_first=True,
+        network="workpeg_net",
+    )
 
     assert len(calls) == 1
     cmd, check = calls[0]
     assert cmd == [
-        "docker", "run", "--rm",
+        "docker", "run", "-d",
         "-p", "9000:9000",
         "--network", "workpeg_net",
+        "--restart", "unless-stopped",
         "built-image",
     ]
     assert check is True
@@ -55,7 +60,8 @@ def test_run_with_docker_no_build(monkeypatch, tmp_path):
     project = tmp_path / "demo"
     project.mkdir()
     (project / "workpeg.json").write_text(
-        '{"build": {"image": "configured-image"}, "runtime": {"docker": {"port": 8000}}}'
+        '{"build": {"image": "configured-image"}, '
+        '"runtime": {"docker": {"port": 8000}}}'
     )
 
     calls = []
@@ -65,13 +71,18 @@ def test_run_with_docker_no_build(monkeypatch, tmp_path):
 
     monkeypatch.setattr(run.subprocess, "run", fake_run)
 
-    run.run_with_docker(path=str(project), build_first=False, network="bridge")
+    run.run_with_docker(
+        path=str(project),
+        build_first=False,
+        network="bridge",
+    )
 
     cmd, check = calls[0]
     assert cmd == [
-        "docker", "run", "--rm",
+        "docker", "run", "-d",
         "-p", "8000:8000",
         "--network", "bridge",
+        "--restart", "unless-stopped",
         "configured-image",
     ]
     assert check is True
@@ -80,10 +91,18 @@ def test_run_with_docker_no_build(monkeypatch, tmp_path):
 def test_run_main_with_docker(monkeypatch):
     called = {}
 
-    def fake_run_with_docker(path=".", build_first=True, network=None):
+    def fake_run_with_docker(
+        path=".",
+        build_first=True,
+        network=None,
+        expose=True,
+        name=None,
+    ):
         called["path"] = path
         called["build_first"] = build_first
         called["network"] = network
+        called["expose"] = expose
+        called["name"] = name
 
     monkeypatch.setattr(run, "run_with_docker", fake_run_with_docker)
 
@@ -93,6 +112,8 @@ def test_run_main_with_docker(monkeypatch):
         "path": "/tmp/demo",
         "build_first": False,
         "network": None,
+        "expose": True,
+        "name": None,
     }
 
 
@@ -118,10 +139,18 @@ def test_run_main_uses_config_default(monkeypatch, tmp_path):
 
     called = {}
 
-    def fake_run_with_docker(path=".", build_first=True, network=None):
+    def fake_run_with_docker(
+        path=".",
+        build_first=True,
+        network=None,
+        expose=True,
+        name=None,
+    ):
         called["path"] = path
         called["build_first"] = build_first
         called["network"] = network
+        called["expose"] = expose
+        called["name"] = name
 
     monkeypatch.setattr(run, "run_with_docker", fake_run_with_docker)
 
@@ -131,16 +160,26 @@ def test_run_main_uses_config_default(monkeypatch, tmp_path):
         "path": str(project),
         "build_first": True,
         "network": None,
+        "expose": True,
+        "name": None,
     }
 
 
 def test_run_main_with_docker_and_network(monkeypatch):
     called = {}
 
-    def fake_run_with_docker(path=".", build_first=True, network=None):
+    def fake_run_with_docker(
+        path=".",
+        build_first=True,
+        network=None,
+        expose=True,
+        name=None,
+    ):
         called["path"] = path
         called["build_first"] = build_first
         called["network"] = network
+        called["expose"] = expose
+        called["name"] = name
 
     monkeypatch.setattr(run, "run_with_docker", fake_run_with_docker)
 
@@ -154,6 +193,8 @@ def test_run_main_with_docker_and_network(monkeypatch):
         "path": "/tmp/demo",
         "build_first": True,
         "network": "workpeg_net",
+        "expose": True,
+        "name": None,
     }
 
 
@@ -171,12 +212,17 @@ def test_run_with_docker_no_expose(monkeypatch, tmp_path):
 
     monkeypatch.setattr(run.subprocess, "run", fake_run)
 
-    run.run_with_docker(path=str(project), build_first=False, expose=False)
+    run.run_with_docker(
+        path=str(project),
+        build_first=False,
+        expose=False,
+    )
 
     assert len(calls) == 1
     cmd, check = calls[0]
     assert cmd == [
-        "docker", "run", "--rm",
+        "docker", "run", "-d",
+        "--restart", "unless-stopped",
         "demo",
     ]
     assert check is True
@@ -196,12 +242,17 @@ def test_run_with_docker_expose(monkeypatch, tmp_path):
 
     monkeypatch.setattr(run.subprocess, "run", fake_run)
 
-    run.run_with_docker(path=str(project), build_first=False, expose=True)
+    run.run_with_docker(
+        path=str(project),
+        build_first=False,
+        expose=True,
+    )
 
     cmd, check = calls[0]
     assert cmd == [
-        "docker", "run", "--rm",
+        "docker", "run", "-d",
         "-p", "9000:9000",
+        "--restart", "unless-stopped",
         "demo",
     ]
     assert check is True
@@ -232,8 +283,9 @@ def test_run_with_docker_with_name(monkeypatch, tmp_path):
     cmd, check = calls[0]
 
     assert cmd == [
-        "docker", "run", "--rm",
+        "docker", "run", "-d",
         "--name", "foo",
+        "--restart", "unless-stopped",
         "demo",
     ]
     assert check is True
@@ -264,9 +316,10 @@ def test_run_with_docker_name_and_network(monkeypatch, tmp_path):
     cmd, check = calls[0]
 
     assert cmd == [
-        "docker", "run", "--rm",
+        "docker", "run", "-d",
         "--name", "foo",
         "--network", "workpeg_net",
+        "--restart", "unless-stopped",
         "demo",
     ]
     assert check is True

{workpeg-0.4.1 → workpeg-0.4.3}/tests/test_submit.py

@@ -155,7 +155,7 @@ def test_submit_bundle_success_builds_request(mock_post):
         api_base="https://repo.workpeg.com",
         peg_id="peg-123",
         token="jwt-token",
-        function_id="fn_echo",
+        branch_id="fn_echo",
         version="1.0.0",
         bundle_bytes=b"tgz-bytes",
         timeout_s=60,
@@ -168,7 +168,7 @@ def test_submit_bundle_success_builds_request(mock_post):
 
     assert args[0] == "https://repo.workpeg.com/api/pegs/peg-123/functions/"
     assert kwargs["headers"]["Authorization"] == "Bearer jwt-token"
-    assert kwargs["data"] == {"function_id": "fn_echo", "version": "1.0.0"}
+    assert kwargs["data"] == {"branch_id": "fn_echo", "version": "1.0.0"}
     assert "files" in kwargs
     file_tuple = kwargs["files"]["bundle"]
     assert file_tuple[0] == "bundle.tar.gz"
@@ -189,7 +189,7 @@ def test_submit_bundle_http_error_json(mock_post):
             api_base="https://repo.workpeg.com",
             peg_id="peg-123",
             token="jwt-token",
-            function_id="fn_echo",
+            branch_id="fn_echo",
             version="1.0.0",
             bundle_bytes=b"tgz-bytes",
         )
@@ -209,7 +209,7 @@ def test_submit_bundle_http_error_non_json(mock_post):
             api_base="https://repo.workpeg.com",
             peg_id="peg-123",
             token="jwt-token",
-            function_id="fn_echo",
+            branch_id="fn_echo",
             version="1.0.0",
             bundle_bytes=b"tgz-bytes",
         )
@@ -265,7 +265,7 @@ def test_main_happy_path_uses_default_api_base(
     _, kwargs = mock_submit_bundle.call_args
     assert kwargs["api_base"] == "https://repo.workpeg.com"
     assert kwargs["peg_id"] == "peg-123"
-    assert kwargs["function_id"] == "fn_echo"
+    assert kwargs["branch_id"] == "fn_echo"
     assert kwargs["version"] == "1.0.0"
     assert kwargs["token"] == token
     assert isinstance(kwargs["bundle_bytes"], (bytes, bytearray))

workpeg-0.4.3/tests/test_utils.py

@@ -0,0 +1,46 @@
+from unittest import TestCase
+
+from workpeg.utils import get_hook_urn
+
+
+class TestGetHookUrn(TestCase):
+
+    def test_returns_hook_urn(self):
+        result = get_hook_urn("mail_sanitizer:v1")
+
+        self.assertEqual(
+            result,
+            "http://mail_sanitizer_v1:8000",
+        )
+
+    def test_removes_custom_prefix(self):
+        result = get_hook_urn("custom.mail_sanitizer:v1")
+
+        self.assertEqual(
+            result,
+            "http://mail_sanitizer_v1:8000",
+        )
+
+    def test_lowercases_hook_name(self):
+        result = get_hook_urn("Mail_Sanitizer:V1")
+
+        self.assertEqual(
+            result,
+            "http://mail_sanitizer_v1:8000",
+        )
+
+    def test_replaces_colon_with_underscore(self):
+        result = get_hook_urn("calendar:1.1")
+
+        self.assertEqual(
+            result,
+            "http://calendar_1.1:8000",
+        )
+
+    def test_handles_hook_without_version(self):
+        result = get_hook_urn("mailer")
+
+        self.assertEqual(
+            result,
+            "http://mailer:8000",
+        )