Merge pull request #38 from sunxfancy/dev

Merge dev

Author: sunxfancy

.github/workflows/quicktest.yml

@@ -15,11 +15,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest, macOS-latest]
+        include:
+          - os: windows-latest
+            platform: windows
+          - os: macOS-latest
+            platform: macosx
+          - os: ubuntu-latest
+            platform: linux
 
     steps:
       - uses: actions/checkout@v4
-          
+         
       - name: Set Node.js 22.x
         uses: actions/setup-node@v4
         with:
@@ -39,7 +45,13 @@ jobs:
           activate-environment: true
 
       - name: Install requirements
-        run: yarn requirements && uv pip install -r .venv/requirements.txt
+        run: uv pip install -r dependencies/${{ matrix.platform }}.lock
+
+      - name: Install system dependencies
+        if: ${{ matrix.platform == 'linux' }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libglib2.0-dev pkg-config
 
       - name: Setup Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1

.github/workflows/release.yml

@@ -18,11 +18,13 @@ jobs:
       matrix:
         include:
           - os: windows-latest
+            platform: windows
             artifacts: |
               desktop/src-tauri/target/release/bundle/msi/*.msi
               desktop/src-tauri/target/release/bundle/nsis/*.exe
 
           - os: macOS-latest
+            platform: macosx
             artifacts: |
               desktop/src-tauri/target/release/bundle/dmg/*.dmg
 
@@ -48,7 +50,7 @@ jobs:
           activate-environment: true
 
       - name: Install requirements
-        run: yarn requirements && uv pip install -r .venv/requirements.txt
+        run: uv pip install -r dependencies/${{ matrix.platform }}.lock
 
       - name: Setup Rust
         uses: actions-rust-lang/setup-rust-toolchain@v1

.gitignore

@@ -9,6 +9,7 @@ dist/
 test_env/
 resources/
 log/
+models/
 
 *.safetensors
 *.pt

Dockerfile

@@ -0,0 +1,103 @@
+# 构建阶段
+FROM nvidia/cuda:12.4.1-cudnn-runtime-ubuntu22.04 as builder
+
+# 设置环境变量
+ENV DEBIAN_FRONTEND=noninteractive
+ENV PYTHONUNBUFFERED=1
+ENV PYTHONDONTWRITEBYTECODE=1
+
+# 安装 Python 3.12
+RUN apt update && apt install -y software-properties-common \
+    && add-apt-repository ppa:deadsnakes/ppa \
+    && apt update \
+    && apt install -y \
+    python3.12 \
+    python3-pip \
+    python3.12-venv \
+    curl \
+    && rm -rf /var/lib/apt/lists/*
+
+# 安装 Node.js 22
+ENV NVM_DIR /usr/local/nvm
+RUN mkdir -p $NVM_DIR \
+    && curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash \
+    && . $NVM_DIR/nvm.sh && nvm install 22 && nvm use 22 \
+    && corepack enable yarn && node -v && yarn -v
+
+# 设置工作目录
+WORKDIR /app
+
+# 创建 .dockerignore 文件
+RUN echo "__pycache__\n*.pyc\n*.pyo\n*.pyd\n.Python\nenv\npip-log.txt\npip-delete-this-directory.txt\n.tox\n.coverage\n.coverage.*\n.cache\nnosetests.xml\ncoverage.xml\n*.cover\n*.log\n.pytest_cache\n.env\n.venv\nvenv\nENV\nnode_modules\ndist\nbuild\n*.egg-info\n.installed.cfg\n*.egg" > .dockerignore
+
+# 复制必要的项目文件
+COPY ssui/ ssui/
+COPY ss_executor/ ss_executor/
+COPY server/ server/
+COPY frontend/ frontend/
+COPY extension_builder/ extension_builder/
+COPY extensions/ extensions/
+COPY dependencies/ dependencies/
+COPY backend/ backend/
+COPY package.json package.json
+COPY yarn.lock yarn.lock
+
+
+# 创建并激活 Python 虚拟环境
+RUN python3.12 -m venv /app/.venv
+ENV PATH="/app/.venv/bin:$PATH"
+
+# 安装 Python 依赖
+RUN pip install uv
+RUN uv pip install --no-cache-dir -r /app/dependencies/requirements-linux.txt
+
+
+# 安装 Node.js 依赖
+ENV SSUI_CI_SKIP_INSTALL=1
+RUN . $NVM_DIR/nvm.sh && yarn
+
+# 构建前端
+RUN . $NVM_DIR/nvm.sh && yarn build:frontend
+
+# 运行阶段
+FROM nvidia/cuda:12.4.1-cudnn-runtime-ubuntu22.04
+
+# 设置环境变量
+ENV DEBIAN_FRONTEND=noninteractive
+ENV PYTHONUNBUFFERED=1
+ENV PYTHONDONTWRITEBYTECODE=1
+
+# 安装运行时依赖
+RUN apt update && apt install -y software-properties-common \
+    && add-apt-repository ppa:deadsnakes/ppa \
+    && apt update \
+    && apt install -y \
+    python3.12 \
+    python3-pip \
+    python3.12-venv \
+    && rm -rf /var/lib/apt/lists/*
+
+# 设置工作目录
+WORKDIR /app
+
+# 从构建阶段复制虚拟环境
+COPY --from=builder /app/.venv /app/.venv
+ENV PATH="/app/.venv/bin:$PATH"
+
+# 从构建阶段复制必要的目录
+COPY --from=builder /app/ssui /app/ssui
+COPY --from=builder /app/ss_executor /app/ss_executor
+COPY --from=builder /app/server /app/server
+COPY --from=builder /app/frontend/functional_ui/dist /app/frontend/functional_ui/dist
+COPY --from=builder /app/extensions /app/extensions
+COPY --from=builder /app/dependencies /app/dependencies
+COPY --from=builder /app/backend /app/backend
+
+RUN apt update && apt install -y ffmpeg libsm6 libxext6 
+
+
+# 暴露端口
+EXPOSE 7422
+
+# 设置启动命令
+CMD ["bash", "-c", "python -m ss_executor & exec python -m server --host 0.0.0.0"]

backend/patches/layers/lora_layer_base.py

@@ -71,6 +71,16 @@ def get_parameters(self, orig_parameters: dict[str, torch.Tensor], weight: float
                 params[param_name] = param_weight.reshape(get_param_shape(orig_param))
 
         return params
+    
+    @classmethod
+    def warn_on_unhandled_keys(cls, values: dict[str, torch.Tensor], handled_keys: set[str]):
+        """Log a warning if values contains unhandled keys."""
+        unknown_keys = set(values.keys()) - handled_keys
+        if unknown_keys:
+            # logger.warning(
+            #     f"Unexpected keys found in LoRA/LyCORIS layer, model might work incorrectly! Unexpected keys: {unknown_keys}"
+            # )
+            pass
 
     def calc_size(self) -> int:
         return calc_tensors_size([self.bias])

backend/stable_diffusion/extensions/lora.py

@@ -25,7 +25,7 @@ def __init__(
 
     @contextmanager
     def patch_unet(self, unet: UNet2DConditionModel, original_weights: OriginalWeightsStorage):
-        lora_model = self._lora_model
+        lora_model = self._lora_model.lora.model
         assert isinstance(lora_model, ModelPatchRaw)
         LayerPatcher.apply_smart_model_patch(
             model=unet,

dependencies/install.cmd

@@ -1,16 +1,16 @@
 @echo off
 @setlocal enabledelayedexpansion
 
-rem 创建.build文件夹并将Python放入其中
+rem Create .build folder and put Python in it
 if not exist ".venv" mkdir .venv
 
-rem 检查Python是否已经存在
+rem Check if Python already exists
 if not exist ".venv\python\python.exe" (
-    rem 检查操作系统类型
+    rem Check operating system type
     set PYTHON_VERSION=3.12.8
     set RELEASE_DATE=20241219
 
-    rem 检查处理器架构
+    rem Check processor architecture
     if /I "!PROCESSOR_ARCHITECTURE!"=="x86" (
         set ARCH=i686-pc-windows-msvc
     ) else if /I "!PROCESSOR_ARCHITECTURE!"=="AMD64" (
@@ -20,11 +20,11 @@ if not exist ".venv\python\python.exe" (
         exit /b
     )
 
-    rem 设置下载链接
+    rem Set download URLs
     set DOWNLOAD_URL=https://github.com/astral-sh/python-build-standalone/releases/download/!RELEASE_DATE!/cpython-!PYTHON_VERSION!+!RELEASE_DATE!-!ARCH!-install_only_stripped.tar.gz
     set CHINA_MIRROR=https://gitee.com/Swordtooth/ssui_assets/releases/download/v0.0.2/cpython-!PYTHON_VERSION!%!RELEASE_DATE!-!ARCH!-install_only_stripped.tar.gz
 
-    rem 尝试从GitHub下载Python
+    rem Try to download Python from GitHub
     echo "Trying to download Python from GitHub..."
     curl -L !DOWNLOAD_URL! -o .venv\python.tar.gz
     if errorlevel 1 (
@@ -40,9 +40,9 @@ if not exist ".venv\python\python.exe" (
     powershell -Command "Remove-Item -Path '.venv\python.tar.gz' -Force"
 )
 
-rem 检查虚拟环境是否已经存在
+rem Check if virtual environment already exists
 if not exist ".venv\Scripts\python.exe" (
-    rem 使用virtualenv创建虚拟环境
+    rem Create virtual environment using venv
     echo "Creating virtual environment..."
     .venv\python\python.exe -m venv .venv
 )

dependencies/install.sh

@@ -1,19 +1,19 @@
 #!/bin/bash
 
-# 创建.venv文件夹
+# Create .venv folder
 mkdir -p .venv
 
-# 检查Python是否已经存在
+# Check if Python already exists
 if [ ! -f ".venv/python/bin/python3" ]; then
-    # 设置Python版本和发布日期
+    # Set Python version and release date
     PYTHON_VERSION="3.12.8"
     RELEASE_DATE="20241219"
 
-    # 检查操作系统类型
+    # Check operating system type
     OS_TYPE=$(uname -s)
     ARCHITECTURE=$(uname -m)
 
-    # 根据操作系统和架构设置下载参数
+    # Set download parameters based on OS and architecture
     if [ "$OS_TYPE" = "Darwin" ]; then
         # macOS
         if [ "$ARCHITECTURE" = "x86_64" ]; then
@@ -40,11 +40,11 @@ if [ ! -f ".venv/python/bin/python3" ]; then
     fi
     https://github.com/astral-sh/python-build-standalone/releases/download/20241219/cpython-3.12.8+20241219-${ARCH}-install_only_stripped.tar.gz
 
-    # 设置下载链接
+    # Set download URLs
     DOWNLOAD_URL="https://github.com/astral-sh/python-build-standalone/releases/download/${RELEASE_DATE}/cpython-${PYTHON_VERSION}+${RELEASE_DATE}-${ARCH}-install_only_stripped.tar.gz"
     CHINA_MIRROR="https://gitee.com/Swordtooth/ssui_assets/releases/download/v0.0.2/cpython-${PYTHON_VERSION}%${RELEASE_DATE}-${ARCH}-install_only_stripped.tar.gz"
 
-    # 下载并解压Python
+    # Download and extract Python
     echo "Downloading Python from ${DOWNLOAD_URL}..."
     if ! curl -L "${DOWNLOAD_URL}" -o .venv/python.tar.gz; then
         echo "Failed to download from primary source, trying Chinese mirror..."
@@ -54,19 +54,19 @@ if [ ! -f ".venv/python/bin/python3" ]; then
         fi
     fi
 
-    # 解压文件
+    # Extract files
     tar -xzf .venv/python.tar.gz -C .venv
     rm .venv/python.tar.gz
 fi
 
-# 检查虚拟环境是否已经存在
+# Check if virtual environment already exists
 if [ ! -f ".venv/bin/python" ]; then
-    # 创建虚拟环境
+    # Create virtual environment
     echo "Creating virtual environment..."
     .venv/python/bin/python3 -m venv .venv
 fi
 
-# 检查并安装uv工具
+# Check and install uv tool
 if [ ! -f ".venv/bin/uv" ]; then
     echo "Installing uv tool..."
     .venv/bin/python -m pip install uv==0.6.11

dependencies/install_requirements.cjs

@@ -0,0 +1,31 @@
+const { platform } = require('os');
+const { execSync } = require('child_process');
+const path = require('path');
+
+function getRequirementsFile() {
+    const os = platform();
+    if (os === 'win32') {
+        return path.join(__dirname, 'windows.lock');
+    } else if (os === 'darwin') {
+        return path.join(__dirname, 'macosx.lock');
+    } else if (os === 'linux') {
+        return path.join(__dirname, 'linux.lock');
+    } else {
+        throw new Error(`Unsupported operating system: ${os}`);
+    }
+}
+
+try {
+    const requirementsFile = getRequirementsFile();
+    console.log(`Installing requirements from: ${requirementsFile}`);
+    
+    // 使用 venv.cjs 来执行 uv pip 命令
+    execSync(`node ${path.join(__dirname, 'venv.cjs')} uv pip install -r "${requirementsFile}"`, {
+        stdio: 'inherit'
+    });
+    
+    console.log('Requirements installed successfully!');
+} catch (error) {
+    console.error('Error installing requirements:', error.message);
+    process.exit(1);
+}