Fix various AI endpoint issues

changelog_entry.yaml

@@ -0,0 +1,8 @@
+- bump: minor
+  changes:
+    changed:
+    - Refactored AI endpoints to match new routes/services/jobs architecture
+    - Disabled default buffering on App Engine deployments for AI endpoints
+    - Updated relevant tests
+    added:
+    - Testing for simulation payload validators

policyengine_api/api.py

@@ -14,6 +14,10 @@
 
 # Endpoints
 from policyengine_api.routes.economy_routes import economy_bp
+from policyengine_api.routes.simulation_analysis_routes import (
+    simulation_analysis_bp,
+)
+from policyengine_api.routes.tracer_analysis_routes import tracer_analysis_bp
 from .endpoints import (
     get_home,
     get_metadata,
@@ -25,15 +29,13 @@
     get_policy_search,
     get_household_under_policy,
     get_calculate,
-    execute_simulation_analysis,
     set_user_policy,
     get_user_policy,
     update_user_policy,
     set_user_profile,
     get_user_profile,
     update_user_profile,
     get_simulations,
-    execute_tracer_analysis,
 )
 
 print("Initialising API...")
@@ -90,10 +92,12 @@
     )
 )
 
+# Routes for economy microsimulation
 app.register_blueprint(economy_bp, url_prefix="/<country_id>/economy")
 
-app.route("/<country_id>/simulation-analysis", methods=["POST"])(
-    execute_simulation_analysis
+# Routes for AI analysis of economy microsim runs
+app.register_blueprint(
+    simulation_analysis_bp, url_prefix="/<country_id>/simulation-analysis"
 )
 
 app.route("/<country_id>/user-policy", methods=["POST"])(set_user_policy)
@@ -112,8 +116,8 @@
 
 app.route("/simulations", methods=["GET"])(get_simulations)
 
-app.route("/<country_id>/tracer-analysis", methods=["POST"])(
-    execute_tracer_analysis
+app.register_blueprint(
+    tracer_analysis_bp, url_prefix="/<country_id>/tracer-analysis"
 )
 
 

policyengine_api/endpoints/__init__.py

@@ -16,13 +16,9 @@
     update_user_policy,
 )
 
-# from .economy import get_economic_impact
-from .simulation_analysis import execute_simulation_analysis
-
 from .user_profile import (
     set_user_profile,
     get_user_profile,
     update_user_profile,
 )
 from .simulation import get_simulations
-from .tracer_analysis import execute_tracer_analysis

policyengine_api/endpoints/household.py

@@ -11,7 +11,7 @@
 import json
 import logging
 from datetime import date
-from policyengine_api.helpers import validate_country
+from policyengine_api.utils.payload_validators import validate_country
 
 
 def add_yearly_variables(household, country_id):

policyengine_api/endpoints/metadata.py

@@ -1,4 +1,4 @@
-from policyengine_api.helpers import validate_country
+from policyengine_api.utils.payload_validators import validate_country
 from policyengine_api.country import COUNTRIES
 
 

policyengine_api/endpoints/policy.py

@@ -1,4 +1,4 @@
-from policyengine_api.helpers import validate_country
+from policyengine_api.utils.payload_validators import validate_country
 from policyengine_api.data import database
 from policyengine_api.utils import hash_object
 from policyengine_api.constants import COUNTRY_PACKAGE_VERSIONS