Run linter with uv run ruff check --fix (#773)

No human-made changes here, only `ruff` linting

Author: Ickerday

.basedpyright/baseline.json

@@ -15,30 +15,29 @@ upgrade:
 	$(UV_SYNC_CMD) --dev --upgrade
 
 # Workaround for make being unable to pass arguments to underlying cmd
-# $ SDK_DEPS_GROUP="build" make uv-sync-ci
+# $ SDK_DEPS_GROUP="build" make ci-install
 .PHONY: ci-install
 ci-install:
-	$(UV_SYNC_CMD) --group $(SDK_DEPS_GROUP)
+	$(UV_SYNC_CMD) --frozen --group $(SDK_DEPS_GROUP)
 
-UV_RUN_CMD := uv run --frozen --no-config
+UV_RUN_CMD := uv run
 .PHONY: lint
 lint: lint-python # TODO: Add mbake
 
 .PHONY: lint-python
 lint-python:
-	$(UV_RUN_CMD) basedpyright
-# 	$(UV_RUN_CMD) ruff check --fix-only
+	$(UV_RUN_CMD) ruff check --fix-only
 	$(UV_RUN_CMD) ruff format
+	$(UV_RUN_CMD) basedpyright
 
-UV_RUN_CMD := uv run --frozen --no-config
 .PHONY: ci-lint
 ci-lint: ci-lint-python # TODO: Add mbake
 
 .PHONY: ci-lint-python
 ci-lint-python:
-	$(UV_RUN_CMD) basedpyright
-# 	$(UV_RUN_CMD) ruff check
+	$(UV_RUN_CMD) ruff check --fix-only --exit-non-zero-on-fix
 	$(UV_RUN_CMD) ruff format --check
+	$(UV_RUN_CMD) basedpyright
 
 .PHONY: clean
 clean:

Makefile

@@ -28,8 +28,8 @@
 __all__ = [
     "Agent",
     "AnthropicModel",
-    "OpenAIModel",
     "GoogleModel",
+    "OpenAIModel",
     "create_structured_prompt",
     "detect_injection",
     "truncate_input",

splunklib/ai/__init__.py

@@ -16,12 +16,12 @@
 import logging
 import os
 import string
-from time import monotonic
 import uuid
 from collections.abc import Awaitable, Callable, Sequence
 from dataclasses import asdict, dataclass
 from enum import Enum
 from functools import partial
+from time import monotonic
 from typing import Any, cast, final, override
 
 from langchain.agents import create_agent  # pyright: ignore[reportUnknownVariableType]
@@ -1909,9 +1909,7 @@ def check_tool_name(type: str, name: str) -> None:
 
     last_ai_message: AIMessage | None = None
     for message in messages:
-        if type(message) is HumanMessage:
-            check_no_pending_calls()
-        elif type(message) is SystemMessage:
+        if type(message) is HumanMessage or type(message) is SystemMessage:
             check_no_pending_calls()
         elif type(message) is AIMessage:
             last_ai_message = message

splunklib/ai/engines/langchain.py

@@ -296,22 +296,24 @@ async def connect_remote_mcp(
     mcp_url = f"{management_url}/services/mcp"
     mcp_token = await asyncio.to_thread(lambda: _get_mcp_token(splunk_username, service))
     if mcp_token is not None:
-        async with streamable_http_client(
-            url=mcp_url,
-            http_client=httpx.AsyncClient(
-                headers={
-                    "x-splunk-trace-id": trace_id,
-                    "x-splunk-app-id": app_id,
-                },
-                auth=_MCPAuth(f"Bearer {mcp_token}"),
-                verify=False,
-                follow_redirects=True,
-                timeout=httpx.Timeout(_MCP_DEFAULT_TIMEOUT, read=_MCP_DEFAULT_SSE_READ_TIMEOUT),
-            ),
-        ) as (read, write, _):
-            async with ClientSession(read, write) as session:
-                await session.initialize()
-                yield session
+        async with (
+            streamable_http_client(
+                url=mcp_url,
+                http_client=httpx.AsyncClient(
+                    headers={
+                        "x-splunk-trace-id": trace_id,
+                        "x-splunk-app-id": app_id,
+                    },
+                    auth=_MCPAuth(f"Bearer {mcp_token}"),
+                    verify=False,
+                    follow_redirects=True,
+                    timeout=httpx.Timeout(_MCP_DEFAULT_TIMEOUT, read=_MCP_DEFAULT_SSE_READ_TIMEOUT),
+                ),
+            ) as (read, write, _),
+            ClientSession(read, write) as session,
+        ):
+            await session.initialize()
+            yield session
     else:
         yield None
 

splunklib/ai/tools.py

@@ -47,14 +47,14 @@
 
 __all__ = [
     "AuthenticationError",
-    "connect",
     "Context",
-    "handler",
     "HTTPError",
     "UrlEncoded",
+    "_NoAuthenticationToken",
     "_encode",
     "_make_cookie_header",
-    "_NoAuthenticationToken",
+    "connect",
+    "handler",
     "namespace",
 ]
 
@@ -102,7 +102,7 @@ def mask_sensitive_data(data):
     if not isinstance(data, dict):
         try:
             data = json.loads(data)
-        except Exception as ex:
+        except Exception:
             return data
 
     # json.loads will return "123"(str) as 123(int), so return the data if it's not 'dict' type
@@ -252,7 +252,7 @@ def __mod__(self, fields):
         raise TypeError("Cannot interpolate into a UrlEncoded object.")
 
     def __repr__(self):
-        return f"UrlEncoded({repr(parse.unquote(str(self)))})"
+        return f"UrlEncoded({parse.unquote(str(self))!r})"
 
 
 @contextmanager
@@ -1619,7 +1619,7 @@ def request(self, url, message, **kwargs):
                     time.sleep(self.retryDelay)
                     self.retries -= 1
         response = record(response)
-        if 400 <= response.status:
+        if response.status >= 400:
             raise HTTPError(response)
 
         # Update the cookie with any HTTP request

splunklib/binding.py

@@ -641,7 +641,7 @@ def restart(self, timeout=None):
                     continue
                 else:
                     return result
-            except Exception as e:
+            except Exception:
                 sleep(1)
         raise Exception("Operation time out.")
 
@@ -1053,7 +1053,7 @@ def __init__(self, service, path, **kwargs):
         Endpoint.__init__(self, service, path)
         self._state = None
         if not kwargs.get("skip_refresh", False):
-            self.refresh(kwargs.get("state", None))  # "Prefresh"
+            self.refresh(kwargs.get("state"))  # "Prefresh"
 
     def __contains__(self, item):
         try:
@@ -1645,7 +1645,7 @@ def iter(self, offset=0, count=None, pagesize=None, **kwargs):
             fetched += N
             for item in items:
                 yield item
-            if pagesize is None or N < pagesize:
+            if pagesize is None or pagesize > N:
                 break
             offset += N
             logger.debug(
@@ -1945,7 +1945,7 @@ def create(self, name):
         # a ConfigurationFile (which is a Collection) instead of some
         # Entity.
         if not isinstance(name, str):
-            raise ValueError(f"Invalid name: {repr(name)}")
+            raise ValueError(f"Invalid name: {name!r}")
         response = self.post(__conf=name)
         if response.status == 303:
             return self[name]
@@ -1996,7 +1996,7 @@ class StoragePassword(Entity):
     """This class contains a storage password."""
 
     def __init__(self, service, path, **kwargs):
-        state = kwargs.get("state", None)
+        state = kwargs.get("state")
         kwargs["skip_refresh"] = kwargs.get("skip_refresh", state is not None)
         super().__init__(service, path, **kwargs)
         self._state = state
@@ -2047,7 +2047,7 @@ def create(self, password, username, realm=None):
         :return: The :class:`StoragePassword` object created.
         """
         if not isinstance(username, str):
-            raise ValueError(f"Invalid name: {repr(username)}")
+            raise ValueError(f"Invalid name: {username!r}")
 
         if realm is None:
             response = self.post(password=password, name=username)
@@ -2202,8 +2202,8 @@ def attach(self, host=None, source=None, sourcetype=None):
         # the input mode
         sock = self.service.connect()
         headers = [
-            f"POST {str(self.service._abspath(path))} HTTP/1.1\r\n".encode("utf-8"),
-            f"Host: {self.service.host}:{int(self.service.port)}\r\n".encode("utf-8"),
+            f"POST {self.service._abspath(path)!s} HTTP/1.1\r\n".encode(),
+            f"Host: {self.service.host}:{int(self.service.port)}\r\n".encode(),
             b"Accept-Encoding: identity\r\n",
             cookie_or_auth_header.encode("utf-8"),
             b"X-Splunk-Input-Mode: Streaming\r\n",
@@ -2806,14 +2806,14 @@ def list(self, *kinds, **kwargs):
             entities = entities[kwargs["offset"] :]
         if "count" in kwargs:
             entities = entities[: kwargs["count"]]
-        if kwargs.get("sort_mode", None) == "alpha":
+        if kwargs.get("sort_mode") == "alpha":
             sort_field = kwargs.get("sort_field", "name")
             if sort_field == "name":
                 f = lambda x: x.name.lower()
             else:
                 f = lambda x: x[sort_field].lower()
             entities = sorted(entities, key=f)
-        if kwargs.get("sort_mode", None) == "alpha_case":
+        if kwargs.get("sort_mode") == "alpha_case":
             sort_field = kwargs.get("sort_field", "name")
             if sort_field == "name":
                 f = lambda x: x.name
@@ -3199,10 +3199,10 @@ def create(self, query, **kwargs):
 
         :return: The :class:`Job`.
         """
-        if kwargs.get("exec_mode", None) == "oneshot":
+        if kwargs.get("exec_mode") == "oneshot":
             raise TypeError("Cannot specify exec_mode=oneshot; use the oneshot method instead.")
         response = self.post(search=query, **kwargs)
-        sid = _load_sid(response, kwargs.get("output_mode", None))
+        sid = _load_sid(response, kwargs.get("output_mode"))
         return Job(self.service, sid)
 
     def export(self, query, **params):
@@ -3421,7 +3421,7 @@ def dispatch(self, **kwargs):
         :return: The :class:`Job`.
         """
         response = self.post("dispatch", **kwargs)
-        sid = _load_sid(response, kwargs.get("output_mode", None))
+        sid = _load_sid(response, kwargs.get("output_mode"))
         return Job(self.service, sid)
 
     @property
@@ -3737,7 +3737,7 @@ def create(self, username, password, roles, **params):
             hilda = users.create("hilda", "anotherpassword", roles=["user", "power"])
         """
         if not isinstance(username, str):
-            raise ValueError(f"Invalid username: {str(username)}")
+            raise ValueError(f"Invalid username: {username!s}")
         username = username.lower()
         self.post(name=username, password=password, roles=roles, **params)
         # splunkd doesn't return the user in the POST response body,
@@ -3859,7 +3859,7 @@ def create(self, name, **params):
             paltry = roles.create("paltry", imported_roles="user", defaultApp="search")
         """
         if not isinstance(name, str):
-            raise ValueError(f"Invalid role name: {str(name)}")
+            raise ValueError(f"Invalid role name: {name!s}")
         name = name.lower()
         self.post(name=name, **params)
         # splunkd doesn't return the user in the POST response body,

splunklib/client.py

@@ -73,6 +73,6 @@ def parse_xml_data(parent_node, child_node_tag):
                 data[child_name] = {"__app": child.get("app", None)}
                 for param in child:
                     data[child_name][param.get("name")] = parse_parameters(param)
-        elif "item" == parent_node.tag:
+        elif parent_node.tag == "item":
             data[child_name] = parse_parameters(child)
     return data

splunklib/modularinput/utils.py

@@ -218,7 +218,7 @@ def _get_specification(self):
         try:
             specification = ConfigurationSettingsType.specification_matrix[name]
         except KeyError:
-            raise AttributeError(f"Unknown configuration setting: {name}={repr(self._value)}")
+            raise AttributeError(f"Unknown configuration setting: {name}={self._value!r}")
 
         return ConfigurationSettingsType.validate_configuration_setting, specification
 

splunklib/searchcommands/decorators.py

@@ -31,7 +31,7 @@
 class ExternalSearchCommand:
     def __init__(self, path, argv=None, environ=None):
         if not isinstance(path, (bytes, str)):
-            raise ValueError(f"Expected a string value for path, not {repr(path)}")
+            raise ValueError(f"Expected a string value for path, not {path!r}")
 
         self._logger = getLogger(self.__class__.__name__)
         self._path = str(path)
@@ -45,22 +45,22 @@ def __init__(self, path, argv=None, environ=None):
 
     @property
     def argv(self):
-        return getattr(self, "_argv")
+        return self._argv
 
     @argv.setter
     def argv(self, value):
         if not (value is None or isinstance(value, (list, tuple))):
-            raise ValueError(f"Expected a list, tuple or value of None for argv, not {repr(value)}")
+            raise ValueError(f"Expected a list, tuple or value of None for argv, not {value!r}")
         self._argv = value
 
     @property
     def environ(self):
-        return getattr(self, "_environ")
+        return self._environ
 
     @environ.setter
     def environ(self, value):
         if not (value is None or isinstance(value, dict)):
-            raise ValueError(f"Expected a dictionary value for environ, not {repr(value)}")
+            raise ValueError(f"Expected a dictionary value for environ, not {value!r}")
         self._environ = value
 
     @property
@@ -83,7 +83,7 @@ def execute(self):
             self._execute(self._path, self._argv, self._environ)
         except:
             error_type, error, tb = sys.exc_info()
-            message = f"Command execution failed: {str(error)}"
+            message = f"Command execution failed: {error!s}"
             self._logger.error(message + "\nTraceback:\n" + "".join(traceback.format_tb(tb)))
             sys.exit(1)