|
|
|
|
@ -65,7 +65,8 @@ run_script() { |
|
|
|
|
else |
|
|
|
|
log "$script failed with exit code $exit_code" |
|
|
|
|
fi |
|
|
|
|
sleep_time=$(tail -n 1 "$script_log" | grep -oP 'sleep_time: \K[0-9]+' || echo $((RANDOM % 601 + 1200))) |
|
|
|
|
# Extract sleep time from the last line containing "sleep_time:" |
|
|
|
|
sleep_time=$(grep "sleep_time:" "$script_log" | tail -n 1 | grep -oP 'sleep_time: \K[0-9]+' || echo $((RANDOM % 601 + 1200))) |
|
|
|
|
log "$script completed, sleep_time: $sleep_time seconds" |
|
|
|
|
rm -f "$LOCK_DIR/${script_name}.lock" |
|
|
|
|
echo "$sleep_time" |
|
|
|
|
@ -100,17 +101,18 @@ update_dependencies() { |
|
|
|
|
log "Created new virtual environment" |
|
|
|
|
fi |
|
|
|
|
source "$BASE_DIR/venv/bin/activate" |
|
|
|
|
"$VENV_PYTHON" -m pip install --upgrade pip |
|
|
|
|
if [ -f "requirements.txt" ]; then |
|
|
|
|
"$VENV_PYTHON" -m pip install -r requirements.txt || { |
|
|
|
|
log "Failed to install requirements.txt, attempting core dependencies" |
|
|
|
|
"$VENV_PYTHON" -m pip install requests openai beautifulsoup4 feedparser praw duckduckgo_search selenium Pillow pytesseract webdriver-manager tweepy python-dotenv flickr-api filelock requests-oauthlib psutil |
|
|
|
|
log "Fallback: Installed core dependencies" |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
log "Error: requirements.txt not found, installing core dependencies" |
|
|
|
|
"$VENV_PYTHON" -m pip install requests openai beautifulsoup4 feedparser praw duckduckgo_search selenium Pillow pytesseract webdriver-manager tweepy python-dotenv flickr-api filelock requests-oauthlib psutil |
|
|
|
|
fi |
|
|
|
|
# Commenting out dependency installation since packages are already installed and working |
|
|
|
|
# "$VENV_PYTHON" -m pip install --upgrade pip |
|
|
|
|
# if [ -f "requirements.txt" ]; then |
|
|
|
|
# "$VENV_PYTHON" -m pip install -r requirements.txt || { |
|
|
|
|
# log "Failed to install requirements.txt, attempting core dependencies" |
|
|
|
|
# "$VENV_PYTHON" -m pip install requests openai beautifulsoup4 feedparser praw duckduckgo_search selenium Pillow pytesseract webdriver-manager tweepy python-dotenv flickr-api filelock requests-oauthlib psutil |
|
|
|
|
# log "Fallback: Installed core dependencies" |
|
|
|
|
# } |
|
|
|
|
# else |
|
|
|
|
# log "Error: requirements.txt not found, installing core dependencies" |
|
|
|
|
# "$VENV_PYTHON" -m pip install requests openai beautifulsoup4 feedparser praw duckduckgo_search selenium Pillow pytesseract webdriver-manager tweepy python-dotenv flickr-api filelock requests-oauthlib psutil |
|
|
|
|
# fi |
|
|
|
|
log "Dependencies updated." |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|