From c901deb002c13cf1d44d2ae1710ddce73c1e8535 Mon Sep 17 00:00:00 2001 From: Saifeddine ALOUI Date: Tue, 8 Oct 2024 23:33:12 +0200 Subject: [PATCH] conda is out for good --- endpoints/lollms_apps.py | 41 ++-------------------------------------- lollms_core | 2 +- requirements.txt | 2 +- 3 files changed, 4 insertions(+), 41 deletions(-) diff --git a/endpoints/lollms_apps.py b/endpoints/lollms_apps.py index 5e7c602f..3bc1043e 100644 --- a/endpoints/lollms_apps.py +++ b/endpoints/lollms_apps.py @@ -348,11 +348,7 @@ async def upload_app(client_id: str, file: UploadFile = File(...)): import shutil from pathlib import Path 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}") @@ -390,40 +386,7 @@ async def install_app(app_name: str, auth: AuthRequest): with open(description_path, 'r') as file: description_data = yaml.safe_load(file) if description_data.get("has_server", (Path(app_path)/"server.py").exists()): - 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.") + pass except Exception as ex: trace_exception(ex) diff --git a/lollms_core b/lollms_core index 246f2e3d..269c640d 160000 --- a/lollms_core +++ b/lollms_core @@ -1 +1 @@ -Subproject commit 246f2e3df8de033a4a5e27440f292e565d09c80a +Subproject commit 269c640dbce3089e06835d550df5d699d8bc929c diff --git a/requirements.txt b/requirements.txt index c0794c7b..55aa7006 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,4 +37,4 @@ lollms_client>=0.7.5 aiofiles python-multipart -zipfile36 +zipfile36 \ No newline at end of file