polyapi-python 0.3.19.dev2__tar.gz → 0.3.19.dev3__tar.gz

{polyapi_python-0.3.19.dev2 → polyapi_python-0.3.19.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.19.dev2
+Version: 0.3.19.dev3
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: PolyAPI <support@polyapi.io>
 License: MIT License
@@ -99,7 +99,7 @@ print(poly.polyapi.function.api.list(my_server, my_api_key))
 To add a new server function, please follow the quickstart. Then you can add a server function like so:
 
 ```bash
-python -m polyapi --context mycontext --description mydesc --server function add <function_name> foo.py
+python -m polyapi function add <function_name> foo.py --server --context mycontext --description mydesc
 ```
 
 The code in `foo.py` should contain a single defined function named the same as your `<function_name>` variable.

{polyapi_python-0.3.19.dev2 → polyapi_python-0.3.19.dev3}/README.md

@@ -58,7 +58,7 @@ print(poly.polyapi.function.api.list(my_server, my_api_key))
 To add a new server function, please follow the quickstart. Then you can add a server function like so:
 
 ```bash
-python -m polyapi --context mycontext --description mydesc --server function add <function_name> foo.py
+python -m polyapi function add <function_name> foo.py --server --context mycontext --description mydesc
 ```
 
 The code in `foo.py` should contain a single defined function named the same as your `<function_name>` variable.

{polyapi_python-0.3.19.dev2 → polyapi_python-0.3.19.dev3}/polyapi/cli.py

@@ -127,7 +127,7 @@ def execute_from_cli():
     fn_add_parser.add_argument("--logs", choices=["enabled", "disabled"], default=None, help="Enable or disable logs for the function.")
     fn_add_parser.add_argument("--execution-api-key", required=False, default="", help="API key for execution (for server functions only).")
     fn_add_parser.add_argument("--skip-generate", action="store_true", help="Skip running generate after function add command, especially useful if you are deploying a bunch of functions at once. Run generate manually at the end!")
-    fn_add_parser.add_argument("--skip-toolkit-build", action="store_true", help="Skip rebuilding the toolkit after adding/updating the function")
+    fn_add_parser.add_argument("--image", type=str, default=None, help="Docker image to use when deploying a server function")
     fn_add_parser.add_argument("--generate-contexts", type=str, help="Server function only – only include certain contexts to speed up function execution")
     fn_add_parser.add_argument("--visibility", type=str, default="environment", help="Specifies the visibility of a function. Options: PUBLIC, TENANT, ENVIRONMENT. Case insensitive")
 
@@ -142,6 +142,8 @@ def execute_from_cli():
             err = "You must specify `--server` or `--client`."
         elif logs_enabled and not args.server:
             err = "Option `logs` is only for server functions (--server)."
+        elif args.image and not args.server:
+            err = "Option `image` is only for server functions (--server)."
         elif args.generate_contexts and not args.server:
             err = "Option `generate-contexts` is only for server functions (--server)."
         elif visibility not in ["PUBLIC", "TENANT", "ENVIRONMENT"]:
@@ -164,7 +166,7 @@ def execute_from_cli():
             execution_api_key=args.execution_api_key,
             generate_contexts=args.generate_contexts,
             visibility=visibility,
-            skip_toolkit_build=args.skip_toolkit_build
+            image=args.image,
         )
 
     fn_add_parser.set_defaults(command=add_function)

{polyapi_python-0.3.19.dev2 → polyapi_python-0.3.19.dev3}/polyapi/function_cli.py

@@ -25,9 +25,9 @@ def function_add_or_update(
     logs_enabled: Optional[bool],
     generate_contexts: Optional[str],
     visibility: Optional[str],
+    image: Optional[str],
     generate: bool = True,
     execution_api_key: str = "",
-    skip_toolkit_build: bool = False,
 ):
     verb = "Updating" if _func_already_exists(context, name) else "Adding"
     ftype = "server" if server else "client"
@@ -69,8 +69,8 @@ def function_add_or_update(
     if generate_contexts:
         data["generateContexts"] = generate_contexts.split(",")
 
-    if server:
-        data["skipToolkitBuild"] = skip_toolkit_build
+    if server and image:
+        data["image"] = image
 
     if server and parsed["dependencies"]:
         print_yellow(

{polyapi_python-0.3.19.dev2 → polyapi_python-0.3.19.dev3}/polyapi_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polyapi-python
-Version: 0.3.19.dev2
+Version: 0.3.19.dev3
 Summary: The Python Client for PolyAPI, the IPaaS by Developers for Developers
 Author-email: PolyAPI <support@polyapi.io>
 License: MIT License
@@ -99,7 +99,7 @@ print(poly.polyapi.function.api.list(my_server, my_api_key))
 To add a new server function, please follow the quickstart. Then you can add a server function like so:
 
 ```bash
-python -m polyapi --context mycontext --description mydesc --server function add <function_name> foo.py
+python -m polyapi function add <function_name> foo.py --server --context mycontext --description mydesc
 ```
 
 The code in `foo.py` should contain a single defined function named the same as your `<function_name>` variable.

{polyapi_python-0.3.19.dev2 → polyapi_python-0.3.19.dev3}/polyapi_python.egg-info/SOURCES.txt

@@ -38,6 +38,7 @@ polyapi_python.egg-info/top_level.txt
 tests/test_api.py
 tests/test_async_proof.py
 tests/test_auth.py
+tests/test_cli.py
 tests/test_dependency_pins.py
 tests/test_deployables.py
 tests/test_generate.py

{polyapi_python-0.3.19.dev2 → polyapi_python-0.3.19.dev3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "polyapi-python"
-version = "0.3.19.dev2"
+version = "0.3.19.dev3"
 description = "The Python Client for PolyAPI, the IPaaS by Developers for Developers"
 authors = [{ name = "PolyAPI", email = "support@polyapi.io" }]
 dependencies = [

polyapi_python-0.3.19.dev3/tests/test_cli.py

@@ -0,0 +1,99 @@
+import sys
+import unittest
+from unittest.mock import mock_open, patch
+
+from polyapi.cli import execute_from_cli
+from polyapi.function_cli import function_add_or_update
+
+
+class T(unittest.TestCase):
+    @patch("polyapi.cli.initialize_config")
+    @patch("polyapi.cli.function_add_or_update")
+    def test_function_add_forwards_image(self, mock_add, _mock_initialize):
+        with patch.object(
+            sys,
+            "argv",
+            [
+                "polyapi",
+                "function",
+                "add",
+                "my_func",
+                "foo.py",
+                "--server",
+                "--image",
+                "python:3.12",
+            ],
+        ):
+            execute_from_cli()
+
+        kwargs = mock_add.call_args.kwargs
+        self.assertEqual(kwargs["image"], "python:3.12")
+        self.assertNotIn("skip_toolkit_build", kwargs)
+
+    def test_function_add_skip_toolkit_build_removed(self):
+        with patch.object(
+            sys,
+            "argv",
+            [
+                "polyapi",
+                "function",
+                "add",
+                "my_func",
+                "foo.py",
+                "--server",
+                "--skip-toolkit-build",
+            ],
+        ):
+            with self.assertRaises(SystemExit) as cm:
+                execute_from_cli()
+
+        self.assertEqual(cm.exception.code, 2)
+
+    @patch("polyapi.function_cli._func_already_exists", return_value=False)
+    @patch("polyapi.function_cli.parse_function_code")
+    @patch("polyapi.function_cli.get_jsonschema_type", side_effect=lambda type_name: type_name)
+    @patch("polyapi.function_cli.get_api_key_and_url", return_value=("api-key", "https://api.example.com"))
+    @patch("polyapi.function_cli.get_auth_headers", return_value={"Authorization": "Bearer api-key"})
+    @patch("polyapi.function_cli.http_client.post")
+    def test_function_add_includes_image_in_server_payload(
+        self,
+        mock_post,
+        _mock_headers,
+        _mock_api_config,
+        _mock_jsonschema,
+        mock_parse,
+        _mock_exists,
+    ):
+        mock_parse.return_value = {
+            "context": "demo",
+            "types": {
+                "description": "",
+                "returns": {"type": "int"},
+                "params": [{"name": "arg", "type": "str", "typeSchema": None, "description": ""}],
+            },
+            "config": {},
+            "dependencies": [],
+        }
+
+        mock_post.return_value.status_code = 201
+        mock_post.return_value.json.return_value = {"id": "fn-123"}
+
+        with patch("builtins.open", mock_open(read_data="def my_func(arg: str) -> int:\n    return 1\n")):
+            function_add_or_update(
+                name="my_func",
+                file="foo.py",
+                context="demo",
+                description="",
+                client=False,
+                server=True,
+                logs_enabled=None,
+                generate_contexts=None,
+                visibility="ENVIRONMENT",
+                image="python:3.12",
+                generate=False,
+                execution_api_key="",
+            )
+
+        payload = mock_post.call_args.kwargs["json"]
+        self.assertEqual(payload["image"], "python:3.12")
+        self.assertNotIn("skipToolkitBuild", payload)