api-foundry-query-engine 0.8.59__tar.gz → 0.8.60__tar.gz

{api_foundry_query_engine-0.8.59 → api_foundry_query_engine-0.8.60}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: api-foundry-query-engine
-Version: 0.8.59
+Version: 0.8.60
 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.60/api_foundry_query_engine/__init__.py

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

{api_foundry_query_engine-0.8.59 → api_foundry_query_engine-0.8.60}/api_foundry_query_engine/adapters/gateway_adapter.py

@@ -99,7 +99,16 @@ class GatewayAdapter(Adapter):
 
         event_params = {}
 
-        path_parameters = self._convert_parameters(event.get("pathParameters"))
+        raw_path = event.get("path") or ""
+        path_parameters = event.get("pathParameters") or {}
+        if "proxy" in path_parameters and not raw_path:
+            raw_path = f"/{path_parameters['proxy']}"
+        extracted_path_params = self._extract_path_params(resource, raw_path)
+        for key, value in extracted_path_params.items():
+            if key not in path_parameters or path_parameters.get(key) in (None, "", "None"):
+                path_parameters[key] = value
+
+        path_parameters = self._convert_parameters(path_parameters)
         if path_parameters is not None:
             event_params.update(path_parameters)
 
@@ -148,6 +157,22 @@ class GatewayAdapter(Adapter):
                     result[parameter] = value
         return result
 
+    def _extract_path_params(self, resource: Optional[str], path: str) -> Dict[str, str]:
+        if not resource or not path:
+            return {}
+
+        resource_parts = [p for p in resource.split("/") if p]
+        path_parts = [p for p in path.split("/") if p]
+        params: Dict[str, str] = {}
+
+        for template, actual in zip(resource_parts, path_parts):
+            if template.startswith("{") and template.endswith("}"):
+                key = template[1:-1]
+                if key:
+                    params[key] = actual
+
+        return params
+
     def split_params(self, parameters: Dict[str, Any]) -> Tuple[Dict[str, Any], Dict[str, Any]]:
         """
         Split a dictionary into two dictionaries based on keys.

api_foundry_query_engine-0.8.59/api_foundry_query_engine/__init__.py

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