Merged main

README.md

@@ -38,7 +38,7 @@ https://github.com/user-attachments/assets/8aa729ff-c431-4a61-a9ef-d17050a27d02
 
 2. Create a Conda environment:
    ```
-   conda create -n codeaide python=3.8
+   conda create -n codeaide python=3.11
    conda activate codeaide
    ```
 

codeaide/ui/code_popup.py

@@ -106,8 +106,10 @@ def line_number_area_paint_event(self, event):
 
         block = self.firstVisibleBlock()
         block_number = block.blockNumber()
-        top = self.blockBoundingGeometry(block).translated(self.contentOffset()).top()
-        bottom = top + self.blockBoundingRect(block).height()
+        top = round(
+            self.blockBoundingGeometry(block).translated(self.contentOffset()).top()
+        )
+        bottom = top + round(self.blockBoundingRect(block).height())
 
         while block.isValid() and top <= event.rect().bottom():
             if block.isVisible() and bottom >= event.rect().top():
@@ -123,7 +125,7 @@ def line_number_area_paint_event(self, event):
                 )
             block = block.next()
             top = bottom
-            bottom = top + self.blockBoundingRect(block).height()
+            bottom = top + round(self.blockBoundingRect(block).height())
             block_number += 1
 
 

codeaide/utils/environment_manager.py

@@ -1,6 +1,7 @@
 import os
 import subprocess
 import venv
+import shutil
 from codeaide.utils.logging_config import get_logger
 
 logger = get_logger()
@@ -45,11 +46,6 @@ def _get_installed_packages(self):
             logger.error(f"Error getting installed packages: {e}")
 
     def install_requirements(self, requirements_file):
-        pip_path = (
-            os.path.join(self.env_path, "bin", "pip")
-            if os.name != "nt"
-            else os.path.join(self.env_path, "Scripts", "pip.exe")
-        )
         with open(requirements_file, "r") as f:
             required_packages = {line.strip().lower() for line in f if line.strip()}
 
@@ -58,9 +54,14 @@ def install_requirements(self, requirements_file):
         if packages_to_install:
             packages_str = " ".join(packages_to_install)
             logger.info(f"Installing new packages: {packages_str}")
+            pip_path = (
+                os.path.join(self.env_path, "bin", "pip")
+                if os.name != "nt"
+                else os.path.join(self.env_path, "Scripts", "pip.exe")
+            )
             try:
                 subprocess.run(
-                    f"{pip_path} install {packages_str}", shell=True, check=True
+                    f'"{pip_path}" install {packages_str}', shell=True, check=True
                 )
                 self.installed_packages.update(packages_to_install)
                 logger.info(
@@ -86,3 +87,16 @@ def get_activation_command(self):
             if os.name == "nt"
             else f"source {activation_path}"
         )
+
+    def get_python_executable(self):
+        if os.name == "nt":  # Windows
+            return os.path.join(self.env_path, "Scripts", "python.exe")
+        else:  # Unix-like
+            return os.path.join(self.env_path, "bin", "python")
+
+    def recreate_environment(self):
+        logger.info(f"Recreating virtual environment at {self.env_path}")
+        if os.path.exists(self.env_path):
+            shutil.rmtree(self.env_path)
+        self._setup_environment()
+        self._get_installed_packages()

codeaide/utils/terminal_manager.py

@@ -180,7 +180,7 @@ def __init__(self, traceback_callback=None):
         atexit.register(self.cleanup)
 
     def run_script(self, script_path, requirements_path):
-        # Install requirements
+        # Install only new requirements
         new_packages = self.env_manager.install_requirements(requirements_path)
 
         # Get activation command
@@ -203,6 +203,8 @@ def run_script(self, script_path, requirements_path):
 
     def _create_script_content(self, script_path, activation_command, new_packages):
         script_name = os.path.basename(script_path)
+        python_executable = self.env_manager.get_python_executable()
+
         script_content = f"""
         clear # Clear the terminal
         echo "Activating environment..."
@@ -216,7 +218,7 @@ def _create_script_content(self, script_path, activation_command, new_packages):
 
         script_content += f"""
         echo "Running {script_name}..."
-        python "{script_path}"
+        "{python_executable}" "{script_path}"
         echo "Script execution completed."
         """
         return script_content

requirements.txt

@@ -3,6 +3,7 @@ google-generativeai==0.8.3
 python-decouple==3.8
 virtualenv==20.16.2
 numpy==1.26.4
+numpy==1.26.4
 openai
 hjson
 pyyaml

setup.py

@@ -26,5 +26,5 @@
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
     ],
-    python_requires=">=3.8",
+    python_requires=">=3.9",
 )