update to flatc version 23.5.26 and regenerate wrappers

Makefile

@@ -7,18 +7,21 @@ FLATC=/usr/local/bin/flatc
 
 build_flatc:
 	cd /tmp && \
-	wget https://github.com/google/flatbuffers/archive/v1.12.0.tar.gz && \
-	tar xvf v1.12.0.tar.gz && \
-	cd flatbuffers-1.12.0 && \
+	wget https://github.com/google/flatbuffers/archive/v23.5.26.tar.gz && \
+	tar xvf v23.5.26.tar.gz && \
+	cd flatbuffers-23.5.26 && \
 	cmake . && \
 	make && \
 	sudo cp ./flatc $(FLATC) && \
 	cd .. && \
-	rm -rf flatbuffers-1.12.0 && rm v1.12.0.tar.gz
+	rm -rf flatbuffers-23.5.26 && rm v23.5.26.tar.gz
+	which flatc
+	flatc --version
 
 clean:
 	-find . -type d -name "__pycache__" -exec rm -rf {} \;
 	-rm -rf ./.pytest_cache
+	-rm -rf ./.mypy_cache/
 	-rm -rf ./build
 	-rm -rf ./dist
 	-rm -rf ./*.egg-info

cfxdb/_version.py

@@ -5,4 +5,4 @@
 #
 ##############################################################################
 
-__version__ = '23.1.1'
+__version__ = '23.12.1'

cfxdb/gen/KeyValue.py

@@ -41,15 +41,26 @@ def Value(self):
             return self._tab.String(o + self._tab.Pos)
         return None
 
-def KeyValueStart(builder): builder.StartObject(2)
+def KeyValueStart(builder):
+    builder.StartObject(2)
+
 def Start(builder):
-    return KeyValueStart(builder)
-def KeyValueAddKey(builder, key): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(key), 0)
+    KeyValueStart(builder)
+
+def KeyValueAddKey(builder, key):
+    builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(key), 0)
+
 def AddKey(builder, key):
-    return KeyValueAddKey(builder, key)
-def KeyValueAddValue(builder, value): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(value), 0)
+    KeyValueAddKey(builder, key)
+
+def KeyValueAddValue(builder, value):
+    builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(value), 0)
+
 def AddValue(builder, value):
-    return KeyValueAddValue(builder, value)
-def KeyValueEnd(builder): return builder.EndObject()
+    KeyValueAddValue(builder, value)
+
+def KeyValueEnd(builder):
+    return builder.EndObject()
+
 def End(builder):
-    return KeyValueEnd(builder)
+    return KeyValueEnd(builder)

cfxdb/gen/arealm/ApplicationRealm.py

@@ -97,33 +97,62 @@ def BridgeMetaApi(self):
             return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos))
         return False
 
-def ApplicationRealmStart(builder): builder.StartObject(8)
+def ApplicationRealmStart(builder):
+    builder.StartObject(8)
+
 def Start(builder):
-    return ApplicationRealmStart(builder)
-def ApplicationRealmAddOid(builder, oid): builder.PrependStructSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(oid), 0)
+    ApplicationRealmStart(builder)
+
+def ApplicationRealmAddOid(builder, oid):
+    builder.PrependStructSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(oid), 0)
+
 def AddOid(builder, oid):
-    return ApplicationRealmAddOid(builder, oid)
-def ApplicationRealmAddCreated(builder, created): builder.PrependUint64Slot(1, created, 0)
+    ApplicationRealmAddOid(builder, oid)
+
+def ApplicationRealmAddCreated(builder, created):
+    builder.PrependUint64Slot(1, created, 0)
+
 def AddCreated(builder, created):
-    return ApplicationRealmAddCreated(builder, created)
-def ApplicationRealmAddOwner(builder, owner): builder.PrependStructSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(owner), 0)
+    ApplicationRealmAddCreated(builder, created)
+
+def ApplicationRealmAddOwner(builder, owner):
+    builder.PrependStructSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(owner), 0)
+
 def AddOwner(builder, owner):
-    return ApplicationRealmAddOwner(builder, owner)
-def ApplicationRealmAddName(builder, name): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(name), 0)
+    ApplicationRealmAddOwner(builder, owner)
+
+def ApplicationRealmAddName(builder, name):
+    builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(name), 0)
+
 def AddName(builder, name):
-    return ApplicationRealmAddName(builder, name)
-def ApplicationRealmAddEventDispatchingChunkSize(builder, eventDispatchingChunkSize): builder.PrependUint32Slot(4, eventDispatchingChunkSize, 0)
+    ApplicationRealmAddName(builder, name)
+
+def ApplicationRealmAddEventDispatchingChunkSize(builder, eventDispatchingChunkSize):
+    builder.PrependUint32Slot(4, eventDispatchingChunkSize, 0)
+
 def AddEventDispatchingChunkSize(builder, eventDispatchingChunkSize):
-    return ApplicationRealmAddEventDispatchingChunkSize(builder, eventDispatchingChunkSize)
-def ApplicationRealmAddUriCheck(builder, uriCheck): builder.PrependInt8Slot(5, uriCheck, 0)
+    ApplicationRealmAddEventDispatchingChunkSize(builder, eventDispatchingChunkSize)
+
+def ApplicationRealmAddUriCheck(builder, uriCheck):
+    builder.PrependInt8Slot(5, uriCheck, 0)
+
 def AddUriCheck(builder, uriCheck):
-    return ApplicationRealmAddUriCheck(builder, uriCheck)
-def ApplicationRealmAddEnableMetaApi(builder, enableMetaApi): builder.PrependBoolSlot(6, enableMetaApi, 0)
+    ApplicationRealmAddUriCheck(builder, uriCheck)
+
+def ApplicationRealmAddEnableMetaApi(builder, enableMetaApi):
+    builder.PrependBoolSlot(6, enableMetaApi, 0)
+
 def AddEnableMetaApi(builder, enableMetaApi):
-    return ApplicationRealmAddEnableMetaApi(builder, enableMetaApi)
-def ApplicationRealmAddBridgeMetaApi(builder, bridgeMetaApi): builder.PrependBoolSlot(7, bridgeMetaApi, 0)
+    ApplicationRealmAddEnableMetaApi(builder, enableMetaApi)
+
+def ApplicationRealmAddBridgeMetaApi(builder, bridgeMetaApi):
+    builder.PrependBoolSlot(7, bridgeMetaApi, 0)
+
 def AddBridgeMetaApi(builder, bridgeMetaApi):
-    return ApplicationRealmAddBridgeMetaApi(builder, bridgeMetaApi)
-def ApplicationRealmEnd(builder): return builder.EndObject()
+    ApplicationRealmAddBridgeMetaApi(builder, bridgeMetaApi)
+
+def ApplicationRealmEnd(builder):
+    return builder.EndObject()
+
 def End(builder):
-    return ApplicationRealmEnd(builder)
+    return ApplicationRealmEnd(builder)

cfxdb/gen/arealm/ApplicationRealmRole.py

@@ -49,15 +49,26 @@ def ArealmOid(self):
             return obj
         return None
 
-def ApplicationRealmRoleStart(builder): builder.StartObject(2)
+def ApplicationRealmRoleStart(builder):
+    builder.StartObject(2)
+
 def Start(builder):
-    return ApplicationRealmRoleStart(builder)
-def ApplicationRealmRoleAddRoleOid(builder, roleOid): builder.PrependStructSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(roleOid), 0)
+    ApplicationRealmRoleStart(builder)
+
+def ApplicationRealmRoleAddRoleOid(builder, roleOid):
+    builder.PrependStructSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(roleOid), 0)
+
 def AddRoleOid(builder, roleOid):
-    return ApplicationRealmRoleAddRoleOid(builder, roleOid)
-def ApplicationRealmRoleAddArealmOid(builder, arealmOid): builder.PrependStructSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(arealmOid), 0)
+    ApplicationRealmRoleAddRoleOid(builder, roleOid)
+
+def ApplicationRealmRoleAddArealmOid(builder, arealmOid):
+    builder.PrependStructSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(arealmOid), 0)
+
 def AddArealmOid(builder, arealmOid):
-    return ApplicationRealmRoleAddArealmOid(builder, arealmOid)
-def ApplicationRealmRoleEnd(builder): return builder.EndObject()
+    ApplicationRealmRoleAddArealmOid(builder, arealmOid)
+
+def ApplicationRealmRoleEnd(builder):
+    return builder.EndObject()
+
 def End(builder):
-    return ApplicationRealmRoleEnd(builder)
+    return ApplicationRealmRoleEnd(builder)

cfxdb/gen/arealm/Credential.py

@@ -101,30 +101,56 @@ def PrincipalOid(self):
             return obj
         return None
 
-def CredentialStart(builder): builder.StartObject(6)
+def CredentialStart(builder):
+    builder.StartObject(6)
+
 def Start(builder):
-    return CredentialStart(builder)
-def CredentialAddOid(builder, oid): builder.PrependStructSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(oid), 0)
+    CredentialStart(builder)
+
+def CredentialAddOid(builder, oid):
+    builder.PrependStructSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(oid), 0)
+
 def AddOid(builder, oid):
-    return CredentialAddOid(builder, oid)
-def CredentialAddAuthmethod(builder, authmethod): builder.PrependInt8Slot(1, authmethod, 0)
+    CredentialAddOid(builder, oid)
+
+def CredentialAddAuthmethod(builder, authmethod):
+    builder.PrependInt8Slot(1, authmethod, 0)
+
 def AddAuthmethod(builder, authmethod):
-    return CredentialAddAuthmethod(builder, authmethod)
-def CredentialAddRealm(builder, realm): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(realm), 0)
+    CredentialAddAuthmethod(builder, authmethod)
+
+def CredentialAddRealm(builder, realm):
+    builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(realm), 0)
+
 def AddRealm(builder, realm):
-    return CredentialAddRealm(builder, realm)
-def CredentialAddAuthid(builder, authid): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(authid), 0)
+    CredentialAddRealm(builder, realm)
+
+def CredentialAddAuthid(builder, authid):
+    builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(authid), 0)
+
 def AddAuthid(builder, authid):
-    return CredentialAddAuthid(builder, authid)
-def CredentialAddAuthconfig(builder, authconfig): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(authconfig), 0)
+    CredentialAddAuthid(builder, authid)
+
+def CredentialAddAuthconfig(builder, authconfig):
+    builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(authconfig), 0)
+
 def AddAuthconfig(builder, authconfig):
-    return CredentialAddAuthconfig(builder, authconfig)
-def CredentialStartAuthconfigVector(builder, numElems): return builder.StartVector(1, numElems, 1)
-def StartAuthconfigVector(builder, numElems):
+    CredentialAddAuthconfig(builder, authconfig)
+
+def CredentialStartAuthconfigVector(builder, numElems):
+    return builder.StartVector(1, numElems, 1)
+
+def StartAuthconfigVector(builder, numElems: int) -> int:
     return CredentialStartAuthconfigVector(builder, numElems)
-def CredentialAddPrincipalOid(builder, principalOid): builder.PrependStructSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(principalOid), 0)
+
+def CredentialAddPrincipalOid(builder, principalOid):
+    builder.PrependStructSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(principalOid), 0)
+
 def AddPrincipalOid(builder, principalOid):
-    return CredentialAddPrincipalOid(builder, principalOid)
-def CredentialEnd(builder): return builder.EndObject()
+    CredentialAddPrincipalOid(builder, principalOid)
+
+def CredentialEnd(builder):
+    return builder.EndObject()
+
 def End(builder):
-    return CredentialEnd(builder)
+    return CredentialEnd(builder)

cfxdb/gen/arealm/Principal.py

@@ -105,30 +105,56 @@ def AuthextraIsNone(self):
         o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(14))
         return o == 0
 
-def PrincipalStart(builder): builder.StartObject(6)
+def PrincipalStart(builder):
+    builder.StartObject(6)
+
 def Start(builder):
-    return PrincipalStart(builder)
-def PrincipalAddOid(builder, oid): builder.PrependStructSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(oid), 0)
+    PrincipalStart(builder)
+
+def PrincipalAddOid(builder, oid):
+    builder.PrependStructSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(oid), 0)
+
 def AddOid(builder, oid):
-    return PrincipalAddOid(builder, oid)
-def PrincipalAddModified(builder, modified): builder.PrependInt32Slot(1, modified, 0)
+    PrincipalAddOid(builder, oid)
+
+def PrincipalAddModified(builder, modified):
+    builder.PrependInt32Slot(1, modified, 0)
+
 def AddModified(builder, modified):
-    return PrincipalAddModified(builder, modified)
-def PrincipalAddArealmOid(builder, arealmOid): builder.PrependStructSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(arealmOid), 0)
+    PrincipalAddModified(builder, modified)
+
+def PrincipalAddArealmOid(builder, arealmOid):
+    builder.PrependStructSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(arealmOid), 0)
+
 def AddArealmOid(builder, arealmOid):
-    return PrincipalAddArealmOid(builder, arealmOid)
-def PrincipalAddAuthid(builder, authid): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(authid), 0)
+    PrincipalAddArealmOid(builder, arealmOid)
+
+def PrincipalAddAuthid(builder, authid):
+    builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(authid), 0)
+
 def AddAuthid(builder, authid):
-    return PrincipalAddAuthid(builder, authid)
-def PrincipalAddRoleOid(builder, roleOid): builder.PrependStructSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(roleOid), 0)
+    PrincipalAddAuthid(builder, authid)
+
+def PrincipalAddRoleOid(builder, roleOid):
+    builder.PrependStructSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(roleOid), 0)
+
 def AddRoleOid(builder, roleOid):
-    return PrincipalAddRoleOid(builder, roleOid)
-def PrincipalAddAuthextra(builder, authextra): builder.PrependUOffsetTRelativeSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(authextra), 0)
+    PrincipalAddRoleOid(builder, roleOid)
+
+def PrincipalAddAuthextra(builder, authextra):
+    builder.PrependUOffsetTRelativeSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(authextra), 0)
+
 def AddAuthextra(builder, authextra):
-    return PrincipalAddAuthextra(builder, authextra)
-def PrincipalStartAuthextraVector(builder, numElems): return builder.StartVector(1, numElems, 1)
-def StartAuthextraVector(builder, numElems):
+    PrincipalAddAuthextra(builder, authextra)
+
+def PrincipalStartAuthextraVector(builder, numElems):
+    return builder.StartVector(1, numElems, 1)
+
+def StartAuthextraVector(builder, numElems: int) -> int:
     return PrincipalStartAuthextraVector(builder, numElems)
-def PrincipalEnd(builder): return builder.EndObject()
+
+def PrincipalEnd(builder):
+    return builder.EndObject()
+
 def End(builder):
-    return PrincipalEnd(builder)
+    return PrincipalEnd(builder)