conda is out for good

This commit is contained in:
Saifeddine ALOUI 2024-10-08 23:33:12 +02:00
parent 502693643e
commit c901deb002
3 changed files with 4 additions and 41 deletions

View File

@ -348,11 +348,7 @@ async def upload_app(client_id: str, file: UploadFile = File(...)):
import shutil import shutil
from pathlib import Path from pathlib import Path
import json import json
# Function to get the current conda environment
def get_current_conda_env():
result = subprocess.run(['conda', 'info', '--json'], capture_output=True, text=True)
conda_info = json.loads(result.stdout)
return conda_info['active_prefix_name']
@router.post("/install/{app_name}") @router.post("/install/{app_name}")
@ -390,40 +386,7 @@ async def install_app(app_name: str, auth: AuthRequest):
with open(description_path, 'r') as file: with open(description_path, 'r') as file:
description_data = yaml.safe_load(file) description_data = yaml.safe_load(file)
if description_data.get("has_server", (Path(app_path)/"server.py").exists()): if description_data.get("has_server", (Path(app_path)/"server.py").exists()):
pass pass
# current_env = get_current_conda_env()
# env_name = app_path.stem
# ASCIIColors.info("Creating a new environment")
# conda.cli.main('create', '-n', env_name, 'python=3.11', '-y')
# # Activate the new conda environment
# activate_command = f"conda activate {env_name}"
# if os.name == 'nt': # Windows
# activate_command = f"call activate {env_name}"
# Install requirements
# install_command = f"{activate_command} && pip install -r {requirements}"
# try:
# ASCIIColors.info(f"Creating a new environment: {env_name}")
# subprocess.run(activate_command, shell=True, check=True)
# ASCIIColors.info("Installing requirements")
# subprocess.run(install_command, shell=True, check=True)
# ASCIIColors.success(f"Environment '{env_name}' created and requirements installed successfully.")
# except subprocess.CalledProcessError as e:
# ASCIIColors.error(f"An error occurred: {str(e)}")
# finally:
# # Switch back to the original environment
# if current_env:
# switch_back_command = f"conda activate {current_env}"
# if os.name == 'nt': # Windows
# switch_back_command = f"call activate {current_env}"
# ASCIIColors.info(f"Switching back to the original environment: {current_env}")
# subprocess.run(switch_back_command, shell=True, check=True)
# else:
# ASCIIColors.warning("Could not determine the original environment. You may need to switch back manually.")
except Exception as ex: except Exception as ex:
trace_exception(ex) trace_exception(ex)

@ -1 +1 @@
Subproject commit 246f2e3df8de033a4a5e27440f292e565d09c80a Subproject commit 269c640dbce3089e06835d550df5d699d8bc929c

View File

@ -37,4 +37,4 @@ lollms_client>=0.7.5
aiofiles aiofiles
python-multipart python-multipart
zipfile36 zipfile36