Merge remote-tracking branch 'upstream/main'

himanshu748 · himanshu748 · commit 8bc210f93ecf · 2026-01-29T11:49:00.000+05:30
diff --git a/core/framework/storage/backend.py b/core/framework/storage/backend.py
@@ -86,13 +86,13 @@ def save_run(self, run: Run) -> None:
         """Save a run to storage."""
         # Save full run using Pydantic's model_dump_json
         run_path = self.base_path / "runs" / f"{run.id}.json"
-        with open(run_path, "w") as f:
+        with open(run_path, "w", encoding="utf-8") as f:
             f.write(run.model_dump_json(indent=2))
 
         # Save summary
         summary = RunSummary.from_run(run)
         summary_path = self.base_path / "summaries" / f"{run.id}.json"
-        with open(summary_path, "w") as f:
+        with open(summary_path, "w", encoding="utf-8") as f:
             f.write(summary.model_dump_json(indent=2))
 
         # Update indexes
@@ -106,7 +106,7 @@ def load_run(self, run_id: str) -> Run | None:
         run_path = self.base_path / "runs" / f"{run_id}.json"
         if not run_path.exists():
             return None
-        with open(run_path) as f:
+        with open(run_path, encoding="utf-8") as f:
             return Run.model_validate_json(f.read())
 
     def load_summary(self, run_id: str) -> RunSummary | None:
@@ -119,7 +119,7 @@ def load_summary(self, run_id: str) -> RunSummary | None:
                 return RunSummary.from_run(run)
             return None
 
-        with open(summary_path) as f:
+        with open(summary_path, encoding="utf-8") as f:
             return RunSummary.model_validate_json(f.read())
 
     def delete_run(self, run_id: str) -> bool:
@@ -178,7 +178,7 @@ def _get_index(self, index_type: str, key: str) -> list[str]:
         index_path = self.base_path / "indexes" / index_type / f"{key}.json"
         if not index_path.exists():
             return []
-        with open(index_path) as f:
+        with open(index_path, encoding="utf-8") as f:
             return json.load(f)
 
     def _add_to_index(self, index_type: str, key: str, value: str) -> None:
@@ -188,7 +188,7 @@ def _add_to_index(self, index_type: str, key: str, value: str) -> None:
         values = self._get_index(index_type, key)  # Already validated in _get_index
         if value not in values:
             values.append(value)
-            with open(index_path, "w") as f:
+            with open(index_path, "w", encoding="utf-8") as f:
                 json.dump(values, f)
 
     def _remove_from_index(self, index_type: str, key: str, value: str) -> None:
@@ -198,7 +198,7 @@ def _remove_from_index(self, index_type: str, key: str, value: str) -> None:
         values = self._get_index(index_type, key)  # Already validated in _get_index
         if value in values:
             values.remove(value)
-            with open(index_path, "w") as f:
+            with open(index_path, "w", encoding="utf-8") as f:
                 json.dump(values, f)
 
     # === UTILITY ===
diff --git a/core/framework/testing/test_storage.py b/core/framework/testing/test_storage.py
@@ -65,7 +65,7 @@ def save_test(self, test: Test) -> None:
 
         # Save full test
         test_path = goal_dir / f"{test.id}.json"
-        with open(test_path, "w") as f:
+        with open(test_path, "w", encoding="utf-8") as f:
             f.write(test.model_dump_json(indent=2))
 
         # Update indexes
@@ -79,7 +79,7 @@ def load_test(self, goal_id: str, test_id: str) -> Test | None:
         test_path = self.base_path / "tests" / goal_id / f"{test_id}.json"
         if not test_path.exists():
             return None
-        with open(test_path) as f:
+        with open(test_path, encoding="utf-8") as f:
             return Test.model_validate_json(f.read())
 
     def delete_test(self, goal_id: str, test_id: str) -> bool:
@@ -175,20 +175,20 @@ def save_result(self, test_id: str, result: TestResult) -> None:
         # Save with timestamp
         timestamp = result.timestamp.strftime("%Y%m%d_%H%M%S")
         result_path = results_dir / f"{timestamp}.json"
-        with open(result_path, "w") as f:
+        with open(result_path, "w", encoding="utf-8") as f:
             f.write(result.model_dump_json(indent=2))
 
         # Update latest
         latest_path = results_dir / "latest.json"
-        with open(latest_path, "w") as f:
+        with open(latest_path, "w", encoding="utf-8") as f:
             f.write(result.model_dump_json(indent=2))
 
     def get_latest_result(self, test_id: str) -> TestResult | None:
         """Get the most recent result for a test."""
         latest_path = self.base_path / "results" / test_id / "latest.json"
         if not latest_path.exists():
             return None
-        with open(latest_path) as f:
+        with open(latest_path, encoding="utf-8") as f:
             return TestResult.model_validate_json(f.read())
 
     def get_result_history(self, test_id: str, limit: int = 10) -> list[TestResult]:
@@ -204,7 +204,7 @@ def get_result_history(self, test_id: str, limit: int = 10) -> list[TestResult]:
 
         results = []
         for f in result_files:
-            with open(f) as file:
+            with open(f, encoding="utf-8") as file:
                 results.append(TestResult.model_validate_json(file.read()))
 
         return results
@@ -216,7 +216,7 @@ def _get_index(self, index_type: str, key: str) -> list[str]:
         index_path = self.base_path / "indexes" / index_type / f"{key}.json"
         if not index_path.exists():
             return []
-        with open(index_path) as f:
+        with open(index_path, encoding="utf-8") as f:
             return json.load(f)
 
     def _add_to_index(self, index_type: str, key: str, value: str) -> None:
@@ -225,7 +225,7 @@ def _add_to_index(self, index_type: str, key: str, value: str) -> None:
         values = self._get_index(index_type, key)
         if value not in values:
             values.append(value)
-            with open(index_path, "w") as f:
+            with open(index_path, "w", encoding="utf-8") as f:
                 json.dump(values, f)
 
     def _remove_from_index(self, index_type: str, key: str, value: str) -> None:
@@ -234,7 +234,7 @@ def _remove_from_index(self, index_type: str, key: str, value: str) -> None:
         values = self._get_index(index_type, key)
         if value in values:
             values.remove(value)
-            with open(index_path, "w") as f:
+            with open(index_path, "w", encoding="utf-8") as f:
                 json.dump(values, f)
 
     # === UTILITY ===
diff --git a/scripts/setup-python.sh b/scripts/setup-python.sh
@@ -19,100 +19,82 @@ NC='\033[0m' # No Color
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
 
+# Python Version
+REQUIRED_PYTHON_VERSION="3.11"
+
+# Python version split into Major and Minor
+IFS='.' read -r PYTHON_MAJOR_VERSION PYTHON_MINOR_VERSION <<< "$REQUIRED_PYTHON_VERSION"
+
+# Available python interpreter (follows sequence)
+POSSIBLE_PYTHONS=("python3" "python" "py")
+
+# Default python interpreter (initialized)
+PYTHON_CMD=()
+
+
 echo ""
 echo "=================================================="
 echo "  Aden Agent Framework - Python Setup"
 echo "=================================================="
 echo ""
 
-# Check for Python, honoring $PYTHON even if it's not on PATH
-if [ -n "$PYTHON" ]; then
-    if [ ! -x "$PYTHON" ] && ! command -v "$PYTHON" &> /dev/null; then
-        echo -e "${RED}Error: PYTHON is set to '$PYTHON' but it was not found or not executable.${NC}"
-        echo "Example: PYTHON=/opt/python3.12/bin/python3.12 ./scripts/setup-python.sh"
-        exit 1
-    fi
-elif ! command -v python &> /dev/null \
-   && ! command -v python3 &> /dev/null \
-   && ! command -v python3.11 &> /dev/null \
-   && ! command -v python3.12 &> /dev/null; then
-    echo -e "${RED}Error: Python is not installed.${NC}"
-    echo "Please install Python 3.11+ (recommended 3.12) from https://python.org"
-    exit 1
-fi
-
-# Choose Python interpreter
-# Priority:
-#  1) $PYTHON env var override (e.g., PYTHON=python3.11)
-#  2) python3.12 if available
-#  3) python3.11 if available
-#  4) python3
-#  5) python
-PYTHON_CMD="${PYTHON:-}"
-
-if [ -n "$PYTHON_CMD" ]; then
-    if [ -x "$PYTHON_CMD" ]; then
-        : # absolute / explicit path provided and executable
-    elif command -v "$PYTHON_CMD" &> /dev/null; then
-        : # found on PATH
-    else
-        echo -e "${RED}Error: PYTHON is set to '$PYTHON_CMD' but it was not found in PATH or as an absolute path.${NC}"
-        echo "Example: PYTHON=/opt/python3.12/bin/python3.12 ./scripts/setup-python.sh"
-        exit 1
+# Available Python interpreter
+for cmd in "${POSSIBLE_PYTHONS[@]}"; do
+    # Check for python interpreter
+    if command -v "$cmd" >/dev/null 2>&1; then
+
+        # Specific check for Windows 'py' launcher
+        if [ "$cmd" = "py" ]; then
+            CURRENT_CMD=(py -3)
+        else
+            CURRENT_CMD=("$cmd")
+        fi
+
+        # Check Python version
+        if "${CURRENT_CMD[@]}" -c "import sys; sys.exit(0 if sys.version_info >= ($PYTHON_MAJOR_VERSION, $PYTHON_MINOR_VERSION) else 1)" >/dev/null 2>&1; then
+            echo -e "${GREEN}✓${NC} interpreter detected: ${CURRENT_CMD[@]}"
+            # Check for pip
+            if "${CURRENT_CMD[@]}" -m pip --version >/dev/null 2>&1; then
+                PYTHON_CMD=("${CURRENT_CMD[@]}")
+                echo -e "${GREEN}✓${NC} pip detected"
+                echo ""
+                break
+            else
+                echo -e "${RED}✗${NC} pip not found"
+                echo ""
+            fi
+        else
+            echo -e "${RED}✗${NC} ${CURRENT_CMD[@]} not found"
+            echo ""
+        fi
     fi
-elif command -v python3.12 &> /dev/null; then
-    PYTHON_CMD="python3.12"
-elif command -v python3.11 &> /dev/null; then
-    PYTHON_CMD="python3.11"
-elif command -v python3 &> /dev/null; then
-    PYTHON_CMD="python3"
-else
-    PYTHON_CMD="python"
-fi
+done
 
-# Check Python version
-PYTHON_VERSION=$($PYTHON_CMD -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
-PYTHON_MAJOR=$($PYTHON_CMD -c 'import sys; print(sys.version_info.major)')
-PYTHON_MINOR=$($PYTHON_CMD -c 'import sys; print(sys.version_info.minor)')
-
-echo -e "${BLUE}Detected Python:${NC} $PYTHON_VERSION (binary: ${PYTHON_CMD})"
-
-# Require 3.11+
-if [ "$PYTHON_MAJOR" -lt 3 ] || ([ "$PYTHON_MAJOR" -eq 3 ] && [ "$PYTHON_MINOR" -lt 11 ]); then
-    echo -e "${RED}Error: Python 3.11+ is required (found $PYTHON_VERSION via '$PYTHON_CMD')${NC}"
+# Display error message if python not found
+if [ "${#PYTHON_CMD[@]}" -eq 0 ]; then
+    echo -e "${RED}Error:${NC} No suitable Python interpreter found with pip installed."
     echo ""
-    echo "Fix options (Linux/macOS/WSL):"
-    echo "  • Ubuntu/Debian/Pop!_OS/WSL:"
-    echo "      sudo apt update && sudo apt install -y python3.11 python3.11-venv python3.11-dev"
-    echo "  • Fedora:"
-    echo "      sudo dnf install -y python3.11 python3.11-devel"
-    echo "  • Arch/Manjaro:"
-    echo "      sudo pacman -S python"
-    echo "  • macOS (Homebrew):"
-    echo "      brew install python@3.11"
+    echo "Requirements:"
+    echo "  • Python $PYTHON_MAJOR_VERSION.$PYTHON_MINOR_VERSION+"
+    echo "  • pip installed"
     echo ""
-    echo "Then re-run with an explicit interpreter if needed:"
-    echo "  PYTHON=python3.11 ./scripts/setup-python.sh"
+    echo "Tried the following commands:"
+    echo "  ${POSSIBLE_PYTHONS[*]}"
     echo ""
+    echo "Please install Python from:"
+    echo "  https://www.python.org/downloads/"
     exit 1
 fi
 
+# Display Python version
+PYTHON_VERSION=$("${PYTHON_CMD[@]}" -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')
+echo -e "${BLUE}Detected Python:${NC} $PYTHON_VERSION"
 echo -e "${GREEN}✓${NC} Python version check passed"
 echo ""
 
-# Check for pip
-if ! $PYTHON_CMD -m pip --version &> /dev/null; then
-    echo -e "${RED}Error: pip is not installed${NC}"
-    echo "Please install pip for Python $PYTHON_VERSION"
-    exit 1
-fi
-
-echo -e "${GREEN}✓${NC} pip detected"
-echo ""
-
 # Upgrade pip, setuptools, and wheel
 echo "Upgrading pip, setuptools, and wheel..."
-if ! $PYTHON_CMD -m pip install --upgrade pip setuptools wheel; then
+if ! "${PYTHON_CMD[@]}" -m pip install --upgrade pip setuptools wheel; then
   echo "Error: Failed to upgrade pip. Please check your python/venv configuration."
   exit 1
 fi
@@ -128,7 +110,8 @@ cd "$PROJECT_ROOT/core"
 
 if [ -f "pyproject.toml" ]; then
     echo "Installing framework from core/ (editable mode)..."
-    $PYTHON_CMD -m pip install -e . > /dev/null 2>&1
+    "${PYTHON_CMD[@]}" -m pip install -e . > /dev/null 2>&1
+
     if [ $? -eq 0 ]; then
         echo -e "${GREEN}✓${NC} Framework package installed"
     else
@@ -148,7 +131,7 @@ cd "$PROJECT_ROOT/tools"
 
 if [ -f "pyproject.toml" ]; then
     echo "Installing aden_tools from tools/ (editable mode)..."
-    $PYTHON_CMD -m pip install -e . > /dev/null 2>&1
+    "${PYTHON_CMD[@]}" -m pip install -e . > /dev/null 2>&1
     if [ $? -eq 0 ]; then
         echo -e "${GREEN}✓${NC} Tools package installed"
     else
@@ -168,17 +151,17 @@ echo "=================================================="
 echo ""
 
 # Check openai version
-OPENAI_VERSION=$($PYTHON_CMD -c "import openai; print(openai.__version__)" 2>/dev/null || echo "not_installed")
+OPENAI_VERSION=$("${PYTHON_CMD[@]}" -c "import openai; print(openai.__version__)" 2>/dev/null || echo "not_installed")
 
 if [ "$OPENAI_VERSION" = "not_installed" ]; then
     echo "Installing openai package..."
-    $PYTHON_CMD -m pip install "openai>=1.0.0" > /dev/null 2>&1
+    "${PYTHON_CMD[@]}" -m pip install "openai>=1.0.0" > /dev/null 2>&1
     echo -e "${GREEN}✓${NC} openai package installed"
 elif [[ "$OPENAI_VERSION" =~ ^0\. ]]; then
     echo -e "${YELLOW}Found old openai version: $OPENAI_VERSION${NC}"
     echo "Upgrading to openai 1.x+ for litellm compatibility..."
-    $PYTHON_CMD -m pip install --upgrade "openai>=1.0.0" > /dev/null 2>&1
-    OPENAI_VERSION=$($PYTHON_CMD -c "import openai; print(openai.__version__)" 2>/dev/null)
+    "${PYTHON_CMD[@]}" -m pip install --upgrade "openai>=1.0.0" > /dev/null 2>&1
+    OPENAI_VERSION=$("${PYTHON_CMD[@]}" -c "import openai; print(openai.__version__)" 2>/dev/null)
     echo -e "${GREEN}✓${NC} openai upgraded to $OPENAI_VERSION"
 else
     echo -e "${GREEN}✓${NC} openai $OPENAI_VERSION is compatible"
@@ -194,23 +177,23 @@ echo ""
 cd "$PROJECT_ROOT"
 
 # Test framework import
-if $PYTHON_CMD -c "import framework; print('framework OK')" > /dev/null 2>&1; then
+if "${PYTHON_CMD[@]}" -c "import framework; print('framework OK')" > /dev/null 2>&1; then
     echo -e "${GREEN}✓${NC} framework package imports successfully"
 else
     echo -e "${RED}✗${NC} framework package import failed"
     echo -e "${YELLOW}  Note: This may be OK if you don't need the framework${NC}"
 fi
 
 # Test aden_tools import
-if $PYTHON_CMD -c "import aden_tools; print('aden_tools OK')" > /dev/null 2>&1; then
+if "${PYTHON_CMD[@]}" -c "import aden_tools; print('aden_tools OK')" > /dev/null 2>&1; then
     echo -e "${GREEN}✓${NC} aden_tools package imports successfully"
 else
     echo -e "${RED}✗${NC} aden_tools package import failed"
     exit 1
 fi
 
 # Test litellm + openai compatibility
-if $PYTHON_CMD -c "import litellm; print('litellm OK')" > /dev/null 2>&1; then
+if "${PYTHON_CMD[@]}" -c "import litellm; print('litellm OK')" > /dev/null 2>&1; then
     echo -e "${GREEN}✓${NC} litellm package imports successfully"
 else
     echo -e "${YELLOW}⚠${NC} litellm import had issues (may be OK if not using LLM features)"
