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

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b3}/PKG-INFO

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

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

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name = "iris_pex_embedded_python"
-version = "3.4.0b1"
+version = "3.4.0b3"
 description = "Iris Interoperability based on Embedded Python"
 readme = "README.md"
 authors = [
@@ -53,3 +53,6 @@ exclude = ["tests*"]
 
 [tool.setuptools.package-data]
 "*" = ["*.cls"]
+
+[tool.pytest.ini_options]
+asyncio_default_fixture_loop_scope = "class"

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b3}/src/grongier/pex/__init__.py

@@ -6,7 +6,7 @@ from iop._business_operation import _BusinessOperation
 from iop._inbound_adapter import _InboundAdapter
 from iop._outbound_adapter import _OutboundAdapter
 from iop._message import _Message
-from iop._pickle_message import _PickleMessage
+from iop._message import _PickleMessage
 from iop._director import _Director
 from iop._utils import _Utils
 

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b3}/src/iop/__init__.py

@@ -3,10 +3,8 @@ from iop._business_process import _BusinessProcess
 from iop._business_service import _BusinessService
 from iop._director import _Director
 from iop._inbound_adapter import _InboundAdapter
-from iop._message import _Message
-from iop._pydantic_message import _PydanticMessage
+from iop._message import _Message, _PickleMessage, _PydanticMessage, _PydanticPickleMessage
 from iop._outbound_adapter import _OutboundAdapter
-from iop._pickle_message import _PickleMessage
 from iop._private_session_duplex import _PrivateSessionDuplex
 from iop._private_session_process import _PrivateSessionProcess
 from iop._utils import _Utils
@@ -23,4 +21,5 @@ class DuplexProcess(_PrivateSessionProcess): pass
 class Message(_Message): pass
 class PickleMessage(_PickleMessage): pass
 class PydanticMessage(_PydanticMessage): pass
+class PydanticPickleMessage(_PydanticPickleMessage): pass
 class Director(_Director): pass

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b3}/src/iop/_common.py

@@ -17,7 +17,19 @@ class _Common(metaclass=abc.ABCMeta):
     INFO_URL: ClassVar[str]
     ICON_URL: ClassVar[str]
     iris_handle: Any = None
-    log_to_console: bool = False
+    _log_to_console: bool = False
+
+    @property
+    def log_to_console(self) -> bool:
+        return self._log_to_console
+    
+    @log_to_console.setter
+    def log_to_console(self, value: bool) -> None:
+        self._log_to_console = value
+        self.logger = LogManager.get_logger(self.__class__.__name__,value)
+
+    def __init__(self):
+        self.logger = LogManager.get_logger(self.__class__.__name__)
 
     # Lifecycle methods
     def on_init(self) -> None:
@@ -172,7 +184,7 @@ class _Common(metaclass=abc.ABCMeta):
         except:
             pass
         return ret
-    
+
     # Logging methods
     def _log(self) -> Tuple[str, Optional[str]]:
         """Get class and method name for logging.
@@ -189,15 +201,27 @@ class _Common(metaclass=abc.ABCMeta):
             pass
         return current_class, current_method
 
-    @property
-    def logger(self) -> logging.Logger:
-        """Get a logger instance for this component.
+    def _logging(self, message: str, level: int, to_console: Optional[bool] = None) -> None:
+        """Write log entry.
         
-        Returns:
-            Logger configured for IRIS integration
+        Args:
+            message: Message to log
+            level: Log level
+            to_console: If True, log to console instead of IRIS
         """
-        class_name, method_name = self._log()
-        return LogManager.get_logger(class_name, method_name, self.log_to_console)
+        current_class, current_method = self._log()
+        if to_console is None:
+            to_console = self.log_to_console
+        if level == logging.DEBUG:
+            self.logger.debug(message, extra={'to_console': to_console, 'class_name': current_class, 'method_name': current_method})
+        elif level == logging.INFO:
+            self.logger.info(message, extra={'to_console': to_console, 'class_name': current_class, 'method_name': current_method})
+        elif level == logging.CRITICAL:
+            self.logger.critical(message, extra={'to_console': to_console, 'class_name': current_class, 'method_name': current_method})
+        elif level == logging.WARNING:
+            self.logger.warning(message, extra={'to_console': to_console, 'class_name': current_class, 'method_name': current_method})
+        elif level == logging.ERROR:
+            self.logger.error(message, extra={'to_console': to_console, 'class_name': current_class, 'method_name': current_method})
 
     def trace(self, message: str, to_console: Optional[bool] = None) -> None:
         """Write trace log entry.
@@ -206,8 +230,7 @@ class _Common(metaclass=abc.ABCMeta):
             message: Message to log
             to_console: If True, log to console instead of IRIS
         """
-        self.logger.debug(message, extra={'to_console': to_console})
-
+        self._logging(message, logging.DEBUG, to_console)
 
     def log_info(self, message: str, to_console: Optional[bool] = None) -> None:
         """Write info log entry.
@@ -216,7 +239,7 @@ class _Common(metaclass=abc.ABCMeta):
             message: Message to log
             to_console: If True, log to console instead of IRIS
         """
-        self.logger.info(message, extra={'to_console': to_console})
+        self._logging(message, logging.INFO, to_console)
 
     def log_alert(self, message: str, to_console: Optional[bool] = None) -> None:
         """Write alert log entry.
@@ -225,7 +248,7 @@ class _Common(metaclass=abc.ABCMeta):
             message: Message to log
             to_console: If True, log to console instead of IRIS
         """
-        self.logger.critical(message, extra={'to_console': to_console})
+        self._logging(message, logging.CRITICAL, to_console)
 
     def log_warning(self, message: str, to_console: Optional[bool] = None) -> None:
         """Write warning log entry.
@@ -234,7 +257,7 @@ class _Common(metaclass=abc.ABCMeta):
             message: Message to log
             to_console: If True, log to console instead of IRIS
         """
-        self.logger.warning(message, extra={'to_console': to_console})
+        self._logging(message, logging.WARNING, to_console)
 
     def log_error(self, message: str, to_console: Optional[bool] = None) -> None:
         """Write error log entry.
@@ -243,7 +266,7 @@ class _Common(metaclass=abc.ABCMeta):
             message: Message to log
             to_console: If True, log to console instead of IRIS
         """
-        self.logger.error(message, extra={'to_console': to_console})
+        self._logging(message, logging.ERROR, to_console)
 
     def log_assert(self, message: str) -> None:
         """Write a log entry of type "assert". Log entries can be viewed in the management portal.

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b3}/src/iop/_log_manager.py

@@ -1,3 +1,4 @@
+import traceback
 import iris
 import logging
 from typing import Optional, Tuple
@@ -6,7 +7,7 @@ class LogManager:
     """Manages logging integration between Python's logging module and IRIS."""
 
     @staticmethod
-    def get_logger(class_name: str, method_name: Optional[str] = None, to_console: bool = False) -> logging.Logger:
+    def get_logger(class_name: str, to_console: bool = False) -> logging.Logger:
         """Get a logger instance configured for IRIS integration.
         
         Args:
@@ -17,11 +18,11 @@ class LogManager:
         Returns:
             Logger instance configured for IRIS integration
         """
-        logger = logging.getLogger(f"{class_name}.{method_name}" if method_name else class_name)
+        logger = logging.Logger(f"{class_name}")
         
         # Only add handler if none exists
         if not logger.handlers:
-            handler = IRISLogHandler(class_name, method_name, to_console)
+            handler = IRISLogHandler(to_console=to_console)
             formatter = logging.Formatter('%(message)s')
             handler.setFormatter(formatter)
             logger.addHandler(handler)
@@ -33,17 +34,9 @@ class LogManager:
 class IRISLogHandler(logging.Handler):
     """Custom logging handler that routes Python logs to IRIS logging system."""
 
-    def __init__(self, class_name: str, method_name: Optional[str] = None, to_console: bool = False):
-        """Initialize the handler with context information.
-        
-        Args:
-            class_name: Name of the class logging the message
-            method_name: Optional name of the method logging the message
-            console: If True, log to the console instead of IRIS
-        """
+    def __init__(self, to_console: bool = False):
+        """Initialize the IRIS logging handler."""
         super().__init__()
-        self.class_name = class_name
-        self.method_name = method_name
         self.to_console = to_console
 
         # Map Python logging levels to IRIS logging methods
@@ -80,10 +73,11 @@ class IRISLogHandler(logging.Handler):
         Args:
             record: The logging record to emit
         """
-
-        log_func = self.level_map.get(record.levelno, iris.cls("Ens.Util.Log").LogInfo)
+        class_name = record.class_name if hasattr(record, "class_name") else record.name
+        method_name = record.method_name if hasattr(record, "method_name") else record.funcName
         if self.to_console or (hasattr(record, "to_console") and record.to_console):
             iris.cls("%SYS.System").WriteToConsoleLog(self.format(record),
-                0,self.level_map_console.get(record.levelno, 0),record.name)
+                0,self.level_map_console.get(record.levelno, 0),class_name+"."+method_name)
         else:
-            log_func(self.class_name, self.method_name, self.format(record))
+            log_func = self.level_map.get(record.levelno, iris.cls("Ens.Util.Log").LogInfo)
+            log_func(class_name, method_name, self.format(record))

iris_pex_embedded_python-3.4.0b3/src/iop/_message.py

@@ -0,0 +1,28 @@
+from typing import Any
+from pydantic import BaseModel
+
+class _Message:
+    """ The abstract class that is the superclass for persistent messages sent from one component to another.
+    This class has no properties or methods. Users subclass Message and add properties.
+    The IOP framework provides the persistence to objects derived from the Message class.
+    """
+    pass
+
+class _PickleMessage:
+    """ The abstract class that is the superclass for persistent messages sent from one component to another.
+    This class has no properties or methods. Users subclass Message and add properties.
+    The IOP framework provides the persistence to objects derived from the Message class.
+    """
+    pass
+
+class _PydanticMessage(BaseModel):
+    """Base class for Pydantic-based messages that can be serialized to IRIS."""
+    
+    def __init__(self, **data: Any):
+        super().__init__(**data)
+
+class _PydanticPickleMessage(BaseModel):
+    """Base class for Pydantic-based messages that can be serialized to IRIS."""
+    
+    def __init__(self, **data: Any):
+        super().__init__(**data)

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b3}/src/iop/_message_validator.py

@@ -1,7 +1,6 @@
 import dataclasses
 from typing import Any, Type
-from pydantic import BaseModel
-from iop._message import _Message
+from iop._message import _Message, _PickleMessage, _PydanticPickleMessage, BaseModel
 
 
 def is_message_instance(obj: Any) -> bool:
@@ -17,6 +16,8 @@ def is_message_instance(obj: Any) -> bool:
 
 def is_pickle_message_instance(obj: Any) -> bool:
     """Check if object is a PickleMessage instance."""
+    if isinstance(obj, _PydanticPickleMessage):
+        return True
     if is_pickle_message_class(type(obj)):
         return True
     return False
@@ -31,8 +32,6 @@ 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, BaseModel):
-        return True
     if issubclass(klass, _Message):
         return True
     return False
@@ -41,7 +40,8 @@ def is_message_class(klass: Type) -> bool:
 
 def is_pickle_message_class(klass: Type) -> bool:
     """Check if class is a PickleMessage type."""
-    name = f"{klass.__module__}.{klass.__qualname__}"
-    if name in ("iop.PickleMessage", "grongier.pex.PickleMessage"):
+    if issubclass(klass, _PickleMessage):
         return True
-    return any(is_pickle_message_class(c) for c in klass.__bases__)
+    if issubclass(klass, _PydanticPickleMessage):
+        return True
+    return False

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b3}/src/iop/_serialization.py

@@ -14,6 +14,7 @@ from typing import Any, Dict, Type, Optional
 from dacite import Config, from_dict
 import iris
 
+from iop._message import _PydanticPickleMessage
 from iop._utils import _Utils
 from pydantic import BaseModel
 
@@ -137,6 +138,9 @@ class MessageSerializer:
     @staticmethod
     def serialize(message: Any, use_pickle: bool = False) -> iris.cls:
         """Serializes a message to IRIS format."""
+        # Check for PydanticPickleMessage first
+        if isinstance(message, _PydanticPickleMessage):
+            return MessageSerializer._serialize_pickle(message)
         if isinstance(message, BaseModel):
             return (MessageSerializer._serialize_pickle(message) 
                    if use_pickle else MessageSerializer._serialize_json(message))

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b3}/src/iop/_utils.py

@@ -7,6 +7,7 @@ import xmltodict
 import pkg_resources
 import importlib
 import json
+from iop._message import _Message, _PydanticMessage
 from dc_schema import get_schema
 
 class _Utils():
@@ -42,7 +43,12 @@ class _Utils():
         
         :param cls: The class to register
         """
-        schema = get_schema(cls)
+        if issubclass(cls,_PydanticMessage):
+            schema = cls.model_json_schema()
+        elif issubclass(cls,_Message):
+            schema = get_schema(cls)
+        else:
+            raise ValueError("The class must be a subclass of _Message or _PydanticMessage")
         schema_name = cls.__module__ + '.' + cls.__name__
         schema_str = json.dumps(schema)
         categories = schema_name

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

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

{iris_pex_embedded_python-3.4.0b1 → iris_pex_embedded_python-3.4.0b3}/src/iris_pex_embedded_python.egg-info/SOURCES.txt

@@ -111,10 +111,8 @@ src/iop/_log_manager.py
 src/iop/_message.py
 src/iop/_message_validator.py
 src/iop/_outbound_adapter.py
-src/iop/_pickle_message.py
 src/iop/_private_session_duplex.py
 src/iop/_private_session_process.py
-src/iop/_pydantic_message.py
 src/iop/_serialization.py
 src/iop/_utils.py
 src/iop/cls/IOP/BusinessOperation.cls

iris_pex_embedded_python-3.4.0b1/src/iop/_message.py

@@ -1,6 +0,0 @@
-class _Message:
-    """ The abstract class that is the superclass for persistent messages sent from one component to another.
-    This class has no properties or methods. Users subclass Message and add properties.
-    The IOP framework provides the persistence to objects derived from the Message class.
-    """
-    pass

iris_pex_embedded_python-3.4.0b1/src/iop/_pickle_message.py

@@ -1,6 +0,0 @@
-class _PickleMessage:
-    """ The abstract class that is the superclass for persistent messages sent from one component to another.
-    This class has no properties or methods. Users subclass Message and add properties.
-    The PEX framework provides the persistence to objects derived from the Message class.
-    """
-    pass

iris_pex_embedded_python-3.4.0b1/src/iop/_pydantic_message.py

@@ -1,9 +0,0 @@
-
-from typing import Any
-from pydantic import BaseModel
-
-class _PydanticMessage(BaseModel):
-    """Base class for Pydantic-based messages that can be serialized to IRIS."""
-    
-    def __init__(self, **data: Any):
-        super().__init__(**data)