chore: Upgrade ruff to 0.6.4

pyproject.toml

@@ -72,6 +72,8 @@ asyncio_mode = "auto"
 [tool.ruff]
 line-length = 100
 src = ["src"]
+
+[tool.ruff.lint]
 select = [
     "E",  # pycodestyle errors
     "W",  # pycodestyle warnings
@@ -82,13 +84,13 @@ select = [
 ]
 ignore = ["E203","E731","E501"]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 known-first-party = ["ai.backend"]
 known-local-folder = ["src"]
 known-third-party = ["alembic", "redis"]
 split-on-trailing-comma = true
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "src/ai/backend/manager/config.py" = ["E402"]
 "src/ai/backend/manager/models/alembic/env.py" = ["E402"]
 

src/ai/backend/accelerator/cuda_open/plugin.py

@@ -169,7 +169,7 @@ async def list_devices(self) -> Collection[CUDADevice]:
             if dev_id in self.device_mask:
                 continue
             raw_info = libcudart.get_device_props(int(dev_id))
-            sysfs_node_path = f"/sys/bus/pci/devices/{raw_info['pciBusID_str'].lower()}/numa_node"
+            sysfs_node_path = f"/sys/bus/pci/devices/{raw_info["pciBusID_str"].lower()}/numa_node"
             node: Optional[int]
             try:
                 node = int(Path(sysfs_node_path).read_text().strip())

src/ai/backend/accelerator/mock/plugin.py

@@ -297,7 +297,7 @@ async def list_devices(self) -> Collection[MockDevice]:
                     init_kwargs["is_mig_device"] = dev_info["is_mig_device"]
                     if dev_info["is_mig_device"]:
                         init_kwargs["device_id"] = DeviceId(
-                            f"MIG-{dev_info['mother_uuid']}/{idx}/0"
+                            f"MIG-{dev_info["mother_uuid"]}/{idx}/0"
                         )
                     device_cls = CUDADevice
                 case _:
@@ -810,7 +810,7 @@ def get_metadata(self) -> AcceleratorMetadata:
 
         device_format = self.device_formats[format_key]
         return {
-            "slot_name": f"{self.mock_config['slot_name']}.{format_key}",
+            "slot_name": f"{self.mock_config["slot_name"]}.{format_key}",
             "human_readable_name": device_format["human_readable_name"],
             "description": device_format["description"],
             "display_unit": device_format["display_unit"],

src/ai/backend/account_manager/config.py

@@ -424,7 +424,7 @@ def generate_example_json(
     if isinstance(schema, types.UnionType):
         return generate_example_json(typing.get_args(schema)[0], parent=[*parent])
     elif isinstance(schema, types.GenericAlias):
-        if typing.get_origin(schema) != list:
+        if typing.get_origin(schema) is not list:
             raise RuntimeError("GenericAlias other than list not supported!")
         return [generate_example_json(typing.get_args(schema)[0], parent=[*parent])]
     elif issubclass(schema, BaseSchema):

src/ai/backend/agent/agent.py

@@ -1961,7 +1961,7 @@ async def create_kernel(
                         if len(overlapping_services) > 0:
                             raise AgentError(
                                 f"Port {port_no} overlaps with built-in service"
-                                f" {overlapping_services[0]['name']}"
+                                f" {overlapping_services[0]["name"]}"
                             )
 
                         preopen_sport: ServicePort = {
@@ -1980,7 +1980,7 @@ async def create_kernel(
                             exposed_ports.append(cport)
                     for index, port in enumerate(ctx.kernel_config["allocated_host_ports"]):
                         service_ports.append({
-                            "name": f"hostport{index+1}",
+                            "name": f"hostport{index + 1}",
                             "protocol": ServicePortProtocols.INTERNAL,
                             "container_ports": (port,),
                             "host_ports": (port,),
@@ -2315,11 +2315,11 @@ async def load_model_definition(
                     ]
                     if len(overlapping_services) > 0:
                         raise AgentError(
-                            f"Port {service['port']} overlaps with built-in service"
-                            f" {overlapping_services[0]['name']}"
+                            f"Port {service["port"]} overlaps with built-in service"
+                            f" {overlapping_services[0]["name"]}"
                         )
                     service_ports.append({
-                        "name": f"{model['name']}-{service['port']}",
+                        "name": f"{model["name"]}-{service["port"]}",
                         "protocol": ServicePortProtocols.PREOPEN,
                         "container_ports": (service["port"],),
                         "host_ports": (None,),

src/ai/backend/agent/docker/agent.py

@@ -926,7 +926,7 @@ async def start_container(
             label for label in service_ports_label if label
         ])
         update_nested_dict(container_config, self.computer_docker_args)
-        kernel_name = f"kernel.{self.image_ref.name.split('/')[-1]}.{self.kernel_id}"
+        kernel_name = f"kernel.{self.image_ref.name.split("/")[-1]}.{self.kernel_id}"
 
         # optional local override of docker config
         extra_container_opts_name = "agent-docker-container-opts.json"
@@ -1165,7 +1165,7 @@ async def __ainit__(self) -> None:
                 {
                     "Cmd": [
                         f"UNIX-LISTEN:/ipc/{self.agent_sockpath.name},unlink-early,fork,mode=777",
-                        f"TCP-CONNECT:127.0.0.1:{self.local_config['agent']['agent-sock-port']}",
+                        f"TCP-CONNECT:127.0.0.1:{self.local_config["agent"]["agent-sock-port"]}",
                     ],
                     "HostConfig": {
                         "Mounts": [
@@ -1399,7 +1399,7 @@ async def handle_agent_socket(self):
         while True:
             agent_sock = zmq_ctx.socket(zmq.REP)
             try:
-                agent_sock.bind(f"tcp://127.0.0.1:{self.local_config['agent']['agent-sock-port']}")
+                agent_sock.bind(f"tcp://127.0.0.1:{self.local_config["agent"]["agent-sock-port"]}")
                 while True:
                     msg = await agent_sock.recv_multipart()
                     if not msg:

src/ai/backend/agent/docker/utils.py

@@ -60,7 +60,7 @@ async def get_container_version_and_status(self) -> Tuple[int, bool]:
                     raise
         if c["Config"].get("Labels", {}).get("ai.backend.system", "0") != "1":
             raise RuntimeError(
-                f"An existing container named \"{c['Name'].lstrip('/')}\" is not a system container"
+                f"An existing container named \"{c["Name"].lstrip("/")}\" is not a system container"
                 " spawned by Backend.AI. Please check and remove it."
             )
         return (

src/ai/backend/agent/kubernetes/utils.py

@@ -59,7 +59,7 @@ async def get_container_version_and_status(self) -> Tuple[int, bool]:
                 raise
         if c["Config"].get("Labels", {}).get("ai.backend.system", "0") != "1":
             raise RuntimeError(
-                f"An existing container named \"{c['Name'].lstrip('/')}\" is not a system container"
+                f"An existing container named \"{c["Name"].lstrip("/")}\" is not a system container"
                 " spawned by Backend.AI. Please check and remove it."
             )
         return (

src/ai/backend/agent/server.py

@@ -874,7 +874,7 @@ async def server_main(
 
     log.info("Preparing kernel runner environments...")
     kernel_mod = importlib.import_module(
-        f"ai.backend.agent.{local_config['agent']['backend'].value}.kernel",
+        f"ai.backend.agent.{local_config["agent"]["backend"].value}.kernel",
     )
     krunner_volumes = await kernel_mod.prepare_krunner_env(local_config)  # type: ignore
     # TODO: merge k8s branch: nfs_mount_path = local_config['baistatic']['mounted-at']
@@ -894,8 +894,8 @@ async def server_main(
         }
     scope_prefix_map = {
         ConfigScopes.GLOBAL: "",
-        ConfigScopes.SGROUP: f"sgroup/{local_config['agent']['scaling-group']}",
-        ConfigScopes.NODE: f"nodes/agents/{local_config['agent']['id']}",
+        ConfigScopes.SGROUP: f"sgroup/{local_config["agent"]["scaling-group"]}",
+        ConfigScopes.NODE: f"nodes/agents/{local_config["agent"]["id"]}",
     }
     etcd = AsyncEtcd(
         local_config["etcd"]["addr"],

src/ai/backend/agent/watcher.py

@@ -409,7 +409,7 @@ def main(
         fn = Path(cfg["logging"]["file"]["filename"])
         cfg["logging"]["file"]["filename"] = f"{fn.stem}-watcher{fn.suffix}"
 
-    setproctitle(f"backend.ai: watcher {cfg['etcd']['namespace']}")
+    setproctitle(f"backend.ai: watcher {cfg["etcd"]["namespace"]}")
     with logger:
         log.info("Backend.AI Agent Watcher {0}", VERSION)
         log.info("runtime: {0}", utils.env_info())

src/ai/backend/cli/interaction.py

@@ -73,12 +73,12 @@ def ask_string_in_array(prompt: str, choices: list, default: str) -> Optional[st
 
     if default:
         question = (
-            f"{prompt} (choices: {'/'.join(choices)}, "
+            f"{prompt} (choices: {"/".join(choices)}, "
             f"if left empty, this will use default value: {default}): "
         )
     else:
         question = (
-            f"{prompt} (choices: {'/'.join(choices)}, if left empty, this will remove this key): "
+            f"{prompt} (choices: {"/".join(choices)}, if left empty, this will remove this key): "
         )
 
     while True:
@@ -92,7 +92,7 @@ def ask_string_in_array(prompt: str, choices: list, default: str) -> Optional[st
         elif user_reply.lower() in choices:
             break
         else:
-            print(f"Please answer in {'/'.join(choices)}.")
+            print(f"Please answer in {"/".join(choices)}.")
     return user_reply
 
 

src/ai/backend/client/cli/admin/image.py

@@ -61,7 +61,7 @@ async def rescan_images_impl(registry: str) -> None:
                 print_error(e)
                 sys.exit(ExitCode.FAILURE)
             if not result["ok"]:
-                print_fail(f"Failed to begin registry scanning: {result['msg']}")
+                print_fail(f"Failed to begin registry scanning: {result["msg"]}")
                 sys.exit(ExitCode.FAILURE)
             print_done("Started updating the image metadata from the configured registries.")
             bgtask_id = result["task_id"]

src/ai/backend/client/cli/pretty.py

@@ -126,7 +126,7 @@ def format_error(exc: Exception):
             if matches:
                 yield "\nCandidates (up to 10 recent entries):\n"
             for item in matches:
-                yield f"- {item['id']} ({item['name']}, {item['status']})\n"
+                yield f"- {item["id"]} ({item["name"]}, {item["status"]})\n"
         elif exc.data["type"].endswith("/session-already-exists"):
             existing_session_id = exc.data["data"].get("existingSessionId", None)
             if existing_session_id is not None:
@@ -145,7 +145,7 @@ def format_error(exc: Exception):
             if exc.data["type"].endswith("/graphql-error"):
                 yield "\n\u279c Message:\n"
                 for err_item in exc.data.get("data", []):
-                    yield f"{err_item['message']}"
+                    yield f"{err_item["message"]}"
                     if err_path := err_item.get("path"):
                         yield f" (path: {_format_gql_path(err_path)})"
                     yield "\n"

src/ai/backend/client/cli/service.py

@@ -113,7 +113,7 @@ def info(ctx: CLIContext, service_name_or_id: str):
             )
             print()
             for route in routes:
-                print(f"Route {route['routing_id']}: ")
+                print(f"Route {route["routing_id"]}: ")
                 ctx.output.print_item(
                     route,
                     _default_routing_fields,
@@ -645,7 +645,7 @@ def generate_token(ctx: CLIContext, service_name_or_id: str, duration: str, quie
             if quiet:
                 print(resp["token"])
             else:
-                print_done(f"Generated API token {resp['token']}")
+                print_done(f"Generated API token {resp["token"]}")
         except Exception as e:
             ctx.output.print_error(e)
             sys.exit(ExitCode.FAILURE)

src/ai/backend/client/func/vfolder.py

@@ -495,7 +495,7 @@ async def _upload_files(
                 input_file = open(base_path / file_path, "rb")
             else:
                 input_file = open(str(Path(file_path).relative_to(base_path)), "rb")
-            print(f"Uploading {base_path / file_path} via {upload_info['url']} ...")
+            print(f"Uploading {base_path / file_path} via {upload_info["url"]} ...")
             # TODO: refactor out the progress bar
             uploader = tus_client.async_uploader(
                 file_stream=input_file,

src/ai/backend/client/output/formatters.py

@@ -17,7 +17,7 @@ def format_stats(raw_stats: Optional[str], indent="") -> str:
     if raw_stats is None:
         return "(unavailable)"
     stats = json.loads(raw_stats)
-    text = "\n".join(f"- {k + ': ':18s}{v}" for k, v in stats.items())
+    text = "\n".join(f"- {k + ": ":18s}{v}" for k, v in stats.items())
     return "\n" + textwrap.indent(text, indent)
 
 
@@ -239,7 +239,7 @@ def format_value(metric: MetricValue, binary: bool) -> str:
                 if metric["pct"] is None:
                     node_metric_bufs.append(f"{stat_key}: (calculating...) % ({num_cores} cores)")
                 else:
-                    node_metric_bufs.append(f"{stat_key}: {metric['pct']} % ({num_cores} cores)")
+                    node_metric_bufs.append(f"{stat_key}: {metric["pct"]} % ({num_cores} cores)")
             else:
                 binary = stat_key == "mem"
                 node_metric_bufs.append(f"{stat_key}: {format_value(metric, binary)}")
@@ -322,10 +322,10 @@ def format_console(self, value: Any, field: FieldSpec, indent="") -> str:
         else:
             text = ""
             for item in value:
-                text += f"+ {item['id']}\n"
+                text += f"+ {item["id"]}\n"
                 text += "\n".join(
                     f"  - {f.humanized_name}: "
-                    f"{_fit_multiline_in_cell(f.formatter.format_console(item[f.field_name], f), '    ')}"  # noqa
+                    f"{_fit_multiline_in_cell(f.formatter.format_console(item[f.field_name], f), "    ")}"  # noqa
                     for f in field.subfields.values()
                     if f.field_name != "id"
                 )
@@ -340,10 +340,10 @@ def format_console(self, value: Any, field: FieldSpec, indent="") -> str:
         else:
             text = ""
             for item in value:
-                text += f"+ {item['name']} ({item['id']})\n"
+                text += f"+ {item["name"]} ({item["id"]})\n"
                 text += "\n".join(
                     f"  - {f.humanized_name}: "
-                    f"{_fit_multiline_in_cell(f.formatter.format_console(item[f.field_name], f), '    ')}"  # noqa
+                    f"{_fit_multiline_in_cell(f.formatter.format_console(item[f.field_name], f), "    ")}"  # noqa
                     for f in field.subfields.values()
                     if f.field_name not in ("id", "name")
                 )

src/ai/backend/common/docker.py

@@ -500,7 +500,7 @@ def generate_aliases(self) -> Mapping[str, "ImageRef"]:
         for name in possible_names:
             ret[name] = self
         for name, ptags in itertools.product(possible_names, itertools.product(*possible_ptags)):
-            ret[f"{name}:{'-'.join(t for t in ptags if t)}"] = self
+            ret[f"{name}:{"-".join(t for t in ptags if t)}"] = self
         return ret
 
     @staticmethod

src/ai/backend/common/types.py

@@ -723,7 +723,7 @@ def normalize_slots(self, *, ignore_unknown: bool) -> ResourceSlot:
         known_slots = current_resource_slots.get()
         unset_slots = known_slots.keys() - self.data.keys()
         if not ignore_unknown and (unknown_slots := self.data.keys() - known_slots.keys()):
-            raise ValueError(f"Unknown slots: {', '.join(map(repr, unknown_slots))}")
+            raise ValueError(f"Unknown slots: {", ".join(map(repr, unknown_slots))}")
         data = {k: v for k, v in self.data.items() if k in known_slots}
         for k in unset_slots:
             data[k] = Decimal(0)

src/ai/backend/install/context.py

@@ -621,8 +621,8 @@
                     file=fp,
                 )
                 print("export BACKEND_ENDPOINT_TYPE=api", file=fp)
-                print(f"export BACKEND_ACCESS_KEY={keypair['access_key']}", file=fp)
-                print(f"export BACKEND_SECRET_KEY={keypair['secret_key']}", file=fp)
+                print(f"export BACKEND_ACCESS_KEY={keypair["access_key"]}", file=fp)
+                print(f"export BACKEND_SECRET_KEY={keypair["secret_key"]}", file=fp)
         with self.resource_path("ai.backend.install.fixtures", "example-users.json") as user_path:
             current_shell = os.environ.get("SHELL", "sh")
             user_data = json.loads(Path(user_path).read_bytes())
@@ -651,8 +651,8 @@
                     f"""echo 'Run `./{client_executable} login` to activate a login session.'""",
                     file=fp,
                 )
-                print(f"""echo 'Your email: {user['email']}'""", file=fp)
-                print(f"""echo 'Your password: {user['password']}'""", file=fp)
+                print(f"""echo 'Your email: {user["email"]}'""", file=fp)
+                print(f"""echo 'Your password: {user["password"]}'""", file=fp)
 
     async def dump_install_info(self) -> None:
         self.log_header("Dumping the installation configs...")

src/ai/backend/kernel/base.py

@@ -698,7 +698,7 @@ async def start_model_service(self, model_info):
             if model_service_info is None:
                 result = {"status": "failed", "error": "service info not provided"}
                 return
-            service_name = f"{model_info['name']}-{model_service_info['port']}"
+            service_name = f"{model_info["name"]}-{model_service_info["port"]}"
             self.service_parser.add_model_service(service_name, model_service_info)
             service_info = {
                 "name": service_name,
@@ -734,7 +734,7 @@ async def start_model_service(self, model_info):
     async def check_model_health(self, model_name, model_service_info):
         health_check_info = model_service_info.get("health_check")
         health_check_endpoint = (
-            f"http://localhost:{model_service_info['port']}{health_check_info['path']}"
+            f"http://localhost:{model_service_info["port"]}{health_check_info["path"]}"
         )
         retries = 0
         current_health_status = HealthStatus.UNDETERMINED
@@ -875,7 +875,7 @@ async def _start_service(self, service_info, *, cwd: Optional[str] = None, do_no
                             await terminate_and_wait(proc, timeout=10.0)
                             self.services_running.pop(service_info["name"], None)
                             error_reason = (
-                                f"opening the service port timed out: {service_info['name']}"
+                                f"opening the service port timed out: {service_info["name"]}"
                             )
                         else:
                             error_reason = "TimeoutError (unknown)"

src/ai/backend/kernel/intrinsic.py

@@ -36,7 +36,7 @@ async def init_sshd_service(child_env):
         )
         stdout, stderr = await proc.communicate()
         if proc.returncode != 0:
-            raise RuntimeError(f"sshd init error: {stderr.decode('utf8')}")
+            raise RuntimeError(f"sshd init error: {stderr.decode("utf8")}")
         pub_key = stdout.splitlines()[1]
         auth_path.write_bytes(pub_key)
         auth_path.chmod(0o600)
@@ -57,7 +57,7 @@ async def init_sshd_service(child_env):
         )
         stdout, stderr = await proc.communicate()
         if proc.returncode != 0:
-            raise RuntimeError(f"sshd init error: {stderr.decode('utf8')}")
+            raise RuntimeError(f"sshd init error: {stderr.decode("utf8")}")
     else:
         try:
             if (auth_path.parent.stat().st_mode & 0o077) != 0:
@@ -83,7 +83,7 @@ async def init_sshd_service(child_env):
     )
     stdout, stderr = await proc.communicate()
     if proc.returncode != 0:
-        raise RuntimeError(f"sshd init error: {stderr.decode('utf8')}")
+        raise RuntimeError(f"sshd init error: {stderr.decode("utf8")}")
 
     cluster_privkey_src_path = Path("/home/config/ssh/id_cluster")
     cluster_ssh_port_mapping_path = Path("/home/config/ssh/port-mapping.json")