From 9e42f1f75c50396918ecff70a728a01290804a23 Mon Sep 17 00:00:00 2001 From: Patrick Ogenstad Date: Tue, 10 Feb 2026 14:30:35 +0100 Subject: [PATCH] Use ternary operator if ALIAS_KEY in value and value[ALIAS_KEY] else key` instead of `if`-`else`-block --- infrahub_sdk/client.py | 18 ++++++++++-------- infrahub_sdk/ctl/cli_commands.py | 5 +---- infrahub_sdk/graphql/renderers.py | 5 +---- infrahub_sdk/node/node.py | 10 ++-------- infrahub_sdk/template/__init__.py | 15 +++------------ pyproject.toml | 1 - tests/unit/sdk/test_file_handler.py | 10 ++-------- tests/unit/sdk/test_schema.py | 10 ++-------- 8 files changed, 21 insertions(+), 53 deletions(-) diff --git a/infrahub_sdk/client.py b/infrahub_sdk/client.py index 4b1a59fb..c924ab41 100644 --- a/infrahub_sdk/client.py +++ b/infrahub_sdk/client.py @@ -1868,10 +1868,11 @@ async def convert_object_type( for more information. """ - if fields_mapping is None: - mapping_dict = {} - else: - mapping_dict = {field_name: model.model_dump(mode="json") for field_name, model in fields_mapping.items()} + mapping_dict = ( + {} + if fields_mapping is None + else {field_name: model.model_dump(mode="json") for field_name, model in fields_mapping.items()} + ) branch_name = branch or self.default_branch response = await self.execute_graphql( @@ -3425,10 +3426,11 @@ def convert_object_type( for more information. """ - if fields_mapping is None: - mapping_dict = {} - else: - mapping_dict = {field_name: model.model_dump(mode="json") for field_name, model in fields_mapping.items()} + mapping_dict = ( + {} + if fields_mapping is None + else {field_name: model.model_dump(mode="json") for field_name, model in fields_mapping.items()} + ) branch_name = branch or self.default_branch response = self.execute_graphql( diff --git a/infrahub_sdk/ctl/cli_commands.py b/infrahub_sdk/ctl/cli_commands.py index 2b571723..47b5f78c 100644 --- a/infrahub_sdk/ctl/cli_commands.py +++ b/infrahub_sdk/ctl/cli_commands.py @@ -350,10 +350,7 @@ def transform( # Run Transform result = asyncio.run(transform.run(data=data)) - if isinstance(result, str): - json_string = result - else: - json_string = ujson.dumps(result, indent=2, sort_keys=True) + json_string = result if isinstance(result, str) else ujson.dumps(result, indent=2, sort_keys=True) if out: write_to_file(Path(out), json_string) diff --git a/infrahub_sdk/graphql/renderers.py b/infrahub_sdk/graphql/renderers.py index e2e4aafc..5b6c2c0f 100644 --- a/infrahub_sdk/graphql/renderers.py +++ b/infrahub_sdk/graphql/renderers.py @@ -149,10 +149,7 @@ def render_query_block(data: dict, offset: int = 4, indentation: int = 4, conver elif isinstance(value, dict) and len(value) == 1 and alias_key in value and value[alias_key]: lines.append(f"{offset_str}{value[alias_key]}: {key}") elif isinstance(value, dict): - if value.get(alias_key): - key_str = f"{value[alias_key]}: {key}" - else: - key_str = key + key_str = f"{value[alias_key]}: {key}" if value.get(alias_key) else key if value.get(filters_key): filters_str = ", ".join( diff --git a/infrahub_sdk/node/node.py b/infrahub_sdk/node/node.py index 74f1a0fc..e6d63559 100644 --- a/infrahub_sdk/node/node.py +++ b/infrahub_sdk/node/node.py @@ -648,10 +648,7 @@ def _init_relationships(self, data: dict | RelatedNode | None = None) -> None: ) if value is not None } - if peer_id_data: - rel_data = peer_id_data - else: - rel_data = None + rel_data = peer_id_data or None self._relationship_cardinality_one_data[rel_schema.name] = RelatedNode( name=rel_schema.name, branch=self._branch, client=self._client, schema=rel_schema, data=rel_data ) @@ -1538,10 +1535,7 @@ def _init_relationships(self, data: dict | None = None) -> None: ) if value is not None } - if peer_id_data: - rel_data = peer_id_data - else: - rel_data = None + rel_data = peer_id_data or None self._relationship_cardinality_one_data[rel_schema.name] = RelatedNodeSync( name=rel_schema.name, branch=self._branch, client=self._client, schema=rel_schema, data=rel_data ) diff --git a/infrahub_sdk/template/__init__.py b/infrahub_sdk/template/__init__.py index 910ec216..32fb818f 100644 --- a/infrahub_sdk/template/__init__.py +++ b/infrahub_sdk/template/__init__.py @@ -64,10 +64,7 @@ def get_template(self) -> jinja2.Template: return self._template_definition try: - if self.is_string_based: - template = self._get_string_based_template() - else: - template = self._get_file_based_template() + template = self._get_string_based_template() if self.is_string_based else self._get_file_based_template() except jinja2.TemplateSyntaxError as exc: self._raise_template_syntax_error(error=exc) except jinja2.TemplateNotFound as exc: @@ -120,10 +117,7 @@ async def render(self, variables: dict[str, Any]) -> str: errors = _identify_faulty_jinja_code(traceback=traceback) raise JinjaTemplateUndefinedError(message=exc.message, errors=errors) except Exception as exc: - if error_message := getattr(exc, "message", None): - message = error_message - else: - message = str(exc) + message = error_message if (error_message := getattr(exc, "message", None)) else str(exc) raise JinjaTemplateError(message=message or "Unknown template error") return output @@ -188,10 +182,7 @@ def _identify_faulty_jinja_code(traceback: Traceback, nbr_context_lines: int = 3 # Extract only the Jinja related exception for frame in [frame for frame in traceback.trace.stacks[0].frames if not frame.filename.endswith(".py")]: code = "".join(linecache.getlines(frame.filename)) - if frame.filename == "