Update app.py

app.py

@@ -30,46 +30,52 @@ async def stream_log(file_path):
 import os
 import subprocess
 import urllib.request
-from pathlib import Path
+import shutil
 
-def install_python_version(python_version: str):
-    python_bin = f"/usr/local/bin/python{python_version}"
-    pip_bin = f"/usr/local/bin/pip{python_version}"
+def install_python_version(python_version: str, use_deb: bool = False, install_dir: str = os.path.expanduser("~/local")):
+    base_url = "https://www.python.org/ftp/python"
+    python_bin = f"{install_dir}/bin/python{python_version}"
+    pip_bin = f"{install_dir}/bin/pip{python_version}"
 
     # Check if Python is already installed
     if os.path.isfile(python_bin):
         return python_bin, pip_bin
 
-    # Download and install Python if not present
     try:
-        url = f"https://www.python.org/ftp/python/{python_version}/Python-{python_version}.tgz"
-        tar_path = f"/tmp/Python-{python_version}.tgz"
-        
-        # Download Python source tarball
-        urllib.request.urlretrieve(url, tar_path)
-        
-        # Extract tarball
-        subprocess.run(["tar", "-xzf", tar_path, "-C", "/tmp"], check=True)
-
-        # Build and install Python
-        python_src_path = f"/tmp/Python-{python_version}"
-        subprocess.run([f"{python_src_path}/configure"], cwd=python_src_path, check=True)
-        subprocess.run(["make", "-j"], cwd=python_src_path, check=True)
-        subprocess.run(["make", "altinstall", f"EXTRA_CFLAGS='-I/usr/local/include'"], cwd=python_src_path, check=True)
-        
-        # Clean up
-        os.remove(tar_path)
-        shutil.rmtree(python_src_path)
-        
-        # Update alternatives (if necessary)
-        subprocess.run(["update-alternatives", "--install", "/usr/bin/python3", "python3", python_bin, "1"], check=True)
-        subprocess.run(["update-alternatives", "--install", "/usr/bin/pip", "pip", pip_bin, "1"], check=True)
-        
-    except Exception as e:
+        os.makedirs(install_dir, exist_ok=True)
+        if use_deb:
+            raise NotImplementedError("Debian package installation requires root permissions.")
+        else:
+            # For .tar.xz binary distribution
+            tar_url = f"{base_url}/{python_version}/Python-{python_version}-linux-x86_64.tar.xz"
+            tar_path = f"/tmp/Python-{python_version}.tar.xz"
+            
+            # Download Python source tarball
+            urllib.request.urlretrieve(tar_url, tar_path)
+            
+            # Extract tarball
+            subprocess.run(["tar", "-xf", tar_path, "-C", "/tmp"], check=True)
+            
+            # Build and install Python to the specified directory
+            python_src_path = f"/tmp/Python-{python_version}"
+            subprocess.run([f"{python_src_path}/configure", f"--prefix={install_dir}"], cwd=python_src_path, check=True)
+            subprocess.run(["make", "-j"], cwd=python_src_path, check=True)
+            subprocess.run(["make", "install"], cwd=python_src_path, check=True)
+            
+            # Clean up
+            os.remove(tar_path)
+            shutil.rmtree(python_src_path)
+
+    except urllib.error.HTTPError as e:
+        raise RuntimeError(f"HTTP Error: {str(e)}")
+    except subprocess.CalledProcessError as e:
         raise RuntimeError(f"Error installing Python {python_version}: {str(e)}")
+    except Exception as e:
+        raise RuntimeError(f"Error: {str(e)}")
 
     return python_bin, pip_bin
 
+
 # @app.post("/download-dependencies")
 # async def download_dependencies(requirements_file: UploadFile = File(...)):
 #     try: