iris-pex-embedded-python 4.0.1b3__py3-none-any.whl → 4.0.1b4__py3-none-any.whl

iop/messages/dispatch.py

@@ -1,3 +1,4 @@
+import ast
 import logging
 from collections.abc import Callable
 from dataclasses import dataclass
@@ -36,6 +37,8 @@ _PICKLE_MESSAGE_CLASSES = {
     "IOP.Generator.Message.StartPickle",
 }
 _HANDLER_ATTRIBUTE = "__iop_handler_message__"
+_IRIS_MODULE_PREFIX = "iris."
+_UNRESOLVED = object()
 
 
 @dataclass(frozen=True)
@@ -60,7 +63,7 @@ def handler(message_type: Any) -> Callable[[Callable], Callable]:
         message_type: The message class, fully qualified class name string, or
             IRIS object instance this method handles.
     """
-    message = _message_class_name(message_type)
+    message = _message_key_from_declared(message_type)
     if message is None:
         raise TypeError("handler() requires a message class or class name")
 
@@ -154,11 +157,10 @@ def dispatch_message(host: Any, request: Any) -> Any:
     """
     call = "on_message"
 
-    module = request.__class__.__module__
-    classname = request.__class__.__name__
+    message_names = _message_keys_from_request(request)
 
     for msg, method in host.DISPATCH:
-        if msg == module + "." + classname:
+        if msg in message_names:
             return getattr(host, method)(request)
 
     return getattr(host, call)(request)
@@ -202,15 +204,24 @@ def create_dispatch(host: Any) -> None:
 
 def _declared_dispatch(host: Any) -> list[tuple[str, str]]:
     if "DISPATCH" in getattr(host, "__dict__", {}):
-        return list(host.__dict__["DISPATCH"])
+        return _normalized_dispatch(host.__dict__["DISPATCH"])
 
     class_dispatch = host.__class__.__dict__.get("DISPATCH")
     if class_dispatch is not None:
-        return list(class_dispatch)
+        return _normalized_dispatch(class_dispatch)
 
     return []
 
 
+def _normalized_dispatch(dispatch: Any) -> list[tuple[str, str]]:
+    entries = []
+    for message, method in dispatch:
+        key = _message_key_from_declared(message)
+        if key is not None:
+            entries.append((key, method))
+    return entries
+
+
 def _decorated_dispatch(host: Any) -> list[tuple[str, str]]:
     dispatch = []
     for method_name in dir(host):
@@ -308,12 +319,7 @@ def get_handler_info(host: Any, method_name: str) -> tuple[str, str] | None:
 
         method = getattr(host, method_name)
         param: Parameter = next(iter(params.values()))
-        annotation = _resolve_annotation(host, method, param.annotation)
-
-        if annotation == Parameter.empty:
-            return None
-
-        message = _message_class_name(annotation)
+        message = _message_key_from_annotation(host, method, param.annotation)
         if message is None:
             return None
 
@@ -323,48 +329,63 @@ def get_handler_info(host: Any, method_name: str) -> tuple[str, str] | None:
         return None
 
 
-def _resolve_annotation(host: Any, method: Callable, annotation: Any) -> Any:
+def _message_key_from_annotation(
+    host: Any, method: Callable, annotation: Any
+) -> str | None:
+    if annotation == Parameter.empty:
+        return None
+
     if not isinstance(annotation, str):
-        return annotation
+        return _message_key_from_declared(annotation, allow_bare_string=False)
 
-    globalns = _annotation_globalns(method)
-    localns = _annotation_localns(host)
+    value: Any = annotation
+    for _ in range(3):
+        if not isinstance(value, str):
+            return _message_key_from_declared(value, allow_bare_string=False)
 
-    try:
-        resolved = eval(annotation, globalns, localns)  # noqa: B307
-    except Exception:
-        resolved = annotation
+        key = _message_key_from_string(value, allow_bare=False)
+        if key is not None:
+            return key
 
-    if isinstance(resolved, str):
-        # Quoted postponed annotations evaluate to a string first.
-        try:
-            resolved = eval(resolved, globalns, localns)  # noqa: B307
-        except Exception:
-            if "." in resolved:
-                return resolved
-            return Parameter.empty
+        unquoted = _unquote_string(value)
+        if unquoted is not None and unquoted != value:
+            value = unquoted
+            continue
 
-    return resolved
+        value = _lookup_annotation_name(host, method, value)
+        if value is _UNRESOLVED:
+            return None
 
+    return None
 
-def _annotation_globalns(method: Callable) -> dict[str, Any]:
-    function = getattr(method, "__func__", method)
-    return getattr(function, "__globals__", {})
 
+def _message_keys_from_request(request: Any) -> tuple[str, ...]:
+    module = request.__class__.__module__
+    classname = request.__class__.__name__
+    names = [f"{module}.{classname}"]
 
-def _annotation_localns(host: Any) -> dict[str, Any]:
-    namespace: dict[str, Any] = {}
-    for klass in reversed(type(host).__mro__):
-        namespace.update(vars(klass))
-    return namespace
+    if module.startswith("iris"):
+        native_name = _native_iris_message_key(request)
+        if native_name:
+            names.append(native_name)
+            names.append(f"{_IRIS_MODULE_PREFIX}{native_name}")
+
+    return tuple(dict.fromkeys(names))
 
 
-def _message_class_name(message_type: Any) -> str | None:
+def _message_key_from_declared(
+    message_type: Any, *, allow_bare_string: bool = True
+) -> str | None:
     if isinstance(message_type, str):
-        return message_type
+        return _message_key_from_string(
+            message_type,
+            allow_bare=allow_bare_string,
+        )
 
     if is_iris_object_instance(message_type):
-        return f"{type(message_type).__module__}.{type(message_type).__name__}"
+        return _native_iris_message_key(message_type) or _python_class_key(
+            type(message_type)
+        )
 
     if message_type is Any or message_type is object:
         return None
@@ -375,7 +396,70 @@ def _message_class_name(message_type: Any) -> str | None:
     if not _is_dispatch_message_class(message_type):
         return None
 
-    return f"{message_type.__module__}.{message_type.__name__}"
+    return _python_class_key(message_type)
+
+
+def _message_key_from_string(value: str, *, allow_bare: bool) -> str | None:
+    if not value or _unquote_string(value) is not None:
+        return None
+
+    normalized = _strip_iris_prefix(value)
+    if "." in normalized:
+        return normalized if _looks_like_message_key(normalized) else None
+
+    return normalized if allow_bare else None
+
+
+def _native_iris_message_key(message: Any) -> str | None:
+    iris_classname = get_iris_object_classname(message)
+    if not iris_classname:
+        return None
+    return _strip_iris_prefix(iris_classname)
+
+
+def _python_class_key(klass: type) -> str:
+    return f"{klass.__module__}.{klass.__name__}"
+
+
+def _strip_iris_prefix(value: str) -> str:
+    if value.startswith(_IRIS_MODULE_PREFIX):
+        return value[len(_IRIS_MODULE_PREFIX) :]
+    return value
+
+
+def _looks_like_message_key(value: str) -> bool:
+    return not any(character in value for character in "'\"[](){} ,:")
+
+
+def _unquote_string(value: str) -> str | None:
+    try:
+        literal = ast.literal_eval(value)
+    except (SyntaxError, ValueError):
+        return None
+    return literal if isinstance(literal, str) else None
+
+
+def _lookup_annotation_name(host: Any, method: Callable, name: str) -> Any:
+    if not name.isidentifier():
+        return _UNRESOLVED
+
+    localns = _annotation_localns(host)
+    if name in localns:
+        return localns[name]
+
+    return _annotation_globalns(method).get(name, _UNRESOLVED)
+
+
+def _annotation_globalns(method: Callable) -> dict[str, Any]:
+    function = getattr(method, "__func__", method)
+    return getattr(function, "__globals__", {})
+
+
+def _annotation_localns(host: Any) -> dict[str, Any]:
+    namespace: dict[str, Any] = {}
+    for klass in reversed(type(host).__mro__):
+        namespace.update(vars(klass))
+    return namespace
 
 
 def _is_dispatch_message_class(klass: type) -> bool:

{iris_pex_embedded_python-4.0.1b3.dist-info → iris_pex_embedded_python-4.0.1b4.dist-info}/METADATA

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

{iris_pex_embedded_python-4.0.1b3.dist-info → iris_pex_embedded_python-4.0.1b4.dist-info}/RECORD

@@ -53,7 +53,7 @@ iop/components/settings.py,sha256=USAKAisdersKlAEIk8HDu_TuYtkO-Sc3an3PXjPcDRA,62
 iop/messages/__init__.py,sha256=k1AKplpjdqSxM5Gl7bpWAfw93xUgigovlI4SKhwKHRI,355
 iop/messages/base.py,sha256=ZrVXEz7JrYHnt5b3M7avxcJCB0_OZxm1uWm9gQ4_eAw,1906
 iop/messages/decorators.py,sha256=CWk08k8U2aTJv7Dx1n2jp8sjZZSCD8NJPoifKLB3W2g,2488
-iop/messages/dispatch.py,sha256=wfoKyaMOcJTzMEAE5hEHYEt3aiRsaUR_TYmROT2fDrg,11592
+iop/messages/dispatch.py,sha256=l7FX-TAx5cLgjxoxNpL8ul3Lj4w4-taxTtyeZU3W85I,14001
 iop/messages/persistent.py,sha256=ibRhRTqzwGcAqem744KZzHiouUlc8-J3ftB4zyzQYx4,16906
 iop/messages/serialization.py,sha256=BW0o-7GaceMW7RMOzOJ8g9rKEv28NYnYFwtTLmAf7Yg,9255
 iop/messages/validation.py,sha256=X6MSWsjLZDuyX1Tfx0TP3T6OI4nj1HZccwR2Z9PSubY,1606
@@ -91,9 +91,9 @@ iop/runtime/remote/director.py,sha256=bkie751GrYLgGs7ApRCowHpSnJA8KupxCOrFDQmjyO
 iop/runtime/remote/migration.py,sha256=Iboz-Ye7i9xif9bn433GazCF-gtD-HJW3wiUwWS5P6w,1831
 iop/runtime/remote/settings.py,sha256=P1Hsgld5o57HpSZgPVZzobyjlUmxJj6bstiWvR0JXnc,2144
 iop/runtime/remote/setup.py,sha256=Tr80F3JJTy7oSUso2jyx0iA_KZayd4MYt9vL0BvPpMA,2600
-iris_pex_embedded_python-4.0.1b3.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-4.0.1b3.dist-info/METADATA,sha256=UFR3F4n2-7iQJSkQ0WLBQYtmNaBwO08z7gZLl-q-_Hg,5846
-iris_pex_embedded_python-4.0.1b3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-iris_pex_embedded_python-4.0.1b3.dist-info/entry_points.txt,sha256=fzS8ZFsPe8cnpEx208X60DNugCPQmuSloPeg4pyyJDY,42
-iris_pex_embedded_python-4.0.1b3.dist-info/top_level.txt,sha256=BM54-OXQ6l2BDtmesWNXckh033s9gcjoO7bfjbwZbxU,4
-iris_pex_embedded_python-4.0.1b3.dist-info/RECORD,,
+iris_pex_embedded_python-4.0.1b4.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
+iris_pex_embedded_python-4.0.1b4.dist-info/METADATA,sha256=TVZxDq5vdJrEGPJ4dc2dqySOdfyEzdZWDGNc8hda_dE,5846
+iris_pex_embedded_python-4.0.1b4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+iris_pex_embedded_python-4.0.1b4.dist-info/entry_points.txt,sha256=fzS8ZFsPe8cnpEx208X60DNugCPQmuSloPeg4pyyJDY,42
+iris_pex_embedded_python-4.0.1b4.dist-info/top_level.txt,sha256=BM54-OXQ6l2BDtmesWNXckh033s9gcjoO7bfjbwZbxU,4
+iris_pex_embedded_python-4.0.1b4.dist-info/RECORD,,