iris-pex-embedded-python 4.0.1b7__tar.gz → 4.0.2b1__tar.gz

{iris_pex_embedded_python-4.0.1b7/src/iris_pex_embedded_python.egg-info → iris_pex_embedded_python-4.0.2b1}/PKG-INFO

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

{iris_pex_embedded_python-4.0.1b7 → iris_pex_embedded_python-4.0.2b1}/pyproject.toml

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

{iris_pex_embedded_python-4.0.1b7 → iris_pex_embedded_python-4.0.2b1}/src/iop/migration/utils.py

@@ -186,6 +186,69 @@ def _get_python_path() -> str:
     return ""
 
 
+def _migration_namespace_hint() -> str:
+    namespace = os.environ.get("IRISNAMESPACE") or os.environ.get("IOP_NAMESPACE")
+    if namespace:
+        return f"namespace {namespace!r}"
+    return "the target namespace"
+
+
+def _looks_like_missing_iris_class_error(exc: RuntimeError) -> bool:
+    message = str(exc).lower()
+    return "error finding class" in message or "iop.utils" in message
+
+
+def _format_register_component_error(
+    exc: RuntimeError,
+    *,
+    module: str,
+    classname: str,
+    path: str,
+    iris_classname: str,
+) -> str:
+    namespace_hint = _migration_namespace_hint()
+    lines = [
+        (
+            f"Could not register IRIS proxy class {iris_classname!r} "
+            f"for Python component {module}.{classname}."
+        )
+    ]
+
+    if _looks_like_missing_iris_class_error(exc):
+        lines.extend(
+            [
+                "",
+                "IRIS could not find a class required during component registration.",
+                (
+                    "Most often this means the IoP support classes "
+                    f"(`IOP.Utils`, `IOP.BusinessService`, etc.) are not loaded in "
+                    f"{namespace_hint} yet, or migration ran before `iop --init` "
+                    "completed."
+                ),
+                "",
+                "Fix:",
+                f"  1. Run `iop --init` in {namespace_hint}.",
+                "  2. Re-run `iop --migrate <settings.py>`.",
+                (
+                    "  3. In containers, wait for IRIS with "
+                    "`/usr/irissys/dev/Container/waitReady.sh` before `iop --init`."
+                ),
+            ]
+        )
+
+    lines.extend(
+        [
+            "",
+            "Registration details:",
+            f"  IRIS proxy class: {iris_classname}",
+            f"  Python component: {module}.{classname}",
+            f"  Python class path: {path}",
+            f"  Original IRIS error: {exc}",
+        ]
+    )
+    return "\n".join(lines)
+
+
 def register_component(
     module: str,
     classname: str,
@@ -228,10 +291,13 @@ def register_component(
         )
     except RuntimeError as e:
         raise RuntimeError(
-            "Could not register component "
-            f"{iris_classname} from {module}.{classname}. "
-            "If IRIS reports that IOP.Utils is missing, initialize the IRIS "
-            f"support classes with `iop --init`. Original IRIS error: {e}"
+            _format_register_component_error(
+                e,
+                module=module,
+                classname=classname,
+                path=path,
+                iris_classname=iris_classname,
+            )
         ) from e
 
 

{iris_pex_embedded_python-4.0.1b7 → iris_pex_embedded_python-4.0.2b1}/src/iop/production/common.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 import importlib
 from typing import Any
 
+from ..components.settings import Setting
+
 PRODUCTION_SETTING_FIELDS: dict[str, tuple[str, Any]] = {
     "shutdown_timeout": ("ShutdownTimeout", 120),
     "update_timeout": ("UpdateTimeout", 10),
@@ -83,11 +85,21 @@ def _adapter_type_from_class_name(class_name: str | None) -> str:
     return _adapter_type_from_component_class(component_class)
 
 
+def _setting_name(name: Any) -> str:
+    if isinstance(name, Setting) and name.name:
+        return name.name
+    return str(name)
+
+
+def _normalize_settings_mapping(values: Any) -> dict[str, Any]:
+    return {_setting_name(key): value for key, value in dict(values or {}).items()}
+
+
 def _settings_to_iris(target_name: str, values: dict[str, Any]) -> list[dict[str, str]]:
     return [
         {
             "@Target": target_name,
-            "@Name": name,
+            "@Name": _setting_name(name),
             "#text": _text_value(value),
         }
         for name, value in values.items()
@@ -97,6 +109,7 @@ def _settings_to_iris(target_name: str, values: dict[str, Any]) -> list[dict[str
 def _apply_settings_update(target: dict[str, Any], updates: Any) -> None:
     """Merge *updates* into *target*, treating ``None`` values as removals."""
     for key, value in (updates or {}).items():
+        key = _setting_name(key)
         if value is None:
             target.pop(key, None)
         else:

{iris_pex_embedded_python-4.0.1b7 → iris_pex_embedded_python-4.0.2b1}/src/iop/production/declarations.py

@@ -2,9 +2,9 @@ from __future__ import annotations
 
 from collections.abc import Iterable, Mapping
 from dataclasses import dataclass, field
-from typing import Any, ClassVar, Protocol
+from typing import Any, ClassVar, Protocol, cast
 
-from .common import SETTING_NAME_ALIASES
+from .common import SETTING_NAME_ALIASES, _normalize_settings_mapping
 from .types import TargetSetting
 
 
@@ -36,7 +36,9 @@ class Route:
             targets = (self.targets,)
         else:
             try:
-                targets = tuple(self.targets)
+                targets = tuple(
+                    cast(Iterable[str | _NamedRouteTarget], self.targets)
+                )
             except TypeError as exc:
                 raise TypeError(
                     f"Route {self.target_setting_name!r} targets must be an item name, "
@@ -174,7 +176,7 @@ def _mapping(
     item_name: str,
 ) -> dict[str, Any]:
     try:
-        return dict(values or {})
+        return _normalize_settings_mapping(values)
     except (TypeError, ValueError) as exc:
         raise TypeError(
             f"Production item {item_name!r} {field_name} must be a mapping"

{iris_pex_embedded_python-4.0.1b7 → iris_pex_embedded_python-4.0.2b1}/src/iop/production/model.py

@@ -9,6 +9,7 @@ from .common import (
     _adapter_type_from_component_class,
     _apply_settings_update,
     _auto_proxy_class_name,
+    _normalize_settings_mapping,
 )
 from .component import ComponentRef
 from .declarative import _DeclarativeProductionMixin
@@ -432,8 +433,8 @@ class Production(_DeclarativeProductionMixin):
             comment=comment,
             log_trace_events=log_trace_events,
             schedule=schedule,
-            host_settings=dict(settings or {}),
-            adapter_settings=dict(adapter_settings or {}),
+            host_settings=_normalize_settings_mapping(settings),
+            adapter_settings=_normalize_settings_mapping(adapter_settings),
         )
         self._add_item(ref)
         return ref

{iris_pex_embedded_python-4.0.1b7 → iris_pex_embedded_python-4.0.2b1}/src/iop/production/validation.py

@@ -8,6 +8,7 @@ from .common import (
     PRODUCTION_SETTING_FIELDS_BY_IRIS,
     PRODUCTION_SETTING_NAMES,
     SETTING_NAME_ALIASES,
+    _normalize_settings_mapping,
 )
 from .import_ import _as_list, _production_payload, _split_settings
 from .types import TargetSetting
@@ -183,14 +184,18 @@ def _validate_component_ref(item: Any) -> list[ProductionValidationIssue]:
 
     issues.extend(
         _validate_settings(
-            settings=dict(getattr(item, "host_settings", {}) or {}),
+            settings=_normalize_settings_mapping(
+                getattr(item, "host_settings", {}) or {}
+            ),
             path_prefix=f"items.{item_name}.settings.Host",
             local_class=component_class,
             iris_class_name=class_name,
         )
     )
 
-    adapter_settings = dict(getattr(item, "adapter_settings", {}) or {})
+    adapter_settings = _normalize_settings_mapping(
+        getattr(item, "adapter_settings", {}) or {}
+    )
     if str(getattr(item, "kind", "")) == "process" and adapter_settings:
         issues.append(
             ProductionValidationIssue(
@@ -355,7 +360,9 @@ def _validate_target_setting_values(production: Any) -> list[ProductionValidatio
     issues: list[ProductionValidationIssue] = []
     for item in items:
         item_name = str(getattr(item, "name", ""))
-        host_settings = dict(getattr(item, "host_settings", {}) or {})
+        host_settings = _normalize_settings_mapping(
+            getattr(item, "host_settings", {}) or {}
+        )
         for setting_name in _target_setting_names(item):
             if setting_name not in host_settings:
                 continue

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