From c45aa1a2a80c32dc7feb11c62bdefc50ea2fe13c Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Wed, 12 Jun 2024 21:27:56 +0200 Subject: [PATCH 01/26] 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 02/26] 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 03/26] 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 04/26] 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 05/26] 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 06/26] 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 07/26] 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 08/26] 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 09/26] 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 10/26] 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') From 23ccea538f76950f87906ef7ade78cf3494f7169 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 27 Jun 2024 08:32:15 +0200 Subject: [PATCH 11/26] README reorganized --- README.md | 58 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 3834be3..0ba46d4 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,35 @@ Only the clients need a connection to this service on configured port. * [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` +**vGPU Software Compatibility Matrix** + +Successfully tested with this package versions. + +| vGPU Suftware | Driver Branch | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date | EOL Date | +|:-------------:|:-------------:|--------------------|--------------|----------------|--------------:|--------------:| +| `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.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 | | +| `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 +- 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` + --- [TOC] @@ -434,33 +463,6 @@ client has 19.2 hours in which to re-establish connectivity before its license e **The token file has to be copied! It's not enough to C&P file contents, because there can be special characters.** -Successfully tested with this package versions: - -| vGPU Suftware | Driver Branch | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date | EOL Date | -|:-------------:|:-------------:|--------------------|--------------|----------------|--------------:|--------------:| -| `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.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 | | -| `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 -- 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` - ## Linux Download *client-token* and place it into `/etc/nvidia/ClientConfigToken`: @@ -748,7 +750,7 @@ The error message can safely be ignored (since we have no license limitation :P) Thanks to vGPU community and all who uses this project and report bugs. -Special thanks to +Special thanks to: - @samicrusader who created build file for **ArchLinux** - @cyrus who wrote the section for **openSUSE** From 1b7d8bc0dccaadcb5c6b27910210daffbd6fb609 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 27 Jun 2024 08:37:21 +0200 Subject: [PATCH 12/26] README reorganized --- README.md | 63 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 0ba46d4..63237e6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ Minimal Delegated License Service (DLS). -Compatibility tested with official NLS 2.0.1, 2.1.0, 3.1.0. For Driver compatibility see [here](#setup-client). +Compatibility tested with official NLS 2.0.1, 2.1.0, 3.1.0. For Driver compatibility +see [compatibility matrix](#vgpu-software-compatibility-matrix). This service can be used without internet connection. Only the clients need a connection to this service on configured port. @@ -24,35 +25,6 @@ Only the clients need a connection to this service on configured port. * [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` -**vGPU Software Compatibility Matrix** - -Successfully tested with this package versions. - -| vGPU Suftware | Driver Branch | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date | EOL Date | -|:-------------:|:-------------:|--------------------|--------------|----------------|--------------:|--------------:| -| `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.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 | | -| `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 -- 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` - --- [TOC] @@ -537,7 +509,6 @@ Done. For more information check [troubleshoot section](#troubleshoot). 8. Set schedule to `At First Array Start Only` 9. Click on Apply - # Endpoints
@@ -746,6 +717,36 @@ The error message can safely be ignored (since we have no license limitation :P)
+# vGPU Software Compatibility Matrix + +Successfully tested with this package versions. + +| vGPU Suftware | Driver Branch | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date | EOL Date | +|:-------------:|:-------------:|--------------------|--------------|----------------|--------------:|--------------:| +| `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.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 | | +| `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 +- 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` + # Credits Thanks to vGPU community and all who uses this project and report bugs. From 3c321a202cb3bf7c377f7d8987aee99be31f4826 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 27 Jun 2024 08:45:25 +0200 Subject: [PATCH 13/26] README updated --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 63237e6..634e39c 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,9 @@ Tested with Ubuntu 22.10 (EOL!) (from Proxmox templates), actually its consuming - Make sure your timezone is set correct on you fastapi-dls server and your client +This guide does not show how to install vGPU host drivers! Look at the official documentation packed with the driver +releases. + ## Docker Docker-Images are available here for Intel (x86), AMD (amd64) and ARM (arm64): @@ -435,6 +438,9 @@ client has 19.2 hours in which to re-establish connectivity before its license e **The token file has to be copied! It's not enough to C&P file contents, because there can be special characters.** +This guide does not show how to install vGPU guest drivers! Look at the official documentation packed with the driver +releases. + ## Linux Download *client-token* and place it into `/etc/nvidia/ClientConfigToken`: From 8af3c8e2b34b92f767cff2bf8e9c4e04777fc2de Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 27 Jun 2024 08:47:04 +0200 Subject: [PATCH 14/26] README updated --- README.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 634e39c..be929b1 100644 --- a/README.md +++ b/README.md @@ -515,32 +515,32 @@ Done. For more information check [troubleshoot section](#troubleshoot). 8. Set schedule to `At First Array Start Only` 9. Click on Apply -# Endpoints +# API Endpoints
show -### `GET /` +**`GET /`** Redirect to `/-/readme`. -### `GET /-/health` +**`GET /-/health`** Status endpoint, used for *healthcheck*. -### `GET /-/config` +**`GET /-/config`** Shows current runtime environment variables and their values. -### `GET /-/readme` +**`GET /-/readme`** HTML rendered README.md. -### `GET /-/manage` +**`GET /-/manage`** Shows a very basic UI to delete origins or leases. -### `GET /-/origins?leases=false` +**`GET /-/origins?leases=false`** List registered origins. @@ -548,11 +548,11 @@ List registered origins. |-----------------|---------|--------------------------------------| | `leases` | `false` | Include referenced leases per origin | -### `DELETE /-/origins` +**`DELETE /-/origins`** Deletes all origins and their leases. -### `GET /-/leases?origin=false` +**`GET /-/leases?origin=false`** List current leases. @@ -560,11 +560,11 @@ List current leases. |-----------------|---------|-------------------------------------| | `origin` | `false` | Include referenced origin per lease | -### `DELETE /-/lease/{lease_ref}` +**`DELETE /-/lease/{lease_ref}`** Deletes an lease. -### `GET /-/client-token` +**`GET /-/client-token`** Generate client token, (see [installation](#installation)). From 49a24f0b68cc5e38c7978a261e84fd69f996bfab Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 27 Jun 2024 08:47:35 +0200 Subject: [PATCH 15/26] README updated --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index be929b1..f38ec9f 100644 --- a/README.md +++ b/README.md @@ -568,7 +568,7 @@ Deletes an lease. Generate client token, (see [installation](#installation)). -### Others +**Others** There are many other internal api endpoints for handling authentication and lease process.
From 8edbb25c16de6b972ace8349a671d03d00b5bd8a Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 27 Jun 2024 08:49:31 +0200 Subject: [PATCH 16/26] README updated --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f38ec9f..aca426f 100644 --- a/README.md +++ b/README.md @@ -595,9 +595,9 @@ Logs are available in `C:\Users\Public\Documents\Nvidia\LoggingLog.NVDisplay.Con ## Linux -### `uvicorn.error:Invalid HTTP request received.` +### Invalid HTTP request -This message can be ignored. +This error message: `uvicorn.error:Invalid HTTP request received.` can be ignored. - Ref. https://github.com/encode/uvicorn/issues/441 From 4b0219b85a4bafd7efd672824ca08ec15b5333dc Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 11 Jul 2024 05:49:00 +0200 Subject: [PATCH 17/26] updated to new vgpu page ref. https://docs.nvidia.com/vgpu/index.html --- test/create_driver_matrix_json.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/create_driver_matrix_json.py b/test/create_driver_matrix_json.py index 1f31884..2047d2e 100644 --- a/test/create_driver_matrix_json.py +++ b/test/create_driver_matrix_json.py @@ -4,7 +4,7 @@ logging.basicConfig() logger = logging.getLogger(__name__) logger.setLevel(logging.INFO) -URL = 'https://docs.nvidia.com/grid/' +URL = 'https://docs.nvidia.com/vgpu/index.html' 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' @@ -25,15 +25,15 @@ def __driver_versions(html: 'BeautifulSoup'): 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() + data = html.find('div', {'id': 'driver-versions'}) + items = data.findAll('bsp-accordion', {'class': 'Accordion-items-item'}) + for item in items: + software_branch = item.find('div', {'class': 'Accordion-items-item-title'}).text.strip() software_branch = software_branch.replace(' Releases', '') matrix_key = software_branch.lower() # driver version info from table-heads (ths) and table-rows (trs) + table = item.find('table') ths, trs = table.find_all('th'), table.find_all('tr') headers, releases = [header.text.strip() for header in ths], [] for trs in trs: @@ -50,7 +50,7 @@ def __driver_versions(html: 'BeautifulSoup'): def __release_branches(html: 'BeautifulSoup'): # find wrapper for "AllReleaseBranches" and find table - data = html.find('div', {'id': 'AllReleaseBranches'}) + data = html.find('div', {'id': 'all-release-branches'}) table = data.find('table') # branch releases info from table-heads (ths) and table-rows (trs) From 0dc8f6c582713b9cb1f74a5c77b2c30f076fab3b Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 11 Jul 2024 05:49:13 +0200 Subject: [PATCH 18/26] refactorings --- app/main.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/main.py b/app/main.py index 60a66b2..41fb238 100644 --- a/app/main.py +++ b/app/main.py @@ -54,6 +54,14 @@ 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) +# Logging +LOG_LEVEL = logging.DEBUG if DEBUG else logging.INFO +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) + # FastAPI @asynccontextmanager @@ -89,14 +97,6 @@ app.add_middleware( allow_headers=['*'], ) -# Logging -LOG_LEVEL = logging.DEBUG if DEBUG else logging.INFO -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 def __get_token(request: Request) -> dict: From 93cf71945405aa432245023c35b14fead8591480 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Wed, 24 Jul 2024 05:35:09 +0200 Subject: [PATCH 19/26] updated support matrix --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index aca426f..d58db25 100644 --- a/README.md +++ b/README.md @@ -729,10 +729,12 @@ Successfully tested with this package versions. | vGPU Suftware | Driver Branch | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date | EOL Date | |:-------------:|:-------------:|--------------------|--------------|----------------|--------------:|--------------:| -| `17.2` | R550 | `550.90.05` | `550.90.07` | `552.55` | June 2024 | February 2025 | +| `17.3` | R550 | `550.90.05` | `550.90.07` | `552.74` | July 2024 | February 2025 | +| `17.2` | R550 | `550.90.05` | `550.90.07` | `552.55` | June 2024 | | | `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.6` | R535 | `535.183.04` | `535.183.01` | `538.67` | June 2024 | July 2026 | +| `16.7` | R535 | `535.183.04` | `535.183.06` | `538.78` | July 2024 | July 2026 | +| `16.6` | R535 | `535.183.04` | `535.183.01` | `538.67` | June 2024 | | | `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 | | From a1123d54516ad9caa3e703350e118e266403b38d Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Wed, 24 Jul 2024 05:35:22 +0200 Subject: [PATCH 20/26] updated support matrix (removed EOL) --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index d58db25..d436965 100644 --- a/README.md +++ b/README.md @@ -741,13 +741,8 @@ Successfully tested with this package versions. | `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 | | +| `15.4` | R525 | `525.147.01` | `525.147.05` | `529.19` | June 2023 | December 2023 | | `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 - https://docs.nvidia.com/grid/gpus-supported-by-vgpu.html From d41314e81d06127bd3b2149d55beaea4a5b7d1ee Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 9 Aug 2024 13:14:53 +0200 Subject: [PATCH 21/26] requirements.txt updated --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 097c30b..0a6a22c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -fastapi==0.111.0 -uvicorn[standard]==0.29.0 +fastapi==0.112.0 +uvicorn[standard]==0.30.5 python-jose==3.3.0 pycryptodome==3.20.0 python-dateutil==2.8.2 -sqlalchemy==2.0.30 +sqlalchemy==2.0.32 markdown==3.6 python-dotenv==1.0.1 From 7489307db83b7b166999d2d694973677eb11b3d9 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Fri, 9 Aug 2024 13:15:16 +0200 Subject: [PATCH 22/26] README.md updated --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d436965..053548b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Minimal Delegated License Service (DLS). -Compatibility tested with official NLS 2.0.1, 2.1.0, 3.1.0. For Driver compatibility +Compatibility tested with official NLS 2.0.1, 2.1.0, 3.1.0, 3.3.1. For Driver compatibility see [compatibility matrix](#vgpu-software-compatibility-matrix). This service can be used without internet connection. From 9377d5ce28d86fca1fe68453a60e59efc3d3c264 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Tue, 8 Oct 2024 14:33:44 +0200 Subject: [PATCH 23/26] requirements.txt updated --- requirements.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0a6a22c..097cfab 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -fastapi==0.112.0 -uvicorn[standard]==0.30.5 +fastapi==0.115.0 +uvicorn[standard]==0.31.0 python-jose==3.3.0 -pycryptodome==3.20.0 +pycryptodome==3.21.0 python-dateutil==2.8.2 -sqlalchemy==2.0.32 -markdown==3.6 +sqlalchemy==2.0.35 +markdown==3.7 python-dotenv==1.0.1 From 9b5a387169844169fee966a751e89119b58dcad2 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 24 Oct 2024 08:09:24 +0200 Subject: [PATCH 24/26] updated support matrix --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 053548b..9cde329 100644 --- a/README.md +++ b/README.md @@ -729,11 +729,13 @@ Successfully tested with this package versions. | vGPU Suftware | Driver Branch | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date | EOL Date | |:-------------:|:-------------:|--------------------|--------------|----------------|--------------:|--------------:| -| `17.3` | R550 | `550.90.05` | `550.90.07` | `552.74` | July 2024 | February 2025 | +| `17.4` | R550 | `550.127.06` | `550.127.05` | `553.24` | October 2024 | February 2025 | +| `17.3` | R550 | `550.90.05` | `550.90.07` | `552.74` | July 2024 | | | `17.2` | R550 | `550.90.05` | `550.90.07` | `552.55` | June 2024 | | | `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.7` | R535 | `535.183.04` | `535.183.06` | `538.78` | July 2024 | July 2026 | +| `16.8` | R535 | `535.216.01` | `535.216.01` | `538.95` | October 2024 | July 2026 | +| `16.7` | R535 | `535.183.04` | `535.183.06` | `538.78` | July 2024 | | | `16.6` | R535 | `535.183.04` | `535.183.01` | `538.67` | June 2024 | | | `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 | | From 4245d5a5825447f2039ad6e575233ae358debd01 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 24 Oct 2024 08:09:30 +0200 Subject: [PATCH 25/26] requirements.txt updated --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 097cfab..ca92baf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ -fastapi==0.115.0 -uvicorn[standard]==0.31.0 +fastapi==0.115.3 +uvicorn[standard]==0.32.0 python-jose==3.3.0 pycryptodome==3.21.0 python-dateutil==2.8.2 -sqlalchemy==2.0.35 +sqlalchemy==2.0.36 markdown==3.7 python-dotenv==1.0.1 From 78214df9cc2b7efd31d68134f643e101e2ab0ee2 Mon Sep 17 00:00:00 2001 From: Oscar Krause Date: Thu, 24 Oct 2024 10:44:31 +0200 Subject: [PATCH 26/26] updated to python 3.12 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ca25001..7d2e448 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11-alpine +FROM python:3.12-alpine ARG VERSION ARG COMMIT=""