Fix Python package installation by using virtual environment
Browse files- Dockerfile +8 -2
- start.sh +14 -3
Dockerfile
CHANGED
|
@@ -6,6 +6,7 @@ WORKDIR /app
|
|
| 6 |
RUN apt-get update && apt-get install -y \
|
| 7 |
python3 \
|
| 8 |
python3-pip \
|
|
|
|
| 9 |
git \
|
| 10 |
curl \
|
| 11 |
&& rm -rf /var/lib/apt/lists/*
|
|
@@ -20,9 +21,14 @@ COPY .space/hf-space.sh /app/
|
|
| 20 |
RUN mkdir -p /tmp/ten_user/agents /tmp/ten_user/logs /app/backup
|
| 21 |
RUN chmod -R 777 /tmp /app/backup
|
| 22 |
|
| 23 |
-
#
|
|
|
|
|
|
|
|
|
|
|
|
|
| 24 |
COPY requirements.txt /app/
|
| 25 |
-
RUN
|
|
|
|
| 26 |
|
| 27 |
# Клонируем репозиторий TEN-Agent
|
| 28 |
RUN git clone --depth 1 https://github.com/TEN-framework/TEN-Agent.git /tmp/ten-agent
|
|
|
|
| 6 |
RUN apt-get update && apt-get install -y \
|
| 7 |
python3 \
|
| 8 |
python3-pip \
|
| 9 |
+
python3-venv \
|
| 10 |
git \
|
| 11 |
curl \
|
| 12 |
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
| 21 |
RUN mkdir -p /tmp/ten_user/agents /tmp/ten_user/logs /app/backup
|
| 22 |
RUN chmod -R 777 /tmp /app/backup
|
| 23 |
|
| 24 |
+
# Создаем и активируем виртуальную среду Python
|
| 25 |
+
RUN python3 -m venv /app/venv
|
| 26 |
+
ENV PATH="/app/venv/bin:$PATH"
|
| 27 |
+
|
| 28 |
+
# Устанавливаем Python зависимости в виртуальную среду
|
| 29 |
COPY requirements.txt /app/
|
| 30 |
+
RUN pip install --no-cache-dir -U pip && \
|
| 31 |
+
pip install --no-cache-dir -r requirements.txt
|
| 32 |
|
| 33 |
# Клонируем репозиторий TEN-Agent
|
| 34 |
RUN git clone --depth 1 https://github.com/TEN-framework/TEN-Agent.git /tmp/ten-agent
|
start.sh
CHANGED
|
@@ -4,6 +4,16 @@ echo "===== Starting TEN-Agent in Python Mode ====="
|
|
| 4 |
echo "$(date)"
|
| 5 |
echo "Current directory: $(pwd)"
|
| 6 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 7 |
# Создаем необходимые директории
|
| 8 |
echo "Creating temporary directories in /tmp..."
|
| 9 |
mkdir -p /tmp/ten_user/agents
|
|
@@ -36,15 +46,16 @@ fi
|
|
| 36 |
echo "===== Environment Information ====="
|
| 37 |
echo "User: $(whoami || echo 'Unknown')"
|
| 38 |
echo "Home directory: $HOME"
|
| 39 |
-
echo "Python version: $(
|
| 40 |
echo "Node version: $(node --version)"
|
|
|
|
| 41 |
|
| 42 |
# Запускаем прокси-сервер в фоновом режиме
|
| 43 |
echo "Starting proxy server..."
|
| 44 |
-
|
| 45 |
PROXY_PID=$!
|
| 46 |
echo "Proxy server started with PID: $PROXY_PID"
|
| 47 |
|
| 48 |
# Запускаем приложение через Python-обертку
|
| 49 |
echo "Starting TEN-Agent via Python wrapper (app.py)..."
|
| 50 |
-
exec
|
|
|
|
| 4 |
echo "$(date)"
|
| 5 |
echo "Current directory: $(pwd)"
|
| 6 |
|
| 7 |
+
# Активируем виртуальную среду Python, если она существует
|
| 8 |
+
if [ -d "/app/venv" ]; then
|
| 9 |
+
echo "Activating Python virtual environment..."
|
| 10 |
+
source /app/venv/bin/activate
|
| 11 |
+
PYTHON_CMD="python"
|
| 12 |
+
else
|
| 13 |
+
echo "No virtual environment found, using system Python..."
|
| 14 |
+
PYTHON_CMD="python3"
|
| 15 |
+
fi
|
| 16 |
+
|
| 17 |
# Создаем необходимые директории
|
| 18 |
echo "Creating temporary directories in /tmp..."
|
| 19 |
mkdir -p /tmp/ten_user/agents
|
|
|
|
| 46 |
echo "===== Environment Information ====="
|
| 47 |
echo "User: $(whoami || echo 'Unknown')"
|
| 48 |
echo "Home directory: $HOME"
|
| 49 |
+
echo "Python version: $($PYTHON_CMD --version)"
|
| 50 |
echo "Node version: $(node --version)"
|
| 51 |
+
echo "Using Python command: $PYTHON_CMD"
|
| 52 |
|
| 53 |
# Запускаем прокси-сервер в фоновом режиме
|
| 54 |
echo "Starting proxy server..."
|
| 55 |
+
$PYTHON_CMD proxy.py &
|
| 56 |
PROXY_PID=$!
|
| 57 |
echo "Proxy server started with PID: $PROXY_PID"
|
| 58 |
|
| 59 |
# Запускаем приложение через Python-обертку
|
| 60 |
echo "Starting TEN-Agent via Python wrapper (app.py)..."
|
| 61 |
+
exec $PYTHON_CMD app.py
|