.

Author: tbotnz

netpalm/backend/core/manager/netpalm_manager.py

@@ -15,11 +15,10 @@
 from typing import Any
 
 from fastapi.encoders import jsonable_encoder
+from pydantic import BaseModel
 
 from netpalm.backend.core.cache.store import CacheStore
 from netpalm.backend.core.confload.confload import NetpalmSettings, get_settings
-from pydantic import BaseModel
-
 from netpalm.backend.core.models.models import (
     QueueStrategy,
 )

netpalm/backend/core/security/whitelist.py

@@ -1,6 +1,5 @@
 import ipaddress
 from fnmatch import fnmatch
-from typing import Union
 
 
 class WhiteListRule:
@@ -13,7 +12,7 @@ class WhiteListRule:
 
     def __init__(self, definition: str):
         self.type: str
-        self.ip_network: Union[ipaddress.IPv4Network, ipaddress.IPv6Network, None] = None
+        self.ip_network: ipaddress.IPv4Network | ipaddress.IPv6Network | None = None
         self.pattern: str = ""
         try:
             self.ip_network = ipaddress.ip_interface(definition).network

netpalm/backend/core/utilities/universal_template_mgr/unvrsl.py

@@ -33,9 +33,7 @@ def add_template(self, payload: dict[str, str]):
             ).model_dump()
             return resultdata
         except Exception as e:
-            error = ResponseBasic(
-                status=TaskResponseEnum.error, data={"task_result": {"error": str(e)}}
-            ).model_dump()
+            error = ResponseBasic(status=TaskResponseEnum.error, data={"task_result": {"error": str(e)}}).model_dump()
             return error
 
     def remove_template(self, payload: dict[str, str]):
@@ -52,9 +50,7 @@ def remove_template(self, payload: dict[str, str]):
             reload_extensibles_func()
             return resultdata
         except Exception as e:
-            error = ResponseBasic(
-                status=TaskResponseEnum.error, data={"task_result": {"error": str(e)}}
-            ).model_dump()
+            error = ResponseBasic(status=TaskResponseEnum.error, data={"task_result": {"error": str(e)}}).model_dump()
             return error
 
     def get_template(self, payload: dict[str, str]):
@@ -73,7 +69,5 @@ def get_template(self, payload: dict[str, str]):
             ).model_dump()
             return resultdata
         except Exception as e:
-            error = ResponseBasic(
-                status=TaskResponseEnum.error, data={"task_result": {"error": str(e)}}
-            ).model_dump()
+            error = ResponseBasic(status=TaskResponseEnum.error, data={"task_result": {"error": str(e)}}).model_dump()
             return error

netpalm/routers/route_utils.py

@@ -49,6 +49,8 @@ def wrapper(self, *args, **kwargs):
             yield
         except asyncio.CancelledError:
             raise
+        except HTTPException:
+            raise
         except Exception as e:
             import traceback
 

netpalm/routers/service.py

@@ -36,7 +36,9 @@ async def get_service_instance(service_id: str, manager: NetpalmManager = Depend
     except Exception:
         raise HTTPException(
             status_code=404,
-            detail=ResponseBasic(status=TaskResponseEnum.success, data={"task_result": f"{service_id} not found"}).model_dump(),
+            detail=ResponseBasic(
+                status=TaskResponseEnum.success, data={"task_result": f"{service_id} not found"}
+            ).model_dump(),
         )