iris-pex-embedded-python 3.4.0b12__tar.gz → 3.4.0b14__tar.gz

{iris_pex_embedded_python-3.4.0b12 → iris_pex_embedded_python-3.4.0b14}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: iris_pex_embedded_python
-Version: 3.4.0b12
+Version: 3.4.0b14
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License
@@ -49,6 +49,7 @@ Requires-Dist: xmltodict>=0.12.0
 Requires-Dist: iris-embedded-python-wrapper>=0.0.6
 Requires-Dist: setuptools>=40.8.0
 Requires-Dist: jsonpath-ng>=1.7.0
+Dynamic: license-file
 
 # IoP (Interoperability On Python)
 

{iris_pex_embedded_python-3.4.0b12 → iris_pex_embedded_python-3.4.0b14}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name = "iris_pex_embedded_python"
-version = "3.4.0b12"
+version = "3.4.0b14"
 description = "Iris Interoperability based on Embedded Python"
 readme = "README.md"
 authors = [

{iris_pex_embedded_python-3.4.0b12 → iris_pex_embedded_python-3.4.0b14}/src/iop/_serialization.py

@@ -8,7 +8,7 @@ from dataclasses import asdict, is_dataclass
 from typing import Any, Dict, Type
 
 import iris
-from pydantic import BaseModel, TypeAdapter
+from pydantic import BaseModel, TypeAdapter, ValidationError
 
 from iop._message import _PydanticPickleMessage
 from iop._utils import _Utils
@@ -108,38 +108,42 @@ class MessageSerializer:
         return classname[:j], classname[j+1:]
 
 def dataclass_from_dict(klass: Type, dikt: Dict) -> Any:
-    field_types = {
-        key: val.annotation
-        for key, val in inspect.signature(klass).parameters.items()
-    }
-    processed_dict = {}
-    for key, val in inspect.signature(klass).parameters.items():
-        if key not in dikt and val.default != val.empty:
-            processed_dict[key] = val.default
-            continue
-        
-        value = dikt.get(key)
+    """Converts a dictionary to a dataclass instance.
+    Handles non attended fields and nested dataclasses."""
+    
+    def process_field(value: Any, field_type: Type) -> Any:
         if value is None:
-            processed_dict[key] = None
+            return None
+        if is_dataclass(field_type):
+            return dataclass_from_dict(field_type, value)
+        if field_type != inspect.Parameter.empty:
+            try:
+                return TypeAdapter(field_type).validate_python(value)
+            except ValidationError:
+                return value
+        return value
+
+    # Get field definitions from class signature
+    fields = inspect.signature(klass).parameters
+    field_dict = {}
+
+    # Process each field
+    for field_name, field_info in fields.items():
+        if field_name not in dikt:
+            if field_info.default != field_info.empty:
+                field_dict[field_name] = field_info.default
             continue
-
-        try:
-            field_type = field_types[key]
-            if field_type != inspect.Parameter.empty:
-                adapter = TypeAdapter(field_type)
-                processed_dict[key] = adapter.validate_python(value)
-            else:
-                processed_dict[key] = value
-        except Exception:
-            processed_dict[key] = value
-
-    instance = klass(
-        **processed_dict
-    )
-    # handle any extra fields
-    for k, v in dikt.items():
-        if k not in processed_dict:
-            setattr(instance, k, v)
+        
+        field_dict[field_name] = process_field(dikt[field_name], field_info.annotation)
+
+    # Create instance
+    instance = klass(**field_dict)
+    
+    # Add any extra fields not in the dataclass definition
+    for key, value in dikt.items():
+        if key not in field_dict:
+            setattr(instance, key, value)
+    
     return instance
 
 def dataclass_to_dict(instance: Any) -> Dict:

{iris_pex_embedded_python-3.4.0b12 → iris_pex_embedded_python-3.4.0b14}/src/iris_pex_embedded_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: iris_pex_embedded_python
-Version: 3.4.0b12
+Version: 3.4.0b14
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License
@@ -49,6 +49,7 @@ Requires-Dist: xmltodict>=0.12.0
 Requires-Dist: iris-embedded-python-wrapper>=0.0.6
 Requires-Dist: setuptools>=40.8.0
 Requires-Dist: jsonpath-ng>=1.7.0
+Dynamic: license-file
 
 # IoP (Interoperability On Python)