restructure

Author: lucadruda

samples/py2.py

@@ -1,69 +1,96 @@
-import sys
 import os
 import configparser
+import sys
 import time
-from random import randint
 
+from random import randint
 
 config = configparser.ConfigParser()
-config.read(os.path.join(os.path.dirname(__file__),'samples.ini'))
+config.read(os.path.join(os.path.dirname(__file__), "samples.ini"))
 
+if config["DEFAULT"].getboolean("Local"):
+    sys.path.insert(0, "src")
 
-if config['DEFAULT'].getboolean('Local'):
-    sys.path.insert(0, 'src')
+from iotc import (
+    IOTCConnectType,
+    IOTCLogLevel,
+    IOTCEvents,
+    Command,
+    CredentialsCache,
+    Storage,
+)
+from iotc import IoTCClient
 
-from iotc import IoTCClient, IOTCConnectType, IOTCLogLevel, IOTCEvents,Storage,CredentialsCache
-
-
-# Change config section name to reflect sample.ini
 device_id = config["DEVICE_M3"]["DeviceId"]
 scope_id = config["DEVICE_M3"]["ScopeId"]
 key = config["DEVICE_M3"]["DeviceKey"]
 
+
 class MemStorage(Storage):
     def retrieve(self):
-        return CredentialsCache('iotc-1f9e162c-eacc-408d-9fb2-c9926a071037.azure-devices.net','javasdkcomponents2',key)
+        return CredentialsCache(
+            "iotc-1f9e162c-eacc-408d-9fb2-c9926a071037.azure-devices.net",
+            "javasdkcomponents2",
+            key,
+        )
+
     def persist(self, credentials):
         return None
 
+
 # optional model Id for auto-provisioning
 try:
     model_id = config["DEVICE_M3"]["ModelId"]
 except:
     model_id = None
 
-def on_props(propName, propValue):
-    print(propValue)
+
+def on_props(property_name, property_value, component_name):
+    print("Received {}:{}".format(property_name, property_value))
     return True
 
 
 def on_commands(command):
-    print('Received command {} with value {}'.format(command.name,command.value))
+    print("Received command {} with value {}".format(command.name, command.value))
     command.reply()
 
 
+def on_enqueued_commands(command):
+    print("Received offline command {} with value {}".format(command.name, command.value))
 
-# see client.Device documentation above for x509 argument sample
-client = IoTCClient(device_id, scope_id,
-                  IOTCConnectType.IOTC_CONNECT_DEVICE_KEY, key,storage=MemStorage())
+
+# change connect type to reflect the used key (device or group)
+client = IoTCClient(
+    device_id,
+    scope_id,
+    IOTCConnectType.IOTC_CONNECT_DEVICE_KEY,
+    key,
+    storage=MemStorage(),
+)
 if model_id != None:
     client.set_model_id(model_id)
 
 client.set_log_level(IOTCLogLevel.IOTC_LOGGING_ALL)
 client.on(IOTCEvents.IOTC_PROPERTIES, on_props)
 client.on(IOTCEvents.IOTC_COMMAND, on_commands)
-
+client.on(IOTCEvents.IOTC_ENQUEUED_COMMAND, on_enqueued_commands)
 
 
 def main():
     client.connect()
+    client.send_property({"writeableProp": 50})
+    
     while client.is_connected():
-        client.send_telemetry({
-            'accelerometerX': str(randint(20, 45)),
-            'accelerometerY': str(randint(20, 45)),
-            "accelerometerZ": str(randint(20, 45))
-        })
+        print("client connected {}".format(client._device_client.connected))
+        client.send_telemetry(
+            {
+                "acceleration": {
+                    "x": str(randint(20, 45)),
+                    "y": str(randint(20, 45)),
+                    "z": str(randint(20, 45)),
+                }
+            }
+        )
         time.sleep(3)
 
-
 main()

samples/py3.py

@@ -96,6 +96,7 @@ async def main():
     # await client.run_telemetry_loop(telemetry_loop)
 
     while client.is_connected():
+        print("client connected {}".format(client._device_client.connected))
         await client.send_telemetry(
             {
                 "acceleration": {
@@ -106,6 +107,6 @@ async def main():
             }
         )
         await asyncio.sleep(3)
-    print("Exiting")
+        # await client.disconnect()
 
 asyncio.run(main())