infrahub-server 1.7.0rc0__py3-none-any.whl → 1.7.2__py3-none-any.whl

infrahub_testcontainers/docker-compose-cluster.test.yml

@@ -13,10 +13,10 @@ x-neo4j-config-common: &neo4j-config-common
   NEO4J_server_metrics_filter: '*'
   NEO4J_server_cluster_system__database__mode: PRIMARY
   NEO4J_initial_server_mode__constraint: PRIMARY
-  NEO4J_dbms_cluster_discovery_endpoints: database:5000,database-core2:5000,database-core3:5000
+  NEO4J_dbms_cluster_endpoints: database:6000,database-core2:6000,database-core3:6000
   NEO4J_initial_dbms_default__primaries__count: 3
-  NEO4J_dbms_memory_heap_initial__size: ${INFRAHUB_TESTING_DB_HEAP_INITIAL_SIZE}
-  NEO4J_dbms_memory_heap_max__size: ${INFRAHUB_TESTING_DB_HEAP_MAX_SIZE}
+  NEO4J_server_memory_heap_initial__size: ${INFRAHUB_TESTING_DB_HEAP_INITIAL_SIZE}
+  NEO4J_server_memory_heap_max__size: ${INFRAHUB_TESTING_DB_HEAP_MAX_SIZE}
   NEO4J_server_memory_pagecache_size: ${INFRAHUB_TESTING_DB_PAGECACHE_SIZE}
 
 
@@ -73,7 +73,6 @@ services:
       <<: *neo4j-config-common
       NEO4J_metrics_prometheus_endpoint: 0.0.0.0:2004
       NEO4J_server_backup_listen__address: 0.0.0.0:6362
-      NEO4J_server_discovery_advertised__address: database:5000
       NEO4J_server_cluster_advertised__address: database:6000
       NEO4J_server_cluster_raft_advertised__address: database:7000
       NEO4J_server_bolt_advertised__address: database:7687
@@ -105,7 +104,6 @@ services:
       <<: *neo4j-config-common
       NEO4J_metrics_prometheus_endpoint: 0.0.0.0:2005
       NEO4J_server_backup_listen__address: 0.0.0.0:6363
-      NEO4J_server_discovery_advertised__address: database-core2:5000
       NEO4J_server_cluster_advertised__address: database-core2:6000
       NEO4J_server_cluster_raft_advertised__address: database-core2:7000
       NEO4J_server_bolt_advertised__address: database-core2:7687
@@ -140,7 +138,6 @@ services:
       <<: *neo4j-config-common
       NEO4J_metrics_prometheus_endpoint: 0.0.0.0:2006
       NEO4J_server_backup_listen__address: 0.0.0.0:6364
-      NEO4J_server_discovery_advertised__address: database-core3:5000
       NEO4J_server_cluster_advertised__address: database-core3:6000
       NEO4J_server_cluster_raft_advertised__address: database-core3:7000
       NEO4J_server_bolt_advertised__address: database-core3:7687
@@ -179,8 +176,8 @@ services:
       INFRAHUB_CACHE_ADDRESS: ${INFRAHUB_TESTING_CACHE_ADDRESS}
       PREFECT_REDIS_MESSAGING_HOST: "${INFRAHUB_TESTING_CACHE_ADDRESS:-cache}"
       PREFECT_REDIS_MESSAGING_DB: "1"
-      PREFECT_REDIS_MESSAGING_CONSUMER_MIN_IDLE_TIME: "30"
-      PREFECT_REDIS_MESSAGING_PUBLISHER_BATCH_SIZE: "1"
+      PREFECT_REDIS_MESSAGING_CONSUMER_MIN_IDLE_TIME: ${INFRAHUB_TESTING_TASKMGR_CONSUMER_MIN_IDLE_TIME:-5}
+      PREFECT_REDIS_MESSAGING_PUBLISHER_BATCH_SIZE: ${INFRAHUB_TESTING_TASKMGR_PUBLISHER_BATCH_SIZE:-5}
 
       PREFECT_MESSAGING_BROKER:
       PREFECT_MESSAGING_CACHE:
@@ -231,14 +228,23 @@ services:
       PREFECT_SERVER_CONCURRENCY_LEASE_STORAGE: prefect_redis.lease_storage
       PREFECT_REDIS_MESSAGING_HOST: "${INFRAHUB_TESTING_CACHE_ADDRESS:-cache}"
       PREFECT_REDIS_MESSAGING_DB: "1"
-      PREFECT_REDIS_MESSAGING_CONSUMER_MIN_IDLE_TIME: "30"
-      PREFECT_REDIS_MESSAGING_PUBLISHER_BATCH_SIZE: "1"
+      PREFECT_REDIS_MESSAGING_CONSUMER_MIN_IDLE_TIME: ${INFRAHUB_TESTING_TASKMGR_CONSUMER_MIN_IDLE_TIME:-5}
+      PREFECT_REDIS_MESSAGING_PUBLISHER_BATCH_SIZE: ${INFRAHUB_TESTING_TASKMGR_PUBLISHER_BATCH_SIZE:-5}
 
       PREFECT_SERVER_SERVICES_EVENT_LOGGER_ENABLED: "true"
       PREFECT_SERVER_SERVICES_EVENT_PERSISTER_ENABLED: "true"
       PREFECT_SERVER_SERVICES_TRIGGERS_ENABLED: "true"
       PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_ENABLED: "true"
 
+      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_READ_BATCH_SIZE: ${INFRAHUB_TESTING_TASKMGR_EVENT_PERSISTER_READ_BATCH_SIZE:-1}
+      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_BATCH_SIZE: ${INFRAHUB_TESTING_TASKMGR_EVENT_PERSISTER_BATCH_SIZE:-20}
+      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_BATCH_SIZE_DELETE: ${INFRAHUB_TESTING_TASKMGR_EVENT_PERSISTER_BATCH_SIZE_DELETE:-10000}
+      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_FLUSH_INTERVAL: ${INFRAHUB_TESTING_TASKMGR_EVENT_PERSISTER_FLUSH_INTERVAL:-5}
+
+      PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_READ_BATCH_SIZE: ${INFRAHUB_TESTING_TASKMGR_TASK_RUN_RECORDER_READ_BATCH_SIZE:-1}
+      PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_BATCH_SIZE: ${INFRAHUB_TESTING_TASKMGR_TASK_RUN_RECORDER_BATCH_SIZE:-1}
+      PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_FLUSH_INTERVAL: ${INFRAHUB_TESTING_TASKMGR_TASK_RUN_RECORDER_FLUSH_INTERVAL:-5}
+
   task-manager-db:
     image: "${POSTGRES_DOCKER_IMAGE:-postgres:18-alpine}"
     command: postgres -c 'max_connections=${INFRAHUB_TESTING_TASK_MANAGER_DB_MAX_CONNECTIONS:-100}'

infrahub_testcontainers/docker-compose.test.yml

@@ -90,8 +90,8 @@ services:
       INFRAHUB_CACHE_ADDRESS: ${INFRAHUB_TESTING_CACHE_ADDRESS}
       PREFECT_REDIS_MESSAGING_HOST: "${INFRAHUB_TESTING_CACHE_ADDRESS:-cache}"
       PREFECT_REDIS_MESSAGING_DB: "1"
-      PREFECT_REDIS_MESSAGING_CONSUMER_MIN_IDLE_TIME: "30"
-      PREFECT_REDIS_MESSAGING_PUBLISHER_BATCH_SIZE: "1"
+      PREFECT_REDIS_MESSAGING_CONSUMER_MIN_IDLE_TIME: ${INFRAHUB_TESTING_TASKMGR_CONSUMER_MIN_IDLE_TIME:-5}
+      PREFECT_REDIS_MESSAGING_PUBLISHER_BATCH_SIZE: ${INFRAHUB_TESTING_TASKMGR_PUBLISHER_BATCH_SIZE:-5}
 
       PREFECT_MESSAGING_BROKER:
       PREFECT_MESSAGING_CACHE:
@@ -142,21 +142,22 @@ services:
       PREFECT_SERVER_CONCURRENCY_LEASE_STORAGE: prefect_redis.lease_storage
       PREFECT_REDIS_MESSAGING_HOST: "${INFRAHUB_TESTING_CACHE_ADDRESS:-cache}"
       PREFECT_REDIS_MESSAGING_DB: "1"
-      PREFECT_REDIS_MESSAGING_CONSUMER_MIN_IDLE_TIME: "30"
-      PREFECT_REDIS_MESSAGING_PUBLISHER_BATCH_SIZE: "1"
+      PREFECT_REDIS_MESSAGING_CONSUMER_MIN_IDLE_TIME: ${INFRAHUB_TESTING_TASKMGR_CONSUMER_MIN_IDLE_TIME:-5}
+      PREFECT_REDIS_MESSAGING_PUBLISHER_BATCH_SIZE: ${INFRAHUB_TESTING_TASKMGR_PUBLISHER_BATCH_SIZE:-5}
 
       PREFECT_SERVER_SERVICES_EVENT_LOGGER_ENABLED: "true"
       PREFECT_SERVER_SERVICES_EVENT_PERSISTER_ENABLED: "true"
       PREFECT_SERVER_SERVICES_TRIGGERS_ENABLED: "true"
       PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_ENABLED: "true"
 
-      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_READ_BATCH_SIZE:
-      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_BATCH_SIZE:
-      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_BATCH_SIZE_DELETE:
-      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_FLUSH_INTERVAL:
+      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_READ_BATCH_SIZE: ${INFRAHUB_TESTING_TASKMGR_EVENT_PERSISTER_READ_BATCH_SIZE:-1}
+      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_BATCH_SIZE: ${INFRAHUB_TESTING_TASKMGR_EVENT_PERSISTER_BATCH_SIZE:-20}
+      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_BATCH_SIZE_DELETE: ${INFRAHUB_TESTING_TASKMGR_EVENT_PERSISTER_BATCH_SIZE_DELETE:-10000}
+      PREFECT_SERVER_SERVICES_EVENT_PERSISTER_FLUSH_INTERVAL: ${INFRAHUB_TESTING_TASKMGR_EVENT_PERSISTER_FLUSH_INTERVAL:-5}
 
-      PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_BATCH_SIZE:
-      PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_FLUSH_INTERVAL:
+      PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_READ_BATCH_SIZE: ${INFRAHUB_TESTING_TASKMGR_TASK_RUN_RECORDER_READ_BATCH_SIZE:-1}
+      PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_BATCH_SIZE: ${INFRAHUB_TESTING_TASKMGR_TASK_RUN_RECORDER_BATCH_SIZE:-1}
+      PREFECT_SERVER_SERVICES_TASK_RUN_RECORDER_FLUSH_INTERVAL: ${INFRAHUB_TESTING_TASKMGR_TASK_RUN_RECORDER_FLUSH_INTERVAL:-5}
 
   task-manager-db:
     image: "${POSTGRES_DOCKER_IMAGE:-postgres:18-alpine}"

infrahub_testcontainers/performance_test.py

@@ -86,7 +86,7 @@ class InfrahubPerformanceTest:
         self,
         definition: MeasurementDefinition,
         value: float | str,
-        **kwargs: str | float,
+        **kwargs: dict[str, float],
     ) -> None:
         self.measurements.append(
             InfrahubMeasurementItem(

infrahub/pools/address.py

@@ -1,16 +0,0 @@
-from netaddr import IPNetwork, IPSet
-
-from infrahub.core.ipam.constants import IPAddressType, IPNetworkType
-
-
-def get_available(network: IPNetworkType, addresses: list[IPAddressType], is_pool: bool) -> IPSet:
-    pool = IPSet(IPNetwork(str(network)))
-    reserved = [IPNetwork(f"{str(address.ip)}/{address.max_prefixlen}") for address in addresses]
-    if not is_pool:
-        # If the specified network is not a pool we remove the network address and
-        # optionally the broadcast address in case of IPv4
-        reserved.append(IPNetwork(f"{str(network.network_address)}/{network.max_prefixlen}"))
-        if network.version == 4:
-            reserved.append(IPNetwork(f"{str(network.broadcast_address)}/{network.max_prefixlen}"))
-
-    return pool - IPSet(reserved)