definitions: new submodule to import definitions

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,

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,

src/infuse_iot/definitions/__init__.py

@@ -0,0 +1 @@
+#!/usr/bin/env python3

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

src/infuse_iot/definitions/rpc.py

@@ -0,0 +1,3 @@
+#!/usr/bin/env python3
+
+from infuse_iot.generated.rpc_definitions import *  # noqa: F403

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

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,

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,
 )

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

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
 

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
 
 

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
 

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 (

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,

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,

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