iris-pex-embedded-python 4.0.1b6__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/component.py

@@ -168,7 +168,7 @@ class ComponentRef:
 
     def connect(
         self,
-        target_setting: str | TargetSettingRef,
+        target_setting: str | TargetSetting | TargetSettingRef,
         target_component: ComponentRef | str | None = None,
         **kwargs: Any,
     ) -> ComponentRef:
@@ -178,7 +178,7 @@ class ComponentRef:
 
     def _coerce_target_setting_ref(
         self,
-        target_setting: str | TargetSettingRef,
+        target_setting: str | TargetSetting | TargetSettingRef,
     ) -> TargetSettingRef:
         if isinstance(target_setting, TargetSettingRef):
             if target_setting.production is not self.production:
@@ -190,6 +190,28 @@ class ComponentRef:
                     "source target setting belongs to a different component"
                 )
             return target_setting
+        if isinstance(target_setting, TargetSetting):
+            owner = target_setting.owner
+            if owner is None or not target_setting.name:
+                raise ValueError(
+                    "target setting must be declared on a component class"
+                )
+            if self.component_class is None or not issubclass(
+                self.component_class,
+                owner,
+            ):
+                owner_name = f"{owner.__module__}.{owner.__qualname__}"
+                component_name = (
+                    f"{self.component_class.__module__}."
+                    f"{self.component_class.__qualname__}"
+                    if self.component_class is not None
+                    else self.class_name
+                )
+                raise ValueError(
+                    f"target setting {target_setting.name!r} belongs to "
+                    f"{owner_name}, not {component_name}"
+                )
+            return self.target_setting(target_setting.name)
         return self.target_setting(str(target_setting))
 
     def inspect(self, *, refresh: bool = True) -> dict[str, Any]:

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
@@ -219,10 +220,10 @@ class Production(_DeclarativeProductionMixin):
 
     def _resolve_production_name(self, name: str | object) -> str:
         if name is not _MISSING:
-            return name  # type: ignore[return-value]
+            return str(name)
         class_name = getattr(type(self), "name", _MISSING)
         if class_name is not _MISSING:
-            return class_name
+            return str(class_name)
         return f"{type(self).__module__}.{type(self).__name__}"
 
     def _production_default(
@@ -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
@@ -570,7 +571,12 @@ class Production(_DeclarativeProductionMixin):
             )
         ]
 
-    def service(self, name_or_cls: str | type, cls: type | None = None, **kwargs):
+    def service(
+        self,
+        name_or_cls: str | type,
+        cls: type | None = None,
+        **kwargs: Any,
+    ) -> ComponentRef:
         """Add a BusinessService item to the production graph.
 
         See docs/cookbooks/hello-world-production.md and
@@ -578,14 +584,24 @@ class Production(_DeclarativeProductionMixin):
         """
         return self.component(name_or_cls, cls, kind="service", **kwargs)
 
-    def process(self, name_or_cls: str | type, cls: type | None = None, **kwargs):
+    def process(
+        self,
+        name_or_cls: str | type,
+        cls: type | None = None,
+        **kwargs: Any,
+    ) -> ComponentRef:
         """Add a BusinessProcess item to the production graph.
 
         See docs/cookbooks/add-business-process.md.
         """
         return self.component(name_or_cls, cls, kind="process", **kwargs)
 
-    def operation(self, name_or_cls: str | type, cls: type | None = None, **kwargs):
+    def operation(
+        self,
+        name_or_cls: str | type,
+        cls: type | None = None,
+        **kwargs: Any,
+    ) -> ComponentRef:
         """Add a BusinessOperation item to the production graph.
 
         See docs/cookbooks/add-business-operation.md.
@@ -650,6 +666,12 @@ class Production(_DeclarativeProductionMixin):
         mode: str = "replace",
     ) -> None:
         if not isinstance(source, TargetSettingRef):
+            if isinstance(source, TargetSetting):
+                raise TypeError(
+                    "source must be bound to a production item. Use "
+                    "component.connect(ComponentClass.Target, target_component) "
+                    "or prod.connect(component.Target, target_component)."
+                )
             raise TypeError(
                 "source must be a TargetSettingRef returned from a ComponentRef"
             )

iop/production/rendering.py

@@ -465,9 +465,7 @@ def _connection_lines(production, variables: dict[str, str], item_names: set[str
     for source_item, source_target_setting in sorted(grouped):
         targets = grouped[(source_item, source_target_setting)]
         source_var = variables[source_item]
-        source_expr = (
-            f"{source_var}.target_setting({_literal(source_target_setting)})"
-        )
+        source_expr = _literal(source_target_setting)
         valid_targets = [target for target in targets if target in variables]
         invalid_targets = [target for target in targets if target not in variables]
         for target in invalid_targets:
@@ -476,15 +474,16 @@ def _connection_lines(production, variables: dict[str, str], item_names: set[str
             continue
         if len(valid_targets) == 1:
             lines.append(
-                f"prod.connect({source_expr}, {variables[valid_targets[0]]})"
+                f"{source_var}.connect({source_expr}, {variables[valid_targets[0]]})"
             )
         else:
             lines.append(
-                f"prod.connect({source_expr}, {variables[valid_targets[0]]})"
+                f"{source_var}.connect({source_expr}, {variables[valid_targets[0]]})"
             )
             for target in valid_targets[1:]:
                 lines.append(
-                    f"prod.connect({source_expr}, {variables[target]}, mode='add')"
+                    f"{source_var}.connect({source_expr}, {variables[target]}, "
+                    "mode='add')"
                 )
 
     for edge in production.edges:

iop/production/types.py

@@ -12,7 +12,7 @@ from ..components.settings import Category, Setting, controls
 class TargetSetting(Setting):
     """Production target setting descriptor created by target()."""
 
-    def __init__(self, default: Any = "", **kwargs: Any):
+    def __init__(self, default: str = "", **kwargs: Any):
         kwargs.setdefault("iris_type", "Ens.DataType.ConfigName")
         kwargs.setdefault("category", Category.BASIC)
         kwargs.setdefault("control", controls.production_item())
@@ -34,7 +34,7 @@ class TargetSetting(Setting):
         return super().__get__(instance, owner)
 
 
-def target(default: Any = "", **kwargs: Any) -> TargetSetting:
+def target(default: str = "", **kwargs: Any) -> TargetSetting:
     """Purpose:
         Declare a configurable outbound target setting on a component class.
 

iop/production/validation.py

@@ -8,8 +8,10 @@ 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
 
 _PRODUCTION_PUBLIC_FIELDS = {
     "name",
@@ -151,6 +153,8 @@ def _build_production_object_report(production: Any) -> ProductionValidationRepo
     for item in getattr(production, "items", ()):
         issues.extend(_validate_component_ref(item))
 
+    issues.extend(_validate_target_setting_values(production))
+
     return ProductionValidationReport(production_name, tuple(issues))
 
 
@@ -180,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(
@@ -334,9 +342,67 @@ def _local_setting_names(cls: type) -> set[str] | None:
     if not callable(getter):
         return None
     try:
-        return {str(prop[0]) for prop in getter() if prop}
+        properties = getter()
     except Exception:
         return None
+    if not isinstance(properties, (list, tuple)):
+        return None
+    names: set[str] = set()
+    for prop in properties:
+        if isinstance(prop, (list, tuple)) and prop:
+            names.add(str(prop[0]))
+    return names
+
+
+def _validate_target_setting_values(production: Any) -> list[ProductionValidationIssue]:
+    items = tuple(getattr(production, "items", ()) or ())
+    item_names = {str(getattr(item, "name", "")) for item in items}
+    issues: list[ProductionValidationIssue] = []
+    for item in items:
+        item_name = str(getattr(item, "name", ""))
+        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
+            for target_name in _target_names(host_settings[setting_name]):
+                if target_name in item_names:
+                    continue
+                issues.append(
+                    ProductionValidationIssue(
+                        kind="route",
+                        path=f"items.{item_name}.settings.Host.{setting_name}",
+                        message=(
+                            f"Target setting references missing production item "
+                            f"{target_name!r}."
+                        ),
+                        suggestion=(
+                            f"Add a production item named {target_name!r}, "
+                            "or update/remove this target setting."
+                        ),
+                    )
+                )
+    return issues
+
+
+def _target_setting_names(item: Any) -> set[str]:
+    names = {str(name) for name in getattr(item, "target_setting_names", set())}
+    component_class = getattr(item, "component_class", None)
+    if isinstance(component_class, type):
+        for base in reversed(component_class.__mro__):
+            for name, value in base.__dict__.items():
+                if isinstance(value, TargetSetting):
+                    names.add(str(name))
+    return names
+
+
+def _target_names(value: Any) -> tuple[str, ...]:
+    return tuple(
+        target
+        for target in (part.strip() for part in str(value or "").split(","))
+        if target
+    )
 
 
 def _validate_names_with_known_set(
@@ -394,7 +460,7 @@ def _adapter_class_name_from_host(host_class_name: str) -> str:
         return ""
 
 
-def _iris_module():
+def _iris_module() -> Any:
     try:
         import iris  # type: ignore
     except Exception:

iop/py.typed

@@ -0,0 +1 @@
+

{iris_pex_embedded_python-4.0.1b6.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.1b6
+Version: 4.0.1b8
 Summary: Iris Interoperability based on Embedded Python
 Author-email: grongier <guillaume.rongier@intersystems.com>
 License: MIT License
@@ -98,7 +98,7 @@ class HelloOperation(BusinessOperation):
 prod = Production("HelloWorld.Production", testing_enabled=True)
 service = prod.service("HelloService", HelloService)
 operation = prod.operation("HelloOperation", HelloOperation)
-prod.connect(service.Output, operation)
+service.connect(HelloService.Output, operation)
 
 PRODUCTIONS = [prod]
 ```

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

@@ -1,5 +1,6 @@
 iop/__init__.py,sha256=bnhSiC7XcOIiS7e51uY8fr9Li7RYjhCnlCyVDzZI6-I,10636
 iop/__main__.py,sha256=2rUNM7vaYK0W57Jj72rm7GORyIFLMXKwPq3QNLwYBmY,100
+iop/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 iop/cli/__init__.py,sha256=Y78pBdA-ULzq1c_9xQZsFBlzm3x5xgxSzkvrH5DoM7I,31
 iop/cli/formatting.py,sha256=OLgHA1d8_paAuINQyKkYgihWMLoBhPn7kSXW5whRlIs,1606
 iop/cli/main.py,sha256=r3sLZniM4LCXP6u1kuQmUgMLLD0H04NC5gVXKMNY31M,18418
@@ -64,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/component.py,sha256=3a4z9rtr5DjFVejbY_7gYUCOIfWucrfDbWU19d8a738,8442
-iop/production/declarations.py,sha256=Tb79Q6rwmFMi6xKpzajJa4Aa2_Tk3sD-e8qiuRJX77s,5821
+iop/production/common.py,sha256=L2QyvE2nC1J333sbebYx_6dyoaFL-89ouMO3Kfe4-D8,3465
+iop/production/component.py,sha256=XalzNEWhCC1RVSZlQZRBpZM3BdRC2TDU-ko3Zn8-Kzo,9475
+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=RCss8i6jnpP-sNv0eLCwpxU2y2uOaLKJ5qeP4mlwwuQ,43533
+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=UVHLICY4zWEP3W7-99TpB2WeLBNREC2N8rYSnBa_iZM,20240
+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=B5tSmRAwFBoFPxp7oVPmfMW9sxHaeBtonAfv6C06W1g,16889
-iop/production/validation.py,sha256=14BfjrLXW1AOuP8AdBrs-CY6zynaDc8_AUD9frsYAIU,13753
+iop/production/types.py,sha256=hzO8rj73z16WqFQBI7YBAznY-1fD8ENyJqzTY-ydFXI,16889
+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
@@ -91,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.1b6.dist-info/licenses/LICENSE,sha256=rZSiBFId_sfbJ6RL0GjjPX-InNLkNS9ou7eQsikciI8,1089
-iris_pex_embedded_python-4.0.1b6.dist-info/METADATA,sha256=BGtIyGv7zT0llTUrwEHAHc27J-sruyQcOxnWrw812aI,5846
-iris_pex_embedded_python-4.0.1b6.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-iris_pex_embedded_python-4.0.1b6.dist-info/entry_points.txt,sha256=fzS8ZFsPe8cnpEx208X60DNugCPQmuSloPeg4pyyJDY,42
-iris_pex_embedded_python-4.0.1b6.dist-info/top_level.txt,sha256=BM54-OXQ6l2BDtmesWNXckh033s9gcjoO7bfjbwZbxU,4
-iris_pex_embedded_python-4.0.1b6.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,,