protoprimer 0.0.2.dev1__tar.gz → 0.0.2.dev2__tar.gz

{protoprimer-0.0.2.dev1 → protoprimer-0.0.2.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: protoprimer
-Version: 0.0.2.dev1
+Version: 0.0.2.dev2
 Summary: universal multi-stage `python` environment initializer & bootstrapper (primer) via a stand-alone automatic (proto) script
 Author: uvsmtid
 Author-email: uvsmtid@gmail.com

{protoprimer-0.0.2.dev1 → protoprimer-0.0.2.dev2}/main/protoprimer/primer_kernel.py

@@ -35,7 +35,7 @@ import venv
 
 # Implements this (using the single script directly without a separate `_version.py` file):
 # https://stackoverflow.com/a/7071358/441652
-__version__ = "0.0.2.dev1"
+__version__ = "0.0.2.dev2"
 
 from typing import (
     Any,
@@ -95,54 +95,50 @@ def init_arg_parser():
     )
 
     arg_parser.add_argument(
-        # TODO: put in ArgConst:
-        "--context_phase",
+        ArgConst.arg_context_phase,
         type=str,
         choices=[context_phase.name for context_phase in PrimerPhase],
-        default=PrimerPhase.proto_primer.name,
+        default=PrimerPhase.phase_proto.name,
         help=f"Select `{PrimerPhase.__name__}`.",
     )
     arg_parser.add_argument(
-        "-s",
-        # TODO: put in ArgConst:
-        "--silent",
+        ArgConst.arg_s,
+        ArgConst.arg_silent,
         action="store_true",
-        dest="log_level_silent",
+        dest=ArgConst.dest_silent,
         # In the case of exceptions, stack traces are still printed:
-        help="Do not log, use non-zero exit code on error.",
+        help="Do not log (set only non-zero exit code on error).",
     )
     arg_parser.add_argument(
-        "-q",
-        # TODO: put in ArgConst:
-        "--quiet",
+        ArgConst.arg_q,
+        ArgConst.arg_quiet,
         action="store_true",
-        dest="log_level_quiet",
+        dest=ArgConst.dest_quiet,
         help="Log errors messages only.",
     )
     arg_parser.add_argument(
-        "-v",
-        # TODO: put in ArgConst:
-        "--verbose",
+        ArgConst.arg_v,
+        ArgConst.arg_verbose,
         action="count",
-        dest="log_level_verbose",
+        dest=ArgConst.dest_verbose,
         default=0,
-        help="Log debug messages.",
+        help="Increase log verbosity level.",
     )
     arg_parser.add_argument(
-        # TODO: put in ArgConst:
-        "--run_mode",
+        ArgConst.arg_run_mode,
         type=str,
         choices=[run_mode.name for run_mode in RunMode],
         default=RunMode.bootstrap_env.name,
-        help="Select run mode.",
+        help=f"Select {RunMode.__name__}.",
     )
     arg_parser.add_argument(
-        # TODO: put in ArgConst:
-        "--state_name",
+        ArgConst.arg_state_name,
         type=str,
+        # TODO: Provide choices?
+        # TODO: Provide default?
         default=None,
         # TODO: Compute universal sink:
-        help="Select state name to start with (default = universal sink).",
+        help=f"Select target {EnvState.__name__}.",
     )
     # TODO: use it with special `--init_repo` flag (otherwise, do not allow):
     arg_parser.add_argument(
@@ -156,7 +152,7 @@ def init_arg_parser():
         type=str,
         choices=[py_exec.name for py_exec in PythonExecutable],
         default=PythonExecutable.py_exec_unknown.name,
-        help="Used internally: category of `python` executable detected by recursive invocation.",
+        help=f"Used internally: override {PythonExecutable.__name__}.",
     )
     # TODO: use it with special `--init_repo` flag (otherwise, do not allow):
     arg_parser.add_argument(
@@ -303,9 +299,9 @@ class PrimerPhase(enum.Enum):
     See: FS_14_52_73_23.primer_phase.md
     """
 
-    proto_primer = enum.auto()
+    phase_proto = enum.auto()
 
-    venv_primer = enum.auto()
+    phase_venv = enum.auto()
 
 
 class RunMode(enum.Enum):
@@ -1258,22 +1254,6 @@ class Bootstrapper_state_py_exec_selected(
                 f"to re-create it automatically. "
             )
 
-        def switch_to_required_python():
-            assert state_py_exec_specified == PythonExecutable.py_exec_unknown
-            self.env_ctx.py_exec = PythonExecutable.py_exec_arbitrary
-            logger.info(
-                f"switching from current `python` interpreter [{path_to_curr_python}] to required one [{state_env_path_to_python}]"
-            )
-            os.execv(
-                state_env_path_to_python,
-                [
-                    state_env_path_to_python,
-                    *sys.argv,
-                    ArgConst.arg_py_exec,
-                    PythonExecutable.py_exec_required.name,
-                ],
-            )
-
         venv_path_to_python = os.path.join(
             state_env_path_to_venv,
             ConfConstGeneral.file_rel_path_venv_python,
@@ -1281,8 +1261,15 @@ class Bootstrapper_state_py_exec_selected(
         path_to_curr_python = get_path_to_curr_python()
         if is_sub_path(path_to_curr_python, state_env_path_to_venv):
             if path_to_curr_python != venv_path_to_python:
+                assert state_py_exec_specified == PythonExecutable.py_exec_unknown
+                self.env_ctx.py_exec = PythonExecutable.py_exec_arbitrary
                 # Ensure `python` is from the correct `venv` path
-                switch_to_required_python()
+                self.env_ctx.switch_python(
+                    curr_py_exec=state_py_exec_specified,
+                    curr_python_path=path_to_curr_python,
+                    next_py_exec=PythonExecutable.py_exec_required,
+                    next_python_path=state_env_path_to_python,
+                )
             else:
                 # If already under `venv` with the expected path, nothing to do.
                 assert (
@@ -1296,7 +1283,14 @@ class Bootstrapper_state_py_exec_selected(
                     self.env_ctx.py_exec = state_py_exec_specified
         else:
             if path_to_curr_python != state_env_path_to_python:
-                switch_to_required_python()
+                assert state_py_exec_specified == PythonExecutable.py_exec_unknown
+                self.env_ctx.py_exec = PythonExecutable.py_exec_arbitrary
+                self.env_ctx.switch_python(
+                    curr_py_exec=state_py_exec_specified,
+                    curr_python_path=path_to_curr_python,
+                    next_py_exec=PythonExecutable.py_exec_required,
+                    next_python_path=state_env_path_to_python,
+                )
             else:
                 assert (
                     state_py_exec_specified == PythonExecutable.py_exec_unknown
@@ -1311,17 +1305,11 @@ class Bootstrapper_state_py_exec_selected(
                     )
                 else:
                     logger.info(f"reusing existing `venv` [{state_env_path_to_venv}]")
-                logger.info(
-                    f"switching from current `python` interpreter [{state_env_path_to_python}] to `venv` interpreter [{venv_path_to_python}]"
-                )
-                os.execv(
-                    venv_path_to_python,
-                    [
-                        venv_path_to_python,
-                        *sys.argv,
-                        ArgConst.arg_py_exec,
-                        PythonExecutable.py_exec_venv.name,
-                    ],
+                self.env_ctx.switch_python(
+                    curr_py_exec=state_py_exec_specified,
+                    curr_python_path=state_env_path_to_python,
+                    next_py_exec=PythonExecutable.py_exec_venv,
+                    next_python_path=venv_path_to_python,
                 )
 
         return self.env_ctx.py_exec
@@ -1435,17 +1423,15 @@ class Bootstrapper_state_py_exec_updated_protoprimer_package_reached(
             < PythonExecutable.py_exec_updated_protoprimer_package.value
         ):
             self.env_ctx.py_exec = PythonExecutable.py_exec_updated_protoprimer_package
-            logger.info(
+            # TODO: maybe add this reason to `switch_python` as an arg?
+            logger.debug(
                 f"restarting current `python` interpreter [{venv_path_to_python}] to make [{EnvState.state_protoprimer_package_installed.name}] effective"
             )
-            os.execv(
-                venv_path_to_python,
-                [
-                    venv_path_to_python,
-                    *sys.argv,
-                    ArgConst.arg_py_exec,
-                    PythonExecutable.py_exec_updated_protoprimer_package.name,
-                ],
+            self.env_ctx.switch_python(
+                curr_py_exec=state_py_exec_specified,
+                curr_python_path=venv_path_to_python,
+                next_py_exec=PythonExecutable.py_exec_updated_protoprimer_package,
+                next_python_path=venv_path_to_python,
             )
         else:
             # Successfully reached end goal:
@@ -1569,17 +1555,15 @@ class Bootstrapper_state_py_exec_updated_proto_kernel_code(
             < PythonExecutable.py_exec_updated_proto_kernel_code.value
         ):
             self.env_ctx.py_exec = PythonExecutable.py_exec_updated_proto_kernel_code
-            logger.info(
+            # TODO: maybe add this reason to `switch_python` as an arg?
+            logger.debug(
                 f"restarting current `python` interpreter [{venv_path_to_python}] to make [{EnvState.state_proto_kernel_updated.name}] effective"
             )
-            os.execv(
-                venv_path_to_python,
-                [
-                    venv_path_to_python,
-                    *sys.argv,
-                    ArgConst.arg_py_exec,
-                    PythonExecutable.py_exec_updated_proto_kernel_code.name,
-                ],
+            self.env_ctx.switch_python(
+                curr_py_exec=state_py_exec_specified,
+                curr_python_path=venv_path_to_python,
+                next_py_exec=PythonExecutable.py_exec_updated_proto_kernel_code,
+                next_python_path=venv_path_to_python,
             )
         else:
             # Successfully reached end goal:
@@ -1763,16 +1747,45 @@ class TargetState:
 
 class ArgConst:
 
-    # TODO: decide on convention for pure `arg_name` and `--arg_name`:
     name_conf_env_path = "conf_env_path"
     name_recursion_flag = "recursion_flag"
     name_client_dir_path = "client_dir_path"
     name_py_exec = "py_exec"
+    name_context_phase = "context_phase"
+    name_run_mode = "run_mode"
+    name_state_name = "state_name"
+
+    name_s = "s"
+    name_silent = "silent"
+
+    name_q = "q"
+    name_quiet = "quiet"
+
+    name_v = "v"
+    name_verbose = "verbose"
+
+    prefix_log_level = "log_level"
 
     arg_conf_env_path = f"--{name_conf_env_path}"
     arg_recursion_flag = f"--{name_recursion_flag}"
     arg_client_dir_path = f"--{name_client_dir_path}"
     arg_py_exec = f"--{name_py_exec}"
+    arg_context_phase = f"--{name_context_phase}"
+    arg_run_mode = f"--{name_run_mode}"
+    arg_state_name = f"--{name_state_name}"
+
+    arg_s = f"-{name_s}"
+    arg_silent = f"--{name_silent}"
+    value_silent = f"--{name_silent}"
+    dest_silent = f"log_level_{name_silent}"
+
+    arg_q = f"-{name_q}"
+    arg_quiet = f"--{name_quiet}"
+    dest_quiet = f"log_level_{name_quiet}"
+
+    arg_v = f"-{name_v}"
+    arg_verbose = f"--{name_verbose}"
+    dest_verbose = f"log_level_{name_verbose}"
 
 
 class ConfConstGeneral:
@@ -2099,6 +2112,26 @@ class EnvContext:
         # `generate_files`
         # TODO: TODO_11_66_62_70: python_bootstrap:
 
+    def switch_python(
+        self,
+        curr_py_exec: PythonExecutable,
+        curr_python_path: str,
+        next_py_exec: PythonExecutable,
+        next_python_path: str,
+    ):
+        logger.info(
+            f"switching from current `python` interpreter [{curr_python_path}][{curr_py_exec.name}] to [{next_python_path}][{next_py_exec.name}]"
+        )
+        os.execv(
+            next_python_path,
+            [
+                next_python_path,
+                *sys.argv,
+                ArgConst.arg_py_exec,
+                next_py_exec.name,
+            ],
+        )
+
 
 class CustomFormatter(logging.Formatter):
     """

{protoprimer-0.0.2.dev1 → protoprimer-0.0.2.dev2}/protoprimer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: protoprimer
-Version: 0.0.2.dev1
+Version: 0.0.2.dev2
 Summary: universal multi-stage `python` environment initializer & bootstrapper (primer) via a stand-alone automatic (proto) script
 Author: uvsmtid
 Author-email: uvsmtid@gmail.com