Updates per PR review.

Author: Phillip Simonds

infrahub_sdk/ctl/cli_commands.py

@@ -208,7 +208,6 @@ def _run_transform(
         query_name: Name of the query to load (e.g. tags_query)
         variables: Dictionary of variables used for graphql query
         transformer_func: The function responsible for transforming data received from graphql
-        transform: A function used to transform the return from the graphql query into a different form
         branch: Name of the *infrahub* branch that should be queried for data
         debug: Prints debug info to the command line
         repository_config: Repository config object. This is used to load the graphql query from the repository.
@@ -220,9 +219,10 @@ def _run_transform(
             query=query_name, variables_dict=variables, branch=branch, debug=debug, repository_config=repository_config
         )
 
-        if debug:
-            message = ("-" * 40, f"Response for GraphQL Query {query_name}", response, "-" * 40)
-            console.print("\n".join(message))
+        # TODO: response is a dict and can't be printed to the console in this way.
+        # if debug:
+        #     message = ("-" * 40, f"Response for GraphQL Query {query_name}", response, "-" * 40)
+        #     console.print("\n".join(message))
     except QueryNotFoundError as exc:
         console.print(f"[red]Unable to find query : {exc}")
         raise typer.Exit(1) from exc
@@ -342,19 +342,20 @@ def transform(
         transform = get_transform_class_instance(
             transform_config=transform_config,
             branch=branch,
-            repository_config=repository_config,
             client=client,
         )
     except InfrahubTransformNotFoundError as exc:
         console.print(f"Unable to load {transform_name} from python_transforms")
         raise typer.Exit(1) from exc
 
-    # Load query config
-    query_config_obj = InfrahubRepositoryGraphQLConfig(name=transform.query, file_path=Path(transform.query + ".gql"))
-    repository_config.queries.append(query_config_obj)
+    # Get data
+    query_str = repository_config.get_query(name=transform.query).load_query()
+    data = asyncio.run(
+        transform.client.execute_graphql(query=query_str, variables=variables_dict, branch_name=transform.branch_name)
+    )
 
     # Run Transform
-    result = asyncio.run(transform.run(variables=variables_dict))
+    result = asyncio.run(transform.run(data=data))
 
     json_string = ujson.dumps(result, indent=2, sort_keys=True)
     if out:

infrahub_sdk/transforms.py

@@ -7,7 +7,6 @@
 from abc import abstractmethod
 from typing import TYPE_CHECKING, Any, Optional
 
-import httpx
 from git import Repo
 
 from infrahub_sdk import InfrahubClient
@@ -17,7 +16,7 @@
 if TYPE_CHECKING:
     from pathlib import Path
 
-    from .schema import InfrahubPythonTransformConfig, InfrahubRepositoryConfig
+    from .schema import InfrahubPythonTransformConfig
 
 INFRAHUB_TRANSFORM_VARIABLE_TO_IMPORT = "INFRAHUB_TRANSFORMS"
 
@@ -33,14 +32,12 @@ def __init__(
         root_directory: str = "",
         server_url: str = "",
         client: Optional[InfrahubClient] = None,
-        repository_config: Optional[InfrahubRepositoryConfig] = None,
     ):
         self.git: Repo
 
         self.branch = branch
         self.server_url = server_url or os.environ.get("INFRAHUB_URL", "http://127.0.0.1:8000")
         self.root_directory = root_directory or os.getcwd()
-        self.repository_config = repository_config
 
         self._client = client
 
@@ -61,7 +58,7 @@ def client(self) -> InfrahubClient:
     async def init(cls, client: Optional[InfrahubClient] = None, *args: Any, **kwargs: Any) -> InfrahubTransform:
         """Async init method, If an existing InfrahubClient client hasn't been provided, one will be created automatically."""
         warnings.warn(
-            "InfrahubClient.init has been deprecated and will be removed in Infrahub SDK 0.14.0 or the next major version",
+            f"{cls.__class__.__name__}.init has been deprecated and will be removed in Infrahub SDK 0.15.0 or the next major version",
             DeprecationWarning,
             stacklevel=1,
         )
@@ -90,39 +87,24 @@ def branch_name(self) -> str:
     def transform(self, data: dict) -> Any:
         pass
 
-    async def collect_data(self, variables: Optional[dict] = None) -> dict:
+    async def collect_data(self) -> dict:
         """Query the result of the GraphQL Query defined in self.query and return the result"""
 
-        if not variables:
-            variables = {}
+        return await self.client.query_gql_query(name=self.query, branch_name=self.branch_name)
 
-        # Try getting data from stored graphql query endpoint
-        try:
-            return await self.client.query_gql_query(name=self.query, branch_name=self.branch_name, variables=variables)
-        # If we run into an error, the stored graphql query may not exist. Try to query the GraphQL API directly instead.
-        except httpx.HTTPStatusError:
-            if not self.repository_config:
-                raise
-            query_str = self.repository_config.get_query(name=self.query).load_query()
-            return await self.client.execute_graphql(query=query_str, variables=variables, branch_name=self.branch_name)
-
-    async def run(self, data: Optional[dict] = None, variables: Optional[dict] = None) -> Any:
+    async def run(self, data: Optional[dict] = None) -> Any:
         """Execute the transformation after collecting the data from the GraphQL query.
 
         The result of the check is determined based on the presence or not of ERROR log messages.
 
         Args:
             data: The data on which to run the transform. Data will be queried from the API if not provided
-            variables: Variables to use in the graphQL query to filter returned data
 
         Returns: Transformed data
         """
 
-        if not variables:
-            variables = {}
-
         if not data:
-            data = await self.collect_data(variables=variables)
+            data = await self.collect_data()
 
         unpacked = data.get("data") or data
 
@@ -136,7 +118,6 @@ def get_transform_class_instance(
     transform_config: InfrahubPythonTransformConfig,
     search_path: Optional[Path] = None,
     branch: str = "",
-    repository_config: Optional[InfrahubRepositoryConfig] = None,
     client: Optional[InfrahubClient] = None,
 ) -> InfrahubTransform:
     """Gets an instance of the InfrahubTransform class.
@@ -146,9 +127,6 @@ def get_transform_class_instance(
         search_path: The path in which to search for a python file containing the transform. The current directory is
             assumed if not speicifed.
         branch: Infrahub branch which will be targeted in graphql query used to acquire data for transformation.
-        repository_config: Repository config object. This is dpendency injected into the InfrahubTransform instance
-            providing it with the ability to interact with other data in the repository where the transform is defined
-            (e.g. a graphql query file).
         client: InfrahubClient used to interact with infrahub API.
     """
     if transform_config.file_path.is_absolute() or search_path is None:
@@ -165,7 +143,7 @@ def get_transform_class_instance(
         transform_class = getattr(module, transform_config.class_name)
 
         # Create an instance of the class
-        transform_instance = transform_class(branch=branch, client=client, repository_config=repository_config)
+        transform_instance = transform_class(branch=branch, client=client)
 
     except (FileNotFoundError, AttributeError) as exc:
         raise InfrahubTransformNotFoundError(name=transform_config.name) from exc