From 111c225cbf8bd8fa7332147062fb8f167d4f91ca Mon Sep 17 00:00:00 2001 From: Akihiko Kuroda Date: Fri, 23 Aug 2024 11:36:23 -0400 Subject: [PATCH 1/3] add filter query string --- client/qiskit_serverless/core/job.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/qiskit_serverless/core/job.py b/client/qiskit_serverless/core/job.py index e190d5b81..4c84b9d3d 100644 --- a/client/qiskit_serverless/core/job.py +++ b/client/qiskit_serverless/core/job.py @@ -551,9 +551,10 @@ def list(self, **kwargs) -> List["Job"]: with tracer.start_as_current_span("job.list"): limit = kwargs.get("limit", 10) offset = kwargs.get("offset", 0) + type_filter = kwargs.get("filter", None) response_data = safe_json_request( request=lambda: requests.get( - f"{self.host}/api/{self.version}/jobs/?limit={limit}&offset={offset}", + f"{self.host}/api/{self.version}/jobs/?limit={limit}&offset={offset}&filter={type_filter}", # pylint: disable="line-too-long" headers={"Authorization": f"Bearer {self._token}"}, timeout=REQUESTS_TIMEOUT, ) From 89e5ec8f918c54ab4225c9a03fad2152aef6d7b1 Mon Sep 17 00:00:00 2001 From: Akihiko Kuroda Date: Fri, 23 Aug 2024 13:54:53 -0400 Subject: [PATCH 2/3] make filter query parameter go through --- client/qiskit_serverless/core/job.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/client/qiskit_serverless/core/job.py b/client/qiskit_serverless/core/job.py index 4c84b9d3d..8f034d2d9 100644 --- a/client/qiskit_serverless/core/job.py +++ b/client/qiskit_serverless/core/job.py @@ -549,12 +549,10 @@ def get(self, job_id) -> Optional["Job"]: def list(self, **kwargs) -> List["Job"]: tracer = trace.get_tracer("client.tracer") with tracer.start_as_current_span("job.list"): - limit = kwargs.get("limit", 10) - offset = kwargs.get("offset", 0) - type_filter = kwargs.get("filter", None) response_data = safe_json_request( request=lambda: requests.get( - f"{self.host}/api/{self.version}/jobs/?limit={limit}&offset={offset}&filter={type_filter}", # pylint: disable="line-too-long" + f"{self.host}/api/{self.version}/jobs", + params=kwargs, headers={"Authorization": f"Bearer {self._token}"}, timeout=REQUESTS_TIMEOUT, ) From f2da0ee951f0d508bf25addb06797a491962bea3 Mon Sep 17 00:00:00 2001 From: Akihiko Kuroda Date: Fri, 23 Aug 2024 14:11:25 -0400 Subject: [PATCH 3/3] make filter query parameter go through --- client/qiskit_serverless/core/job.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/qiskit_serverless/core/job.py b/client/qiskit_serverless/core/job.py index 8f034d2d9..9002f044c 100644 --- a/client/qiskit_serverless/core/job.py +++ b/client/qiskit_serverless/core/job.py @@ -549,6 +549,10 @@ def get(self, job_id) -> Optional["Job"]: def list(self, **kwargs) -> List["Job"]: tracer = trace.get_tracer("client.tracer") with tracer.start_as_current_span("job.list"): + limit = kwargs.get("limit", 10) + kwargs["limit"] = limit + offset = kwargs.get("offset", 0) + kwargs["offset"] = offset response_data = safe_json_request( request=lambda: requests.get( f"{self.host}/api/{self.version}/jobs",