Merge branch 'main' into add/dllm-plugin

Author: deep1401

install.sh

@@ -479,123 +479,6 @@ doctor() {
 
 }
 
-##############################
-## Optional: Install Mountpoint for Amazon S3 (Linux only)
-##############################
-
-install_s3_mounting() {
-  title "Install S3 Mounting Tools"
-
-  # Only proceed if TFL_MULTITENANT is exactly "true"
-  if [[ "${TFL_MULTITENANT:-}" != "true" ]]; then
-    echo "Skipping S3 mounting install because TFL_MULTITENANT is not 'true'."
-    return 0
-  fi
-
-  if [[ -n "${TLAB_ON_MACOS}" ]]; then
-    install_s3fs_macos
-  else
-    install_mountpoint_linux
-  fi
-}
-
-install_s3fs_macos() {
-  title "Install s3fs for macOS S3 Mounting"
-
-  if command -v s3fs >/dev/null 2>&1; then
-    ohai "✅ s3fs already installed (s3fs found)."
-    return 0
-  fi
-
-  # Check if Homebrew is installed
-  if ! command -v brew >/dev/null 2>&1; then
-    echo "Installing Homebrew first..."
-    /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-    
-    # Add Homebrew to PATH for Apple Silicon Macs
-    if [[ $(uname -m) == "arm64" ]]; then
-      echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zprofile
-      eval "$(/opt/homebrew/bin/brew shellenv)"
-    fi
-  fi
-
-  echo "Installing macFUSE (required for s3fs)..."
-  brew install --cask macfuse
-  
-  echo "Installing s3fs using Homebrew..."
-  brew install gromgit/fuse/s3fs-mac
-
-  if command -v s3fs >/dev/null 2>&1; then
-    ohai "✅ s3fs installed successfully."
-  else
-    warn "s3fs installation may have failed; 's3fs' not found."
-    return 1
-  fi
-}
-
-install_mountpoint_linux() {
-  title "Install Mountpoint for Amazon S3 (Linux only)"
-
-  if command -v mount-s3 >/dev/null 2>&1; then
-    ohai "✅ Mountpoint for Amazon S3 already installed (mount-s3 found)."
-    return 0
-  fi
-
-  ARCH=$(uname -m)
-  if [[ "$ARCH" == "aarch64" || "$ARCH" == "arm64" ]]; then
-    MP_ARCH="arm64"
-  else
-    MP_ARCH="x86_64"
-  fi
-
-  TMP_DIR=$(mktemp -d)
-  cleanup() { rm -rf "$TMP_DIR" 2>/dev/null || true; }
-  trap cleanup EXIT
-
-  if command -v apt-get >/dev/null 2>&1; then
-    echo "Detected apt-based system. Installing .deb package."
-    DEB_URL="https://s3.amazonaws.com/mountpoint-s3-release/latest/${MP_ARCH}/mount-s3.deb"
-    echo "Downloading: $DEB_URL"
-    wget -q "$DEB_URL" -O "$TMP_DIR/mount-s3.deb"
-    sudo apt-get install -y "$TMP_DIR/mount-s3.deb"
-  elif command -v yum >/dev/null 2>&1; then
-    echo "Detected yum-based system. Installing .rpm package."
-    RPM_URL="https://s3.amazonaws.com/mountpoint-s3-release/latest/${MP_ARCH}/mount-s3.rpm"
-    echo "Downloading: $RPM_URL"
-    wget -q "$RPM_URL" -O "$TMP_DIR/mount-s3.rpm"
-    sudo yum install -y "$TMP_DIR/mount-s3.rpm"
-  elif command -v dnf >/dev/null 2>&1; then
-    echo "Detected dnf-based system. Installing .rpm package."
-    RPM_URL="https://s3.amazonaws.com/mountpoint-s3-release/latest/${MP_ARCH}/mount-s3.rpm"
-    echo "Downloading: $RPM_URL"
-    wget -q "$RPM_URL" -O "$TMP_DIR/mount-s3.rpm"
-    sudo dnf install -y "$TMP_DIR/mount-s3.rpm"
-  else
-    warn "Unsupported Linux package manager for automatic Mountpoint install. Please install manually."
-    return 1
-  fi
-
-  if command -v mount-s3 >/dev/null 2>&1; then
-    ohai "✅ Mountpoint for Amazon S3 installed successfully."
-  else
-    warn "Mountpoint for Amazon S3 installation may have failed; 'mount-s3' not found."
-  fi
-}
-
-install_mounting() {
-  title "Step 5: Install Mounting (S3)"
-  echo "🌘 Step 5: START"
-
-  # This wrapper ensures we only run mounting installers when multitenant is truthy
-  if [[ "${TFL_MULTITENANT:-}" == "true" ]]; then
-    install_s3_mounting || true
-  else
-    echo "Skipping mounting installation because TFL_MULTITENANT is not 'true'."
-  fi
-
-  echo "🌕 Step 5: COMPLETE"
-}
-
 print_success_message() {
   title "Installation Complete"
   echo "------------------------------------------"
@@ -614,11 +497,8 @@ print_success_message() {
 }
 
 # Load .env configuration (prefer current dir, then fallback to app src dir)
-TFL_MULTITENANT=${TFL_MULTITENANT:-}
 load_env_from_file "${RUN_DIR}/.env"
-if [ -z "${TFL_MULTITENANT:-}" ]; then
-  load_env_from_file "${TLAB_CODE_DIR}/.env"
-fi
+load_env_from_file "${TLAB_CODE_DIR}/.env"
 
 # Check if there are positional arguments; if not, perform full install
 if [[ "$#" -eq 0 ]]; then
@@ -627,7 +507,6 @@ if [[ "$#" -eq 0 ]]; then
   install_conda
   create_conda_environment
   install_dependencies
-  install_mounting
   print_success_message
 else
   for arg in "$@"; do
@@ -644,9 +523,6 @@ else
       install_dependencies)
         install_dependencies
         ;;
-      install_mounting)
-        install_mounting
-        ;;
       doctor)
         doctor
         ;;
@@ -658,8 +534,7 @@ else
         ;;
       *)
         # Print allowed arguments
-        echo "Allowed arguments: [download_transformer_lab, install_conda, create_conda_environment, install_dependencies, install_mounting] or leave blank to perform a full installation."
-        echo "To enable multitenant setup, set TFL_MULTITENANT=true in a local .env file."
+        echo "Allowed arguments: [download_transformer_lab, install_conda, create_conda_environment, install_dependencies] or leave blank to perform a full installation."
         abort "❌ Unknown argument: $arg"
         ;;
     esac

run.sh

@@ -179,14 +179,6 @@ EOF
         echo "⚠️ AWS_ACCESS_KEY_ID or AWS_SECRET_ACCESS_KEY not set, skipping AWS setup"
     fi
 
-    # # Mount S3 bucket using AWS credentials from ~/.aws
-    # if [ -n "$BUCKET_NAME" ]; then
-    #     echo "☁️ Mounting S3 bucket '$BUCKET_NAME' to remote workspace"
-    #     mount-s3 --profile transformerlab-s3 "$BUCKET_NAME" "$REMOTE_WORKSPACE_DIR"
-    # else
-    #     echo "⚠️ BUCKET_NAME not set in environment variables, skipping S3 mount"
-    #     echo "💡 Please set BUCKET_NAME in your .env file"
-    # fi
 fi
 
 echo "▶️ Starting the API server:"

scripts/increment_plugin_versions.py

@@ -0,0 +1,88 @@
+#!/usr/bin/env python3
+"""Increment plugin versions by 0.0.1 (patch version)
+
+This script increments the patch version (third number) in all plugin index.json files.
+For example, 3.4.2 becomes 3.4.3, or 1.0.27 becomes 1.0.28.
+
+Usage:
+    python increment_plugin_versions.py
+
+Run from the transformerlab-api directory or from this scripts directory.
+"""
+
+import json
+import sys
+from pathlib import Path
+
+def increment_version(version_str):
+    """Increment patch version by 1 (e.g., 3.4.2 -> 3.4.3)"""
+    parts = version_str.split('.')
+    if len(parts) == 3:
+        major, minor, patch = parts
+        new_patch = str(int(patch) + 1)
+        return f"{major}.{minor}.{new_patch}"
+    else:
+        # Handle edge cases - if version format is unexpected, try to increment last part
+        print(f"Warning: Unexpected version format: {version_str}")
+        if len(parts) >= 1:
+            parts[-1] = str(int(parts[-1]) + 1)
+            return '.'.join(parts)
+        return version_str
+
+def process_plugin_index(plugin_path):
+    """Read, update version, and write index.json"""
+    index_path = plugin_path / "index.json"
+    if not index_path.exists():
+        print(f"Warning: {index_path} does not exist")
+        return False
+    
+    try:
+        with open(index_path, 'r', encoding='utf-8') as f:
+            data = json.load(f)
+        
+        if 'version' not in data:
+            print(f"Warning: {index_path} does not have a version field")
+            return False
+        
+        old_version = data['version']
+        new_version = increment_version(old_version)
+        data['version'] = new_version
+        
+        with open(index_path, 'w', encoding='utf-8') as f:
+            json.dump(data, f, indent=2, ensure_ascii=False)
+            f.write('\n')  # Add newline at end
+        
+        print(f"Updated {plugin_path.name}: {old_version} -> {new_version}")
+        return True
+    except Exception as e:
+        print(f"Error processing {index_path}: {e}")
+        return False
+
+def main():
+    # Get the script directory and find transformerlab-api root
+    script_dir = Path(__file__).parent.resolve()
+    
+    # Try to find transformerlab-api root (should be parent of scripts)
+    api_root = script_dir.parent
+    plugins_dir = api_root / "transformerlab" / "plugins"
+    
+    if not plugins_dir.exists():
+        print(f"Error: {plugins_dir} does not exist")
+        print(f"Script is in: {script_dir}")
+        print(f"Looking for plugins in: {plugins_dir}")
+        sys.exit(1)
+    
+    plugin_dirs = [d for d in plugins_dir.iterdir() if d.is_dir()]
+    print(f"Found {len(plugin_dirs)} plugin directories")
+    print(f"Processing plugins in: {plugins_dir}\n")
+    
+    updated = 0
+    for plugin_dir in sorted(plugin_dirs):
+        if process_plugin_index(plugin_dir):
+            updated += 1
+    
+    print(f"\nSuccessfully updated {updated} plugins")
+
+if __name__ == "__main__":
+    main()
+

test/api/test_diffusion.py

@@ -318,7 +318,10 @@ def test_delete_image_from_history_not_found(client):
     with (
         patch("transformerlab.routers.experiment.diffusion.get_history_file_path", return_value="/fake/history.json"),
         patch("transformerlab.routers.experiment.diffusion.storage.exists", return_value=True),
-        patch("transformerlab.routers.experiment.diffusion.storage.open", mock_open(read_data='[{"id": "other-id", "image_path": "/fake/path.png"}]')),
+        patch(
+            "transformerlab.routers.experiment.diffusion.storage.open",
+            mock_open(read_data='[{"id": "other-id", "image_path": "/fake/path.png"}]'),
+        ),
     ):
         resp = client.delete("/experiment/test-exp-name/diffusion/history/non-existent-id")
         assert resp.status_code == 500
@@ -334,7 +337,10 @@ def test_create_dataset_from_history_success(client):
         patch("transformerlab.routers.experiment.diffusion.storage.makedirs"),
         patch("transformerlab.routers.experiment.diffusion.storage.exists", return_value=True),
         patch("transformerlab.routers.experiment.diffusion.storage.isdir", return_value=True),
-        patch("transformerlab.routers.experiment.diffusion.storage.ls", return_value=["/fake/path/folder/0.png", "/fake/path/folder/1.png"]),
+        patch(
+            "transformerlab.routers.experiment.diffusion.storage.ls",
+            return_value=["/fake/path/folder/0.png", "/fake/path/folder/1.png"],
+        ),
         patch("transformerlab.routers.experiment.diffusion.storage.copy_file"),
         patch("transformerlab.routers.experiment.diffusion.storage.open", mock_open()),
     ):
@@ -666,7 +672,9 @@ def test_load_history_with_pagination():
     with (
         patch("transformerlab.routers.experiment.diffusion.get_history_file_path", return_value="/fake/history.json"),
         patch("transformerlab.routers.experiment.diffusion.storage.exists", return_value=True),
-        patch("transformerlab.routers.experiment.diffusion.storage.open", mock_open(read_data=json.dumps(history_data))),
+        patch(
+            "transformerlab.routers.experiment.diffusion.storage.open", mock_open(read_data=json.dumps(history_data))
+        ),
     ):
         from transformerlab.routers.experiment.diffusion import load_history
 
@@ -770,7 +778,9 @@ def test_find_image_by_id_success():
     with (
         patch("transformerlab.routers.experiment.diffusion.get_history_file_path", return_value="/fake/history.json"),
         patch("transformerlab.routers.experiment.diffusion.storage.exists", return_value=True),
-        patch("transformerlab.routers.experiment.diffusion.storage.open", mock_open(read_data=json.dumps(history_data))),
+        patch(
+            "transformerlab.routers.experiment.diffusion.storage.open", mock_open(read_data=json.dumps(history_data))
+        ),
     ):
         from transformerlab.routers.experiment.diffusion import find_image_by_id
 
@@ -817,7 +827,9 @@ def test_find_image_by_id_not_found(client):
     with (
         patch("transformerlab.routers.experiment.diffusion.get_history_file_path", return_value="/fake/history.json"),
         patch("transformerlab.routers.experiment.diffusion.storage.exists", return_value=True),
-        patch("transformerlab.routers.experiment.diffusion.storage.open", mock_open(read_data=json.dumps(history_data))),
+        patch(
+            "transformerlab.routers.experiment.diffusion.storage.open", mock_open(read_data=json.dumps(history_data))
+        ),
     ):
         from transformerlab.routers.experiment.diffusion import find_image_by_id