pythagoras 0.20.3__tar.gz → 0.20.4__tar.gz

{pythagoras-0.20.3 → pythagoras-0.20.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pythagoras
-Version: 0.20.3
+Version: 0.20.4
 Summary: Planet-scale distributed computing in Python.
 Keywords: cloud,ML,AI,serverless,distributed,parallel,machine-learning,deep-learning,pythagoras
 Author: Volodymyr (Vlad) Pavlov

{pythagoras-0.20.3 → pythagoras-0.20.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "pythagoras"
-version = "0.20.3"
+version = "0.20.4"
 authors = [
     {name = "Volodymyr (Vlad) Pavlov", email = "vlpavlov@ieee.org"},
 ]

pythagoras-0.20.4/src/pythagoras/_070_protected_code_portals/package_manager.py

@@ -0,0 +1,76 @@
+import subprocess
+import importlib
+import sys
+from typing import Optional
+
+_uv_and_pip_installation_needed:bool = True
+
+def _install_uv_and_pip() -> None:
+    global _uv_and_pip_installation_needed
+    if not _uv_and_pip_installation_needed:
+        return
+    _uv_pip_installation_attempted = False
+
+    try:
+        importlib.import_module("uv")
+    except:
+        install_package("uv", use_uv=False)
+
+    try:
+        importlib.import_module("pip")
+    except:
+        install_package("pip", use_uv=True)
+
+
+def install_package(package_name:str
+        , upgrade:bool=False
+        , version:Optional[str]=None
+        , use_uv:bool = True
+        ) -> None:
+    """Install package using pip."""
+
+    if package_name == "pip":
+        assert use_uv
+    elif package_name == "uv":
+        assert not use_uv
+    else:
+        _install_uv_and_pip()
+
+    if use_uv:
+        command = [sys.executable, "-m", "uv", "pip", "install"]
+    else:
+        command = [sys.executable, "-m", "pip", "install"]
+
+    if upgrade:
+        command += ["--upgrade"]
+
+    package_spec = f"{package_name}=={version}" if version else package_name
+    command += [package_spec]
+
+    subprocess.run(command, check=True, stdout=subprocess.PIPE
+        , stderr=subprocess.STDOUT, text=True)
+
+    importlib.import_module(package_name)
+
+
+def uninstall_package(package_name:str, use_uv:bool=True)->None:
+    """Uninstall package using uv or pip."""
+
+    assert package_name not in ["pip", "uv"]
+
+    if use_uv:
+        command = [sys.executable, "-m", "uv", "pip", "uninstall", package_name]
+    else:
+        command = [sys.executable, "-m", "pip", "uninstall", "-y", package_name]
+
+    subprocess.run(command, check=True, stdout=subprocess.PIPE
+        , stderr=subprocess.STDOUT, text=True)
+
+    try:
+        package = importlib.import_module(package_name)
+        importlib.reload(package)
+    except:
+        pass
+    else:
+        raise Exception(
+            f"Failed to validate package uninstallation for '{package_name}'. ")

pythagoras-0.20.3/src/pythagoras/_070_protected_code_portals/package_manager.py

@@ -1,38 +0,0 @@
-import subprocess
-import importlib
-import sys
-from typing import Optional
-
-def install_package(package_name:str
-        , upgrade:bool=False
-        , version:Optional[str]=None
-        ) -> None:
-    """Install package using pip."""
-    command = [sys.executable, "-m", "uv", "pip", "install"]
-
-    if upgrade:
-        command += ["--upgrade"]
-
-    package_spec = f"{package_name}=={version}" if version else package_name
-    command += [package_spec]
-
-    subprocess.run(command, check=True, stdout=subprocess.PIPE
-        , stderr=subprocess.STDOUT, text=True)
-
-    importlib.import_module(package_name)
-
-def uninstall_package(package_name:str)->None:
-    """Uninstall package using pip."""
-
-    command = [sys.executable, "-m", "uv", "pip", "uninstall", package_name]
-    subprocess.run(command, check=True, stdout=subprocess.PIPE
-        , stderr=subprocess.STDOUT, text=True)
-
-    try:
-        package = importlib.import_module(package_name)
-        importlib.reload(package)
-    except:
-        pass
-    else:
-        raise Exception(
-            f"Failed to validate package uninstallation for '{package_name}'. ")