mirror of
https://gitea.publichub.eu/oscar.krause/fastapi-dls.git
synced 2025-11-26 07:06:13 +00:00
Compare commits
3 Commits
main
...
drivers-di
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5973e75327 | ||
|
|
42008ff66f | ||
|
|
c6ca1cafb9 |
11
README.md
11
README.md
@@ -4,7 +4,7 @@ Minimal Delegated License Service (DLS).
|
|||||||
|
|
||||||
> [!warning] Branch support
|
> [!warning] Branch support
|
||||||
> FastAPI-DLS Version 1.x supports up to **`17.x`** releases. \
|
> FastAPI-DLS Version 1.x supports up to **`17.x`** releases. \
|
||||||
> FastAPI-DLS Version 2.x is backwards compatible to `17.x` and supports **`18.x`**, **`19.x`**, releases in combination
|
> FastAPI-DLS Version 2.x is backwards compatible to `17.x` and supports **`18.x`** releases in combination
|
||||||
> with [gridd-unlock-patcher](https://git.collinwebdesigns.de/vgpu/gridd-unlock-patcher).
|
> with [gridd-unlock-patcher](https://git.collinwebdesigns.de/vgpu/gridd-unlock-patcher).
|
||||||
> Other combinations of FastAPI-DLS and Driver-Branches may work but are not tested.
|
> Other combinations of FastAPI-DLS and Driver-Branches may work but are not tested.
|
||||||
|
|
||||||
@@ -672,8 +672,7 @@ Shows current runtime environment variables and their values.
|
|||||||
|
|
||||||
**`GET /-/config/root-certificate`**
|
**`GET /-/config/root-certificate`**
|
||||||
|
|
||||||
Returns the Root-Certificate Certificate which is used.
|
Returns the Root-Certificate Certificate which is used. This is required for patching `nvidia-gridd` on 18.x releases.
|
||||||
This is required for patching `nvidia-gridd` on `18.x`, `19.x` releases.
|
|
||||||
|
|
||||||
**`GET /-/readme`**
|
**`GET /-/readme`**
|
||||||
|
|
||||||
@@ -888,9 +887,7 @@ The error message can safely be ignored (since we have no license limitation :P)
|
|||||||
|
|
||||||
| FastAPI-DLS Version | vGPU Suftware | Driver Branch | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date | EOL Date |
|
| FastAPI-DLS Version | vGPU Suftware | Driver Branch | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date | EOL Date |
|
||||||
|---------------------|:-------------:|:-------------:|--------------------|--------------|----------------|--------------:|--------------:|
|
|---------------------|:-------------:|:-------------:|--------------------|--------------|----------------|--------------:|--------------:|
|
||||||
| `2.x` | `19.0` | **R580** | `580.65.05` | `580.65.06` | `580.88` | August 2025 | July 2028 |
|
| `2.x` | `18.3` | **R570** | `570.158.02` | `570.158.01` | `573.36` | June 2025 | March 2026 |
|
||||||
| `2.x` | `18.4` | **R570** | `570.172.07` | `570.172.08` | `573.48` | July 2025 | March 2026 |
|
|
||||||
| | `18.3` | **R570** | `570.158.02` | `570.158.01` | `573.36` | June 2025 | |
|
|
||||||
| | `18.2` | **R570** | `570.148.06` | `570.148.08` | `573.07` | May 2025 | |
|
| | `18.2` | **R570** | `570.148.06` | `570.148.08` | `573.07` | May 2025 | |
|
||||||
| | `18.1` | **R570** | `570.133.08` | `570.133.07` | `572.83` | April 2025 | |
|
| | `18.1` | **R570** | `570.133.08` | `570.133.07` | `572.83` | April 2025 | |
|
||||||
| | `18.0` | **R570** | `570.124.03` | `570.124.06` | `572.60` | March 2025 | |
|
| | `18.0` | **R570** | `570.124.03` | `570.124.06` | `572.60` | March 2025 | |
|
||||||
@@ -901,7 +898,7 @@ The error message can safely be ignored (since we have no license limitation :P)
|
|||||||
| | `17.2` | | `550.90.05` | `550.90.07` | `552.55` | June 2024 | |
|
| | `17.2` | | `550.90.05` | `550.90.07` | `552.55` | June 2024 | |
|
||||||
| | `17.1` | | `550.54.16` | `550.54.15` | `551.78` | March 2024 | |
|
| | `17.1` | | `550.54.16` | `550.54.15` | `551.78` | March 2024 | |
|
||||||
| | `17.0` | **R550** | `550.54.10` | `550.54.14` | `551.61` | February 2024 | |
|
| | `17.0` | **R550** | `550.54.10` | `550.54.14` | `551.61` | February 2024 | |
|
||||||
| `1.x` | `16.11` | **R535** | `535.261.04` | `535.261.03` | `539.41` | July 2025 | July 2026 |
|
| `1.x` | `16.10` | **R535** | `535.247.02` | `535.247.01` | `539.28` | April 2025 | July 2026 |
|
||||||
| `1.x` | `15.4` | **R525** | `525.147.01` | `525.147.05` | `529.19` | June 2023 | December 2023 |
|
| `1.x` | `15.4` | **R525** | `525.147.01` | `525.147.05` | `529.19` | June 2023 | December 2023 |
|
||||||
| `1.x` | `14.4` | **R510** | `510.108.03` | `510.108.03` | `514.08` | December 2022 | February 2023 |
|
| `1.x` | `14.4` | **R510** | `510.108.03` | `510.108.03` | `514.08` | December 2022 | February 2023 |
|
||||||
|
|
||||||
|
|||||||
26
app/main.py
26
app/main.py
@@ -6,7 +6,7 @@ from datetime import datetime, timedelta, UTC
|
|||||||
from hashlib import sha256
|
from hashlib import sha256
|
||||||
from json import loads as json_loads, dumps as json_dumps
|
from json import loads as json_loads, dumps as json_dumps
|
||||||
from os import getenv as env
|
from os import getenv as env
|
||||||
from os.path import join, dirname
|
from os.path import join, dirname, exists, isdir, isfile
|
||||||
from textwrap import wrap
|
from textwrap import wrap
|
||||||
from uuid import uuid4
|
from uuid import uuid4
|
||||||
|
|
||||||
@@ -20,6 +20,7 @@ from jose.constants import ALGORITHMS
|
|||||||
from sqlalchemy import create_engine
|
from sqlalchemy import create_engine
|
||||||
from sqlalchemy.orm import sessionmaker
|
from sqlalchemy.orm import sessionmaker
|
||||||
from starlette.middleware.cors import CORSMiddleware
|
from starlette.middleware.cors import CORSMiddleware
|
||||||
|
from starlette.staticfiles import StaticFiles
|
||||||
|
|
||||||
from orm import Origin, Lease, init as db_init, migrate
|
from orm import Origin, Lease, init as db_init, migrate
|
||||||
from util import CASetup, PrivateKey, Cert, ProductMapping, load_file
|
from util import CASetup, PrivateKey, Cert, ProductMapping, load_file
|
||||||
@@ -50,6 +51,7 @@ LEASE_RENEWAL_PERIOD = float(env('LEASE_RENEWAL_PERIOD', 0.15))
|
|||||||
LEASE_RENEWAL_DELTA = timedelta(days=int(env('LEASE_EXPIRE_DAYS', 90)), hours=int(env('LEASE_EXPIRE_HOURS', 0)))
|
LEASE_RENEWAL_DELTA = timedelta(days=int(env('LEASE_EXPIRE_DAYS', 90)), hours=int(env('LEASE_EXPIRE_HOURS', 0)))
|
||||||
CLIENT_TOKEN_EXPIRE_DELTA = relativedelta(years=12)
|
CLIENT_TOKEN_EXPIRE_DELTA = relativedelta(years=12)
|
||||||
CORS_ORIGINS = str(env('CORS_ORIGINS', '')).split(',') if (env('CORS_ORIGINS')) else [f'https://{DLS_URL}']
|
CORS_ORIGINS = str(env('CORS_ORIGINS', '')).split(',') if (env('CORS_ORIGINS')) else [f'https://{DLS_URL}']
|
||||||
|
DRIVERS_DIR = env('DRIVERS_DIR', None)
|
||||||
DT_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ'
|
DT_FORMAT = '%Y-%m-%dT%H:%M:%S.%fZ'
|
||||||
PRODUCT_MAPPING = ProductMapping(filename=join(dirname(__file__), 'static/product_mapping.json'))
|
PRODUCT_MAPPING = ProductMapping(filename=join(dirname(__file__), 'static/product_mapping.json'))
|
||||||
|
|
||||||
@@ -100,6 +102,9 @@ async def lifespan(_: FastAPI):
|
|||||||
config = dict(openapi_url=None, docs_url=None, redoc_url=None) # dict(openapi_url='/-/openapi.json', docs_url='/-/docs', redoc_url='/-/redoc')
|
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 = FastAPI(title='FastAPI-DLS', description='Minimal Delegated License Service (DLS).', version=VERSION, lifespan=lifespan, **config)
|
||||||
|
|
||||||
|
if DRIVERS_DIR is not None:
|
||||||
|
app.mount('/-/static-drivers', StaticFiles(directory=str(DRIVERS_DIR), html=False), name='drivers')
|
||||||
|
|
||||||
app.debug = DEBUG
|
app.debug = DEBUG
|
||||||
app.add_middleware(
|
app.add_middleware(
|
||||||
CORSMiddleware,
|
CORSMiddleware,
|
||||||
@@ -206,6 +211,25 @@ async def _manage(request: Request):
|
|||||||
return Response(response, media_type='text/html', status_code=200)
|
return Response(response, media_type='text/html', status_code=200)
|
||||||
|
|
||||||
|
|
||||||
|
@app.get('/-/drivers/{directory:path}', summary='* List drivers directory')
|
||||||
|
async def _drivers(request: Request, directory: str | None):
|
||||||
|
if DRIVERS_DIR is None:
|
||||||
|
return Response(status_code=404, content=f'Variable "DRIVERS_DIR" not set.')
|
||||||
|
|
||||||
|
path = join(DRIVERS_DIR, directory)
|
||||||
|
|
||||||
|
if not exists(path) and not isfile(path):
|
||||||
|
return Response(status_code=404, content=f'Resource "{path}" not found!')
|
||||||
|
|
||||||
|
content = [{
|
||||||
|
"type": "file" if isfile(f'{path}/{_}') else "folder" if isdir(f'{path}/{_}') else "unknown",
|
||||||
|
"name": _,
|
||||||
|
"link": f'/-/static-drivers/{directory}{_}',
|
||||||
|
} for _ in listdir(path)]
|
||||||
|
|
||||||
|
return Response(content=json_dumps({"directory": path, "content": content}), media_type='application/json', status_code=200)
|
||||||
|
|
||||||
|
|
||||||
@app.get('/-/origins', summary='* Origins')
|
@app.get('/-/origins', summary='* Origins')
|
||||||
async def _origins(request: Request, leases: bool = False):
|
async def _origins(request: Request, leases: bool = False):
|
||||||
session = sessionmaker(bind=db)()
|
session = sessionmaker(bind=db)()
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
fastapi==0.116.1
|
fastapi==0.115.14
|
||||||
uvicorn[standard]==0.35.0
|
uvicorn[standard]==0.35.0
|
||||||
python-jose[cryptography]==3.5.0
|
python-jose[cryptography]==3.5.0
|
||||||
cryptography==45.0.6
|
cryptography==45.0.5
|
||||||
python-dateutil==2.9.0
|
python-dateutil==2.9.0
|
||||||
sqlalchemy==2.0.42
|
sqlalchemy==2.0.41
|
||||||
markdown==3.8.2
|
markdown==3.8.2
|
||||||
python-dotenv==1.1.1
|
python-dotenv==1.1.1
|
||||||
|
|||||||
Reference in New Issue
Block a user