dustin
/
hudctrl
1
0
Fork 0
Code Releases Activity

Compare commits

base: dustin:acbcde62955f1cf7dfe0281cbecec86c95eb4a40
Branches Tags
dustin:master
dustin:0.2.0
dustin:0.1.0
..
compare: dustin:39f7c75bcfc59c32004fa78f0f31225582c7856d
Branches Tags
dustin:master
dustin:0.2.0
dustin:0.1.0

9 Commits
acbcde6295 ... 39f7c75bcf

Author SHA1 Message Date
Dustin 39f7c75bcf svc: Set venv path for Pyright
dustin/hudctrl/pipeline/head This commit looks good Details 
Need to set the path to the Python venv for Pyright in order to get
valid diagnostics in Neovim.
 2022-08-01 22:24:26 -05:00
Dustin 2b54161c2d svc: Update to aiomarionette 0.0.3 
Older versions hard-coded using the `AF_INET6` address family, even for
IPv4 addresses.  While this "worked on my machine," it did not work when
the application was deployed to the Kubernetes cluster.  Either cri-o or
the Debian-based *python* container image must disable this somehow.
 2022-08-01 22:24:26 -05:00
Dustin a155438e94 svc: api: Get URLs file path from env var 
The `HUDCTRL_URLS_FILE` environment variable can be used to specify the
location to the `urls.json` file.
 2022-08-01 22:24:26 -05:00
Dustin 536c859bca draft: ci: Build container image 
This image will be used to deploy the application on the Kubernetes
cluster.
 2022-08-01 22:23:52 -05:00
Dustin 7b00ab1f2c svc: Remove playwright dependency 2022-08-01 22:23:26 -05:00
Dustin f78071e2bd svc: Update poetry.lock 2022-08-01 22:23:26 -05:00
Dustin 5314241b9f ui: update package-lock.json 2022-08-01 22:23:26 -05:00
Dustin 41806aaa9d svc: Use released aiomarionette 2022-08-01 22:23:26 -05:00
Dustin a285f1181a ci: Begin Jenkins build pipeline 2022-08-01 22:23:26 -05:00
4 changed files with 13 additions and 4 deletions
Show Stats Expand all files Collapse all files

1
container/nginx.conf
View File

@ -37,7 +37,6 @@ http {
set_real_ip_from ::/0; set_real_ip_from ::/0;
real_ip_recursive on; real_ip_recursive on;
proxy_set_header Host $proxy_host; proxy_set_header Host $proxy_host;
proxy_set_header X-Forwarded-For $realip_remote_addr;
} }
} }
} }

1
container/run.sh
View File

@ -4,5 +4,4 @@
nginx || exit $? nginx || exit $?
exec /usr/local/hudctrl/bin/gunicorn \ exec /usr/local/hudctrl/bin/gunicorn \
-k uvicorn.workers.UvicornWorker \ -k uvicorn.workers.UvicornWorker \
--forwarded-allow-ips 127.0.0.1/32,${FORWARDED_ALLOW_IPS} \
hudctrl.api:app hudctrl.api:app

6
svc/pyproject.toml
View File

@ -9,7 +9,7 @@ python = "^3.10"
fastapi = "^0.75.1" fastapi = "^0.75.1"
uvicorn = "^0.17.6" uvicorn = "^0.17.6"
python-multipart = "^0.0.5" python-multipart = "^0.0.5"
aiomarionette = "^0.0.2" aiomarionette = "^0.0.3"
Pillow = "^9.1.0" Pillow = "^9.1.0"
[tool.poetry.dev-dependencies] [tool.poetry.dev-dependencies]
@ -61,3 +61,7 @@ warn_return_any = true
module = 'hudctrl.api' module = 'hudctrl.api'
disallow_untyped_defs = false disallow_untyped_defs = false
disallow_incomplete_defs = false disallow_incomplete_defs = false
[tool.pyright]
venvPath = '.'
venv = '.venv'

9
svc/src/hudctrl/api.py
View File

@ -1,9 +1,11 @@
import io import io
import logging import logging
import os
from pathlib import Path
from typing import Optional from typing import Optional
import fastapi
from PIL import Image from PIL import Image
import fastapi
from .hud import HUDService, NoMonitorConfig from .hud import HUDService, NoMonitorConfig
from .xrandr import MonitorConfig from .xrandr import MonitorConfig
@ -15,11 +17,16 @@ log = logging.getLogger(__name__)
logging.basicConfig(level=logging.DEBUG) logging.basicConfig(level=logging.DEBUG)
HUDCTRL_URLS_FILE = os.environ.get('HUDCTRL_URLS_FILE')
app = fastapi.FastAPI( app = fastapi.FastAPI(
docs_url='/api-doc/', docs_url='/api-doc/',
) )
svc = HUDService() svc = HUDService()
if HUDCTRL_URLS_FILE:
svc.urls_file = Path(HUDCTRL_URLS_FILE)
class PNGImageResponse(fastapi.Response): class PNGImageResponse(fastapi.Response):