refactor: ruff autofixes

This commit is contained in:
Mark Paronyan committed 2026-09-27 15:55:10 +03:00
1 parent 2ac637c662
commit a0450b6bce
455 files changed
+12322 -14762

No files matched your search

+19 -19
View File
@@ -202,12 +202,12 @@ class Controller:
if computes:
for c in computes:
try:
#FIXME: Task exception was never retrieved
# FIXME: Task exception was never retrieved
await self.add_compute(
compute_id=str(c.compute_id),
connect=False,
**c.dict(exclude_unset=True, exclude={"compute_id", "created_at", "updated_at"}),
ssl_context=self._ssl_context
ssl_context=self._ssl_context,
)
except (ControllerError, KeyError):
pass # Skip not available servers at loading
@@ -222,11 +222,9 @@ class Controller:
# start to auto open projects (if configured) 5 seconds after the controller has started
self._project_auto_open_task_handle = asyncio.get_event_loop().call_later(
5,
lambda: asyncio.create_task(self._project_auto_open())
5, lambda: asyncio.create_task(self._project_auto_open())
)
def _create_ssl_context(self, server_config):
import ssl
@@ -303,11 +301,10 @@ class Controller:
controller_vars = {
"appliances_etag": self._appliance_manager.appliances_etag,
"iou_license_check": self._iou_license_settings["license_check"],
"version": __version__
"version": __version__,
}
if self._iou_license_settings["iourc_content"]:
server_config = Config.instance().settings.Server
os.makedirs(server_config.secrets_dir, exist_ok=True)
iourc_path = os.path.join(server_config.secrets_dir, "iou_license")
@@ -321,7 +318,7 @@ class Controller:
try:
os.makedirs(os.path.dirname(self._vars_file), exist_ok=True)
with open(self._vars_file, 'w+') as f:
with open(self._vars_file, "w+") as f:
json.dump(controller_vars, f, indent=4, sort_keys=True)
except OSError as e:
log.error(f"Cannot write controller vars file '{self._vars_file}': {e}")
@@ -357,15 +354,20 @@ class Controller:
# IOU license check is disabled by default
self._iou_license_settings["license_check"] = controller_vars.get("iou_license_check", False)
log.info("IOU license check is {} on the controller".format("enabled" if self._iou_license_settings["license_check"] else "disabled"))
log.info(
"IOU license check is {} on the controller".format(
"enabled" if self._iou_license_settings["license_check"] else "disabled"
)
)
# install the built-in appliances if needed
if Config.instance().settings.Server.install_builtin_appliances:
previous_version = controller_vars.get("version")
log.info("Comparing controller version {} with config version {}".format(__version__, previous_version))
builtin_appliances_path = self._appliance_manager.builtin_appliances_path()
if not previous_version or \
parse_version(__version__.split("+")[0]) > parse_version(previous_version.split("+")[0]):
if not previous_version or parse_version(__version__.split("+")[0]) > parse_version(
previous_version.split("+")[0]
):
await self._appliance_manager.install_builtin_appliances()
elif not os.listdir(builtin_appliances_path):
await self._appliance_manager.install_builtin_appliances()
@@ -467,7 +469,9 @@ class Controller:
self._projects_scan_handle.cancel()
loop = self._projects_monitor_loop or asyncio.get_running_loop()
self._projects_scan_handle = loop.call_later(delay, lambda: asyncio.create_task(self._scan_projects_directory()))
self._projects_scan_handle = loop.call_later(
delay, lambda: asyncio.create_task(self._scan_projects_directory())
)
async def _scan_projects_directory(self):
"""
@@ -488,7 +492,6 @@ class Controller:
except Exception as e:
log.warning(f"Projects directory rescan failed: {e}")
@staticmethod
async def install_resource_files(dst_path, resource_name, upgrade_resources=True):
"""
@@ -496,6 +499,7 @@ class Controller:
"""
installed_resources = []
async def should_copy(src, dst, upgrade_resources):
if not os.path.exists(dst):
return True
@@ -512,7 +516,7 @@ class Controller:
if not os.path.exists(os.path.join(dst_path, filename)):
shutil.copy(os.path.join(resource_path, filename), os.path.join(dst_path, filename))
else:
for entry in importlib_resources.files('gns3server').joinpath(resource_name).iterdir():
for entry in importlib_resources.files("gns3server").joinpath(resource_name).iterdir():
full_path = os.path.join(dst_path, entry.name)
if entry.is_file() and await should_copy(str(entry), full_path, upgrade_resources):
log.debug(f'Installing {resource_name} resource file "{entry.name}" to "{full_path}"')
@@ -604,7 +608,6 @@ class Controller:
"""
if compute_id not in self._computes:
# We disallow to create from the outside the local and VM server
if (compute_id == "local" or compute_id == "vm") and not force:
return None
@@ -799,10 +802,7 @@ class Controller:
project = self._projects[topo_data["project_id"]]
else:
project = await self.add_project(
path=os.path.dirname(path),
status="closed",
filename=os.path.basename(path),
**topo_data
path=os.path.dirname(path), status="closed", filename=os.path.basename(path), **topo_data
)
if load or project.auto_open:
await project.open()