iris-pex-embedded-python 4.0.0b8__tar.gz → 4.0.0b10__tar.gz

{iris_pex_embedded_python-4.0.0b8/src/iris_pex_embedded_python.egg-info → iris_pex_embedded_python-4.0.0b10}/PKG-INFO

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

{iris_pex_embedded_python-4.0.0b8 → iris_pex_embedded_python-4.0.0b10}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel"]
 
 [project]
 name = "iris_pex_embedded_python"
-version = "4.0.0b8"
+version = "4.0.0b10"
 description = "Iris Interoperability based on Embedded Python"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -63,6 +63,9 @@ markers = [
     "e2e_remote: end-to-end test requiring a remote IRIS instance via REST API",
 ]
 
+[tool.pyright]
+pythonVersion = "3.10"
+
 [tool.ruff]
 target-version = "py310"
 line-length = 88

{iris_pex_embedded_python-4.0.0b8 → iris_pex_embedded_python-4.0.0b10}/src/iop/__init__.py

@@ -29,19 +29,23 @@ from iop.migration.utils import unregister_component as unregister_component
 from iop.production import ComponentItem as ComponentItem
 from iop.production import ComponentRef as ComponentRef
 from iop.production import OperationItem as OperationItem
-from iop.production import Port as Port
 from iop.production import ProcessItem as ProcessItem
 from iop.production import Production as Production
+from iop.production import ProductionApplyResult as ProductionApplyResult
+from iop.production import ProductionChangePlan as ProductionChangePlan
 from iop.production import ProductionDiff as ProductionDiff
 from iop.production import ProductionDiffEntry as ProductionDiffEntry
 from iop.production import ProductionGraph as ProductionGraph
+from iop.production import ProductionPlanOperation as ProductionPlanOperation
 from iop.production import ProductionValidationError as ProductionValidationError
 from iop.production import ProductionValidationIssue as ProductionValidationIssue
 from iop.production import ProductionValidationReport as ProductionValidationReport
 from iop.production import ProductionValidationWarning as ProductionValidationWarning
+from iop.production import ProductionVerifyResult as ProductionVerifyResult
 from iop.production import Route as Route
 from iop.production import ServiceItem as ServiceItem
 from iop.production import TargetSetting as TargetSetting
+from iop.production import TargetSettingRef as TargetSettingRef
 from iop.production import target as target
 from iop.runtime.director import _Director
 from iop.runtime.protocol import DirectorProtocol as DirectorProtocol
@@ -67,12 +71,15 @@ __all__ = [
     "PersistentMessage",
     "PickleMessage",
     "PollingBusinessService",
-    "Port",
     "ProcessItem",
     "Production",
+    "ProductionApplyResult",
+    "ProductionChangePlan",
     "ProductionDiff",
     "ProductionDiffEntry",
     "ProductionGraph",
+    "ProductionPlanOperation",
+    "ProductionVerifyResult",
     "ProductionValidationError",
     "ProductionValidationIssue",
     "ProductionValidationReport",
@@ -83,6 +90,7 @@ __all__ = [
     "ServiceItem",
     "Setting",
     "TargetSetting",
+    "TargetSettingRef",
     "Utils",
     "bind_component",
     "controls",

{iris_pex_embedded_python-4.0.0b8 → iris_pex_embedded_python-4.0.0b10}/src/iop/cli/main.py

@@ -9,7 +9,7 @@ from importlib.metadata import version
 import requests
 
 from ..migration import utils as migration_utils
-from ..production import Production
+from ..production import Production, ProductionChangePlan
 from ..runtime.local import _LocalDirector
 from ..runtime.protocol import DirectorProtocol
 from ..runtime.remote import _RemoteDirector, get_remote_settings
@@ -78,6 +78,11 @@ class Command:
                 self.args.bindings,
                 self.args.unbind is not None,
                 self.args.update,
+                self.args.plan,
+                self.args.review_plan,
+                self.args.apply_plan,
+                self.args.verify_plan,
+                self.args.rollback_backup,
             ]
         )
 
@@ -109,6 +114,11 @@ class Command:
             CommandType.UNBIND: self._handle_unbind,
             CommandType.HELP: self._handle_help,
             CommandType.UPDATE: self._handle_update,
+            CommandType.PLAN: self._handle_plan,
+            CommandType.REVIEW_PLAN: self._handle_review_plan,
+            CommandType.APPLY_PLAN: self._handle_apply_plan,
+            CommandType.VERIFY_PLAN: self._handle_verify_plan,
+            CommandType.ROLLBACK_BACKUP: self._handle_rollback_backup,
         }
         handler = command_handlers.get(command_type)
         if handler:
@@ -149,6 +159,16 @@ class Command:
             return CommandType.UNBIND
         if self.args.update:
             return CommandType.UPDATE
+        if self.args.plan:
+            return CommandType.PLAN
+        if self.args.review_plan:
+            return CommandType.REVIEW_PLAN
+        if self.args.apply_plan:
+            return CommandType.APPLY_PLAN
+        if self.args.verify_plan:
+            return CommandType.VERIFY_PLAN
+        if self.args.rollback_backup:
+            return CommandType.ROLLBACK_BACKUP
         return CommandType.HELP
 
     def _handle_default(self) -> None:
@@ -236,6 +256,9 @@ class Command:
         if export_format == "graph":
             print(production.graph())
             return
+        if export_format == "mermaid":
+            print(production.to_mermaid(), end="")
+            return
         raise ValueError(f"Unsupported export format: {export_format}")
 
     def _handle_migrate(self) -> None:
@@ -324,6 +347,55 @@ class Command:
         self.director.unbind_component(self.args.unbind)
         print(f"Removed binding {self.args.unbind}.")
 
+    def _handle_plan(self) -> None:
+        production = self._load_production_from_settings(
+            self.args.plan,
+            self.args.production,
+        )
+        plan = production.plan()
+        if self.args.out:
+            plan.save(self._absolute_path(self.args.out))
+            print(f"Production change plan written to {self.args.out}")
+        else:
+            print(plan)
+
+    def _handle_review_plan(self) -> None:
+        plan = ProductionChangePlan.load(self._absolute_path(self.args.review_plan))
+        print(plan)
+
+    def _handle_apply_plan(self) -> None:
+        if not self.args.settings:
+            raise ValueError("--apply-plan requires --settings.")
+        plan = ProductionChangePlan.load(self._absolute_path(self.args.apply_plan))
+        production = self._load_production_from_settings(
+            self.args.settings,
+            self.args.production or plan.production_name,
+        )
+        result = production.apply(
+            plan,
+            allow_destructive=self.args.allow_destructive,
+            backup_dir=self.args.backup_dir,
+        )
+        print(result)
+
+    def _handle_verify_plan(self) -> None:
+        plan = ProductionChangePlan.load(self._absolute_path(self.args.verify_plan))
+        production = Production(
+            self.args.production or plan.production_name,
+            namespace=self.director.namespace,
+            director=self.director,
+        )
+        print(production.verify(plan))
+
+    def _handle_rollback_backup(self) -> None:
+        result = Production.rollback_backup(
+            self._absolute_path(self.args.rollback_backup),
+            director=self.director,
+            namespace=self.director.namespace,
+            allow_destructive=self.args.allow_destructive,
+        )
+        print(result)
+
     def _handle_help(self) -> None:
         create_parser().print_help()
         if self._is_remote:
@@ -334,6 +406,73 @@ class Command:
         except Exception:
             logging.warning("Could not retrieve default production.")
 
+    def _load_production_from_settings(
+        self,
+        settings_file: str | None,
+        production_name: str | None,
+    ) -> Production:
+        if not settings_file:
+            raise ValueError("A settings.py file is required.")
+        settings_path = self._absolute_path(settings_file)
+        settings, path_added = migration_utils._load_settings(settings_path)
+        try:
+            production = _select_production(
+                getattr(settings, "PRODUCTIONS", None),
+                production_name,
+                director=self.director,
+                namespace=self.director.namespace,
+            )
+            production.with_director(self.director)
+            if not production.namespace:
+                production.in_namespace(self.director.namespace)
+            return production
+        finally:
+            migration_utils._cleanup_sys_path(path_added)
+
+    @staticmethod
+    def _absolute_path(path: str | None) -> str:
+        if not path:
+            raise ValueError("Path is required.")
+        if os.path.isabs(path):
+            return path
+        return os.path.join(os.getcwd(), path)
+
+
+def _select_production(
+    productions,
+    production_name: str | None,
+    *,
+    director: DirectorProtocol,
+    namespace: str | None,
+) -> Production:
+    if not isinstance(productions, list):
+        raise ValueError("settings.py must define PRODUCTIONS as a list.")
+    candidates: list[Production] = []
+    for entry in productions:
+        if isinstance(entry, Production):
+            candidate = entry
+        elif isinstance(entry, dict):
+            candidate = Production.from_dict(
+                entry,
+                director=director,
+                namespace=namespace,
+            )
+        else:
+            continue
+        candidates.append(candidate)
+    if production_name:
+        for candidate in candidates:
+            if candidate.name == production_name:
+                return candidate
+        raise ValueError(f"Production {production_name!r} not found in settings.")
+    if len(candidates) == 1:
+        return candidates[0]
+    names = ", ".join(candidate.name for candidate in candidates) or "none"
+    raise ValueError(
+        "Production name is required when settings.py contains multiple "
+        f"productions ({names})."
+    )
+
 
 def main(argv=None) -> None:
     parser = create_parser()

{iris_pex_embedded_python-4.0.0b8 → iris_pex_embedded_python-4.0.0b10}/src/iop/cli/parser.py

@@ -64,6 +64,17 @@ def create_parser() -> argparse.ArgumentParser:
         "-t", "--test", help="test the iop module in iris", nargs="?", const="not_set"
     )
     parser.add_argument("-u", "--update", help="update a production", action="store_true")
+    parser.add_argument(
+        "--plan",
+        help="build a conservative production change plan from a Python settings file",
+    )
+    parser.add_argument("--review-plan", help="print a saved production change plan")
+    parser.add_argument("--apply-plan", help="apply a saved production change plan")
+    parser.add_argument("--verify-plan", help="verify a saved production change plan")
+    parser.add_argument(
+        "--rollback-backup",
+        help="restore a production from a plan/apply backup directory",
+    )
 
     start = main_parser.add_argument_group("start arguments")
     start.add_argument(
@@ -105,7 +116,7 @@ def create_parser() -> argparse.ArgumentParser:
     export.add_argument(
         "--format",
         dest="export_format",
-        choices=("json", "python", "class", "graph"),
+        choices=("json", "python", "class", "graph", "mermaid"),
         default="json",
         help="export format for -e/--export",
     )
@@ -117,6 +128,27 @@ def create_parser() -> argparse.ArgumentParser:
         action="store_true",
     )
 
+    plan = main_parser.add_argument_group("production plan arguments")
+    plan.add_argument(
+        "--production",
+        help="target production name for --plan, or override the plan production",
+    )
+    plan.add_argument("--out", help="write --plan JSON to this path")
+    plan.add_argument(
+        "--settings",
+        help="settings.py file containing the desired Production for --apply-plan",
+    )
+    plan.add_argument(
+        "--backup-dir",
+        default=".iop/backups",
+        help="directory for apply backup artifacts",
+    )
+    plan.add_argument(
+        "--allow-destructive",
+        help="allow destructive plan operations or rollback",
+        action="store_true",
+    )
+
     remote = main_parser.add_argument_group("remote arguments")
     remote.add_argument(
         "-R",

{iris_pex_embedded_python-4.0.0b8 → iris_pex_embedded_python-4.0.0b10}/src/iop/cli/types.py

@@ -23,6 +23,11 @@ class CommandType(Enum):
     UNBIND = auto()
     HELP = auto()
     UPDATE = auto()
+    PLAN = auto()
+    REVIEW_PLAN = auto()
+    APPLY_PLAN = auto()
+    VERIFY_PLAN = auto()
+    ROLLBACK_BACKUP = auto()
 
 
 @dataclass
@@ -56,3 +61,13 @@ class CommandArgs:
     update: bool = False
     migration_plan: bool = False
     strict_production_validation: bool = False
+    plan: str | None = None
+    production: str | None = None
+    out: str | None = None
+    review_plan: str | None = None
+    apply_plan: str | None = None
+    verify_plan: str | None = None
+    rollback_backup: str | None = None
+    settings: str | None = None
+    backup_dir: str = ".iop/backups"
+    allow_destructive: bool = False