From 7800bf73a878e0de749df3876211a326315476fc Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Tue, 27 Feb 2024 15:44:34 +0100 Subject: [PATCH 01/29] added "16.4" and "17.0" as supported --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8f7ffea..f3a6f73 100644 --- a/README.md +++ b/README.md @@ -428,6 +428,8 @@ Successfully tested with this package versions: | vGPU Suftware | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date | |---------------|--------------------|--------------|----------------|---------------| +| `17.0` | `550.54.10` | `550.54.14` | `551.61` | February 2024 | +| `16.4` | `535.161.05` | `535.161.05` | `538.33` | February 2024 | | `16.3` | `535.154.02` | `535.154.05` | `538.15` | January 2024 | | `16.2` | `535.129.03` | `535.129.03` | `537.70` | October 2023 | | `16.1` | `535.104.06` | `535.104.05` | `537.13` | August 2023 | From 66d203e72aede8f635173a78ebde288b7163b07d Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 4 Mar 2024 21:13:12 +0100 Subject: [PATCH 02/29] requirements.txt updated --- Dockerfile | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 14d53b1..ca25001 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN apk update \ && apk add --no-cache --virtual build-deps gcc g++ python3-dev musl-dev pkgconfig \ && apk add --no-cache curl postgresql postgresql-dev mariadb-dev sqlite-dev \ && pip install --no-cache-dir --upgrade uvicorn \ - && pip install --no-cache-dir psycopg2==2.9.6 mysqlclient==2.2.0 pysqlite3==0.5.1 \ + && pip install --no-cache-dir psycopg2==2.9.9 mysqlclient==2.2.4 pysqlite3==0.5.2 \ && pip install --no-cache-dir -r /tmp/requirements.txt \ && apk del build-deps diff --git a/requirements.txt b/requirements.txt index 6eea61c..69e8fb4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,6 @@ uvicorn[standard]==0.27.1 python-jose==3.3.0 pycryptodome==3.20.0 python-dateutil==2.8.2 -sqlalchemy==2.0.27 +sqlalchemy==2.0.28 markdown==3.5.2 python-dotenv==1.0.1 From a5d599a52c68e6a26d34de02be89c064f93fbd17 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 4 Mar 2024 21:31:56 +0100 Subject: [PATCH 03/29] typos --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f3a6f73..c45188c 100644 --- a/README.md +++ b/README.md @@ -416,9 +416,9 @@ After first success you have to replace `--issue` with `--renew`. every 4.8 hours. If network connectivity is lost, the loss of connectivity is detected during license renewal and the client has 19.2 hours in which to re-establish connectivity before its license expires. -\*3 Always use `https`, since guest-drivers only support secure connections! +\*2 Always use `https`, since guest-drivers only support secure connections! -\*4 If you recreate instance keys you need to **recreate client-token for each guest**! +\*3 If you recreate your instance keys you need to **recreate client-token for each guest**! # Setup (Client) From dd69f60fd0df0eaa73d37fc71b82915e5b717809 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Wed, 6 Mar 2024 20:58:51 +0100 Subject: [PATCH 04/29] added link to releases & release notes --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c45188c..a10d929 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,8 @@ Only the clients need a connection to this service on configured port. *All other repositories are forks! (which is no bad - just for information and bug reports)* +[Releases & Release Notes](https://git.collinwebdesigns.de/oscar.krause/fastapi-dls/-/releases) + --- [[_TOC_]] From 8f498f496067985a416938b237b87de7d0ea6b69 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Mon, 8 Apr 2024 15:10:01 +0200 Subject: [PATCH 05/29] added 17.1 as supported --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a10d929..199cf54 100644 --- a/README.md +++ b/README.md @@ -430,6 +430,7 @@ Successfully tested with this package versions: | vGPU Suftware | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date | |---------------|--------------------|--------------|----------------|---------------| +| `17.1` | `550.54.16` | `550.54.15` | `551.78` | March 2024 | | `17.0` | `550.54.10` | `550.54.14` | `551.61` | February 2024 | | `16.4` | `535.161.05` | `535.161.05` | `538.33` | February 2024 | | `16.3` | `535.154.02` | `535.154.05` | `538.15` | January 2024 | From e04723d128e9a25e0c9e96d12f477aab2c33ab3a Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Tue, 9 Apr 2024 08:01:01 +0200 Subject: [PATCH 06/29] removed biggerthanshit link --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index 199cf54..43748b9 100644 --- a/README.md +++ b/README.md @@ -446,10 +446,7 @@ Successfully tested with this package versions: - https://docs.nvidia.com/grid/index.html -*To get the latest drivers, visit Nvidia or search in Discord-Channel `GPU Unlocking` (Server-ID: `829786927829745685`) on channel `licensing` `biggerthanshit` - - -https://archive.biggerthanshit.com/NVIDIA/ (nvidia / b1gg3rth4nsh1t) +*To get the latest drivers, visit Nvidia or search in Discord-Channel `GPU Unlocking` (Server-ID: `829786927829745685`) on channel `licensing` `biggerthanshit` ## Linux From 07273c3ebd47bb8512b952d52cfe402d2da269b2 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Tue, 9 Apr 2024 08:01:20 +0200 Subject: [PATCH 07/29] update vGPU Version Matrix --- README.md | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 43748b9..7e52b39 100644 --- a/README.md +++ b/README.md @@ -428,21 +428,23 @@ client has 19.2 hours in which to re-establish connectivity before its license e Successfully tested with this package versions: -| vGPU Suftware | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date | -|---------------|--------------------|--------------|----------------|---------------| -| `17.1` | `550.54.16` | `550.54.15` | `551.78` | March 2024 | -| `17.0` | `550.54.10` | `550.54.14` | `551.61` | February 2024 | -| `16.4` | `535.161.05` | `535.161.05` | `538.33` | February 2024 | -| `16.3` | `535.154.02` | `535.154.05` | `538.15` | January 2024 | -| `16.2` | `535.129.03` | `535.129.03` | `537.70` | October 2023 | -| `16.1` | `535.104.06` | `535.104.05` | `537.13` | August 2023 | -| `16.0` | `535.54.06` | `535.54.03` | `536.22` | July 2023 | -| `15.3` | `525.125.03` | `525.125.06` | `529.11` | June 2023 | -| `15.2` | `525.105.14` | `525.105.17` | `528.89` | March 2023 | -| `15.1` | `525.85.07` | `525.85.05` | `528.24` | January 2023 | -| `15.0` | `525.60.12` | `525.60.13` | `527.41` | December 2022 | -| `14.4` | `510.108.03` | `510.108.03` | `514.08` | December 2022 | -| `14.3` | `510.108.03` | `510.108.03` | `513.91` | November 2022 | +| vGPU Suftware | Driver Branch | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date | EOL Date | +|:-------------:|:-------------:|--------------------|--------------|----------------|--------------:|--------------:| +| `17.1` | R550 | `550.54.16` | `550.54.15` | `551.78` | March 2024 | February 2025 | +| `17.0` | R550 | `550.54.10` | `550.54.14` | `551.61` | February 2024 | | +| `16.5` | R535 | `535.161.05` | `535.161.08` | `538.46` | February 2024 | July 2026 | +| `16.4` | R535 | `535.161.05` | `535.161.07` | `538.33` | February 2024 | | +| `16.3` | R535 | `535.154.02` | `535.154.05` | `538.15` | January 2024 | | +| `16.2` | R535 | `535.129.03` | `535.129.03` | `537.70` | October 2023 | | +| `16.1` | R535 | `535.104.06` | `535.104.05` | `537.13` | August 2023 | | +| `16.0` | R535 | `535.54.06` | `535.54.03` | `536.22` | July 2023 | | +| `15.4` | R525 | `525.147.01` | `525.147.05` | `529.19` | June 2023 | October 2023 | +| `15.3` | R525 | `525.125.03` | `525.125.06` | `529.11` | June 2023 | | +| `15.2` | R525 | `525.105.14` | `525.105.17` | `528.89` | March 2023 | | +| `15.1` | R525 | `525.85.07` | `525.85.05` | `528.24` | January 2023 | | +| `15.0` | R525 | `525.60.12` | `525.60.13` | `527.41` | December 2022 | | +| `14.4` | R510 | `510.108.03` | `510.108.03` | `514.08` | December 2022 | February 2023 | +| `14.3` | R510 | `510.108.03` | `510.108.03` | `513.91` | November 2022 | | - https://docs.nvidia.com/grid/index.html From 254e4ee08c983e4bc3a854b66648d55566dbb595 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Tue, 9 Apr 2024 08:13:33 +0200 Subject: [PATCH 08/29] requirements.txt updated --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 69e8fb4..d084a8c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -fastapi==0.110.0 -uvicorn[standard]==0.27.1 +fastapi==0.110.1 +uvicorn[standard]==0.29.0 python-jose==3.3.0 pycryptodome==3.20.0 python-dateutil==2.8.2 -sqlalchemy==2.0.28 -markdown==3.5.2 +sqlalchemy==2.0.29 +markdown==3.6 python-dotenv==1.0.1 From 395884f6439c126c424f86eb3292f9fc66f425f0 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Wed, 10 Apr 2024 07:09:01 +0200 Subject: [PATCH 09/29] credits & further reading --- README.md | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 7e52b39..1798142 100644 --- a/README.md +++ b/README.md @@ -9,14 +9,19 @@ Only the clients need a connection to this service on configured port. **Official Links** -- https://git.collinwebdesigns.de/oscar.krause/fastapi-dls (Private Git) -- https://gitea.publichub.eu/oscar.krause/fastapi-dls (Public Git) -- https://hub.docker.com/r/collinwebdesigns/fastapi-dls (Docker-Hub `collinwebdesigns/fastapi-dls:latest`) +* https://git.collinwebdesigns.de/oscar.krause/fastapi-dls (Private Git) +* https://gitea.publichub.eu/oscar.krause/fastapi-dls (Public Git) +* https://hub.docker.com/r/collinwebdesigns/fastapi-dls (Docker-Hub `collinwebdesigns/fastapi-dls:latest`) *All other repositories are forks! (which is no bad - just for information and bug reports)* [Releases & Release Notes](https://git.collinwebdesigns.de/oscar.krause/fastapi-dls/-/releases) +**Further Reading** + +* [NVIDIA vGPU Guide](https://gitlab.com/polloloco/vgpu-proxmox) - This document serves as a guide to install NVIDIA vGPU host drivers on the latest Proxmox VE version +* [vgpu_unlock](https://github.com/DualCoder/vgpu_unlock) - Unlock vGPU functionality for consumer-grade Nvidia GPUs. +* [vGPU_Unlock Wiki](https://docs.google.com/document/d/1pzrWJ9h-zANCtyqRgS7Vzla0Y8Ea2-5z2HEi4X75d2Q) - Guide for `vgpu_unlock` --- [[_TOC_]] @@ -104,7 +109,7 @@ volumes: dls-db: ``` -## Debian/Ubuntu/macOS (manual method using `git clone` and python virtual environment) +## Debian / Ubuntu / macOS (manual method using `git clone` and python virtual environment) Tested on `Debian 11 (bullseye)`, `Debian 12 (bookworm)` and `macOS Ventura (13.6)`, Ubuntu may also work. **Please note that setup on macOS differs from Debian based systems.** @@ -311,7 +316,7 @@ EOF Now you have to run `systemctl daemon-reload`. After that you can start service with `systemctl start fastapi-dls.service` and enable autostart with `systemctl enable fastapi-dls.service`. -## Debian/Ubuntu (using `dpkg`) +## Debian / Ubuntu (using `dpkg` / `apt`) Packages are available here: @@ -583,7 +588,7 @@ Generate client token, (see [installation](#installation)). There are many other internal api endpoints for handling authentication and lease process. -# Troubleshoot +# Troubleshoot / Debug **Please make sure that fastapi-dls and your guests are on the same timezone!** @@ -739,6 +744,11 @@ Thanks to vGPU community and all who uses this project and report bugs. Special thanks to -- @samicrusader who created build file for ArchLinux -- @cyrus who wrote the section for openSUSE -- @midi who wrote the section for unRAID +- @samicrusader who created build file for **ArchLinux** +- @cyrus who wrote the section for **openSUSE** +- @midi who wrote the section for **unRAID** +- @polloloco who wrote the *[NVIDIA vGPU Guide](https://gitlab.com/polloloco/vgpu-proxmox)* +- @DualCoder who creates the `vgpu_unlock` functionality [vgpu_unlock](https://github.com/DualCoder/vgpu_unlock) +- Krutav Shah who wrote the [vGPU_Unlock Wiki](https://docs.google.com/document/d/1pzrWJ9h-zANCtyqRgS7Vzla0Y8Ea2-5z2HEi4X75d2Q/) + +And thanks to all people who contributed to all these libraries! From 9eb91cbe1ad1536c9ff915d3b4666aa7c1164aab Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 18 Apr 2024 07:07:57 +0200 Subject: [PATCH 10/29] link to proxmox-installer.sh and credits --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 1798142..bc1a670 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,8 @@ Only the clients need a connection to this service on configured port. * [NVIDIA vGPU Guide](https://gitlab.com/polloloco/vgpu-proxmox) - This document serves as a guide to install NVIDIA vGPU host drivers on the latest Proxmox VE version * [vgpu_unlock](https://github.com/DualCoder/vgpu_unlock) - Unlock vGPU functionality for consumer-grade Nvidia GPUs. * [vGPU_Unlock Wiki](https://docs.google.com/document/d/1pzrWJ9h-zANCtyqRgS7Vzla0Y8Ea2-5z2HEi4X75d2Q) - Guide for `vgpu_unlock` +* [Proxmox All-In-One Installer Script](https://wvthoog.nl/proxmox-vgpu-v3/) - Also known as `proxmox-installer.sh` + --- [[_TOC_]] @@ -750,5 +752,6 @@ Special thanks to - @polloloco who wrote the *[NVIDIA vGPU Guide](https://gitlab.com/polloloco/vgpu-proxmox)* - @DualCoder who creates the `vgpu_unlock` functionality [vgpu_unlock](https://github.com/DualCoder/vgpu_unlock) - Krutav Shah who wrote the [vGPU_Unlock Wiki](https://docs.google.com/document/d/1pzrWJ9h-zANCtyqRgS7Vzla0Y8Ea2-5z2HEi4X75d2Q/) +- Wim van 't Hoog for the [Proxmox All-In-One Installer Script](https://wvthoog.nl/proxmox-vgpu-v3/) And thanks to all people who contributed to all these libraries! From be6797efc7af5d696a8e365211f5d28f9414c22b Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Tue, 23 Apr 2024 07:43:39 +0200 Subject: [PATCH 11/29] requirements.txt updated --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d084a8c..ed8dd48 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -fastapi==0.110.1 +fastapi==0.110.2 uvicorn[standard]==0.29.0 python-jose==3.3.0 pycryptodome==3.20.0 From 11f14565387404597c1e7543d2a2688e4cc3e46f Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 10 May 2024 07:56:13 +0200 Subject: [PATCH 12/29] test image matrix --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ef24bf..5ca622b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,7 +126,7 @@ build:pacman: - "*.pkg.tar.zst" test: - image: python:3.11-slim-bookworm + image: $IMAGE stage: test interruptible: true rules: @@ -141,6 +141,7 @@ test: DATABASE: sqlite:///../app/db.sqlite parallel: matrix: + - IMAGE: ['python:3.11-slim-bookworm'] - REQUIREMENTS: - requirements.txt - .DEBIAN/requirements-bookworm-12.txt From 4ebb4d790e7a9f29a319d63673b4b26fe4aab0e2 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 10 May 2024 08:22:47 +0200 Subject: [PATCH 13/29] added ubuntu-24.04 "requirements-ubuntu-24.04.txt" --- .DEBIAN/requirements-ubuntu-24.04.txt | 10 ++++++++++ .gitlab-ci.yml | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .DEBIAN/requirements-ubuntu-24.04.txt diff --git a/.DEBIAN/requirements-ubuntu-24.04.txt b/.DEBIAN/requirements-ubuntu-24.04.txt new file mode 100644 index 0000000..7cb653b --- /dev/null +++ b/.DEBIAN/requirements-ubuntu-24.04.txt @@ -0,0 +1,10 @@ +# https://packages.ubuntu.com +fastapi==0.101.0 +uvicorn[standard]==0.27.1 +python-jose[pycryptodome]==3.3.0 +pycryptodome==3.20.0 +python-dateutil==2.8.2 +sqlalchemy==1.4.50 +markdown==3.5.2 +python-dotenv==1.0.1 +jinja2==3.1.2 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5ca622b..f7ba457 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,7 +126,7 @@ build:pacman: - "*.pkg.tar.zst" test: - image: $IMAGE + image: python:3.11-slim-bookworm stage: test interruptible: true rules: @@ -141,11 +141,11 @@ test: DATABASE: sqlite:///../app/db.sqlite parallel: matrix: - - IMAGE: ['python:3.11-slim-bookworm'] - REQUIREMENTS: - requirements.txt - .DEBIAN/requirements-bookworm-12.txt - .DEBIAN/requirements-ubuntu-23.10.txt + - .DEBIAN/requirements-ubuntu-24.04.txt before_script: - apt-get update && apt-get install -y python3-dev gcc - pip install -r $REQUIREMENTS From 78c1978dd50d7737aee0a3f2b8886d05e82fa8a2 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 10 May 2024 09:15:46 +0200 Subject: [PATCH 14/29] added test matrix for python3.12 --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7ba457..5543e53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,7 +126,7 @@ build:pacman: - "*.pkg.tar.zst" test: - image: python:3.11-slim-bookworm + image: $IMAGE stage: test interruptible: true rules: @@ -141,7 +141,8 @@ test: DATABASE: sqlite:///../app/db.sqlite parallel: matrix: - - REQUIREMENTS: + - IMAGE: [ 'python:3.11-slim-bookworm', 'python:3.12-slim-bullseye' ] + REQUIREMENTS: - requirements.txt - .DEBIAN/requirements-bookworm-12.txt - .DEBIAN/requirements-ubuntu-23.10.txt @@ -206,7 +207,7 @@ test:debian: test:ubuntu: extends: .test:linux - image: ubuntu:23.10 + image: ubuntu:24.04 test:archlinux: image: archlinux:base From e51d6bd391b770d962e3f6dcdd139f5bd02fd075 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 10 May 2024 09:16:20 +0200 Subject: [PATCH 15/29] added Ubuntu 24.04 as supported --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index bc1a670..95f2ee0 100644 --- a/README.md +++ b/README.md @@ -330,6 +330,7 @@ Successful tested with: - Ubuntu 22.10 (Kinetic Kudu) (EOL: July 20, 2023) - Ubuntu 23.04 (Lunar Lobster) (EOL: January 2024) - Ubuntu 23.10 (Mantic Minotaur) (EOL: July 2024) +- Ubuntu 24.04 (Noble Numbat) (EOL: April 2036) Not working with: From ad3b622c23c885d9f8609b4e72cd299f3cfb4f8a Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 10 May 2024 10:09:28 +0200 Subject: [PATCH 16/29] requirements.txt updated --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index ed8dd48..097c30b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -fastapi==0.110.2 +fastapi==0.111.0 uvicorn[standard]==0.29.0 python-jose==3.3.0 pycryptodome==3.20.0 python-dateutil==2.8.2 -sqlalchemy==2.0.29 +sqlalchemy==2.0.30 markdown==3.6 python-dotenv==1.0.1 From ca53a4e08459ae8c905ad4cc339831045555bf0d Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 7 Jun 2024 08:42:37 +0200 Subject: [PATCH 17/29] updated supported vGPU releases --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 95f2ee0..cba5481 100644 --- a/README.md +++ b/README.md @@ -438,9 +438,11 @@ Successfully tested with this package versions: | vGPU Suftware | Driver Branch | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date | EOL Date | |:-------------:|:-------------:|--------------------|--------------|----------------|--------------:|--------------:| -| `17.1` | R550 | `550.54.16` | `550.54.15` | `551.78` | March 2024 | February 2025 | +| `17.2` | R550 | `550.90.05` | `550.90.07` | `552.55` | June 2024 | February 2025 | +| `17.1` | R550 | `550.54.16` | `550.54.15` | `551.78` | March 2024 | | | `17.0` | R550 | `550.54.10` | `550.54.14` | `551.61` | February 2024 | | -| `16.5` | R535 | `535.161.05` | `535.161.08` | `538.46` | February 2024 | July 2026 | +| `16.6` | R535 | `535.183.04` | `535.183.01` | `538.67` | June 2024 | July 2026 | +| `16.5` | R535 | `535.161.05` | `535.161.08` | `538.46` | February 2024 | | | `16.4` | R535 | `535.161.05` | `535.161.07` | `538.33` | February 2024 | | | `16.3` | R535 | `535.154.02` | `535.154.05` | `538.15` | January 2024 | | | `16.2` | R535 | `535.129.03` | `535.129.03` | `537.70` | October 2023 | | From 847d3589c5acd00924ca42ba17378b73846b306c Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 7 Jun 2024 08:42:41 +0200 Subject: [PATCH 18/29] typos --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cba5481..cd07e66 100644 --- a/README.md +++ b/README.md @@ -326,7 +326,7 @@ Packages are available here: Successful tested with: -- Debian 12 (Bookworm) +- Debian 12 (Bookworm) (EOL: tba.) - Ubuntu 22.10 (Kinetic Kudu) (EOL: July 20, 2023) - Ubuntu 23.04 (Lunar Lobster) (EOL: January 2024) - Ubuntu 23.10 (Mantic Minotaur) (EOL: July 2024) From 1d0631417d7e060059627a3a698bb1ad8fa0d278 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Wed, 12 Jun 2024 19:44:37 +0200 Subject: [PATCH 19/29] added link to gpu support matrix --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cd07e66..ba9aa63 100644 --- a/README.md +++ b/README.md @@ -457,6 +457,7 @@ Successfully tested with this package versions: | `14.3` | R510 | `510.108.03` | `510.108.03` | `513.91` | November 2022 | | - https://docs.nvidia.com/grid/index.html +- https://docs.nvidia.com/grid/gpus-supported-by-vgpu.html *To get the latest drivers, visit Nvidia or search in Discord-Channel `GPU Unlocking` (Server-ID: `829786927829745685`) on channel `licensing` `biggerthanshit` From c45aa1a2a80c32dc7feb11c62bdefc50ea2fe13c Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Wed, 12 Jun 2024 21:27:56 +0200 Subject: [PATCH 20/29] fixed [[__TOC__]] to [TOC] to support "markdown" package --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ba9aa63..3834be3 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Only the clients need a connection to this service on configured port. --- -[[_TOC_]] +[TOC] # Setup (Service) From 6473655e57d31f6d30aaba82c7af24beecf2c9c2 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 13 Jun 2024 19:24:46 +0200 Subject: [PATCH 21/29] import fixes --- app/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main.py b/app/main.py index 45b53aa..bbeb3b8 100644 --- a/app/main.py +++ b/app/main.py @@ -108,7 +108,7 @@ async def _config(): @app.get('/-/readme', summary='* Readme') async def _readme(): from markdown import markdown - content = load_file('../README.md').decode('utf-8') + content = load_file(join(dirname(__file__), '../README.md')).decode('utf-8') return HTMLr(markdown(text=content, extensions=['tables', 'fenced_code', 'md_in_html', 'nl2br', 'toc'])) From eff6aae25dd5d3c929ca862012fe92259bef1bb7 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 13 Jun 2024 19:53:57 +0200 Subject: [PATCH 22/29] code styling --- app/orm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/orm.py b/app/orm.py index 0b19e92..dacf2b0 100644 --- a/app/orm.py +++ b/app/orm.py @@ -1,6 +1,6 @@ from datetime import datetime, timedelta -from dateutil.relativedelta import relativedelta +from dateutil.relativedelta import relativedelta from sqlalchemy import Column, VARCHAR, CHAR, ForeignKey, DATETIME, update, and_, inspect, text from sqlalchemy.engine import Engine from sqlalchemy.orm import sessionmaker, declarative_base From 21f19be8ab2b8d555d161801d5e0ddb93e09691c Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 13 Jun 2024 20:16:51 +0200 Subject: [PATCH 23/29] code styling & improved logging --- app/main.py | 4 +++- app/util.py | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/app/main.py b/app/main.py index bbeb3b8..adafd34 100644 --- a/app/main.py +++ b/app/main.py @@ -60,9 +60,11 @@ app.add_middleware( allow_headers=['*'], ) +LOG_LEVEL = logging.DEBUG if DEBUG else logging.INFO logging.basicConfig() logger = logging.getLogger(__name__) -logger.setLevel(logging.DEBUG if DEBUG else logging.INFO) +logger.setLevel(LOG_LEVEL) +logging.getLogger('util').setLevel(LOG_LEVEL) def __get_token(request: Request) -> dict: diff --git a/app/util.py b/app/util.py index ca3eec6..530e5c0 100644 --- a/app/util.py +++ b/app/util.py @@ -1,10 +1,17 @@ -def load_file(filename) -> bytes: +import logging + +logging.basicConfig() + + +def load_file(filename: str) -> bytes: + log = logging.getLogger(f'{__name__}') + log.debug(f'Loading contents of file "{filename}') with open(filename, 'rb') as file: content = file.read() return content -def load_key(filename) -> "RsaKey": +def load_key(filename: str) -> "RsaKey": try: # Crypto | Cryptodome on Debian from Crypto.PublicKey import RSA @@ -13,6 +20,8 @@ def load_key(filename) -> "RsaKey": from Cryptodome.PublicKey import RSA from Cryptodome.PublicKey.RSA import RsaKey + log = logging.getLogger(__name__) + log.debug(f'Importing RSA-Key from "{filename}"') return RSA.import_key(extern_key=load_file(filename), passphrase=None) @@ -24,5 +33,6 @@ def generate_key() -> "RsaKey": except ModuleNotFoundError: from Cryptodome.PublicKey import RSA from Cryptodome.PublicKey.RSA import RsaKey - + log = logging.getLogger(__name__) + log.debug(f'Generating RSA-Key') return RSA.generate(bits=2048) From 5438317fb7ac9a4237c00f6dc8250ba9f014e379 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 13 Jun 2024 20:18:18 +0200 Subject: [PATCH 24/29] rearranged imports --- app/main.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/main.py b/app/main.py index adafd34..6be05df 100644 --- a/app/main.py +++ b/app/main.py @@ -1,26 +1,26 @@ import logging from base64 import b64encode as b64enc +from calendar import timegm +from datetime import datetime, timedelta from hashlib import sha256 -from uuid import uuid4 -from os.path import join, dirname +from json import loads as json_loads from os import getenv as env +from os.path import join, dirname +from uuid import uuid4 +from dateutil.relativedelta import relativedelta from dotenv import load_dotenv from fastapi import FastAPI from fastapi.requests import Request -from json import loads as json_loads -from datetime import datetime, timedelta -from dateutil.relativedelta import relativedelta -from calendar import timegm from jose import jws, jwk, jwt, JWTError from jose.constants import ALGORITHMS -from starlette.middleware.cors import CORSMiddleware -from starlette.responses import StreamingResponse, JSONResponse as JSONr, HTMLResponse as HTMLr, Response, RedirectResponse from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker +from starlette.middleware.cors import CORSMiddleware +from starlette.responses import StreamingResponse, JSONResponse as JSONr, HTMLResponse as HTMLr, Response, RedirectResponse -from util import load_key, load_file from orm import Origin, Lease, init as db_init, migrate +from util import load_key, load_file load_dotenv('../version.env') From 0d9e814d0d2b766b6584f7f3a34c3c1d6889b71f Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 13 Jun 2024 20:18:33 +0200 Subject: [PATCH 25/29] show if debug is enabled on app startup --- app/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/main.py b/app/main.py index 6be05df..ab87bde 100644 --- a/app/main.py +++ b/app/main.py @@ -553,6 +553,8 @@ async def app_on_startup(): Your client-token file (.tok) is valid for {str(CLIENT_TOKEN_EXPIRE_DELTA)}. ''') + logger.info(f'Debug is {"enabled" if DEBUG else "disabled"}.') + if __name__ == '__main__': import uvicorn From 8c5850beda441b4f1d7d2f8f718514657ef3534d Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 13 Jun 2024 20:34:27 +0200 Subject: [PATCH 26/29] migrated from deprecated "startup" to "lifespan" hook (fastapi) --- app/main.py | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/app/main.py b/app/main.py index ab87bde..886cfe1 100644 --- a/app/main.py +++ b/app/main.py @@ -1,6 +1,7 @@ import logging from base64 import b64encode as b64enc from calendar import timegm +from contextlib import asynccontextmanager from datetime import datetime, timedelta from hashlib import sha256 from json import loads as json_loads @@ -51,6 +52,28 @@ CORS_ORIGINS = str(env('CORS_ORIGINS', '')).split(',') if (env('CORS_ORIGINS')) jwt_encode_key = jwk.construct(INSTANCE_KEY_RSA.export_key().decode('utf-8'), algorithm=ALGORITHMS.RS256) jwt_decode_key = jwk.construct(INSTANCE_KEY_PUB.export_key().decode('utf-8'), algorithm=ALGORITHMS.RS256) +# FastAPI +@asynccontextmanager +async def lifespan(_: FastAPI): + # on startup + logger.info(f''' + + Using timezone: {str(TZ)}. Make sure this is correct and match your clients! + + Your clients renew their license every {str(Lease.calculate_renewal(LEASE_RENEWAL_PERIOD, LEASE_RENEWAL_DELTA))}. + If the renewal fails, the license is {str(LEASE_RENEWAL_DELTA)} valid. + + Your client-token file (.tok) is valid for {str(CLIENT_TOKEN_EXPIRE_DELTA)}. + ''') + + logger.info(f'Debug is {"enabled" if DEBUG else "disabled"}.') + + yield + + # on shutdown + logger.info(f'Shutting down ...') + + app.debug = DEBUG app.add_middleware( CORSMiddleware, @@ -542,20 +565,6 @@ async def leasing_v1_lessor_shutdown(request: Request): return JSONr(response) -@app.on_event('startup') -async def app_on_startup(): - logger.info(f''' - Using timezone: {str(TZ)}. Make sure this is correct and match your clients! - - Your clients renew their license every {str(Lease.calculate_renewal(LEASE_RENEWAL_PERIOD, LEASE_RENEWAL_DELTA))}. - If the renewal fails, the license is {str(LEASE_RENEWAL_DELTA)} valid. - - Your client-token file (.tok) is valid for {str(CLIENT_TOKEN_EXPIRE_DELTA)}. - ''') - - logger.info(f'Debug is {"enabled" if DEBUG else "disabled"}.') - - if __name__ == '__main__': import uvicorn From c9ac915055af21d4b7586b05e8bd34e10defab34 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 13 Jun 2024 20:34:45 +0200 Subject: [PATCH 27/29] code styling & comments --- app/main.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/main.py b/app/main.py index 886cfe1..c79c7b7 100644 --- a/app/main.py +++ b/app/main.py @@ -23,18 +23,20 @@ from starlette.responses import StreamingResponse, JSONResponse as JSONr, HTMLRe from orm import Origin, Lease, init as db_init, migrate from util import load_key, load_file +# Load variables load_dotenv('../version.env') +# Get current timezone TZ = datetime.now().astimezone().tzinfo +# Load basic variables VERSION, COMMIT, DEBUG = env('VERSION', 'unknown'), env('COMMIT', 'unknown'), bool(env('DEBUG', False)) -config = dict(openapi_url=None, docs_url=None, redoc_url=None) # dict(openapi_url='/-/openapi.json', docs_url='/-/docs', redoc_url='/-/redoc') -app = FastAPI(title='FastAPI-DLS', description='Minimal Delegated License Service (DLS).', version=VERSION, **config) +# Database connection db = create_engine(str(env('DATABASE', 'sqlite:///db.sqlite'))) db_init(db), migrate(db) -# everything prefixed with "INSTANCE_*" is used as "SERVICE_INSTANCE_*" or "SI_*" in official dls service +# Load DLS variables (all prefixed with "INSTANCE_*" is used as "SERVICE_INSTANCE_*" or "SI_*" in official dls service) DLS_URL = str(env('DLS_URL', 'localhost')) DLS_PORT = int(env('DLS_PORT', '443')) SITE_KEY_XID = str(env('SITE_KEY_XID', '00000000-0000-0000-0000-000000000000')) @@ -52,6 +54,7 @@ CORS_ORIGINS = str(env('CORS_ORIGINS', '')).split(',') if (env('CORS_ORIGINS')) jwt_encode_key = jwk.construct(INSTANCE_KEY_RSA.export_key().decode('utf-8'), algorithm=ALGORITHMS.RS256) jwt_decode_key = jwk.construct(INSTANCE_KEY_PUB.export_key().decode('utf-8'), algorithm=ALGORITHMS.RS256) + # FastAPI @asynccontextmanager async def lifespan(_: FastAPI): @@ -74,6 +77,9 @@ async def lifespan(_: FastAPI): logger.info(f'Shutting down ...') +config = dict(openapi_url=None, docs_url=None, redoc_url=None) # dict(openapi_url='/-/openapi.json', docs_url='/-/docs', redoc_url='/-/redoc') +app = FastAPI(title='FastAPI-DLS', description='Minimal Delegated License Service (DLS).', version=VERSION, lifespan=lifespan, **config) + app.debug = DEBUG app.add_middleware( CORSMiddleware, @@ -83,6 +89,7 @@ app.add_middleware( allow_headers=['*'], ) +# Logging LOG_LEVEL = logging.DEBUG if DEBUG else logging.INFO logging.basicConfig() logger = logging.getLogger(__name__) @@ -90,12 +97,15 @@ logger.setLevel(LOG_LEVEL) logging.getLogger('util').setLevel(LOG_LEVEL) +# Helper def __get_token(request: Request) -> dict: authorization_header = request.headers.get('authorization') token = authorization_header.split(' ')[1] return jwt.decode(token=token, key=jwt_decode_key, algorithms=ALGORITHMS.RS256, options={'verify_aud': False}) +# Endpoints + @app.get('/', summary='Index') async def index(): return RedirectResponse('/-/readme') From 35fc5ea6b0bc266def42e0fc6fb952ae0d81ecbd Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 21 Jun 2024 18:59:23 +0200 Subject: [PATCH 28/29] set log format --- app/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/main.py b/app/main.py index c79c7b7..81c1c37 100644 --- a/app/main.py +++ b/app/main.py @@ -91,7 +91,7 @@ app.add_middleware( # Logging LOG_LEVEL = logging.DEBUG if DEBUG else logging.INFO -logging.basicConfig() +logging.basicConfig(format='[{levelname:^7}] [{module:^15}] {message}', style='{') logger = logging.getLogger(__name__) logger.setLevel(LOG_LEVEL) logging.getLogger('util').setLevel(LOG_LEVEL) From c79455b84d200f9515e976ac8cc385323a8bbb30 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 21 Jun 2024 19:01:33 +0200 Subject: [PATCH 29/29] added way to include driver version in api use `create_driver_matrix_json.py` to generate file in `static/driver_matrix.json`. Logging currently is disabled to not confuse users when file is missing. This is optional! --- app/main.py | 1 + app/orm.py | 5 ++ app/util.py | 44 ++++++++++ test/create_driver_matrix_json.py | 137 ++++++++++++++++++++++++++++++ 4 files changed, 187 insertions(+) create mode 100644 test/create_driver_matrix_json.py diff --git a/app/main.py b/app/main.py index 81c1c37..60a66b2 100644 --- a/app/main.py +++ b/app/main.py @@ -95,6 +95,7 @@ logging.basicConfig(format='[{levelname:^7}] [{module:^15}] {message}', style='{ logger = logging.getLogger(__name__) logger.setLevel(LOG_LEVEL) logging.getLogger('util').setLevel(LOG_LEVEL) +logging.getLogger('NV').setLevel(LOG_LEVEL) # Helper diff --git a/app/orm.py b/app/orm.py index dacf2b0..73828fd 100644 --- a/app/orm.py +++ b/app/orm.py @@ -5,6 +5,8 @@ from sqlalchemy import Column, VARCHAR, CHAR, ForeignKey, DATETIME, update, and_ from sqlalchemy.engine import Engine from sqlalchemy.orm import sessionmaker, declarative_base +from util import NV + Base = declarative_base() @@ -23,6 +25,8 @@ class Origin(Base): return f'Origin(origin_ref={self.origin_ref}, hostname={self.hostname})' def serialize(self) -> dict: + _ = NV().find(self.guest_driver_version) + return { 'origin_ref': self.origin_ref, # 'service_instance_xid': self.service_instance_xid, @@ -30,6 +34,7 @@ class Origin(Base): 'guest_driver_version': self.guest_driver_version, 'os_platform': self.os_platform, 'os_version': self.os_version, + '$driver': _ if _ is not None else None, } @staticmethod diff --git a/app/util.py b/app/util.py index 530e5c0..b5b1ff1 100644 --- a/app/util.py +++ b/app/util.py @@ -36,3 +36,47 @@ def generate_key() -> "RsaKey": log = logging.getLogger(__name__) log.debug(f'Generating RSA-Key') return RSA.generate(bits=2048) + + +class NV: + __DRIVER_MATRIX_FILENAME = 'static/driver_matrix.json' + __DRIVER_MATRIX: None | dict = None # https://docs.nvidia.com/grid/ => "Driver Versions" + + def __init__(self): + self.log = logging.getLogger(self.__class__.__name__) + + if NV.__DRIVER_MATRIX is None: + from json import load as json_load + try: + file = open(NV.__DRIVER_MATRIX_FILENAME) + NV.__DRIVER_MATRIX = json_load(file) + file.close() + self.log.debug(f'Successfully loaded "{NV.__DRIVER_MATRIX_FILENAME}".') + except Exception as e: + NV.__DRIVER_MATRIX = {} # init empty dict to not try open file everytime, just when restarting app + # self.log.warning(f'Failed to load "{NV.__DRIVER_MATRIX_FILENAME}": {e}') + + @staticmethod + def find(version: str) -> dict | None: + if NV.__DRIVER_MATRIX is None: + return None + for idx, (key, branch) in enumerate(NV.__DRIVER_MATRIX.items()): + for release in branch.get('$releases'): + linux_driver = release.get('Linux Driver') + windows_driver = release.get('Windows Driver') + if version == linux_driver or version == windows_driver: + tmp = branch.copy() + tmp.pop('$releases') + + is_latest = release.get('vGPU Software') == branch.get('Latest Release in Branch') + + return { + 'software_branch': branch.get('vGPU Software Branch'), + 'branch_version': release.get('vGPU Software'), + 'driver_branch': branch.get('Driver Branch'), + 'branch_status': branch.get('vGPU Branch Status'), + 'release_date': release.get('Release Date'), + 'eol': branch.get('EOL Date') if is_latest else None, + 'is_latest': is_latest, + } + return None diff --git a/test/create_driver_matrix_json.py b/test/create_driver_matrix_json.py new file mode 100644 index 0000000..1f31884 --- /dev/null +++ b/test/create_driver_matrix_json.py @@ -0,0 +1,137 @@ +import logging + +logging.basicConfig() +logger = logging.getLogger(__name__) +logger.setLevel(logging.INFO) + +URL = 'https://docs.nvidia.com/grid/' + +BRANCH_STATUS_KEY, SOFTWARE_BRANCH_KEY, = 'vGPU Branch Status', 'vGPU Software Branch' +VGPU_KEY, GRID_KEY, DRIVER_BRANCH_KEY = 'vGPU Software', 'vGPU Software', 'Driver Branch' +LINUX_VGPU_MANAGER_KEY, LINUX_DRIVER_KEY = 'Linux vGPU Manager', 'Linux Driver' +WINDOWS_VGPU_MANAGER_KEY, WINDOWS_DRIVER_KEY = 'Windows vGPU Manager', 'Windows Driver' +ALT_VGPU_MANAGER_KEY = 'vGPU Manager' +RELEASE_DATE_KEY, LATEST_KEY, EOL_KEY = 'Release Date', 'Latest Release in Branch', 'EOL Date' +JSON_RELEASES_KEY = '$releases' + + +def __driver_versions(html: 'BeautifulSoup'): + def __strip(_: str) -> str: + # removes content after linebreak (e.g. "Hello\n World" to "Hello") + _ = _.strip() + tmp = _.split('\n') + if len(tmp) > 0: + return tmp[0] + return _ + + # find wrapper for "DriverVersions" and find tables + data = html.find('div', {'id': 'DriverVersions'}) + tables = data.findAll('table') + for table in tables: + # parse software-branch (e.g. "vGPU software 17 Releases" and remove " Releases" for "matrix_key") + software_branch = table.parent.find_previous_sibling('button', {'class': 'accordion'}).text.strip() + software_branch = software_branch.replace(' Releases', '') + matrix_key = software_branch.lower() + + # driver version info from table-heads (ths) and table-rows (trs) + ths, trs = table.find_all('th'), table.find_all('tr') + headers, releases = [header.text.strip() for header in ths], [] + for trs in trs: + tds = trs.find_all('td') + if len(tds) == 0: # skip empty + continue + # create dict with table-heads as key and cell content as value + x = {headers[i]: __strip(cell.text) for i, cell in enumerate(tds)} + releases.append(x) + + # add to matrix + MATRIX.update({matrix_key: {JSON_RELEASES_KEY: releases}}) + + +def __release_branches(html: 'BeautifulSoup'): + # find wrapper for "AllReleaseBranches" and find table + data = html.find('div', {'id': 'AllReleaseBranches'}) + table = data.find('table') + + # branch releases info from table-heads (ths) and table-rows (trs) + ths, trs = table.find_all('th'), table.find_all('tr') + headers = [header.text.strip() for header in ths] + for trs in trs: + tds = trs.find_all('td') + if len(tds) == 0: # skip empty + continue + # create dict with table-heads as key and cell content as value + x = {headers[i]: cell.text.strip() for i, cell in enumerate(tds)} + + # get matrix_key + software_branch = x.get(SOFTWARE_BRANCH_KEY) + matrix_key = software_branch.lower() + + # add to matrix + MATRIX.update({matrix_key: MATRIX.get(matrix_key) | x}) + + +def __debug(): + # print table head + s = f'{SOFTWARE_BRANCH_KEY:^21} | {BRANCH_STATUS_KEY:^21} | {VGPU_KEY:^13} | {LINUX_VGPU_MANAGER_KEY:^21} | {LINUX_DRIVER_KEY:^21} | {WINDOWS_VGPU_MANAGER_KEY:^21} | {WINDOWS_DRIVER_KEY:^21} | {RELEASE_DATE_KEY:>21} | {EOL_KEY:>21}' + print(s) + + # iterate over dict & format some variables to not overload table + for idx, (key, branch) in enumerate(MATRIX.items()): + branch_status = branch.get(BRANCH_STATUS_KEY) + branch_status = branch_status.replace('Branch ', '') + branch_status = branch_status.replace('Long-Term Support', 'LTS') + branch_status = branch_status.replace('Production', 'Prod.') + + software_branch = branch.get(SOFTWARE_BRANCH_KEY).replace('NVIDIA ', '') + for release in branch.get(JSON_RELEASES_KEY): + version = release.get(VGPU_KEY, release.get(GRID_KEY, '')) + linux_manager = release.get(LINUX_VGPU_MANAGER_KEY, release.get(ALT_VGPU_MANAGER_KEY, '')) + linux_driver = release.get(LINUX_DRIVER_KEY) + windows_manager = release.get(WINDOWS_VGPU_MANAGER_KEY, release.get(ALT_VGPU_MANAGER_KEY, '')) + windows_driver = release.get(WINDOWS_DRIVER_KEY) + release_date = release.get(RELEASE_DATE_KEY) + is_latest = release.get(VGPU_KEY) == branch.get(LATEST_KEY) + + version = f'{version} *' if is_latest else version + eol = branch.get(EOL_KEY) if is_latest else '' + s = f'{software_branch:^21} | {branch_status:^21} | {version:<13} | {linux_manager:<21} | {linux_driver:<21} | {windows_manager:<21} | {windows_driver:<21} | {release_date:>21} | {eol:>21}' + print(s) + + +def __dump(filename: str): + import json + + file = open(filename, 'w') + json.dump(MATRIX, file) + file.close() + + +if __name__ == '__main__': + MATRIX = {} + + try: + import httpx + from bs4 import BeautifulSoup + except Exception as e: + logger.error(f'Failed to import module: {e}') + logger.info('Run "pip install beautifulsoup4 httpx"') + exit(1) + + r = httpx.get(URL) + if r.status_code != 200: + logger.error(f'Error loading "{URL}" with status code {r.status_code}.') + exit(2) + + # parse html + soup = BeautifulSoup(r.text, features='html.parser') + + # build matrix + __driver_versions(soup) + __release_branches(soup) + + # debug output + __debug() + + # dump data to file + __dump('../app/static/driver_matrix.json')