iris-pex-embedded-python 4.0.0b13__tar.gz → 4.0.0b14__tar.gz

{iris_pex_embedded_python-4.0.0b13/src/iris_pex_embedded_python.egg-info → iris_pex_embedded_python-4.0.0b14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris_pex_embedded_python
-Version: 4.0.0b13
+Version: 4.0.0b14
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License

{iris_pex_embedded_python-4.0.0b13 → iris_pex_embedded_python-4.0.0b14}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name = "iris_pex_embedded_python"
-version = "4.0.0b13"
+version = "4.0.0b14"
 description = "Iris Interoperability based on Embedded Python"
 readme = "README.md"
 requires-python = ">=3.10"

{iris_pex_embedded_python-4.0.0b13 → iris_pex_embedded_python-4.0.0b14}/src/iop/messages/dispatch.py

@@ -7,6 +7,7 @@ from typing import Any
 from .persistent import (
     deserialize_persistent_message,
     get_iris_object_classname,
+    is_persistent_message_class,
     is_persistent_message_instance,
     serialize_persistent_message,
 )
@@ -20,7 +21,9 @@ from .serialization import (
 )
 from .validation import (
     is_iris_object_instance,
+    is_message_class,
     is_message_instance,
+    is_pickle_message_class,
     is_pickle_message_instance,
 )
 
@@ -326,7 +329,23 @@ def _message_class_name(message_type: Any) -> str | None:
     if is_iris_object_instance(message_type):
         return f"{type(message_type).__module__}.{type(message_type).__name__}"
 
+    if message_type is Any or message_type is object:
+        return None
+
     if not isinstance(message_type, type):
         return None
 
+    if not _is_dispatch_message_class(message_type):
+        return None
+
     return f"{message_type.__module__}.{message_type.__name__}"
+
+
+def _is_dispatch_message_class(klass: type) -> bool:
+    if is_message_class(klass):
+        return True
+    if is_pickle_message_class(klass):
+        return True
+    if is_persistent_message_class(klass):
+        return True
+    return klass.__module__.startswith("iris")

{iris_pex_embedded_python-4.0.0b13 → iris_pex_embedded_python-4.0.0b14}/src/iop/messages/validation.py

@@ -1,12 +1,14 @@
 import dataclasses
 from typing import Any
 
-from .base import BaseModel, _Message, _PickleMessage, _PydanticPickleMessage
+from .base import _Message, _PickleMessage, _PydanticMessage, _PydanticPickleMessage
+
+_PYDANTIC_BASE = _PydanticMessage.__mro__[1]
 
 
 def is_message_instance(obj: Any) -> bool:
     """Check if object is a valid Message instance."""
-    if isinstance(obj, BaseModel):
+    if isinstance(obj, _PYDANTIC_BASE):
         return True
     if is_message_class(type(obj)):
         if not dataclasses.is_dataclass(obj):
@@ -38,15 +40,15 @@ def is_iris_object_instance(obj: Any) -> bool:
 
 def is_message_class(klass: type) -> bool:
     """Check if class is a Message type."""
-    if issubclass(klass, _Message):
-        return True
-    return False
+    try:
+        return issubclass(klass, (_Message, _PYDANTIC_BASE))
+    except TypeError:
+        return False
 
 
 def is_pickle_message_class(klass: type) -> bool:
     """Check if class is a PickleMessage type."""
-    if issubclass(klass, _PickleMessage):
-        return True
-    if issubclass(klass, _PydanticPickleMessage):
-        return True
-    return False
+    try:
+        return issubclass(klass, (_PickleMessage, _PydanticPickleMessage))
+    except TypeError:
+        return False

{iris_pex_embedded_python-4.0.0b13 → iris_pex_embedded_python-4.0.0b14/src/iris_pex_embedded_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iris_pex_embedded_python
-Version: 4.0.0b13
+Version: 4.0.0b14
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License