Merge pull request #49 from samson0v/master

imbeacon · web-flow · commit a5a9b04061b8 · 2022-02-01T12:46:22.000+02:00
Updated requirements.txt &amp; imports
diff --git a/requirements.txt b/requirements.txt
@@ -3,3 +3,4 @@ six >= 1.10
 python_dateutil >= 2.5.3
 setuptools >= 21.0.0
 urllib3 >= 1.15.1
+requests==2.26.0
diff --git a/tb_rest_client/models/models_ce/api_usage_state_filter.py b/tb_rest_client/models/models_ce/api_usage_state_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class ApiUsageStateFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_ce/asset_type_filter.py b/tb_rest_client/models/models_ce/asset_type_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class AssetTypeFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_ce/boolean_filter_predicate.py b/tb_rest_client/models/models_ce/boolean_filter_predicate.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import KeyFilterPredicate
+from .key_filter_predicate import KeyFilterPredicate
 
 
 class BooleanFilterPredicate(KeyFilterPredicate):
diff --git a/tb_rest_client/models/models_ce/complex_filter_predicate.py b/tb_rest_client/models/models_ce/complex_filter_predicate.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import KeyFilterPredicate
+from .key_filter_predicate import KeyFilterPredicate
 
 
 class ComplexFilterPredicate(KeyFilterPredicate):
diff --git a/tb_rest_client/models/models_ce/debug_rule_node_event_filter.py b/tb_rest_client/models/models_ce/debug_rule_node_event_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import EventFilter
+from .event_filter import EventFilter
 
 
 class DebugRuleNodeEventFilter(EventFilter):
diff --git a/tb_rest_client/models/models_ce/default_coap_device_type_configuration.py b/tb_rest_client/models/models_ce/default_coap_device_type_configuration.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import CoapDeviceTypeConfiguration
+from .coap_device_type_configuration import CoapDeviceTypeConfiguration
 
 
 class DefaultCoapDeviceTypeConfiguration(CoapDeviceTypeConfiguration):
diff --git a/tb_rest_client/models/models_ce/default_device_configuration.py b/tb_rest_client/models/models_ce/default_device_configuration.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import DeviceConfiguration
+from .device_configuration import DeviceConfiguration
 
 
 class DefaultDeviceConfiguration(DeviceConfiguration):
diff --git a/tb_rest_client/models/models_ce/device_search_query_filter.py b/tb_rest_client/models/models_ce/device_search_query_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class DeviceSearchQueryFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_ce/device_type_filter.py b/tb_rest_client/models/models_ce/device_type_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class DeviceTypeFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_ce/duration_alarm_condition_spec.py b/tb_rest_client/models/models_ce/duration_alarm_condition_spec.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import AlarmConditionSpec
+from .alarm_condition_spec import AlarmConditionSpec
 
 
 class DurationAlarmConditionSpec(AlarmConditionSpec):
diff --git a/tb_rest_client/models/models_ce/edge_search_query_filter.py b/tb_rest_client/models/models_ce/edge_search_query_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class EdgeSearchQueryFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_ce/edge_type_filter.py b/tb_rest_client/models/models_ce/edge_type_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class EdgeTypeFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_ce/entity_list_filter.py b/tb_rest_client/models/models_ce/entity_list_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class EntityListFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_ce/entity_name_filter.py b/tb_rest_client/models/models_ce/entity_name_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class EntityNameFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_ce/entity_type_filter.py b/tb_rest_client/models/models_ce/entity_type_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class EntityTypeFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_ce/entity_view_search_query_filter.py b/tb_rest_client/models/models_ce/entity_view_search_query_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class EntityViewSearchQueryFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_ce/error_event_filter.py b/tb_rest_client/models/models_ce/error_event_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import EventFilter
+from .event_filter import EventFilter
 
 
 class ErrorEventFilter(EventFilter):
diff --git a/tb_rest_client/models/models_ce/mqtt_device_transport_configuration.py b/tb_rest_client/models/models_ce/mqtt_device_transport_configuration.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import DeviceTransportConfiguration
+from .device_transport_configuration import DeviceTransportConfiguration
 
 
 class MqttDeviceTransportConfiguration(DeviceTransportConfiguration):
diff --git a/tb_rest_client/models/models_ce/numeric_filter_predicate.py b/tb_rest_client/models/models_ce/numeric_filter_predicate.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import KeyFilterPredicate
+from .key_filter_predicate import KeyFilterPredicate
 
 
 class NumericFilterPredicate(KeyFilterPredicate):
diff --git a/tb_rest_client/models/models_ce/proto_transport_payload_configuration.py b/tb_rest_client/models/models_ce/proto_transport_payload_configuration.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import TransportPayloadTypeConfiguration
+from .transport_payload_type_configuration import TransportPayloadTypeConfiguration
 
 
 class ProtoTransportPayloadConfiguration(TransportPayloadTypeConfiguration):
diff --git a/tb_rest_client/models/models_ce/psk_lw_m2_m_bootstrap_server_credential.py b/tb_rest_client/models/models_ce/psk_lw_m2_m_bootstrap_server_credential.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import LwM2MBootstrapServerCredential
+from .lw_m2_m_bootstrap_server_credential import LwM2MBootstrapServerCredential
 
 
 class PSKLwM2MBootstrapServerCredential(LwM2MBootstrapServerCredential):
diff --git a/tb_rest_client/models/models_ce/repeating_alarm_condition_spec.py b/tb_rest_client/models/models_ce/repeating_alarm_condition_spec.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import AlarmConditionSpec
+from .alarm_condition_spec import AlarmConditionSpec
 
 
 class RepeatingAlarmConditionSpec(AlarmConditionSpec):
diff --git a/tb_rest_client/models/models_ce/shared_attributes_setting_snmp_communication_config.py b/tb_rest_client/models/models_ce/shared_attributes_setting_snmp_communication_config.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import SnmpCommunicationConfig
+from .snmp_communication_config import SnmpCommunicationConfig
 
 
 class SharedAttributesSettingSnmpCommunicationConfig(SnmpCommunicationConfig):
diff --git a/tb_rest_client/models/models_ce/simple_alarm_condition_spec.py b/tb_rest_client/models/models_ce/simple_alarm_condition_spec.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import AlarmConditionSpec
+from .alarm_condition_spec import AlarmConditionSpec
 
 
 class SimpleAlarmConditionSpec(AlarmConditionSpec):
diff --git a/tb_rest_client/models/models_ce/single_entity_filter.py b/tb_rest_client/models/models_ce/single_entity_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class SingleEntityFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_ce/statistics_event_filter.py b/tb_rest_client/models/models_ce/statistics_event_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import EventFilter
+from .event_filter import EventFilter
 
 
 class StatisticsEventFilter(EventFilter):
diff --git a/tb_rest_client/models/models_ce/string_filter_predicate.py b/tb_rest_client/models/models_ce/string_filter_predicate.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_ce import KeyFilterPredicate
+from .key_filter_predicate import KeyFilterPredicate
 
 
 class StringFilterPredicate(KeyFilterPredicate):
diff --git a/tb_rest_client/models/models_pe/api_usage_state_filter.py b/tb_rest_client/models/models_pe/api_usage_state_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class ApiUsageStateFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_pe/asset_type_filter.py b/tb_rest_client/models/models_pe/asset_type_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class AssetTypeFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_pe/boolean_filter_predicate.py b/tb_rest_client/models/models_pe/boolean_filter_predicate.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import KeyFilterPredicate
+from .key_filter_predicate import KeyFilterPredicate
 
 
 class BooleanFilterPredicate(KeyFilterPredicate):
diff --git a/tb_rest_client/models/models_pe/complex_filter_predicate.py b/tb_rest_client/models/models_pe/complex_filter_predicate.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import KeyFilterPredicate
+from .key_filter_predicate import KeyFilterPredicate
 
 
 class ComplexFilterPredicate(KeyFilterPredicate):
diff --git a/tb_rest_client/models/models_pe/debug_converter_event_filter.py b/tb_rest_client/models/models_pe/debug_converter_event_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import EventFilter
+from .event_filter import EventFilter
 
 
 class DebugConverterEventFilter(EventFilter):
diff --git a/tb_rest_client/models/models_pe/debug_rule_node_event_filter.py b/tb_rest_client/models/models_pe/debug_rule_node_event_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import EventFilter
+from .event_filter import EventFilter
 
 
 class DebugRuleNodeEventFilter(EventFilter):
diff --git a/tb_rest_client/models/models_pe/default_coap_device_type_configuration.py b/tb_rest_client/models/models_pe/default_coap_device_type_configuration.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import CoapDeviceTypeConfiguration
+from .coap_device_type_configuration import CoapDeviceTypeConfiguration
 
 
 class DefaultCoapDeviceTypeConfiguration(CoapDeviceTypeConfiguration):
diff --git a/tb_rest_client/models/models_pe/default_device_configuration.py b/tb_rest_client/models/models_pe/default_device_configuration.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import DeviceConfiguration
+from .device_configuration import DeviceConfiguration
 
 
 class DefaultDeviceConfiguration(DeviceConfiguration):
diff --git a/tb_rest_client/models/models_pe/device_search_query_filter.py b/tb_rest_client/models/models_pe/device_search_query_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class DeviceSearchQueryFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_pe/device_type_filter.py b/tb_rest_client/models/models_pe/device_type_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class DeviceTypeFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_pe/duration_alarm_condition_spec.py b/tb_rest_client/models/models_pe/duration_alarm_condition_spec.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import AlarmConditionSpec
+from .alarm_condition_spec import AlarmConditionSpec
 
 
 class DurationAlarmConditionSpec(AlarmConditionSpec):
diff --git a/tb_rest_client/models/models_pe/edge_search_query_filter.py b/tb_rest_client/models/models_pe/edge_search_query_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class EdgeSearchQueryFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_pe/edge_type_filter.py b/tb_rest_client/models/models_pe/edge_type_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class EdgeTypeFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_pe/entity_group_filter.py b/tb_rest_client/models/models_pe/entity_group_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class EntityGroupFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_pe/entity_group_list_filter.py b/tb_rest_client/models/models_pe/entity_group_list_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class EntityGroupListFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_pe/entity_group_name_filter.py b/tb_rest_client/models/models_pe/entity_group_name_filter.py
@@ -15,7 +15,7 @@
 
 import six
 
-from tb_rest_client.models.models_pe import EntityFilter
+from .entity_filter import EntityFilter
 
 
 class EntityGroupNameFilter(EntityFilter):
diff --git a/tb_rest_client/models/models_pe/entity_list_filter.py b/tb_rest_client/models/models_pe/entity_list_filter.py
diff --git a/tb_rest_client/models/models_pe/entity_name_filter.py b/tb_rest_client/models/models_pe/entity_name_filter.py
diff --git a/tb_rest_client/models/models_pe/entity_type_filter.py b/tb_rest_client/models/models_pe/entity_type_filter.py
diff --git a/tb_rest_client/models/models_pe/entity_view_search_query_filter.py b/tb_rest_client/models/models_pe/entity_view_search_query_filter.py
diff --git a/tb_rest_client/models/models_pe/error_event_filter.py b/tb_rest_client/models/models_pe/error_event_filter.py
diff --git a/tb_rest_client/models/models_pe/mqtt_device_transport_configuration.py b/tb_rest_client/models/models_pe/mqtt_device_transport_configuration.py
diff --git a/tb_rest_client/models/models_pe/numeric_filter_predicate.py b/tb_rest_client/models/models_pe/numeric_filter_predicate.py
diff --git a/tb_rest_client/models/models_pe/proto_transport_payload_configuration.py b/tb_rest_client/models/models_pe/proto_transport_payload_configuration.py
diff --git a/tb_rest_client/models/models_pe/repeating_alarm_condition_spec.py b/tb_rest_client/models/models_pe/repeating_alarm_condition_spec.py
diff --git a/tb_rest_client/models/models_pe/shared_attributes_setting_snmp_communication_config.py b/tb_rest_client/models/models_pe/shared_attributes_setting_snmp_communication_config.py
diff --git a/tb_rest_client/models/models_pe/simple_alarm_condition_spec.py b/tb_rest_client/models/models_pe/simple_alarm_condition_spec.py
diff --git a/tb_rest_client/models/models_pe/single_entity_filter.py b/tb_rest_client/models/models_pe/single_entity_filter.py
diff --git a/tb_rest_client/models/models_pe/state_entity_owner_filter.py b/tb_rest_client/models/models_pe/state_entity_owner_filter.py
diff --git a/tb_rest_client/models/models_pe/statistics_event_filter.py b/tb_rest_client/models/models_pe/statistics_event_filter.py
diff --git a/tb_rest_client/models/models_pe/string_filter_predicate.py b/tb_rest_client/models/models_pe/string_filter_predicate.py
