mirror of
				https://gitea.publichub.eu/oscar.krause/fastapi-dls.git
				synced 2025-11-04 05:36:06 +00:00 
			
		
		
		
	Merge branch 'main' into v18.x-support
# Conflicts: # app/util.py
This commit is contained in:
		@@ -5,7 +5,7 @@ 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
 | 
			
		||||
from util import DriverMatrix
 | 
			
		||||
 | 
			
		||||
Base = declarative_base()
 | 
			
		||||
 | 
			
		||||
@@ -25,7 +25,7 @@ class Origin(Base):
 | 
			
		||||
        return f'Origin(origin_ref={self.origin_ref}, hostname={self.hostname})'
 | 
			
		||||
 | 
			
		||||
    def serialize(self) -> dict:
 | 
			
		||||
        _ = NV().find(self.guest_driver_version)
 | 
			
		||||
        _ = DriverMatrix().find(self.guest_driver_version)
 | 
			
		||||
 | 
			
		||||
        return {
 | 
			
		||||
            'origin_ref': self.origin_ref,
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										38
									
								
								app/util.py
									
									
									
									
									
								
							
							
						
						
									
										38
									
								
								app/util.py
									
									
									
									
									
								
							@@ -1,4 +1,5 @@
 | 
			
		||||
import logging
 | 
			
		||||
from json import load as json_load
 | 
			
		||||
from datetime import datetime, UTC, timedelta
 | 
			
		||||
from json import loads as json_loads
 | 
			
		||||
from os.path import join, dirname, isfile
 | 
			
		||||
@@ -16,6 +17,14 @@ from cryptography.x509 import load_pem_x509_certificate, Certificate
 | 
			
		||||
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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class CASetup:
 | 
			
		||||
    ###
 | 
			
		||||
    #
 | 
			
		||||
@@ -317,30 +326,31 @@ def load_file(filename: str) -> bytes:
 | 
			
		||||
        content = file.read()
 | 
			
		||||
    return content
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class NV:
 | 
			
		||||
class DriverMatrix:
 | 
			
		||||
    __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}')
 | 
			
		||||
        if DriverMatrix.__DRIVER_MATRIX is None:
 | 
			
		||||
            self.__load()
 | 
			
		||||
 | 
			
		||||
    def __load(self):
 | 
			
		||||
        try:
 | 
			
		||||
            file = open(DriverMatrix.__DRIVER_MATRIX_FILENAME)
 | 
			
		||||
            DriverMatrix.__DRIVER_MATRIX = json_load(file)
 | 
			
		||||
            file.close()
 | 
			
		||||
            self.log.debug(f'Successfully loaded "{DriverMatrix.__DRIVER_MATRIX_FILENAME}".')
 | 
			
		||||
        except Exception as e:
 | 
			
		||||
            DriverMatrix.__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:
 | 
			
		||||
        if DriverMatrix.__DRIVER_MATRIX is None:
 | 
			
		||||
            return None
 | 
			
		||||
        for idx, (key, branch) in enumerate(NV.__DRIVER_MATRIX.items()):
 | 
			
		||||
        for idx, (key, branch) in enumerate(DriverMatrix.__DRIVER_MATRIX.items()):
 | 
			
		||||
            for release in branch.get('$releases'):
 | 
			
		||||
                linux_driver = release.get('Linux Driver')
 | 
			
		||||
                windows_driver = release.get('Windows Driver')
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user