From e3b0eb8e726ec9745af200dd72d34be29e45430d Mon Sep 17 00:00:00 2001 From: Jason Munro Date: Thu, 12 Oct 2023 14:16:21 -0700 Subject: [PATCH 1/3] Ensure header processor alters the correct object --- src/maggma/api/resource/aggregation.py | 3 ++- src/maggma/api/resource/read_resource.py | 4 ++-- src/maggma/api/resource/s3_url.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/maggma/api/resource/aggregation.py b/src/maggma/api/resource/aggregation.py index 8b5e7a076..77324a143 100644 --- a/src/maggma/api/resource/aggregation.py +++ b/src/maggma/api/resource/aggregation.py @@ -94,9 +94,10 @@ def search(**queries: Dict[str, STORE_PARAMS]) -> Dict: meta = Meta(total_doc=count) response = {"data": data, "meta": {**meta.dict(), **operator_meta}} + response = Response(orjson.dumps(response, default=serialization_helper)) # type: ignore if self.header_processor is not None: - self.header_processor.process_header(temp_response, request) + self.header_processor.process_header(response, request) return response diff --git a/src/maggma/api/resource/read_resource.py b/src/maggma/api/resource/read_resource.py index d331b7de5..5e2703041 100644 --- a/src/maggma/api/resource/read_resource.py +++ b/src/maggma/api/resource/read_resource.py @@ -173,7 +173,7 @@ def get_by_key( response = Response(orjson.dumps(response, default=serialization_helper)) # type: ignore if self.header_processor is not None: - self.header_processor.process_header(temp_response, request) + self.header_processor.process_header(response, request) return response @@ -269,7 +269,7 @@ def search(**queries: Dict[str, STORE_PARAMS]) -> Union[Dict, Response]: response = Response(orjson.dumps(response, default=serialization_helper)) # type: ignore if self.header_processor is not None: - self.header_processor.process_header(temp_response, request) + self.header_processor.process_header(response, request) return response diff --git a/src/maggma/api/resource/s3_url.py b/src/maggma/api/resource/s3_url.py index 19c6bbc4e..c4d1176d1 100644 --- a/src/maggma/api/resource/s3_url.py +++ b/src/maggma/api/resource/s3_url.py @@ -123,7 +123,7 @@ def get_by_key( response = Response(orjson.dumps(response, default=serialization_helper)) # type: ignore if self.header_processor is not None: - self.header_processor.process_header(temp_response, request) + self.header_processor.process_header(response, request) return response From 794da5279d4fb0d6a915b55ae541e349f7fe68e8 Mon Sep 17 00:00:00 2001 From: Jason Munro Date: Thu, 12 Oct 2023 14:31:26 -0700 Subject: [PATCH 2/3] Fix import --- src/maggma/api/resource/aggregation.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/maggma/api/resource/aggregation.py b/src/maggma/api/resource/aggregation.py index 77324a143..7c6f21309 100644 --- a/src/maggma/api/resource/aggregation.py +++ b/src/maggma/api/resource/aggregation.py @@ -1,4 +1,5 @@ from typing import Any, Dict, List, Optional, Type +import orjson from fastapi import HTTPException, Request, Response from pydantic import BaseModel From 2e769a9faca9b1036e26d44aaa4605e1d37b6fc1 Mon Sep 17 00:00:00 2001 From: Jason Munro Date: Thu, 12 Oct 2023 14:43:20 -0700 Subject: [PATCH 3/3] Fix second import --- src/maggma/api/resource/aggregation.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/maggma/api/resource/aggregation.py b/src/maggma/api/resource/aggregation.py index 7c6f21309..65676313a 100644 --- a/src/maggma/api/resource/aggregation.py +++ b/src/maggma/api/resource/aggregation.py @@ -12,6 +12,7 @@ from maggma.api.resource import HeaderProcessor, Resource from maggma.api.resource.utils import attach_query_ops from maggma.api.utils import STORE_PARAMS, merge_queries +from maggma.api.utils import serialization_helper from maggma.core import Store