Fix API Routing and Add Automated Testing

deployment/cloud-run/debug_api_import.py

@@ -17,23 +17,23 @@
     print("✅ Flask imported successfully")
 except Exception as e:
     print(f"❌ Flask import failed: {e}")
-    sys.exit(1)
+    raise RuntimeError(f"Flask import failed: {e}") from e
 
 try:
     print("2. Importing Flask-RESTX...")
     from flask_restx import Api, Resource, fields, Namespace
     print("✅ Flask-RESTX imported successfully")
 except Exception as e:
     print(f"❌ Flask-RESTX import failed: {e}")
-    sys.exit(1)
+    raise RuntimeError(f"Flask-RESTX import failed: {e}") from e
 
 try:
     print("3. Creating Flask app...")
     app = Flask(__name__)
     print("✅ Flask app created successfully")
 except Exception as e:
     print(f"❌ Flask app creation failed: {e}")
-    sys.exit(1)
+    raise RuntimeError(f"Flask app creation failed: {e}") from e
 
 try:
     print("4. Creating API object...")
@@ -47,7 +47,7 @@
     print(f"API object: {api}")
 except Exception as e:
     print(f"❌ API creation failed: {e}")
-    sys.exit(1)
+    raise RuntimeError(f"API creation failed: {e}") from e
 
 try:
     print("5. Testing API decorator...")
@@ -59,7 +59,7 @@ def test_handler(error):
     print(f"❌ API decorator test failed: {e}")
     print(f"API type at this point: {type(api)}")
     print(f"API value at this point: {api}")
-    sys.exit(1)
+    raise RuntimeError(f"API decorator test failed: {e}") from e
 
 try:
     print("6. Testing namespace creation...")
@@ -68,7 +68,7 @@ def test_handler(error):
     print("✅ Namespace test successful")
 except Exception as e:
     print(f"❌ Namespace test failed: {e}")
-    sys.exit(1)
+    raise RuntimeError(f"Namespace test failed: {e}") from e
 
 print("🎉 All tests passed! The issue is not with basic Flask-RESTX functionality.")
 

deployment/cloud-run/debug_errorhandler.py

@@ -17,7 +17,7 @@
     print("✅ Imports successful")
 except Exception as e:
     print(f"❌ Import failed: {e}")
-    sys.exit(1)
+    raise RuntimeError(f"Import failed: {e}") from e
 
 try:
     app = Flask(__name__)
@@ -30,7 +30,7 @@
     print("✅ API object created successfully")
 except Exception as e:
     print(f"❌ API creation failed: {e}")
-    sys.exit(1)
+    raise RuntimeError(f"API creation failed: {e}") from e
 
 # Let's inspect the API object in detail
 print(f"\n🔍 API object details:")

deployment/cloud-run/debug_errorhandler_detailed.py

@@ -3,8 +3,11 @@
 Detailed debug script to understand the errorhandler issue
 """
 
+# ruff: noqa: T201
+
 import os
-os.environ['ADMIN_API_KEY'] = 'test123'
+if __name__ == '__main__':
+    os.environ.setdefault('ADMIN_API_KEY', 'test-admin-key-123')
 
 print("🔍 Starting detailed errorhandler debug...")
 
@@ -14,15 +17,15 @@
     print("✅ Imports successful")
 except Exception as e:
     print(f"❌ Import failed: {e}")
-    exit(1)
+    raise RuntimeError(f"Import failed: {e}") from e
 
 try:
     app = Flask(__name__)
     api = Api(app, version='1.0.0', title='Test')
     print("✅ API object created")
 except Exception as e:
     print(f"❌ API creation failed: {e}")
-    exit(1)
+    raise RuntimeError(f"API creation failed: {e}") from e
 
 # Let's inspect the API object in detail
 print(f"\n🔍 API object details:")
@@ -56,7 +59,7 @@
     print(f"Bound call result: {type(result2)} - {result2}")
 
     # Let's check if there's a difference
-    print(f"\nResults are the same: {result == result2}")
+    print(f"\nSame object: {result is result2}")
 
 except Exception as e:
     print(f"❌ errorhandler testing failed: {e}")
@@ -70,9 +73,9 @@
 
 # Let's check if there's a version issue
 try:
-    import flask_restx
-    print(f"\n🔍 Flask-RESTX version: {flask_restx.__version__}")
-    print(f"Flask version: {flask.__version__}")
+    from importlib.metadata import version
+    print(f"\n🔍 Flask-RESTX version: {version('flask-restx')}")
+    print(f"Flask version: {version('flask')}")
 except Exception as e:
     print(f"❌ Could not get versions: {e}")
 

deployment/cloud-run/docs_blueprint.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import os
+from pathlib import Path
 from flask import Blueprint, Response, jsonify, render_template, g
 
 
@@ -11,13 +12,24 @@
 def serve_openapi_spec():
     """Serve OpenAPI spec for Swagger UI with safe path validation."""
     # Restrict spec path to a safe directory
-    allowed_dir = os.path.abspath(os.environ.get('OPENAPI_ALLOWED_DIR', '/app'))
+    allowed_dir = Path(os.environ.get('OPENAPI_ALLOWED_DIR', '/app')).resolve()
     spec_path = os.environ.get('OPENAPI_SPEC_PATH', '/app/openapi.yaml')
-    abs_spec_path = os.path.abspath(spec_path)
+    abs_spec_path = Path(spec_path).resolve()
 
     try:
         # Validate that the spec path is within the allowed directory
-        if os.path.commonpath([abs_spec_path, allowed_dir]) != allowed_dir:
+        # Use robust containment check compatible with older Python versions
+        try:
+            is_contained = abs_spec_path.is_relative_to(allowed_dir)
+        except AttributeError:
+            # Fallback for Python < 3.9
+            try:
+                is_contained = (os.path.commonpath([str(allowed_dir), str(abs_spec_path)]) == \
+                    str(allowed_dir))
+            except ValueError:
+                is_contained = False
+
+        if abs_spec_path.parent != allowed_dir and not is_contained:
             return jsonify({'error': 'Invalid OpenAPI spec path'}), 400
 
         with open(abs_spec_path, 'r', encoding='utf-8') as f:

deployment/cloud-run/health_monitor.py

@@ -4,7 +4,6 @@
 """
 
 import os
-import sys
 import time
 import signal
 import logging
@@ -60,7 +59,7 @@ def _graceful_shutdown(self, signum, frame):
         else:
             logger.info("Graceful shutdown completed successfully")
 
-        sys.exit(0)
+        raise SystemExit(0)
 
     def get_system_metrics(self) -> Dict[str, float]:
         """Get current system resource usage"""

deployment/cloud-run/minimal_test.py

@@ -4,7 +4,7 @@
 """
 
 import os
-os.environ['ADMIN_API_KEY'] = 'test123'
+os.environ.setdefault('ADMIN_API_KEY', os.environ.get('TEST_ADMIN_API_KEY', 'test-admin-key-123'))
 
 print("🔍 Starting minimal API setup test...")
 
@@ -15,15 +15,15 @@
     print("✅ Imports successful")
 except Exception as e:
     print(f"❌ Imports failed: {e}")
-    exit(1)
+    raise RuntimeError(f"Imports failed: {e}") from e
 
 try:
     print("2. Creating Flask app...")
     app = Flask(__name__)
     print("✅ Flask app created")
 except Exception as e:
     print(f"❌ Flask app creation failed: {e}")
-    exit(1)
+    raise RuntimeError(f"Flask app creation failed: {e}") from e
 
 try:
     print("3. Creating API object...")
@@ -36,7 +36,7 @@
     print(f"✅ API object created: {type(api)}")
 except Exception as e:
     print(f"❌ API creation failed: {e}")
-    exit(1)
+    raise RuntimeError(f"API creation failed: {e}") from e
 
 try:
     print("4. Creating namespace...")
@@ -45,7 +45,7 @@
     print("✅ Namespace added")
 except Exception as e:
     print(f"❌ Namespace creation failed: {e}")
-    exit(1)
+    raise RuntimeError(f"Namespace creation failed: {e}") from e
 
 try:
     print("5. Creating model...")
@@ -55,18 +55,20 @@
     print("✅ Model created")
 except Exception as e:
     print(f"❌ Model creation failed: {e}")
-    exit(1)
+    raise RuntimeError(f"Model creation failed: {e}") from e
 
 try:
     print("6. Testing errorhandler...")
-    @api.errorhandler(429)
+    from werkzeug.exceptions import TooManyRequests
+    @api.errorhandler(TooManyRequests)
     def test_handler(error):
+        """Return a canned 429 for debug validation."""
         return {"error": "test"}, 429
     print("✅ Error handler created")
 except Exception as e:
     print(f"❌ Error handler creation failed: {e}")
     print(f"API type at this point: {type(api)}")
     print(f"API errorhandler type: {type(api.errorhandler)}")
-    exit(1)
+    raise RuntimeError(f"Error handler creation failed: {e}") from e
 
 print("🎉 All tests passed!")