Skip to content

fix(async): Fix erroneous code conversion causing TypeError at Datasource.smartquery() #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
amotl wants to merge 2 commits into from
Closed

fix(async): Fix erroneous code conversion causing TypeError at Datasource.smartquery() #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b8a070
fix(async): correct async POST/GET method handling in smartquery
JIAQIA Jul 25, 2025
63fa13d
fix(async): Fix code generator for edge cases at "smartquery" interface
amotl Jul 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# CHANGELOG

## unreleased
- Async: Fixed code generator for edge cases at "smartquery" interface. Thanks, @JIAQIA.

## 4.3.2 (2025-03-04)
- Alerting: Allowed the datasource to be specified with managed alerting. Thanks, @dmyerscough.
Expand Down
8 changes: 4 additions & 4 deletions grafana_client/elements/_async/datasource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,9 +353,9 @@ async def smartquery(
# Compute request method, body, and endpoint.
if "method" in request and isinstance(request["method"], str):
if request["method"] == "POST":
send_request = await self.client.POST
send_request = self.client.POST
else:
send_request = await self.client.GET
send_request = self.client.GET

logger.info(f"Submitting request: {request}")

Expand All @@ -378,7 +378,7 @@ async def smartquery(
database_name=datasource.get("database"),
)
request_kwargs = {}
send_request = await self.client.GET
send_request = self.client.GET

elif datasource_type in ("prometheus", "loki") and Version(await self.api.version) <= VERSION_7:
if (
Expand Down Expand Up @@ -411,7 +411,7 @@ async def smartquery(

# Submit query.
try:
return send_request(url, **request_kwargs)
return await send_request(url, **request_kwargs)
except (GrafanaClientError, GrafanaServerError) as ex:
logger.error(
f"Querying data source failed. id={datasource_id}, type={datasource_type}. "
Expand Down
5 changes: 3 additions & 2 deletions script/generate_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,14 @@ def process(source: Path, target: Path):

module_dump = re.sub(r"( {4}def )(?!_)", r" async def ", module_dump)

module_dump = module_dump.replace("self.client.", "await self.client.")
module_dump = re.sub(r"self\.client\.(.+)\(", r"await self.client.\1(", module_dump)

for relative_import in [".base", "..client", "..knowledge", "..model"]:
module_dump = module_dump.replace(f"from {relative_import}", f"from .{relative_import}")

module_dump = module_dump.replace("self.api.version", "await self.api.version")
module_dump = module_dump.replace("= self.", "= await self.")
module_dump = re.sub(r"= self\.(.+)\(", r"= await self.\1(", module_dump)
module_dump = re.sub(r"send_request\(", r"await send_request(", module_dump)

module_processed.append(module_path)
target_path = Path(str(module_path).replace(str(source), str(target)))
Expand Down
Loading