Skip to content

Develop #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sky-sharma merged 8 commits into from
Mar 24, 2023
Merged

Develop #27

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
de601a5
ListDevicesRequest >> _prepare_params_for_list: (#16)
sky-sharma Dec 29, 2022
8775b04
updated device class and enums (#19)
rajasd27 Jan 9, 2023
4d25b0f
updated send_command function to base64 encode payload (#18)
rajasd27 Jan 9, 2023
bb2915d
Changed 'cloud_ack_time' to 'cloud_update_time' (#20)
sky-sharma Jan 10, 2023
a8a38e9
Merge branch 'main' into develop
sky-sharma Feb 20, 2023
76c48bc
Iot 918 conform to google format times binary data (#24)
sky-sharma Feb 28, 2023
926b8ef
'config', 'state' None? (i.e. not in fieldMask?) (#26)
sky-sharma Mar 24, 2023
09a537d
Merge branch 'main' into develop
sky-sharma Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 37 additions & 9 deletions clearblade/cloud/iot_v1/device_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ def from_json(json):
lastConfigAckTimeFromJson = get_value(json, 'lastConfigAckTime')
lastConfigSendTimeFromJson = get_value(json, 'lastConfigSendTime')
lastErrorTimeFromJson = get_value(json, 'lastErrorTime')
configFromJson = get_value(json, 'config')
stateFromJson = get_value(json, 'state')

convert_times_to_datetime_with_nanoseconds = (False if os.environ.get("BINARYDATA_AND_TIME_GOOGLE_FORMAT") == None else os.environ.get("BINARYDATA_AND_TIME_GOOGLE_FORMAT").lower() == "true")
if convert_times_to_datetime_with_nanoseconds:
Expand All @@ -91,15 +93,21 @@ def from_json(json):
last_config_send_time = lastConfigSendTimeFromJson
last_error_time = lastErrorTimeFromJson

deviceConfig = DeviceConfig.from_json(get_value(json, 'config'))
config = { "version": deviceConfig.version, "cloudUpdateTime": deviceConfig.cloud_update_time }
if (deviceConfig.binary_data not in [None, ""]):
config["binaryData"] = deviceConfig.binary_data
if (deviceConfig.device_ack_time not in [None, ""]):
config["deviceAckTime"] = deviceConfig.device_ack_time

deviceState = DeviceState.from_json(get_value(json, 'state'))
state = { "updateTime": deviceState.update_time, "binaryData": deviceState.binary_data }
if (configFromJson):
deviceConfig = DeviceConfig.from_json(configFromJson)
config = { "version": deviceConfig.version, "cloudUpdateTime": deviceConfig.cloud_update_time }
if (deviceConfig.binary_data not in [None, ""]):
config["binaryData"] = deviceConfig.binary_data
if (deviceConfig.device_ack_time not in [None, ""]):
config["deviceAckTime"] = deviceConfig.device_ack_time
else:
config = configFromJson

if (stateFromJson):
deviceState = DeviceState.from_json(stateFromJson)
state = { "updateTime": deviceState.update_time, "binaryData": deviceState.binary_data }
else:
state = stateFromJson

return Device(
id=get_value(json, 'id'),
Expand Down Expand Up @@ -180,6 +188,26 @@ def log_level(self):
def last_heartbeat_time(self):
return self._last_heartbeat_time

@property
def last_event_time(self):
return self._last_event_time

@property
def last_state_time(self):
return self._last_state_time

@property
def last_config_ack_time(self):
return self._last_config_ack_time

@property
def last_config_send_time(self):
return self._last_config_send_time

@property
def last_error_time(self):
return self._last_error_time

@property
def blocked(self):
return self._blocked
Expand Down