iris-pex-embedded-python 3.4.0b2__tar.gz → 3.4.0b4__tar.gz

{iris_pex_embedded_python-3.4.0b2 → iris_pex_embedded_python-3.4.0b4}/PKG-INFO

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

{iris_pex_embedded_python-3.4.0b2 → iris_pex_embedded_python-3.4.0b4}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name = "iris_pex_embedded_python"
-version = "3.4.0b2"
+version = "3.4.0b4"
 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.0b2 → iris_pex_embedded_python-3.4.0b4}/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.0b4/src/iop/_dispatch.py

@@ -0,0 +1,101 @@
+from inspect import signature
+from typing import Any
+
+from iop._serialization import serialize_message, serialize_pickle_message, deserialize_message, deserialize_pickle_message
+from iop._message_validator import is_message_instance, is_pickle_message_instance, is_iris_object_instance
+
+def dispatch_serializer(message: Any) -> Any:
+    """Serializes the message based on its type.
+    
+    Args:
+        message: The message to serialize
+        
+    Returns:
+        The serialized message
+        
+    Raises:
+        TypeError: If message is invalid type
+    """
+    if message is not None:
+        if is_message_instance(message):
+            return serialize_message(message)
+        elif is_pickle_message_instance(message):
+            return serialize_pickle_message(message)
+        elif is_iris_object_instance(message):
+            return message
+
+    if message == "" or message is None:
+        return message
+
+    raise TypeError("The message must be an instance of a class that is a subclass of Message or IRISObject %Persistent class.")
+
+def dispatch_deserializer(serial: Any) -> Any:
+    """Deserializes the message based on its type.
+    
+    Args:
+        serial: The serialized message
+        
+    Returns:
+        The deserialized message
+    """
+    if (
+        serial is not None
+        and type(serial).__module__.startswith('iris')
+        and (
+            serial._IsA("IOP.Message")
+            or serial._IsA("Grongier.PEX.Message")
+        )
+    ):
+        return deserialize_message(serial)
+    elif (
+        serial is not None
+        and type(serial).__module__.startswith('iris')
+        and (
+            serial._IsA("IOP.PickleMessage")
+            or serial._IsA("Grongier.PEX.PickleMessage")
+        )
+    ):
+        return deserialize_pickle_message(serial)
+    else:
+        return serial
+
+def dispach_message(host, request: Any) -> Any:
+    """Dispatches the message to the appropriate method.
+    
+    Args:
+        request: The request object
+        
+    Returns:
+        The response object
+    """
+    call = 'on_message'
+
+    module = request.__class__.__module__
+    classname = request.__class__.__name__
+
+    for msg, method in host.DISPATCH:
+        if msg == module + "." + classname:
+            call = method
+
+    return getattr(host, call)(request)
+
+def create_dispatch(host) -> None:
+    """Creates a list of tuples, where each tuple contains the name of a class and the name of a method
+    that takes an instance of that class as its only argument.
+    """
+    if len(host.DISPATCH) == 0:
+        method_list = [func for func in dir(host) if callable(getattr(host, func)) and not func.startswith("_")]
+        for method in method_list:
+            try:
+                param = signature(getattr(host, method)).parameters
+            except ValueError as e:
+                param = ''
+            if (len(param) == 1):
+                annotation = str(param[list(param)[0]].annotation)
+                i = annotation.find("'")
+                j = annotation.rfind("'")
+                if j == -1:
+                    j = None
+                classname = annotation[i+1:j]
+                host.DISPATCH.append((classname, method))
+    return

{iris_pex_embedded_python-3.4.0b2 → iris_pex_embedded_python-3.4.0b4}/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.0b2 → iris_pex_embedded_python-3.4.0b4}/src/iop/_serialization.py

@@ -7,9 +7,7 @@ import importlib
 import json
 import pickle
 import uuid
-from abc import ABC, abstractmethod
-from dataclasses import is_dataclass
-from typing import Any, Dict, Type, Optional
+from typing import Any, Dict, Type
 
 from dacite import Config, from_dict
 import iris

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

iris_pex_embedded_python-3.4.0b2/src/iop/_dispatch.py

@@ -1,223 +0,0 @@
-import codecs
-import importlib
-from inspect import signature
-import json
-import pickle
-from typing import Any, Dict, List, Type
-
-import iris
-from dacite import Config, from_dict
-from pydantic import BaseModel
-
-from iop._utils import _Utils
-from iop._serialization import IrisJSONEncoder, IrisJSONDecoder
-from iop._message_validator import is_message_instance, is_pickle_message_instance, is_iris_object_instance
-
-def serialize_pickle_message(message: Any) -> iris.cls:
-    """Converts a python dataclass message into an iris iop.message.
-
-    Args:
-        message: The message to serialize, an instance of a class that is a subclass of Message.
-
-    Returns:
-        The message in json format.
-    """
-    pickle_string = codecs.encode(pickle.dumps(message), "base64").decode()
-    module = message.__class__.__module__
-    classname = message.__class__.__name__
-
-    msg = iris.cls('IOP.PickleMessage')._New()
-    msg.classname = module + "." + classname
-
-    stream = _Utils.string_to_stream(pickle_string)
-    msg.jstr = stream
-
-    return msg
-
-def dispatch_serializer(message: Any) -> Any:
-    """Serializes the message based on its type.
-    
-    Args:
-        message: The message to serialize
-        
-    Returns:
-        The serialized message
-        
-    Raises:
-        TypeError: If message is invalid type
-    """
-    if message is not None:
-        if is_message_instance(message):
-            return serialize_message(message)
-        elif is_pickle_message_instance(message):
-            return serialize_pickle_message(message)
-        elif is_iris_object_instance(message):
-            return message
-
-    if message == "" or message is None:
-        return message
-
-    raise TypeError("The message must be an instance of a class that is a subclass of Message or IRISObject %Persistent class.")
-
-def serialize_message(message: Any) -> iris.cls:
-    """Converts a python dataclass message into an iris iop.message.
-
-    Args:
-        message: The message to serialize, an instance of a class that is a subclass of Message.
-
-    Returns:
-        The message in json format.
-    """
-    json_string = json.dumps(message, cls=IrisJSONEncoder, ensure_ascii=False)
-    module = message.__class__.__module__
-    classname = message.__class__.__name__
-
-    msg = iris.cls('IOP.Message')._New()
-    msg.classname = module + "." + classname
-
-    if hasattr(msg, 'buffer') and len(json_string) > msg.buffer:
-        msg.json = _Utils.string_to_stream(json_string, msg.buffer)
-    else:
-        msg.json = json_string
-
-    return msg
-
-def deserialize_pickle_message(serial: iris.cls) -> Any:
-    """Converts an iris iop.message into a python dataclass message.
-    
-    Args:
-        serial: The serialized message
-        
-    Returns:
-        The deserialized message
-    """
-    string = _Utils.stream_to_string(serial.jstr)
-    msg = pickle.loads(codecs.decode(string.encode(), "base64"))
-    return msg
-
-def dispatch_deserializer(serial: Any) -> Any:
-    """Deserializes the message based on its type.
-    
-    Args:
-        serial: The serialized message
-        
-    Returns:
-        The deserialized message
-    """
-    if (
-        serial is not None
-        and type(serial).__module__.startswith('iris')
-        and (
-            serial._IsA("IOP.Message")
-            or serial._IsA("Grongier.PEX.Message")
-        )
-    ):
-        return deserialize_message(serial)
-    elif (
-        serial is not None
-        and type(serial).__module__.startswith('iris')
-        and (
-            serial._IsA("IOP.PickleMessage")
-            or serial._IsA("Grongier.PEX.PickleMessage")
-        )
-    ):
-        return deserialize_pickle_message(serial)
-    else:
-        return serial
-
-def deserialize_message(serial: iris.cls) -> Any:
-    """Converts an iris iop.message into a python dataclass message.
-    
-    Args:
-        serial: The serialized message
-        
-    Returns:
-        The deserialized message
-    """
-    if (serial.classname is None):
-        raise ValueError("JSON message malformed, must include classname")
-    classname = serial.classname
-
-    j = classname.rindex(".")
-    if (j <= 0):
-        raise ValueError("Classname must include a module: " + classname)
-    try:
-        module = importlib.import_module(classname[:j])
-        msg = getattr(module, classname[j+1:])
-    except Exception:
-        raise ImportError("Class not found: " + classname)
-
-    string = ""
-    if (serial.type == 'Stream'):
-        string = _Utils.stream_to_string(serial.json)
-    else:
-        string = serial.json
-
-    jdict = json.loads(string, cls=IrisJSONDecoder)
-    return dataclass_from_dict(msg, jdict)
-
-def dataclass_from_dict(klass: Type, dikt: Dict) -> Any:
-    """Converts a dictionary to a dataclass instance.
-    
-    Args:
-        klass: The dataclass to convert to
-        dikt: The dictionary to convert to a dataclass
-        
-    Returns:
-        A dataclass object with the fields of the dataclass and the fields of the dictionary.
-    """
-    if issubclass(klass, BaseModel):
-        return klass.model_validate(dikt)
-    else:
-        ret = from_dict(klass, dikt, Config(check_types=False))
-        
-        try:
-            fieldtypes = klass.__annotations__
-        except Exception as e:
-            fieldtypes = []
-        
-        for key, val in dikt.items():
-            if key not in fieldtypes:
-                setattr(ret, key, val)
-        return ret
-
-def dispach_message(host, request: Any) -> Any:
-    """Dispatches the message to the appropriate method.
-    
-    Args:
-        request: The request object
-        
-    Returns:
-        The response object
-    """
-    call = 'on_message'
-
-    module = request.__class__.__module__
-    classname = request.__class__.__name__
-
-    for msg, method in host.DISPATCH:
-        if msg == module + "." + classname:
-            call = method
-
-    return getattr(host, call)(request)
-
-def create_dispatch(host) -> None:
-    """Creates a list of tuples, where each tuple contains the name of a class and the name of a method
-    that takes an instance of that class as its only argument.
-    """
-    if len(host.DISPATCH) == 0:
-        method_list = [func for func in dir(host) if callable(getattr(host, func)) and not func.startswith("_")]
-        for method in method_list:
-            try:
-                param = signature(getattr(host, method)).parameters
-            except ValueError as e:
-                param = ''
-            if (len(param) == 1):
-                annotation = str(param[list(param)[0]].annotation)
-                i = annotation.find("'")
-                j = annotation.rfind("'")
-                if j == -1:
-                    j = None
-                classname = annotation[i+1:j]
-                host.DISPATCH.append((classname, method))
-    return