Skip to content

Commit 928174c

Browse files
Fix schema
1 parent 7fc6403 commit 928174c

6 files changed

Lines changed: 14 additions & 10 deletions

File tree

.gencode_hash.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ b65ce6e8061e61ba676a72c624f1c425bd238e152ce8e3ebb1e9c23f0e502bcb gencode/docs/e
1616
46fd37b577c655965346d1e3ececf559c4384791214900eeeea1ad8fc72a02b8 gencode/docs/events_udmi.html
1717
baf59590b1a71a49e59d8f499ae5112a1b7a555294dbd72bc821203aecceefa3 gencode/docs/events_validation.html
1818
2f321864fe830aec2679325a1e3dc83fdddace121b6664329f513506904cda35 gencode/docs/metadata.html
19-
25a29952621d804c118b169ec4b886a1a01fc399054726da296d118c09c5c322 gencode/docs/monitoring.html
19+
18178a591940c176371fb9196048eaacd40f1323997cf907ca11eb879a095c7e gencode/docs/monitoring.html
2020
64d21cf916e20566171cf9d723e59c297b576bcba89e2a73aec2b018398cc7da gencode/docs/mosquitto_client_response.html
2121
6f332da9cc64230df3551f9748a4eaa4060146e767cae967fc0e73b1f348be5b gencode/docs/persistent_device.html
2222
e11595fd11477947a27461f8ef4fb6facb5f60e2abd6212193f7581ab123ff84 gencode/docs/properties.html
@@ -73,7 +73,7 @@ baef666f5f58f790b73ba7bed8f60eacdd75ba3151b9abc32265954a9da84faa gencode/java/u
7373
421126685b752587bd2e5f2ea7d7cfa140847500ed8c4f2a7146c9a605f0f2b0 gencode/java/udmi/schema/EndpointConfiguration.java
7474
8610ae5a6a32fd17063ce7d488d4546e5ca1fd045c4cc9f0a4b94ad37f58dd60 gencode/java/udmi/schema/Entry.java
7575
4aaacb28a3de0dffeeb8a0bd4352b76b1e9f3279147f8ea303a7fa3d0ff95e0d gencode/java/udmi/schema/Enumerations.java
76-
fe46f4923b169dfd1376a1e9eec814820757ae0159179a099ab3abf4ac46f591 gencode/java/udmi/schema/Envelope.java
76+
f890a14567657f5c97c2d3c1c753d751025ee094700ef0659f63f448529cc529 gencode/java/udmi/schema/Envelope.java
7777
9df1e0a689390bda0847a0acab5a13fd7ced8c09b8563c13a7ce000ef1ea4999 gencode/java/udmi/schema/Events.java
7878
8aed152c906c51a72a9224e7aec14bcdbd9ac2e00c2b1fed6bd5515082f79488 gencode/java/udmi/schema/ExecutionConfiguration.java
7979
a5a41a2bc809988efbbc121cdf730cbc1eb066372e046747fb6ae3f30e96a8b1 gencode/java/udmi/schema/FamilyDiscovery.java
@@ -198,7 +198,7 @@ f7193dd8eddcae6c646b99fb4c33fe47f43bed7c9615ab1bd0a0bf5612527607 gencode/python
198198
86f262123525f2e6119c174fe4a4cd2f2c35863ced03a66f6db32c08e5a08542 gencode/python/udmi/schema/discovery_feature.py
199199
b978caf892bc6d0fb875b2560b81668cd1a47a09436609dc56d6353ef35b5f86 gencode/python/udmi/schema/discovery_ref.py
200200
be97796ac8949ccb7fbdecfb4ff087987cf2849bf223ff39b947771a08422156 gencode/python/udmi/schema/entry.py
201-
f29b8569a14e5180da83e44a67ab5c7b738b4034c68a279cde22a281f6f1f211 gencode/python/udmi/schema/envelope.py
201+
ab1a8ee1f12d04dd88837b6f026030b5ed3550ef3bfbbfbcb4f77cc4df39e93a gencode/python/udmi/schema/envelope.py
202202
04f518ca330acb6f376838bdc4425f15582eb185f4b05f00fc76d1af92bac57f gencode/python/udmi/schema/equipment_translation.py
203203
3dcf4daa94b8450b7360e58500e20e1fbe5701502ac28358112ee1a6bd2a87f1 gencode/python/udmi/schema/events.py
204204
af48a2d32b4ec326df6e3f165d8944b994fb426bd4e663c42c1d592f5cb41f83 gencode/python/udmi/schema/events_alarmset.py

edge/spotter/bin/reassemble_pcap

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ def parse_stream_events(raw_text: str):
3636
try:
3737
data = json.loads(raw_text)
3838
if isinstance(data, list):
39-
return data
39+
return [item.get("payload", item) if (isinstance(item, dict) and "payload" in item and isinstance(item["payload"], dict)) else item for item in data]
4040
if isinstance(data, dict):
41+
if "payload" in data and isinstance(data["payload"], dict) and "data" in data["payload"]:
42+
return [data["payload"]]
4143
return [data]
4244
except json.JSONDecodeError:
4345
pass
@@ -56,8 +58,10 @@ def parse_stream_events(raw_text: str):
5658

5759
try:
5860
obj = json.loads(payload)
59-
if isinstance(obj, dict) and "data" in obj:
60-
events.append(obj)
61+
if isinstance(obj, dict):
62+
inner = obj.get("payload") if (isinstance(obj.get("payload"), dict) and "data" in obj["payload"]) else obj
63+
if "data" in inner:
64+
events.append(inner)
6165
except json.JSONDecodeError:
6266
continue
6367

gencode/docs/monitoring.html

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gencode/java/udmi/schema/Envelope.java

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gencode/python/udmi/schema/envelope.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

schema/envelope.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"validation",
7070
"blobset",
7171
"monitoring",
72-
"stream"
72+
"streams"
7373
]
7474
},
7575
"subType": {

0 commit comments

Comments
 (0)