api-foundry-query-engine 0.8.62__tar.gz → 0.8.63__tar.gz

{api_foundry_query_engine-0.8.62 → api_foundry_query_engine-0.8.63}/PKG-INFO

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

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

{api_foundry_query_engine-0.8.62 → api_foundry_query_engine-0.8.63}/api_foundry_query_engine/adapters/gateway_adapter.py

@@ -43,9 +43,7 @@ class GatewayAdapter(Adapter):
             parts = [p for p in resource.split("/") if p]
             # Skip common API prefixes like "api", "v1", "v2", etc.
             api_prefixes = {"api", "v1", "v2", "v3"}
-            literal_parts = [
-                p for p in parts if p not in api_prefixes and not p.startswith("{")
-            ]
+            literal_parts = [p for p in parts if p not in api_prefixes and not p.startswith("{")]
             entity = "_".join(literal_parts) if literal_parts else None
         else:
             entity = None

{api_foundry_query_engine-0.8.62 → api_foundry_query_engine-0.8.63}/api_foundry_query_engine/dao/sql_insert_query_handler.py

@@ -1,3 +1,4 @@
+import json
 from typing import Dict, Optional
 from api_foundry_query_engine.dao.sql_query_handler import SQLSchemaQueryHandler
 from api_foundry_query_engine.operation import Operation
@@ -128,15 +129,15 @@ class SQLInsertSchemaQueryHandler(SQLSchemaQueryHandler):
         }
         log.info("allowed properties: %s", allowed_properties)
 
-        import json
-
-        # First, validate that user is not trying to set injected properties
         for property_name, property in self.schema_object.properties.items():
-            if property.inject_value and property_name in self.operation.store_params:
+            inject_value = getattr(property, "inject_value", None)
+            inject_on = getattr(property, "inject_on", None) or []
+            if not inject_value or "create" not in inject_on:
+                continue
+            if property_name in self.operation.store_params:
                 raise ApplicationException(
                     403,
-                    f"Property '{property_name}' is auto-injected and "
-                    + "cannot be set manually",
+                    f"Property '{property_name}' is auto-injected and cannot be set manually",
                 )
 
         for name, value in self.operation.store_params.items():
@@ -172,24 +173,20 @@ class SQLInsertSchemaQueryHandler(SQLSchemaQueryHandler):
                     property.api_name
                 ] = property.convert_to_db_value(value)
 
-        # Inject values from claims/timestamps/etc for properties with
-        # x-af-inject-value on CREATE
         for property_name, property in self.schema_object.properties.items():
-            if property.inject_value and "create" in property.inject_on:
-                injected_value = self.extract_injected_value(property.inject_value)
-                if injected_value is not None:
-                    placeholder_key = f"__inject_{property_name}"
-                    columns.append(property.column_name)
-                    placeholders.append(self.placeholder(property, placeholder_key))
-                    self.store_placeholders[
-                        placeholder_key
-                    ] = property.convert_to_db_value(injected_value)
-                elif property.required:
-                    raise ApplicationException(
-                        400,
-                        f"Required injected property '{property_name}' "
-                        + f"could not be populated from '{property.inject_value}'",
-                    )
+            inject_value = getattr(property, "inject_value", None)
+            inject_on = getattr(property, "inject_on", None) or []
+            if not inject_value or "create" not in inject_on:
+                continue
+            if property_name in self.store_placeholders:
+                continue
+
+            injected_value = self.extract_injected_value(property)
+            columns.append(property.column_name)
+            placeholders.append(self.placeholder(property, property.api_name))
+            self.store_placeholders[property.api_name] = property.convert_to_db_value(
+                injected_value
+            )
 
         if self.key_property:
             if self.key_property.key_type == "sequence":

{api_foundry_query_engine-0.8.62 → api_foundry_query_engine-0.8.63}/api_foundry_query_engine/dao/sql_query_handler.py

@@ -1,4 +1,6 @@
 import re
+import os
+import uuid
 from typing import Optional, List, Dict
 from datetime import datetime, date
 
@@ -340,6 +342,35 @@ class SQLQueryHandler:
     def selection_results(self) -> Dict:
         raise NotImplementedError()
 
+    def extract_injected_value(
+        self, property: SchemaObjectProperty
+    ) -> Optional[object]:
+        inject_value = getattr(property, "inject_value", None)
+        if not inject_value:
+            return None
+
+        if inject_value.startswith("claim:"):
+            claim_name = inject_value.split(":", 1)[1]
+            return self.operation.claims.get(claim_name)
+
+        if inject_value == "timestamp":
+            return datetime.utcnow().isoformat()
+
+        if inject_value == "date":
+            return date.today().isoformat()
+
+        if inject_value == "uuid":
+            return str(uuid.uuid4())
+
+        if inject_value.startswith("env:"):
+            env_name = inject_value.split(":", 1)[1]
+            return os.getenv(env_name)
+
+        raise ApplicationException(
+            500,
+            f"Unsupported inject_value source '{inject_value}' for property '{property.api_name}'",
+        )
+
     def generate_sql_condition(
         self, property: SchemaObjectProperty, value, prefix: Optional[str] = None
     ) -> str:

{api_foundry_query_engine-0.8.62 → api_foundry_query_engine-0.8.63}/api_foundry_query_engine/dao/sql_update_query_handler.py

@@ -1,3 +1,4 @@
+import json
 import re
 from typing import Match
 from api_foundry_query_engine.dao.sql_query_handler import SQLSchemaQueryHandler
@@ -115,15 +116,15 @@ class SQLUpdateSchemaQueryHandler(SQLSchemaQueryHandler):
         columns = []
         invalid_columns = []
 
-        import json
-
-        # First, validate that user is not trying to set injected properties
         for property_name, property in self.schema_object.properties.items():
-            if property.inject_value and property_name in self.operation.store_params:
+            inject_value = getattr(property, "inject_value", None)
+            inject_on = getattr(property, "inject_on", None) or []
+            if not inject_value:
+                continue
+            if property_name in self.operation.store_params:
                 raise ApplicationException(
                     403,
-                    f"Property '{property_name}' is auto-injected and "
-                    + "cannot be set manually",
+                    f"Property '{property_name}' is auto-injected and cannot be set manually",
                 )
 
         for name, value in self.operation.store_params.items():
@@ -146,26 +147,19 @@ class SQLUpdateSchemaQueryHandler(SQLSchemaQueryHandler):
                     value
                 )
 
-        # Inject values from claims/timestamps/etc for properties with
-        # x-af-inject-value on UPDATE
         for property_name, property in self.schema_object.properties.items():
-            if property.inject_value and "update" in property.inject_on:
-                injected_value = self.extract_injected_value(property.inject_value)
-                if injected_value is not None:
-                    placeholder_key = f"__inject_{property_name}"
-                    column_name = property.column_name
-                    columns.append(
-                        f"{column_name} = {self.placeholder(property, placeholder_key)}"
-                    )
-                    self.store_placeholders[
-                        placeholder_key
-                    ] = property.convert_to_db_value(injected_value)
-                elif property.required:
-                    raise ApplicationException(
-                        400,
-                        f"Required injected property '{property_name}' "
-                        + f"could not be populated from '{property.inject_value}'",
-                    )
+            inject_value = getattr(property, "inject_value", None)
+            inject_on = getattr(property, "inject_on", None) or []
+            if not inject_value or "update" not in inject_on:
+                continue
+
+            placeholder = (
+                str(property.api_name) if property.api_name is not None else property_name
+            )
+            columns.append(f"{property.column_name} = {self.placeholder(property, placeholder)}")
+            self.store_placeholders[placeholder] = property.convert_to_db_value(
+                self.extract_injected_value(property)
+            )
 
         if invalid_columns:
             raise ApplicationException(

api_foundry_query_engine-0.8.62/api_foundry_query_engine/__init__.py

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