From 53acc80208c4de979d23f0fde12c3600ffa0e728 Mon Sep 17 00:00:00 2001 From: Jordan Yates Date: Thu, 7 Aug 2025 17:31:06 +1000 Subject: [PATCH 1/2] definitions: new submodule to import definitions Add a new location to import TDF, RPC and KV definitions from, enabling definitions to be imported from different locations without changes to end-user tools or scripts. Signed-off-by: Jordan Yates --- src/infuse_iot/definitions/__init__.py | 1 + src/infuse_iot/definitions/kv.py | 3 +++ src/infuse_iot/definitions/rpc.py | 3 +++ src/infuse_iot/definitions/tdf.py | 3 +++ 4 files changed, 10 insertions(+) create mode 100644 src/infuse_iot/definitions/__init__.py create mode 100644 src/infuse_iot/definitions/kv.py create mode 100644 src/infuse_iot/definitions/rpc.py create mode 100644 src/infuse_iot/definitions/tdf.py diff --git a/src/infuse_iot/definitions/__init__.py b/src/infuse_iot/definitions/__init__.py new file mode 100644 index 0000000..e5a0d9b --- /dev/null +++ b/src/infuse_iot/definitions/__init__.py @@ -0,0 +1 @@ +#!/usr/bin/env python3 diff --git a/src/infuse_iot/definitions/kv.py b/src/infuse_iot/definitions/kv.py new file mode 100644 index 0000000..dd8c5a5 --- /dev/null +++ b/src/infuse_iot/definitions/kv.py @@ -0,0 +1,3 @@ +#!/usr/bin/env python3 + +from infuse_iot.generated.kv_definitions import slots, structs # noqa: F401 diff --git a/src/infuse_iot/definitions/rpc.py b/src/infuse_iot/definitions/rpc.py new file mode 100644 index 0000000..ebf9915 --- /dev/null +++ b/src/infuse_iot/definitions/rpc.py @@ -0,0 +1,3 @@ +#!/usr/bin/env python3 + +from infuse_iot.generated.rpc_definitions import * # noqa: F403 diff --git a/src/infuse_iot/definitions/tdf.py b/src/infuse_iot/definitions/tdf.py new file mode 100644 index 0000000..eba50f5 --- /dev/null +++ b/src/infuse_iot/definitions/tdf.py @@ -0,0 +1,3 @@ +#!/usr/bin/env python3 + +from infuse_iot.generated.tdf_definitions import id_type_mapping, readings, structs # noqa: F401 From ad625a86e7e99cc0f5c140c8a72728ae2d91b8f9 Mon Sep 17 00:00:00 2001 From: Jordan Yates Date: Thu, 7 Aug 2025 17:39:36 +1000 Subject: [PATCH 2/2] treewide: use new definitions path Update all files in-tree to use the new definitions path. Signed-off-by: Jordan Yates --- scripts/apn_set.py | 2 +- scripts/reboot_count_reset.py | 2 +- src/infuse_iot/rpc_wrappers/bt_connect_infuse.py | 2 +- src/infuse_iot/rpc_wrappers/bt_disconnect.py | 2 +- src/infuse_iot/rpc_wrappers/bt_file_copy_coap.py | 2 +- src/infuse_iot/rpc_wrappers/coap_download.py | 2 +- src/infuse_iot/rpc_wrappers/file_write_basic.py | 2 +- src/infuse_iot/rpc_wrappers/lte_modem_info.py | 4 ++-- src/infuse_iot/tools/data_logger_sync.py | 2 +- src/infuse_iot/tools/localhost.py | 2 +- src/infuse_iot/tools/ota_upgrade.py | 2 +- src/infuse_iot/util/argparse.py | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/apn_set.py b/scripts/apn_set.py index 2073681..9e2672c 100755 --- a/scripts/apn_set.py +++ b/scripts/apn_set.py @@ -9,8 +9,8 @@ import infuse_iot.generated.kv_definitions as kv import infuse_iot.generated.rpc_definitions as rpc +from infuse_iot.definitions.tdf import readings from infuse_iot.epacket.packet import Auth -from infuse_iot.generated.tdf_definitions import readings from infuse_iot.rpc_client import RpcClient from infuse_iot.socket_comms import ( GatewayRequestConnectionRequest, diff --git a/scripts/reboot_count_reset.py b/scripts/reboot_count_reset.py index 853cf90..f091ae8 100755 --- a/scripts/reboot_count_reset.py +++ b/scripts/reboot_count_reset.py @@ -8,8 +8,8 @@ import infuse_iot.generated.kv_definitions as kv import infuse_iot.generated.rpc_definitions as rpc +from infuse_iot.definitions.tdf import readings from infuse_iot.epacket.packet import Auth -from infuse_iot.generated.tdf_definitions import readings from infuse_iot.rpc_client import RpcClient from infuse_iot.socket_comms import ( GatewayRequestConnectionRequest, diff --git a/src/infuse_iot/rpc_wrappers/bt_connect_infuse.py b/src/infuse_iot/rpc_wrappers/bt_connect_infuse.py index bb6362f..39b2f0e 100644 --- a/src/infuse_iot/rpc_wrappers/bt_connect_infuse.py +++ b/src/infuse_iot/rpc_wrappers/bt_connect_infuse.py @@ -3,7 +3,7 @@ import infuse_iot.generated.rpc_definitions as defs from infuse_iot.commands import InfuseRpcCommand -from infuse_iot.generated.rpc_definitions import ( +from infuse_iot.definitions.rpc import ( rpc_enum_bt_le_addr_type, rpc_enum_infuse_bt_characteristic, rpc_struct_bt_addr_le, diff --git a/src/infuse_iot/rpc_wrappers/bt_disconnect.py b/src/infuse_iot/rpc_wrappers/bt_disconnect.py index 3ded029..4246f52 100644 --- a/src/infuse_iot/rpc_wrappers/bt_disconnect.py +++ b/src/infuse_iot/rpc_wrappers/bt_disconnect.py @@ -3,7 +3,7 @@ import infuse_iot.generated.rpc_definitions as defs from infuse_iot.commands import InfuseRpcCommand -from infuse_iot.generated.rpc_definitions import ( +from infuse_iot.definitions.rpc import ( rpc_enum_bt_le_addr_type, rpc_struct_bt_addr_le, ) diff --git a/src/infuse_iot/rpc_wrappers/bt_file_copy_coap.py b/src/infuse_iot/rpc_wrappers/bt_file_copy_coap.py index 8a14199..f5636c1 100644 --- a/src/infuse_iot/rpc_wrappers/bt_file_copy_coap.py +++ b/src/infuse_iot/rpc_wrappers/bt_file_copy_coap.py @@ -4,7 +4,7 @@ import infuse_iot.generated.rpc_definitions as defs from infuse_iot.commands import InfuseRpcCommand -from infuse_iot.generated.rpc_definitions import rpc_enum_bt_le_addr_type, rpc_enum_file_action, rpc_struct_bt_addr_le +from infuse_iot.definitions.rpc import rpc_enum_bt_le_addr_type, rpc_enum_file_action, rpc_struct_bt_addr_le from infuse_iot.rpc_wrappers.coap_download import coap_download, coap_server_file_stats from infuse_iot.util.argparse import BtLeAddress from infuse_iot.util.ctypes import bytes_to_uint8 diff --git a/src/infuse_iot/rpc_wrappers/coap_download.py b/src/infuse_iot/rpc_wrappers/coap_download.py index aff3a40..3b523ee 100644 --- a/src/infuse_iot/rpc_wrappers/coap_download.py +++ b/src/infuse_iot/rpc_wrappers/coap_download.py @@ -10,7 +10,7 @@ from infuse_iot.api_client.api.coap import get_coap_file_stats from infuse_iot.commands import InfuseRpcCommand from infuse_iot.credentials import get_api_key -from infuse_iot.generated.rpc_definitions import rpc_enum_file_action +from infuse_iot.definitions.rpc import rpc_enum_file_action from infuse_iot.util.ctypes import UINT32_MAX from infuse_iot.zephyr.errno import errno diff --git a/src/infuse_iot/rpc_wrappers/file_write_basic.py b/src/infuse_iot/rpc_wrappers/file_write_basic.py index 2374eef..c83d40e 100644 --- a/src/infuse_iot/rpc_wrappers/file_write_basic.py +++ b/src/infuse_iot/rpc_wrappers/file_write_basic.py @@ -10,7 +10,7 @@ import infuse_iot.generated.rpc_definitions as defs from infuse_iot.commands import Auth, InfuseRpcCommand -from infuse_iot.generated.rpc_definitions import rpc_enum_file_action +from infuse_iot.definitions.rpc import rpc_enum_file_action from infuse_iot.zephyr.errno import errno diff --git a/src/infuse_iot/rpc_wrappers/lte_modem_info.py b/src/infuse_iot/rpc_wrappers/lte_modem_info.py index 288bcc8..2cb8dcf 100644 --- a/src/infuse_iot/rpc_wrappers/lte_modem_info.py +++ b/src/infuse_iot/rpc_wrappers/lte_modem_info.py @@ -3,8 +3,8 @@ # import ctypes import argparse -from infuse_iot.generated.kv_definitions import slots as kv_slots -from infuse_iot.generated.kv_definitions import structs as kv_structs +from infuse_iot.definitions.kv import slots as kv_slots +from infuse_iot.definitions.kv import structs as kv_structs from infuse_iot.zephyr import lte as z_lte from infuse_iot.zephyr.errno import errno diff --git a/src/infuse_iot/tools/data_logger_sync.py b/src/infuse_iot/tools/data_logger_sync.py index 89e3c7f..754c7b0 100644 --- a/src/infuse_iot/tools/data_logger_sync.py +++ b/src/infuse_iot/tools/data_logger_sync.py @@ -20,8 +20,8 @@ from rich.table import Table from infuse_iot.commands import InfuseCommand +from infuse_iot.definitions.rpc import data_logger_read, rpc_enum_data_logger from infuse_iot.epacket.packet import Auth -from infuse_iot.generated.rpc_definitions import data_logger_read, rpc_enum_data_logger from infuse_iot.generated.tdf_definitions import readings from infuse_iot.rpc_client import RpcClient from infuse_iot.socket_comms import ( diff --git a/src/infuse_iot/tools/localhost.py b/src/infuse_iot/tools/localhost.py index bb65e37..908a5c2 100644 --- a/src/infuse_iot/tools/localhost.py +++ b/src/infuse_iot/tools/localhost.py @@ -18,8 +18,8 @@ import infuse_iot.epacket.interface as interface from infuse_iot.commands import InfuseCommand from infuse_iot.common import InfuseType +from infuse_iot.definitions.tdf import structs from infuse_iot.generated.tdf_base import TdfStructBase -from infuse_iot.generated.tdf_definitions import structs from infuse_iot.socket_comms import ( ClientNotificationEpacketReceived, LocalClient, diff --git a/src/infuse_iot/tools/ota_upgrade.py b/src/infuse_iot/tools/ota_upgrade.py index 04f7655..5018e69 100644 --- a/src/infuse_iot/tools/ota_upgrade.py +++ b/src/infuse_iot/tools/ota_upgrade.py @@ -21,8 +21,8 @@ from infuse_iot.commands import InfuseCommand from infuse_iot.common import InfuseID +from infuse_iot.definitions.rpc import bt_file_copy_basic, file_write_basic, rpc_enum_file_action from infuse_iot.epacket.packet import Auth, HopReceived -from infuse_iot.generated.rpc_definitions import bt_file_copy_basic, file_write_basic, rpc_enum_file_action from infuse_iot.rpc_client import RpcClient from infuse_iot.socket_comms import ( GatewayRequestConnectionRequest, diff --git a/src/infuse_iot/util/argparse.py b/src/infuse_iot/util/argparse.py index c32893b..aefbeea 100644 --- a/src/infuse_iot/util/argparse.py +++ b/src/infuse_iot/util/argparse.py @@ -7,7 +7,7 @@ import yaml -from infuse_iot.generated.rpc_definitions import rpc_enum_bt_le_addr_type, rpc_struct_bt_addr_le +from infuse_iot.definitions.rpc import rpc_enum_bt_le_addr_type, rpc_struct_bt_addr_le from infuse_iot.util.ctypes import bytes_to_uint8