iris-pex-embedded-python 4.0.0b1__tar.gz → 4.0.0b3__tar.gz

{iris_pex_embedded_python-4.0.0b1/src/iris_pex_embedded_python.egg-info → iris_pex_embedded_python-4.0.0b3}/PKG-INFO

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

{iris_pex_embedded_python-4.0.0b1 → iris_pex_embedded_python-4.0.0b3}/pyproject.toml

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

{iris_pex_embedded_python-4.0.0b1 → iris_pex_embedded_python-4.0.0b3}/src/iop/components/business_operation.py

@@ -1,5 +1,6 @@
-import importlib
-from typing import Any
+import importlib
+import warnings
+from typing import Any
 
 from ..messages.decorators import input_deserializer, output_serializer
 from ..messages.dispatch import create_dispatch, dispatch_message
@@ -17,8 +18,8 @@ class _BusinessOperation(_BusinessHost):
     Adapter: Any = None
     adapter: Any = None
 
-    def on_message(self, request: Any) -> Any:
-        """Handle incoming messages.
+    def on_message(self, request: Any) -> Any:
+        """Handle incoming messages.
 
         Process messages received from other production components and either
         send to external system or forward to another component.
@@ -26,9 +27,16 @@ class _BusinessOperation(_BusinessHost):
         Args:
             request: The incoming message
 
-        Returns:
-            Response message
-        """
+        Returns:
+            Response message
+        """
+        warnings.warn(
+            f"{self.__class__.__name__} did not override on_message(); "
+            "the incoming operation message was ignored. "
+            "This default no-op handler will raise NotImplementedError in v5.0.",
+            RuntimeWarning,
+            stacklevel=2,
+        )
         return None
 
     def on_keepalive(self) -> None:

{iris_pex_embedded_python-4.0.0b1 → iris_pex_embedded_python-4.0.0b3}/src/iop/components/business_service.py

@@ -1,10 +1,25 @@
-import importlib
-
-from ..messages.decorators import input_deserializer, output_serializer
-from .business_host import _BusinessHost
-
-
-class _BusinessService(_BusinessHost):
+import importlib
+import warnings
+from inspect import signature
+
+from ..messages.decorators import input_deserializer, output_serializer
+from .business_host import _BusinessHost
+
+
+def _accepts_process_input_argument(method) -> bool:
+    try:
+        return len(signature(method).parameters) > 0
+    except (TypeError, ValueError):
+        return True
+
+
+def _call_process_input(method, request):
+    if _accepts_process_input_argument(method):
+        return method(request)
+    return method()
+
+
+class _BusinessService(_BusinessHost):
     """This class is responsible for receiving the data from external system and sending it to business processes or business operations in the production.
     The business service can use an adapter to access the external system, which is specified in the InboundAdapter property.
     There are three ways of implementing a business service:
@@ -25,16 +40,32 @@ class _BusinessService(_BusinessHost):
 
         return
 
-    def on_process_input(self, message_input):
-        """Receives the message from the inbond adapter via the PRocessInput method and is responsible for forwarding it to target business processes or operations.
-        If the business service does not specify an adapter, then the default adapter calls this method with no message
-        and the business service is responsible for receiving the data from the external system and validating it.
-
-        Parameters:
-        message_input: an instance of IRISObject or subclass of Message containing the data that the inbound adapter passes in.
-            The message can have any structure agreed upon by the inbound adapter and the business service.
-        """
+    def on_message(self, request=None):
+        """Handle a message received by the business service.
+
+        Override this for message-driven services. Adapter-driven services may
+        still override on_process_input() directly when they need the lower
+        level IRIS ProcessInput hook.
+        """
+        warnings.warn(
+            f"{self.__class__.__name__} did not override on_message() or "
+            "on_process_input(); the incoming service message was ignored. "
+            "This default no-op handler will raise NotImplementedError in v5.0.",
+            RuntimeWarning,
+            stacklevel=2,
+        )
         return None
+
+    def on_process_input(self, message_input=None):
+        """Receives the message from the inbond adapter via the PRocessInput method and is responsible for forwarding it to target business processes or operations.
+        If the business service does not specify an adapter, then the default adapter calls this method with no message
+        and the business service is responsible for receiving the data from the external system and validating it.
+
+        Parameters:
+        message_input: an instance of IRISObject or subclass of Message containing the data that the inbound adapter passes in.
+            The message can have any structure agreed upon by the inbound adapter and the business service.
+        """
+        return self.on_message(message_input)
 
     def _set_iris_handles(self, handle_current, handle_partner):
         """For internal use only."""
@@ -47,7 +78,7 @@ class _BusinessService(_BusinessHost):
         return
 
     @input_deserializer
-    @output_serializer
+    @output_serializer
     def _dispatch_on_process_input(self, request):
         """For internal use only."""
-        return self.on_process_input(request)
+        return _call_process_input(self.on_process_input, request)

iris_pex_embedded_python-4.0.0b3/src/iop/components/polling_business_service.py

@@ -0,0 +1,28 @@
+import warnings
+
+
+class _PollingBusinessServiceMixin:
+    """Mixin for services polled by the default IRIS inbound adapter."""
+
+    @staticmethod
+    def get_adapter_type() -> str:
+        return "Ens.InboundAdapter"
+
+    def on_poll(self):
+        """Run one scheduled polling cycle.
+
+        Override this for services that are called by the default IRIS inbound
+        adapter and fetch their own external data.
+        """
+        warnings.warn(
+            f"{self.__class__.__name__} did not override on_poll() or "
+            "on_process_input(); the scheduled poll was ignored. "
+            "This default no-op handler will raise NotImplementedError in v5.0.",
+            RuntimeWarning,
+            stacklevel=2,
+        )
+        return None
+
+    def on_process_input(self, message_input=None):
+        """Compatibility hook called by IRIS ProcessInput."""
+        return self.on_poll()

{iris_pex_embedded_python-4.0.0b1 → iris_pex_embedded_python-4.0.0b3}/src/iop/messages/serialization.py

@@ -22,6 +22,12 @@ class SerializationError(Exception):
     pass
 
 
+class MessageClassImportError(SerializationError, ImportError):
+    """Raised when a JSON message's Python class cannot be imported."""
+
+    pass
+
+
 class TempPydanticModel(BaseModel):
     model_config = {"arbitrary_types_allowed": True, "extra": "allow"}
 
@@ -93,8 +99,8 @@ class MessageSerializer:
             )
             module = importlib.import_module(module_name)
             msg_class = getattr(module, class_name)
-        except Exception as e:
-            raise SerializationError(
+        except (ModuleNotFoundError, AttributeError, ValueError) as e:
+            raise MessageClassImportError(
                 f"Failed to load class {serial.classname}: {str(e)}"
             ) from e
 
@@ -130,9 +136,12 @@ class MessageSerializer:
 
     @staticmethod
     def _parse_classname(classname: str) -> tuple[str, str]:
-        j = classname.rindex(".")
+        try:
+            j = classname.rindex(".")
+        except ValueError as e:
+            raise ValueError(f"Classname must include a module: {classname}") from e
         if j <= 0:
-            raise SerializationError(f"Classname must include a module: {classname}")
+            raise ValueError(f"Classname must include a module: {classname}")
         return classname[:j], classname[j + 1 :]
 
     @staticmethod

{iris_pex_embedded_python-4.0.0b1 → iris_pex_embedded_python-4.0.0b3}/src/iop/runtime/director.py

@@ -9,6 +9,7 @@ from dataclasses import dataclass
 from functools import wraps
 
 from ..messages.dispatch import dispatch_deserializer, dispatch_serializer
+from ..messages.serialization import MessageClassImportError
 from ..migration import utils as _migration_utils
 from ..runtime import iris as _iris
 
@@ -327,11 +328,20 @@ def test_component(target, message=None, classname=None, body=None):
     response = iris.cls("IOP.Utils").dispatchTestComponent(target, serial_message)
     try:
         deserialized_response = dispatch_deserializer(response)
-    except ImportError:
-        # can't import the class, return the string
-        deserialized_response = (
-            f"{response.classname} : {_migration_utils.stream_to_string(response.jstr)}"
-        )
+    except MessageClassImportError:
+        if response._IsA("IOP.Message"):
+            body = (
+                _migration_utils.stream_to_string(response.json)
+                if response.type == "Stream"
+                else response.json
+            )
+            deserialized_response = {
+                "classname": response.classname,
+                "body": body,
+                "truncated": False,
+            }
+        else:
+            raise
     return deserialized_response
 
 

{iris_pex_embedded_python-4.0.0b1 → iris_pex_embedded_python-4.0.0b3/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.0b1
+Version: 4.0.0b3
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License

iris_pex_embedded_python-4.0.0b1/src/iop/components/polling_business_service.py

@@ -1,6 +0,0 @@
-class _PollingBusinessServiceMixin:
-    """Mixin for services polled by the default IRIS inbound adapter."""
-
-    @staticmethod
-    def get_adapter_type() -> str:
-        return "Ens.InboundAdapter"