Compare commits
	
		
			2 Commits
		
	
	
		
			83dc6440d8
			...
			ee41b64af0
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						ee41b64af0
	
				 | 
					
					
						|||
| 
						
						
							
						
						cb87f4e2d7
	
				 | 
					
					
						
@@ -26,10 +26,10 @@ repos:
 | 
			
		||||
    rev: v3.19.1
 | 
			
		||||
    hooks:
 | 
			
		||||
      - id: pyupgrade
 | 
			
		||||
        args: ["--py311-plus"]
 | 
			
		||||
        args: ["--py39-plus"]
 | 
			
		||||
 | 
			
		||||
  - repo: https://github.com/astral-sh/ruff-pre-commit
 | 
			
		||||
    rev: v0.9.5
 | 
			
		||||
    rev: v0.11.5
 | 
			
		||||
    hooks:
 | 
			
		||||
      - id: ruff-format
 | 
			
		||||
      - id: ruff
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										24
									
								
								Dockerfile
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								Dockerfile
									
									
									
									
									
								
							@@ -1,23 +1,25 @@
 | 
			
		||||
FROM python:3.13-slim
 | 
			
		||||
# syntax=docker/dockerfile:1
 | 
			
		||||
# check=error=true;experimental=all
 | 
			
		||||
 | 
			
		||||
FROM --platform=$BUILDPLATFORM ghcr.io/jrottenberg/ffmpeg:7.1-scratch
 | 
			
		||||
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 | 
			
		||||
 | 
			
		||||
RUN apt-get update && apt-get install ffmpeg -y --no-install-recommends && rm -rf /var/lib/apt/lists/*
 | 
			
		||||
ENV PYTHONUNBUFFERED=1
 | 
			
		||||
ENV PYTHONDONTWRITEBYTECODE=1
 | 
			
		||||
ENV UV_COMPILE_BYTECODE=1
 | 
			
		||||
ENV UV_LINK_MODE=copy
 | 
			
		||||
ENV UV_NO_CACHE=1
 | 
			
		||||
 | 
			
		||||
RUN useradd --create-home botuser && mkdir /Uploads && chown botuser:botuser /Uploads
 | 
			
		||||
RUN apk add --no-cache shadow python3 && useradd --create-home botuser && mkdir /Uploads && chown botuser:botuser /Uploads
 | 
			
		||||
USER botuser
 | 
			
		||||
 | 
			
		||||
WORKDIR /app
 | 
			
		||||
ADD --chown=botuser:botuser discord_embed /app/discord_embed
 | 
			
		||||
 | 
			
		||||
RUN --mount=type=cache,target=/root/.cache/uv \
 | 
			
		||||
    --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
 | 
			
		||||
    uv sync --no-install-project
 | 
			
		||||
 | 
			
		||||
COPY --chown=botuser:botuser discord_embed /app/discord_embed
 | 
			
		||||
RUN --mount=type=bind,source=pyproject.toml,target=pyproject.toml \
 | 
			
		||||
    uv sync --no-install-project --no-dev
 | 
			
		||||
 | 
			
		||||
VOLUME ["/Uploads"]
 | 
			
		||||
EXPOSE 5000
 | 
			
		||||
 | 
			
		||||
ENV PYTHONUNBUFFERED=1
 | 
			
		||||
ENV PYTHONDONTWRITEBYTECODE=1
 | 
			
		||||
 | 
			
		||||
CMD ["uv", "run", "uvicorn", "discord_embed.main:app", "--host", "0.0.0.0", "--port", "5000", "--use-colors", "--proxy-headers", "--forwarded-allow-ips", "*", "--log-level", "debug"]
 | 
			
		||||
 
 | 
			
		||||
@@ -29,7 +29,7 @@ def generate_html_for_videos(
 | 
			
		||||
    Returns:
 | 
			
		||||
        Returns HTML for video.
 | 
			
		||||
    """
 | 
			
		||||
    time_now: datetime.datetime = datetime.datetime.now(tz=datetime.UTC)
 | 
			
		||||
    time_now: datetime.datetime = datetime.datetime.now(tz=datetime.timezone.utc)
 | 
			
		||||
    time_now_str: str = time_now.strftime("%Y-%m-%d %H:%M:%S %Z")
 | 
			
		||||
 | 
			
		||||
    video_html: str = f"""
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										14
									
								
								noxfile.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								noxfile.py
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,14 @@
 | 
			
		||||
from __future__ import annotations
 | 
			
		||||
 | 
			
		||||
import nox
 | 
			
		||||
 | 
			
		||||
nox.options.default_venv_backend = "uv"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@nox.session(python=["3.9", "3.10", "3.11", "3.12", "3.13"])
 | 
			
		||||
def tests(session: nox.Session) -> None:
 | 
			
		||||
    """Run the test suite."""
 | 
			
		||||
    # pip install .
 | 
			
		||||
    session.install(".")
 | 
			
		||||
    session.install("pytest", "pytest-httpx")
 | 
			
		||||
    session.run("pytest")
 | 
			
		||||
@@ -3,7 +3,7 @@ name = "discord-embed"
 | 
			
		||||
version = "1.0.0"
 | 
			
		||||
description = "Make nice embeds for Discord"
 | 
			
		||||
readme = "README.md"
 | 
			
		||||
requires-python = ">=3.13"
 | 
			
		||||
requires-python = ">=3.9"
 | 
			
		||||
dependencies = [
 | 
			
		||||
  "discord-webhook",
 | 
			
		||||
  "fastapi",
 | 
			
		||||
@@ -16,7 +16,7 @@ dependencies = [
 | 
			
		||||
]
 | 
			
		||||
 | 
			
		||||
[dependency-groups]
 | 
			
		||||
dev = ["pytest", "httpx"]
 | 
			
		||||
dev = ["pytest", "httpx", "nox"]
 | 
			
		||||
 | 
			
		||||
[build-system]
 | 
			
		||||
build-backend = "poetry.core.masonry.api"
 | 
			
		||||
@@ -30,19 +30,20 @@ authors = ["Joakim Hellsén <tlovinator@gmail.com>"]
 | 
			
		||||
license = "GPL-3.0-or-later"
 | 
			
		||||
 | 
			
		||||
[tool.poetry.dependencies]
 | 
			
		||||
python = "^3.13"
 | 
			
		||||
python = "^3.9"
 | 
			
		||||
discord-webhook = "*"
 | 
			
		||||
fastapi = "*"
 | 
			
		||||
ffmpeg-python = "*"
 | 
			
		||||
Jinja2 = "*"
 | 
			
		||||
python-dotenv = "*"
 | 
			
		||||
python-multipart = "*"
 | 
			
		||||
sentry-sdk = {extras = ["fastapi"], version = "*"}
 | 
			
		||||
uvicorn = {extras = ["standard"], version = "*"}
 | 
			
		||||
sentry-sdk = { extras = ["fastapi"], version = "*" }
 | 
			
		||||
uvicorn = { extras = ["standard"], version = "*" }
 | 
			
		||||
 | 
			
		||||
[tool.poetry.group.dev.dependencies]
 | 
			
		||||
httpx = "*"
 | 
			
		||||
pytest = "*"
 | 
			
		||||
nox = "*"
 | 
			
		||||
 | 
			
		||||
[tool.ruff]
 | 
			
		||||
preview = true
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user