Fix for Enumeration, and Nested Extension Object import (#1907)

* fixed localizedText regex and added missing emum datatype

* fixed enum resolution when actual numbers are passed

* change if check because of ruff

* reverted Localized Text

* fixes nested extension object error with wrong datatype resolve

Author: Alexander-Zender

asyncua/common/ua_utils.py

@@ -133,7 +133,10 @@ def string_to_val(string, vtype):
     elif vtype == ua.VariantType.Guid:
         val = uuid.UUID(string)
     elif issubclass(vtype, Enum):
-        enum_int = int(string.rsplit("_", 1)[1])
+        if string.isdigit():
+            enum_int = int(string)
+        else:
+            enum_int = int(string.rsplit("_", 1)[1])
         val = vtype(enum_int)
     else:
         # FIXME: Some types are probably missing!

asyncua/common/xmlimporter.py

@@ -548,7 +548,9 @@ def _set_attr(self, atttype, fargs, attname: str, val):
             for attname2, v2 in val:
                 if attname2 != "EncodingMask":
                     # Skip Encoding Mask used for optional types
-                    sub_atttype = self._get_val_type(atttype, attname2)
+                    resolved_sub_type = get_type_hints(atttype, {"ua": ua})
+                    sub_atttype = resolved_sub_type[attname2]
+                    # sub_atttype = self._get_val_type(atttype, attname2)
                     self._set_attr(sub_atttype, subargs, attname2, v2)
             subargs.pop("Encoding", None)
             fargs[attname] = atttype(**subargs)  # type: ignore[operator]

asyncua/ua/uatypes.py

@@ -192,6 +192,10 @@ class DateTime(datetime):
 class Guid(uuid.UUID):
     pass
 
+class Enumeration(IntEnum):
+    pass
+
+
 
 _microsecond = timedelta(microseconds=1)