more fixes

Author: albertodonato

stacklet/client/platform/client.py

@@ -92,13 +92,11 @@ def _method(executor, function_name, snippet, pager, expr):
     for k, v in snippet.optional.items():
         defaults[k] = None
 
-    snippet_name = snippet.name
-
     def api_func(self, **kw):
         params = dict(defaults)
         params.update(kw)
 
-        result = executor.run(snippet_name, variables=params)
+        result = executor.run_snippet(snippet, variables=params)
         if result == {"message": "The incoming token has expired"}:
             # would be nicer off the 401 status code
             raise PlatformTokenExpired()
@@ -115,7 +113,7 @@ def api_func(self, **kw):
 
         while page_info["hasNextPage"]:
             params["after"] = page_info["endCursor"]
-            result = executor.run(snippet_name, variables=params)
+            result = executor.run_snippet(snippet, variables=params)
             if result.get("errors"):
                 raise PlatformApiError(result["errors"])
             pages.append(result)

stacklet/client/platform/graphql.py

@@ -71,7 +71,8 @@ def __init__(self):
 
     @classmethod
     def build(cls, variables: JSONDict | None):
-        variables = cls._transform_variables(variables)
+        if variables is None:
+            variables = {}
 
         if cls.snippet:
             split_snippet = list(filter(None, cls.snippet.split("\n")))
@@ -105,9 +106,8 @@ def build(cls, variables: JSONDict | None):
         return d
 
     @classmethod
-    def _transform_variables(cls, variables: JSONDict | None) -> JSONDict:
-        if not variables:
-            return {}
+    def transform_variables(cls, variables: JSONDict | None) -> JSONDict:
+        variables = variables.copy() if variables else {}
 
         for name, value in variables.items():
             if transformer := cls.variable_transformers.get(name):
@@ -162,22 +162,32 @@ def __init__(self, api: str, token: str):
             }
         )
 
-    def run(self, name: str, variables: JSONDict | None = None) -> JSONDict:
-        """Run a named graphql snippet."""
+    def run(
+        self, name: str, variables: JSONDict | None = None, transform_variables: bool = False
+    ) -> JSONDict:
+        """Run a named graphql snippet by name."""
         snippet = GRAPHQL_SNIPPETS.get(name)
         if not snippet:
             raise UnknownSnippet(name)
 
-        return self._run_snippet(snippet, variables=variables)
+        return self.run_snippet(
+            snippet, variables=variables, transform_variables=transform_variables
+        )
 
     def run_query(self, query: str) -> JSONDict:
         """Run a literal GraphQL query string."""
         snippet = type("AdHocSnippet", (AdHocSnippet,), {"snippet": query})
-        return self._run_snippet(snippet)
+        return self.run_snippet(snippet)
 
-    def _run_snippet(
-        self, snippet: type[StackletGraphqlSnippet], variables: JSONDict | None = None
+    def run_snippet(
+        self,
+        snippet: type[StackletGraphqlSnippet],
+        variables: JSONDict | None = None,
+        transform_variables: bool = False,
     ) -> JSONDict:
+        """Run a graphql snippet."""
+        if transform_variables:
+            variables = snippet.transform_variables(variables)
         request = snippet.build(variables)
         self.log.debug("Request: %s" % json.dumps(request, indent=2))
         res = self.session.post(self.api, json=request)

stacklet/client/platform/graphql_cli.py

@@ -30,7 +30,7 @@ def run_graphql(context: StackletContext, name=None, variables=None, snippet=Non
     if snippet:
         res = context.executor.run_query(snippet)
     else:
-        res = context.executor.run(name, variables=variables)
+        res = context.executor.run(name, variables=variables, transform_variables=True)
     if raw:
         return res
     fmt = context.formatter()

tests/test_graphql.py

@@ -80,9 +80,36 @@ def test_executor_run_query(self, requests_adapter, executor):
         requests_adapter.post(requests_mock.ANY, json=payload)
         assert executor.run_query(snippet) == payload
 
+    @pytest.mark.parametrize("transform_variables", [False, True])
+    def test_executor_run_snippet(self, requests_adapter, executor, transform_variables):
+        class TransformSnippet(StackletGraphqlSnippet):
+            name = "test-transform-snippet"
+            snippet = """
+            query {
+              sample(somevar: $somevar) {
+                foo
+                bar
+              }
+            }
+            """
+            variable_transformers = {"somevar": lambda x: x.upper()}
+
+        requests_adapter.register_uri(
+            "POST",
+            "mock://stacklet.acme.org/api",
+            json={"data": {"sample": {"foo": "bar"}}},
+        )
+
+        executor.run_snippet(
+            TransformSnippet, variables={"somevar": "test"}, transform_variables=transform_variables
+        )
+
+        payload = requests_adapter.last_request.json()
+        assert payload["variables"]["somevar"] == "TEST" if transform_variables else "test"
+
 
 class TestStackletGraphqlSnippet:
-    def test_build_expands_variables(self):
+    def test_build(self):
         class Snippet(StackletGraphqlSnippet):
             name = "sample"
             snippet = """
@@ -93,7 +120,6 @@ class Snippet(StackletGraphqlSnippet):
               }
             }
             """
-            variable_transformers = {"somevar": lambda x: x.upper()}
 
         result = Snippet.build({"somevar": "test"})
         assert result == {
@@ -104,5 +130,5 @@ class Snippet(StackletGraphqlSnippet):
               }
             }
             """,
-            "variables": {"somevar": "TEST"},
+            "variables": {"somevar": "test"},
         }