shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-22 13:34:04 +03:00
Code Issues Releases Wiki Activity

Refactor code to remove unused imports and fix formatting

Browse Source
This commit is contained in:
Adolfo Gómez García 2024-09-07 23:47:56 +02:00
parent 3f8797f4d0
commit 6a0244e83d
No known key found for this signature in database
GPG Key ID: DD1ABF20724CDA23
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
server/src/uds/core/util/decorators.py
View File

@ -79,7 +79,6 @@ def classproperty(func: collections.abc.Callable[..., typing.Any]) -> ClassPrope
return ClassPropertyDescriptor(func) return ClassPropertyDescriptor(func)
def deprecated(func: collections.abc.Callable[P, T]) -> collections.abc.Callable[P, T]: def deprecated(func: collections.abc.Callable[P, T]) -> collections.abc.Callable[P, T]:
"""This is a decorator which can be used to mark functions """This is a decorator which can be used to mark functions
as deprecated. It will result in a warning being emitted as deprecated. It will result in a warning being emitted
@ -138,15 +137,17 @@ def deprecated_class_value(new_var_name: str) -> collections.abc.Callable[..., t
return functools.partial(innerDeprecated, newVarName=new_var_name) return functools.partial(innerDeprecated, newVarName=new_var_name)
# Keep this, but mypy does not likes it... it's perfect with pyright # Keep this, but mypy does not likes it... it's perfect with pyright
# # So only classes that have a "connect" method can use this decorator # # So only classes that have a "connect" method can use this decorator
class _HasConnect(typing.Protocol): class _HasConnect(typing.Protocol):
def connect(self) -> None: def connect(self) -> None: ...
...
# HasConnect = typing.TypeVar('HasConnect', bound=_HasConnect) # HasConnect = typing.TypeVar('HasConnect', bound=_HasConnect)
# def ensure_connected(func: collections.abc.Callable[typing.Concatenate[HasConnect, P], T]) -> collections.abc.Callable[typing.Concatenate[HasConnect, P], T]: # def ensure_connected(func: collections.abc.Callable[typing.Concatenate[HasConnect, P], T]) -> collections.abc.Callable[typing.Concatenate[HasConnect, P], T]:
def ensure_connected(func: collections.abc.Callable[P, T]) -> collections.abc.Callable[P, T]: def ensure_connected(func: collections.abc.Callable[P, T]) -> collections.abc.Callable[P, T]:
"""This decorator calls "connect" method of the class of the wrapped object""" """This decorator calls "connect" method of the class of the wrapped object"""
@ -184,7 +185,7 @@ def cached(
Note: Note:
* The `key_helper` function will receive the first argument of the function (`self`) and must return a string that will be appended to the cache key. * The `key_helper` function will receive the first argument of the function (`self`) and must return a string that will be appended to the cache key.
* Also the cached decorator, if no args provided, must be the last decorator unless all underlying decorators uses functools.wraps * Also the cached decorator, if no args provided, must be the last decorator unless all underlying decorators uses functools.wraps
This is because the decorator will try to infer the parameters from the function signature, This is because the decorator will try to infer the parameters from the function signature,
and if the function signature is not available, it will cache the result no matter the parameters. and if the function signature is not available, it will cache the result no matter the parameters.
""" """
from uds.core.util.cache import Cache # To avoid circular references from uds.core.util.cache import Cache # To avoid circular references
@ -225,14 +226,14 @@ def cached(
@functools.wraps(fnc) @functools.wraps(fnc)
def wrapper(*args: P.args, **kwargs: P.kwargs) -> T: def wrapper(*args: P.args, **kwargs: P.kwargs) -> T:
nonlocal hits, misses, exec_time nonlocal hits, misses, exec_time
cache_key: str = prefix cache_key: str = prefix
for i in args_list: for i in args_list:
if i < len(args): if i < len(args):
cache_key += str(args[i]) cache_key += str(args[i])
for s in kwargs_list: for s in kwargs_list:
cache_key += str(kwargs.get(s, '')) cache_key += str(kwargs.get(s, ''))
# Append key helper to cache key and get real cache # Append key helper to cache key and get real cache
# Note tha this value (cache_key) will be hashed by cache, so it's not a problem if it's too long # Note tha this value (cache_key) will be hashed by cache, so it's not a problem if it's too long
if len(args) > 0: if len(args) > 0:
@ -241,7 +242,7 @@ def cached(
else: else:
cache_key += key_helper_fnc(fnc.__name__) cache_key += key_helper_fnc(fnc.__name__)
inner_cache = None inner_cache = None
# Get cache from object if present, or use the global 'functionCache' (generic, common to all objects) # Get cache from object if present, or use the global 'functionCache' (generic, common to all objects)
cache = inner_cache or Cache('functionCache') cache = inner_cache or Cache('functionCache')
@ -255,7 +256,7 @@ def cached(
if data is not consts.cache.CACHE_NOT_FOUND: if data is not consts.cache.CACHE_NOT_FOUND:
hits += 1 hits += 1
return data return data
misses += 1 misses += 1
if 'force' in kwargs: if 'force' in kwargs:
@ -264,7 +265,7 @@ def cached(
# Execute the function outside the DB transaction # Execute the function outside the DB transaction
t = time.thread_time_ns() t = time.thread_time_ns()
data = fnc(*args, **kwargs) # pyright: ignore # For some reason, pyright does not like this line data = fnc(*args, **kwargs) # pyright: ignore # For some reason, pyright does not like this line
exec_time += time.thread_time_ns() - t exec_time += time.thread_time_ns() - t
try: try:
@ -286,8 +287,7 @@ def cached(
return CacheInfo(hits, misses, hits + misses, exec_time) return CacheInfo(hits, misses, hits + misses, exec_time)
def cache_clear() -> None: def cache_clear() -> None:
"""Clear the cache and cache statistics """Clear the cache and cache statistics"""
"""
nonlocal hits, misses, exec_time nonlocal hits, misses, exec_time
hits = misses = exec_time = 0 hits = misses = exec_time = 0
@ -345,9 +345,7 @@ def blocker(
if not GlobalConfig.BLOCK_ACTOR_FAILURES.as_bool(True) and not ignore_block_config: if not GlobalConfig.BLOCK_ACTOR_FAILURES.as_bool(True) and not ignore_block_config:
return f(*args, **kwargs) return f(*args, **kwargs)
request: typing.Optional[typing.Any] = getattr( request: typing.Optional[typing.Any] = getattr(args[0], request_attr or '_request', None)
args[0], request_attr or '_request', None
)
# No request object, so we can't block # No request object, so we can't block
if request is None or not isinstance(request, types.requests.ExtendedHttpRequest): if request is None or not isinstance(request, types.requests.ExtendedHttpRequest):
@ -416,4 +414,3 @@ def profiler(
return wrapper return wrapper
return decorator return decorator

2
server/src/uds/services/Proxmox/proxmox/client.py
View File

@ -287,7 +287,7 @@ class ProxmoxClient:
return False return False
return True return True
@cached('nodeNets', consts.CACHE_DURATION, args=1, kwargs=['node'], key_helper=caching_key_helper) @cached('nodeNets', consts.CACHE_DURATION, key_helper=caching_key_helper)
def get_node_networks(self, node: str, **kwargs: typing.Any) -> typing.Any: def get_node_networks(self, node: str, **kwargs: typing.Any) -> typing.Any:
return self.do_get(f'nodes/{node}/network', node=node)['data'] return self.do_get(f'nodes/{node}/network', node=node)['data']