api-foundry-query-engine 0.8.79__tar.gz → 0.8.82__tar.gz

{api_foundry_query_engine-0.8.79 → api_foundry_query_engine-0.8.82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: api-foundry-query-engine
-Version: 0.8.79
+Version: 0.8.82
 Summary: The AWS lambda service handler use by the `api_foundry` project is a powerful tool designed to automate the deployment of REST APIs on AWS using Lambda services to access and interact with relational databases (RDBMS). This project leverages the OpenAPI specification to define and manage the APIs
 Project-URL: Documentation, https://github.com/DanRepik/api-foundry
 Project-URL: Source, https://github.com/DanRepik/api-foundry

api_foundry_query_engine-0.8.82/api_foundry_query_engine/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.8.82"

{api_foundry_query_engine-0.8.79 → api_foundry_query_engine-0.8.82}/api_foundry_query_engine/dao/sql_select_query_handler.py

@@ -281,10 +281,21 @@ class SQLSelectSchemaQueryHandler(SQLSchemaQueryHandler):
                     schema_object.permissions,
                     schema_object.properties,
                 )
+                # Only genuine joined relations need their columns
+                # qualified (e.g. "customer.name", to disambiguate from
+                # the parent's own "name") -- the primary entity's own
+                # properties come back from the cursor under their bare
+                # column names, and marshal_record/the post-fetch column
+                # filter in PostgresCursor.execute both key off that.
+                # Prefixing them too (self.prefix_map[relation], as
+                # before) produced selection_results keys like "q.slug"
+                # that never matched any real result column, so every
+                # row came back empty and marshal_record KeyError'd
+                # trying to unwrap it.
                 filtered_keys = self.filter_and_prefix_keys(
                     reg_exs,
                     allowed_properties,
-                    self.prefix_map[relation],
+                    self.prefix_map[relation] if relation_property else None,
                 )
 
                 # Extend the result map with the filtered keys

{api_foundry_query_engine-0.8.79 → api_foundry_query_engine-0.8.82}/api_foundry_query_engine/lambda_handler.py

@@ -13,21 +13,54 @@ logging.basicConfig(level=os.getenv("LOG_LEVEL", "INFO"))
 log = logging.getLogger(__name__)
 
 
+# Lambda rejects synchronous responses over 6 MB (6,291,556 bytes including
+# its own envelope); API Gateway then surfaces that as an opaque
+# "502 Internal server error". The margin leaves room for the statusCode/
+# headers wrapper so a body under the limit can't still be refused.
+DEFAULT_MAX_RESPONSE_BYTES = 6 * 1024 * 1024 - 4096
+
+
 class QueryEngine:
     def __init__(self, config: Mapping[str, str]):
         self.adapter = GatewayAdapter(config)
+        self.max_response_bytes = int(
+            config.get("MAX_RESPONSE_BYTES") or DEFAULT_MAX_RESPONSE_BYTES
+        )
 
     def handler(self, event) -> dict[str, Any]:
         log.debug("event: %s", event)
         try:
             response = self.adapter.process_event(event)
+            body = json.dumps(response)
+
+            # json.dumps escapes to ASCII by default, so len(body) is bytes.
+            if len(body) > self.max_response_bytes:
+                log.error(
+                    "response of %d bytes exceeds limit of %d bytes",
+                    len(body),
+                    self.max_response_bytes,
+                )
+                return {
+                    "isBase64Encoded": False,
+                    "statusCode": 502,
+                    "headers": {"Content-Type": "application/json"},
+                    "body": json.dumps(
+                        {
+                            "message": (
+                                f"response of {len(body)} bytes exceeds the "
+                                f"maximum of {self.max_response_bytes} bytes; "
+                                "narrow the request with filters"
+                            )
+                        }
+                    ),
+                }
 
             # Ensure the response conforms to API Gateway requirements
             return {
                 "isBase64Encoded": False,
                 "statusCode": 200,
                 "headers": {"Content-Type": "application/json"},
-                "body": json.dumps(response),
+                "body": body,
             }
         except ApplicationException as e:
             log.error("exception: %s", e, exc_info=True)

api_foundry_query_engine-0.8.79/api_foundry_query_engine/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.8.79"