mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-09-23 17:52:05 +02:00
Fix build (#19634)
* Don't put special constraints * Undo joserfc install * Fix joserfc * Formatting
This commit is contained in:
parent
e92267d7e2
commit
9fb09408d1
@ -11,7 +11,8 @@ COPY docker/main/requirements-wheels.txt /requirements-wheels.txt
|
|||||||
COPY docker/rockchip/requirements-wheels-rk.txt /requirements-wheels-rk.txt
|
COPY docker/rockchip/requirements-wheels-rk.txt /requirements-wheels-rk.txt
|
||||||
RUN sed -i "/https:\/\//d" /requirements-wheels.txt
|
RUN sed -i "/https:\/\//d" /requirements-wheels.txt
|
||||||
RUN sed -i "/onnxruntime/d" /requirements-wheels.txt
|
RUN sed -i "/onnxruntime/d" /requirements-wheels.txt
|
||||||
RUN pip3 wheel --wheel-dir=/rk-wheels -c /requirements-wheels.txt -r /requirements-wheels-rk.txt
|
RUN sed -i '/\[.*\]/d' /requirements-wheels.txt \
|
||||||
|
&& pip3 wheel --wheel-dir=/rk-wheels -c /requirements-wheels.txt -r /requirements-wheels-rk.txt
|
||||||
RUN rm -rf /rk-wheels/opencv_python-*
|
RUN rm -rf /rk-wheels/opencv_python-*
|
||||||
RUN rm -rf /rk-wheels/torch-*
|
RUN rm -rf /rk-wheels/torch-*
|
||||||
|
|
||||||
|
@ -12,7 +12,10 @@ ARG PIP_BREAK_SYSTEM_PACKAGES
|
|||||||
# Install TensorRT wheels
|
# Install TensorRT wheels
|
||||||
COPY docker/tensorrt/requirements-amd64.txt /requirements-tensorrt.txt
|
COPY docker/tensorrt/requirements-amd64.txt /requirements-tensorrt.txt
|
||||||
COPY docker/main/requirements-wheels.txt /requirements-wheels.txt
|
COPY docker/main/requirements-wheels.txt /requirements-wheels.txt
|
||||||
RUN pip3 wheel --wheel-dir=/trt-wheels -c /requirements-wheels.txt -r /requirements-tensorrt.txt
|
|
||||||
|
# remove dependencies from the requirements that have type constraints
|
||||||
|
RUN sed -i '/\[.*\]/d' /requirements-wheels.txt \
|
||||||
|
&& pip3 wheel --wheel-dir=/trt-wheels -c /requirements-wheels.txt -r /requirements-tensorrt.txt
|
||||||
|
|
||||||
FROM deps AS frigate-tensorrt
|
FROM deps AS frigate-tensorrt
|
||||||
ARG PIP_BREAK_SYSTEM_PACKAGES
|
ARG PIP_BREAK_SYSTEM_PACKAGES
|
||||||
|
@ -1,8 +1,10 @@
|
|||||||
import logging
|
import logging
|
||||||
|
import re
|
||||||
from typing import Optional
|
from typing import Optional
|
||||||
|
|
||||||
from fastapi import FastAPI, Request
|
from fastapi import FastAPI, Request
|
||||||
from fastapi.responses import JSONResponse
|
from fastapi.responses import JSONResponse
|
||||||
|
from joserfc.jwk import OctKey
|
||||||
from playhouse.sqliteq import SqliteQueueDatabase
|
from playhouse.sqliteq import SqliteQueueDatabase
|
||||||
from slowapi import _rate_limit_exceeded_handler
|
from slowapi import _rate_limit_exceeded_handler
|
||||||
from slowapi.errors import RateLimitExceeded
|
from slowapi.errors import RateLimitExceeded
|
||||||
@ -130,6 +132,26 @@ def create_fastapi_app(
|
|||||||
app.stats_emitter = stats_emitter
|
app.stats_emitter = stats_emitter
|
||||||
app.event_metadata_updater = event_metadata_updater
|
app.event_metadata_updater = event_metadata_updater
|
||||||
app.config_publisher = config_publisher
|
app.config_publisher = config_publisher
|
||||||
app.jwt_token = get_jwt_secret() if frigate_config.auth.enabled else None
|
|
||||||
|
if frigate_config.auth.enabled:
|
||||||
|
secret = get_jwt_secret()
|
||||||
|
key_bytes = None
|
||||||
|
if isinstance(secret, str):
|
||||||
|
# If the secret looks like hex (e.g., generated by secrets.token_hex), use raw bytes
|
||||||
|
if len(secret) % 2 == 0 and re.fullmatch(r"[0-9a-fA-F]+", secret or ""):
|
||||||
|
try:
|
||||||
|
key_bytes = bytes.fromhex(secret)
|
||||||
|
except ValueError:
|
||||||
|
key_bytes = secret.encode("utf-8")
|
||||||
|
else:
|
||||||
|
key_bytes = secret.encode("utf-8")
|
||||||
|
elif isinstance(secret, (bytes, bytearray)):
|
||||||
|
key_bytes = bytes(secret)
|
||||||
|
else:
|
||||||
|
key_bytes = str(secret).encode("utf-8")
|
||||||
|
|
||||||
|
app.jwt_token = OctKey.import_key(key_bytes)
|
||||||
|
else:
|
||||||
|
app.jwt_token = None
|
||||||
|
|
||||||
return app
|
return app
|
||||||
|
Loading…
Reference in New Issue
Block a user