Skip to content

added rudimentary support for M3 app removal of value wrapping #4

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

Closed
wants to merge 1 commit into from
Closed

added rudimentary support for M3 app removal of value wrapping #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions src/iotc/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,9 @@ def _sync_twin(self):
for desired_prop in desired:
if desired_prop == '$version':
continue
if '__t' in desired[desired_prop]: # is a component
if str(type(desired[desired_prop])) == "<class 'dict'>": # is a component
desired_prop_component = desired_prop
for desired_prop_name in desired[desired_prop_component]:
if desired_prop_name == '__t':
continue
has_reported = False
try:
has_reported = reported[desired_prop_component][desired_prop_name]
Expand Down Expand Up @@ -268,7 +266,7 @@ def _handle_property_ack(
"{}".format(component_name): {
"{}".format(property_name): {
"ac": 200,
"ad": "Property received",
"ad": "Completed",
"av": property_version,
"value": property_value,
}
Expand All @@ -281,7 +279,7 @@ def _handle_property_ack(
{
"{}".format(property_name): {
"ac": 200,
"ad": "Property received",
"ad": "Completed",
"av": property_version,
"value": property_value,
}
Expand Down
22 changes: 11 additions & 11 deletions src/iotc/aio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,12 @@ async def _handle_property_ack(
await self.send_property(
{
"{}".format(component_name): {
"{}".format(property_name): {
"ac": 200,
"ad": "Property received",
"av": property_version,
"value": property_value,
}
"value": {
"{}".format(property_name): property_value
},
"ac": 200,
"ad": "Completed",
"av": property_version,
}
}
)
Expand All @@ -140,7 +140,7 @@ async def _handle_property_ack(
{
"{}".format(property_name): {
"ac": 200,
"ad": "Property received",
"ad": "Completed",
"av": property_version,
"value": property_value,
}
Expand All @@ -159,12 +159,12 @@ async def _update_properties(self, patch, prop_cb):

# check if component
try:
is_component = patch[prop]["__t"]
is_component = str(type(patch[prop])) == "<class 'dict'>"
except KeyError:
pass
if is_component:
for component_prop in patch[prop]:
if component_prop == "__t":
if str(type(component_prop)) == "<class 'dict'>":
continue
await self._logger.debug(
'In component "{}" for property "{}"'.format(
Expand All @@ -174,13 +174,13 @@ async def _update_properties(self, patch, prop_cb):
await self._handle_property_ack(
prop_cb,
component_prop,
patch[prop][component_prop]["value"],
patch[prop][component_prop],
patch["$version"],
prop,
)
else:
await self._handle_property_ack(
prop_cb, prop, patch[prop]["value"], patch["$version"]
prop_cb, prop, patch[prop], patch["$version"]
)

async def _on_properties(self):
Expand Down