Skip to content
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.

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

fix: add get, head and count parameters to the rpc method. #444

Merged
merged 4 commits into from
Jun 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 18 additions & 3 deletions postgrest/_async/client.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import annotations

from typing import Any, Dict, Union, cast
from typing import Any, Dict, Optional, Union, cast

from deprecation import deprecated
from httpx import Headers, QueryParams, Timeout
Expand All @@ -11,6 +11,7 @@
DEFAULT_POSTGREST_CLIENT_HEADERS,
DEFAULT_POSTGREST_CLIENT_TIMEOUT,
)
from ..types import CountMethod
from ..utils import AsyncClient
from .request_builder import AsyncRequestBuilder, AsyncRPCFilterRequestBuilder

Expand Down Expand Up @@ -78,12 +79,22 @@ def from_table(self, table: str) -> AsyncRequestBuilder:
"""Alias to :meth:`from_`."""
return self.from_(table)

def rpc(self, func: str, params: dict) -> AsyncRPCFilterRequestBuilder[Any]:
def rpc(
self,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (code-quality): We've found these issues:

func: str,
params: dict,
count: Optional[CountMethod] = None,
head: bool = False,
get: bool = False,
) -> AsyncRPCFilterRequestBuilder[Any]:
"""Perform a stored procedure call.

Args:
func: The name of the remote procedure to run.
params: The parameters to be passed to the remote procedure.
count: The method to use to get the count of rows returned.
head: When set to `true`, `data` will not be returned. Useful if you only need the count.
get: When set to `true`, the function will be called with read-only access mode.
Returns:
:class:`AsyncRPCFilterRequestBuilder`
Example:
Expand All @@ -97,7 +108,11 @@ def rpc(self, func: str, params: dict) -> AsyncRPCFilterRequestBuilder[Any]:
This method now returns a :class:`AsyncFilterRequestBuilder` which allows you to
filter on the RPC's resultset.
"""
method = "HEAD" if head else "GET" if get else "POST"

headers = Headers({"Prefer": f"count={count}"}) if count else Headers()

# the params here are params to be sent to the RPC and not the queryparams!
return AsyncRPCFilterRequestBuilder[Any](
self.session, f"/rpc/{func}", "POST", Headers(), QueryParams(), json=params
self.session, f"/rpc/{func}", method, headers, QueryParams(), json=params
)
21 changes: 18 additions & 3 deletions postgrest/_sync/client.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import annotations

from typing import Any, Dict, Union, cast
from typing import Any, Dict, Optional, Union, cast

from deprecation import deprecated
from httpx import Headers, QueryParams, Timeout
Expand All @@ -11,6 +11,7 @@
DEFAULT_POSTGREST_CLIENT_HEADERS,
DEFAULT_POSTGREST_CLIENT_TIMEOUT,
)
from ..types import CountMethod
from ..utils import SyncClient
from .request_builder import SyncRequestBuilder, SyncRPCFilterRequestBuilder

Expand Down Expand Up @@ -78,12 +79,22 @@ def from_table(self, table: str) -> SyncRequestBuilder:
"""Alias to :meth:`from_`."""
return self.from_(table)

def rpc(self, func: str, params: dict) -> SyncRPCFilterRequestBuilder[Any]:
def rpc(
self,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (code-quality): We've found these issues:

func: str,
params: dict,
count: Optional[CountMethod] = None,
head: bool = False,
get: bool = False,
) -> SyncRPCFilterRequestBuilder[Any]:
"""Perform a stored procedure call.
Args:
func: The name of the remote procedure to run.
params: The parameters to be passed to the remote procedure.
count: The method to use to get the count of rows returned.
head: When set to `true`, `data` will not be returned. Useful if you only need the count.
get: When set to `true`, the function will be called with read-only access mode.
Returns:
:class:`AsyncRPCFilterRequestBuilder`
Example:
Expand All @@ -97,7 +108,11 @@ def rpc(self, func: str, params: dict) -> SyncRPCFilterRequestBuilder[Any]:
This method now returns a :class:`AsyncFilterRequestBuilder` which allows you to
filter on the RPC's resultset.
"""
method = "HEAD" if head else "GET" if get else "POST"

headers = Headers({"Prefer": f"count={count}"}) if count else Headers()

# the params here are params to be sent to the RPC and not the queryparams!
return SyncRPCFilterRequestBuilder[Any](
self.session, f"/rpc/{func}", "POST", Headers(), QueryParams(), json=params
self.session, f"/rpc/{func}", method, headers, QueryParams(), json=params
)
Loading