iris-pex-embedded-python 4.0.1b7__py3-none-any.whl → 4.0.1b8__py3-none-any.whl

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:

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"

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

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.dist-info → iris_pex_embedded_python-4.0.1b8.dist-info}/METADATA

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

{iris_pex_embedded_python-4.0.1b7.dist-info → iris_pex_embedded_python-4.0.1b8.dist-info}/RECORD

@@ -65,21 +65,21 @@ iop/migration/plans.py,sha256=5kx3aqQiPDJ3F8hU9pp9_mOO1_N6GA0Ps7--G1Iv6z8,2549
 iop/migration/utils.py,sha256=pOojLPMZes05KXrGN2ap45ffppP5Z4tS4bjJ0gSD5Oc,38183
 iop/production/__init__.py,sha256=95VmJgC3lWtHpUJijLqyKKxFZa65OcRni8803kb4aHE,2148
 iop/production/actions.py,sha256=TLVAjPTPq21oLj9c-IG10qMNJ2hvPzueviMy_c1a0ZU,17199
-iop/production/common.py,sha256=IoUg9jkFzSQwDsHcXvkVAC4qxpWKs3kTfXFm_EP07EU,3091
+iop/production/common.py,sha256=L2QyvE2nC1J333sbebYx_6dyoaFL-89ouMO3Kfe4-D8,3465
 iop/production/component.py,sha256=XalzNEWhCC1RVSZlQZRBpZM3BdRC2TDU-ko3Zn8-Kzo,9475
-iop/production/declarations.py,sha256=Tb79Q6rwmFMi6xKpzajJa4Aa2_Tk3sD-e8qiuRJX77s,5821
+iop/production/declarations.py,sha256=u1hzgbDchr55R3dEXEIi9-P5JkfMG7C3aiSWhfhifG8,5952
 iop/production/declarative.py,sha256=IpHYO46mu7k9wnq3DpFreoALPoX1Vi8DrJb-85O_-bQ,7853
 iop/production/diff.py,sha256=NYpcSVklaGpaZOyl933W8eLsDWcwjlf6Upbp4pVGSMU,9975
 iop/production/import_.py,sha256=twBra6j2peolFadv8WyDwZZOd9NznzAkPsk2RbOfZQM,10833
 iop/production/inspection.py,sha256=PPv9DiDS4OrnKROqV7JPbuY8Y0JR-m8syPhap3GgE4g,3363
-iop/production/model.py,sha256=3p70HARmvm9bd7rQ9l4lbX_abZj983QxmVk-OF2gWqo,44021
+iop/production/model.py,sha256=bEtDo-IwECuCrkKDXJXm1hB5Bmme4srB6l9isc8n3KI,44088
 iop/production/planning.py,sha256=nCYrXLKlHBlUaQZPzPfqtIERIv62F2sg4gJ0b8mtcKk,23375
 iop/production/reconstruction.py,sha256=5vVteTEM6IOiQUfpe4AUQg6Nt4oaaIDR61-1l6Vu8hk,12532
 iop/production/rendering.py,sha256=gyJyUcWwvgwRWvlvddZbCIhkjJ1DcMZfbL2brIa_k8U,20229
 iop/production/runtime.py,sha256=6grX1u20OhHnvhzC3yPDTFEoDs_TN4mfs5MxzFzZMls,2637
 iop/production/source_inference.py,sha256=Wl3E9-1hWb4qxD1jwrrZTLSgqN-0vGhOrJtmzDWPCao,21613
 iop/production/types.py,sha256=hzO8rj73z16WqFQBI7YBAznY-1fD8ENyJqzTY-ydFXI,16889
-iop/production/validation.py,sha256=yoh3joKyOmuSn3aSYhc-aWOV61s5V5Sd1hLbNXDp12g,16049
+iop/production/validation.py,sha256=gzRFLCTPGiNMIot1yG1FXG5ab9inpq4rqYYQpefhBYs,16217
 iop/runtime/__init__.py,sha256=wcyWMRuPCYE_CLd1NmgmI1M-IbFs2Gz2yIj2-EW_2AA,70
 iop/runtime/director.py,sha256=KW8BvkATK8XuIUPNBD9rMww9r3Zg4K3H54868eOgvl0,12867
 iop/runtime/environment.py,sha256=0KZ4EoW6NUEbF7FW471emxQ-9FbaiX6ngUHVGihgZXU,1564
@@ -92,9 +92,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.1b7.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-4.0.1b7.dist-info/METADATA,sha256=O2hhJWlDeQ1GJMdbvujQJ3-9EREctqL-1BSe_H3MpGg,5854
-iris_pex_embedded_python-4.0.1b7.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-iris_pex_embedded_python-4.0.1b7.dist-info/entry_points.txt,sha256=fzS8ZFsPe8cnpEx208X60DNugCPQmuSloPeg4pyyJDY,42
-iris_pex_embedded_python-4.0.1b7.dist-info/top_level.txt,sha256=BM54-OXQ6l2BDtmesWNXckh033s9gcjoO7bfjbwZbxU,4
-iris_pex_embedded_python-4.0.1b7.dist-info/RECORD,,
+iris_pex_embedded_python-4.0.1b8.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
+iris_pex_embedded_python-4.0.1b8.dist-info/METADATA,sha256=2xgGbmP5t_sp-SvMGjzJp1wkpiU9p32fQ22gWUjG7GE,5854
+iris_pex_embedded_python-4.0.1b8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+iris_pex_embedded_python-4.0.1b8.dist-info/entry_points.txt,sha256=fzS8ZFsPe8cnpEx208X60DNugCPQmuSloPeg4pyyJDY,42
+iris_pex_embedded_python-4.0.1b8.dist-info/top_level.txt,sha256=BM54-OXQ6l2BDtmesWNXckh033s9gcjoO7bfjbwZbxU,4
+iris_pex_embedded_python-4.0.1b8.dist-info/RECORD,,