infrahub-server 1.5.5__py3-none-any.whl → 1.6.0__py3-none-any.whl

infrahub_sdk/schema/main.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import warnings
 from collections.abc import MutableMapping
 from enum import Enum
-from typing import TYPE_CHECKING, Any, Union
+from typing import TYPE_CHECKING, Any
 
 from pydantic import BaseModel, ConfigDict, Field
 from typing_extensions import Self
@@ -11,7 +11,7 @@ from typing_extensions import Self
 if TYPE_CHECKING:
     from ..node import InfrahubNode, InfrahubNodeSync
 
-    InfrahubNodeTypes = Union[InfrahubNode, InfrahubNodeSync]
+    InfrahubNodeTypes = InfrahubNode | InfrahubNodeSync
 
 
 class RelationshipCardinality(str, Enum):

infrahub_sdk/schema/repository.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, TypeVar, Union
+from typing import TYPE_CHECKING, Any, TypeVar
 
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 
@@ -18,7 +18,7 @@ from ..utils import duplicates
 if TYPE_CHECKING:
     from ..node import InfrahubNode, InfrahubNodeSync
 
-    InfrahubNodeTypes = Union[InfrahubNode, InfrahubNodeSync]
+    InfrahubNodeTypes = InfrahubNode | InfrahubNodeSync
 
 ResourceClass = TypeVar("ResourceClass")
 

infrahub_sdk/spec/object.py

@@ -74,7 +74,7 @@ class RelationshipInfo(BaseModel):
 
     @property
     def is_reference(self) -> bool:
-        return self.format in [RelationshipDataFormat.ONE_REF, RelationshipDataFormat.MANY_REF]
+        return self.format in {RelationshipDataFormat.ONE_REF, RelationshipDataFormat.MANY_REF}
 
     def get_context(self, value: Any) -> dict:
         """Return a dict to insert to the context if the relationship is mandatory"""
@@ -230,7 +230,7 @@ class InfrahubObjectFileData(BaseModel):
 
         # First validate if all mandatory fields are present
         for element in schema.mandatory_input_names:
-            if not any([element in data.keys(), element in context.keys()]):
+            if not any([element in data, element in context]):
                 errors.append(ObjectValidationError(position=position + [element], message=f"{element} is mandatory"))
 
         # Validate if all attributes are valid

infrahub_sdk/spec/range_expansion.py

@@ -69,7 +69,7 @@ def _extract_constants(pattern: str, re_compiled: re.Pattern) -> tuple[list[int]
 def _expand_interfaces(pattern: str, interface_constant: list[int], cartesian_list: list[list[str]]) -> list[str]:
     def _pairwise(lst: list[int]) -> list[tuple[int, int]]:
         it = iter(lst)
-        return list(zip(it, it))
+        return list(zip(it, it, strict=False))
 
     if interface_constant[-1] < len(pattern):
         interface_constant.append(len(pattern))

infrahub_sdk/template/__init__.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 import linecache
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Callable, NoReturn
+from typing import Any, NoReturn
 
 import jinja2
 from jinja2 import meta, nodes

infrahub_sdk/transfer/importer/json.py

@@ -62,7 +62,7 @@ class LineDelimitedJSONImporter(ImporterInterface):
 
         with self.wrapped_task_output("Analyzing import"):
             import_nodes_by_kind = defaultdict(list)
-            for graphql_data, kind in zip(table.column("graphql_json"), table.column("kind")):
+            for graphql_data, kind in zip(table.column("graphql_json"), table.column("kind"), strict=False):
                 node = await InfrahubNode.from_graphql(self.client, branch, ujson.loads(str(graphql_data)))
                 import_nodes_by_kind[str(kind)].append(node)
                 self.all_nodes[node.id] = node
@@ -109,7 +109,7 @@ class LineDelimitedJSONImporter(ImporterInterface):
                         relationship_schema
                     )
 
-            for relationship_name in self.optional_relationships_schemas_by_node_kind[node_kind].keys():
+            for relationship_name in self.optional_relationships_schemas_by_node_kind[node_kind]:
                 relationship_value = getattr(node, relationship_name)
                 if isinstance(relationship_value, RelationshipManager):
                     if relationship_value.peer_ids:
@@ -144,7 +144,7 @@ class LineDelimitedJSONImporter(ImporterInterface):
         await self.execute_batches([update_batch], "Adding optional relationships to nodes")
 
     async def update_many_to_many_relationships(self, file: Path) -> None:
-        relationships = ujson.loads(file.read_text())
+        relationships = ujson.loads(file.read_text(encoding="utf-8"))
         update_batch = await self.client.create_batch(return_exceptions=True)
 
         for relationship in relationships:

infrahub_sdk/types.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import enum
 from logging import Logger
-from typing import TYPE_CHECKING, Any, Protocol, Union, runtime_checkable
+from typing import TYPE_CHECKING, Any, Protocol, runtime_checkable
 
 from pydantic import BaseModel
 
@@ -65,7 +65,7 @@ class InfrahubLogger(Protocol):
         """Send an exception event."""
 
 
-InfrahubLoggers = Union[InfrahubLogger, Logger]
+InfrahubLoggers = InfrahubLogger | Logger
 
 
 class Order(BaseModel):

infrahub_sdk/utils.py

@@ -168,7 +168,7 @@ def str_to_bool(value: str) -> bool:
     if isinstance(value, bool):
         return value
 
-    if isinstance(value, int) and value in [0, 1]:
+    if isinstance(value, int) and value in {0, 1}:
         return bool(value)
 
     if not isinstance(value, str):
@@ -318,7 +318,7 @@ def write_to_file(path: Path, value: Any) -> bool:
         raise FileExistsError(f"{path} is a directory")
 
     to_write = str(value)
-    written = path.write_text(to_write)
+    written = path.write_text(to_write, encoding="utf-8")
 
     return written is not None
 

{infrahub_server-1.5.5.dist-info → infrahub_server-1.6.0.dist-info}/METADATA

@@ -1,66 +1,66 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: infrahub-server
-Version: 1.5.5
+Version: 1.6.0
 Summary: Infrahub is taking a new approach to Infrastructure Management by providing a new generation of datastore to organize and control all the data that defines how an infrastructure should run.
-License: Apache-2.0
-Author: OpsMill
-Author-email: info@opsmill.com
-Requires-Python: >=3.12,<3.13
+Project-URL: Homepage, https://opsmill.com
+Project-URL: Repository, https://github.com/opsmill/infrahub
+Project-URL: Documentation, https://docs.infrahub.app/
+Author-email: OpsMill <info@opsmill.com>
+License-Expression: Apache-2.0
+License-File: LICENSE.txt
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: Jinja2 (>=3,<4)
-Requires-Dist: aio-pika (>=9.4,<9.5)
-Requires-Dist: aiodataloader (==0.4.0)
-Requires-Dist: ariadne-codegen (==0.15.3)
-Requires-Dist: asgi-correlation-id (==4.2.0)
-Requires-Dist: authlib (==1.6.5)
-Requires-Dist: bcrypt (>=4.1,<4.2)
-Requires-Dist: boto3 (==1.34.129)
-Requires-Dist: cachetools-async (>=0.0.5,<0.0.6)
-Requires-Dist: click (==8.1.7)
-Requires-Dist: copier (>=9.8.0,<10.0.0)
-Requires-Dist: dulwich (>=0.22.7,<0.23.0)
-Requires-Dist: email-validator (>=2.1,<2.2)
-Requires-Dist: fast-depends (>=2.4.12,<3.0.0)
-Requires-Dist: fastapi (==0.121.1)
-Requires-Dist: fastapi-storages (>=0.3,<0.4)
-Requires-Dist: gitpython (>=3,<4)
-Requires-Dist: graphene (>=3.4,<3.5)
-Requires-Dist: gunicorn (>=23.0.0,<24.0.0)
-Requires-Dist: lunr (>=0.7.0.post1,<0.8.0)
-Requires-Dist: nats-py (>=2.7.2,<3.0.0)
-Requires-Dist: neo4j (>=5.28,<5.29)
-Requires-Dist: neo4j-rust-ext (>=5.28,<5.29)
-Requires-Dist: netaddr (==1.3.0)
-Requires-Dist: netutils (==1.12.0)
-Requires-Dist: numpy (>=1.26.2,<2.0.0)
-Requires-Dist: opentelemetry-exporter-otlp-proto-grpc (==1.28.1)
-Requires-Dist: opentelemetry-exporter-otlp-proto-http (==1.28.1)
-Requires-Dist: opentelemetry-instrumentation-aio-pika (==0.49b1)
-Requires-Dist: opentelemetry-instrumentation-fastapi (==0.49b1)
-Requires-Dist: prefect (==3.4.23)
-Requires-Dist: prefect-redis (==0.2.5)
-Requires-Dist: pyarrow (>=14)
-Requires-Dist: pydantic (>=2.10,<2.11)
-Requires-Dist: pydantic-settings (>=2.8,<2.9)
-Requires-Dist: pyjwt (>=2.8,<2.9)
-Requires-Dist: pytest (>=7.4,<7.5)
-Requires-Dist: python-multipart (==0.0.18)
-Requires-Dist: pyyaml (>=6,<7)
-Requires-Dist: redis[hiredis] (>=6.0.0,<7.0.0)
-Requires-Dist: rich (>=13,<14)
-Requires-Dist: starlette-exporter (>=0.23,<0.24)
-Requires-Dist: structlog (==24.1.0)
-Requires-Dist: tomli (>=1.1.0) ; python_version < "3.11"
-Requires-Dist: typer (==0.12.5)
-Requires-Dist: ujson (>=5,<6)
-Requires-Dist: uvicorn[standard] (>=0.32,<0.33)
-Requires-Dist: whenever (==0.7.3)
-Project-URL: Documentation, https://docs.infrahub.app/
-Project-URL: Homepage, https://opsmill.com
-Project-URL: Repository, https://github.com/opsmill/infrahub
+Requires-Python: <3.13,>=3.12
+Requires-Dist: aio-pika<9.5,>=9.4
+Requires-Dist: aiodataloader==0.4.0
+Requires-Dist: ariadne-codegen==0.15.3
+Requires-Dist: asgi-correlation-id==4.2.0
+Requires-Dist: authlib==1.6.5
+Requires-Dist: bcrypt<4.2,>=4.1
+Requires-Dist: boto3==1.34.129
+Requires-Dist: cachetools-async==0.0.5
+Requires-Dist: click==8.1.7
+Requires-Dist: copier==9.8.0
+Requires-Dist: deepdiff==8.6.1
+Requires-Dist: dulwich==0.22.7
+Requires-Dist: email-validator<2.2,>=2.1
+Requires-Dist: fast-depends==2.4.12
+Requires-Dist: fastapi-storages<0.4,>=0.3
+Requires-Dist: fastapi==0.121.1
+Requires-Dist: gitpython<4,>=3
+Requires-Dist: graphene<3.5,>=3.4
+Requires-Dist: gunicorn<24,>=23.0.0
+Requires-Dist: jinja2<4,>=3
+Requires-Dist: lunr<0.8,>=0.7.0.post1
+Requires-Dist: nats-py==2.7.2
+Requires-Dist: neo4j-rust-ext<5.29,>=5.28
+Requires-Dist: neo4j<5.29,>=5.28
+Requires-Dist: netaddr==1.3.0
+Requires-Dist: netutils==1.12.0
+Requires-Dist: numpy==1.26.2
+Requires-Dist: opentelemetry-exporter-otlp-proto-grpc==1.28.1
+Requires-Dist: opentelemetry-exporter-otlp-proto-http==1.28.1
+Requires-Dist: opentelemetry-instrumentation-aio-pika==0.49b1
+Requires-Dist: opentelemetry-instrumentation-fastapi==0.49b1
+Requires-Dist: prefect-redis==0.2.6
+Requires-Dist: prefect==3.5.0
+Requires-Dist: pyarrow<15,>=14
+Requires-Dist: pydantic-settings<2.9,>=2.8
+Requires-Dist: pydantic<2.11,>=2.10
+Requires-Dist: pyjwt<2.9,>=2.8
+Requires-Dist: pytest<7.5,>=7.4
+Requires-Dist: python-multipart==0.0.18
+Requires-Dist: pyyaml<7,>=6
+Requires-Dist: redis[hiredis]==6.0.0
+Requires-Dist: rich<14,>=13
+Requires-Dist: starlette-exporter<0.24,>=0.23
+Requires-Dist: structlog==24.1.0
+Requires-Dist: tomli>=1.1.0; python_version <= '3.11'
+Requires-Dist: typer==0.19.2
+Requires-Dist: ujson<6,>=5
+Requires-Dist: uvicorn[standard]<0.33,>=0.32
+Requires-Dist: whenever==0.7.3
 Description-Content-Type: text/markdown
 
 <h1 align="center">
@@ -137,4 +137,3 @@ To help our community with the creation of contributions, please view our [CONTR
 ## Security
 
 [View our SECURITY](https://github.com/opsmill/infrahub?tab=security-ov-file) policy to find the latest information.
-