- Full API application, streamlined, de-duplication of document handling code into document_utils.py

- Added meta-data fields to DocumentVersion
- Docker container to support API

eveai_api/__init__.py

@@ -1,13 +1,13 @@
-from flask import Flask, jsonify
-from flask_jwt_extended import get_jwt_identity
-from common.extensions import db, api, jwt, minio_client
+from flask import Flask, jsonify, request
+from flask_jwt_extended import get_jwt_identity, verify_jwt_in_request
+from common.extensions import db, api_rest, jwt, minio_client, simple_encryption
 import os
 import logging.config
 
 from common.utils.database import Database
 from config.logging_config import LOGGING
-from .api.document_api import AddDocumentResource
-from .api.auth import TokenResource
+from .api.document_api import document_ns
+from .api.auth import auth_ns
 from config.config import get_config
 from common.utils.celery_utils import make_celery, init_celery
 from common.utils.eveai_exceptions import EveAIException
@@ -39,34 +39,51 @@ def create_app(config_file=None):
     # Register Necessary Extensions
     register_extensions(app)
 
+    # register Blueprints
+    register_namespaces(api_rest)
+
     # Error handler for the API
     @app.errorhandler(EveAIException)
     def handle_eveai_exception(error):
-        response = jsonify(error.to_dict())
-        response.status_code = error.status_code
-        return response
+        return {'message': str(error)}, error.status_code
 
-    @api.before_request
+    @app.before_request
     def before_request():
-        # Extract tenant_id from the JWT token
-        tenant_id = get_jwt_identity()
+        app.logger.debug(f'Before request: {request.method} {request.path}')
 
-        # Switch to the correct schema
-        Database(tenant_id).switch_schema()
+        # Check if this is a request to the token endpoint
+        if request.path == '/api/v1/token' and request.method == 'POST':
+            app.logger.debug('Token request detected, skipping JWT verification')
+            return
 
-    # Register resources
-    register_api_resources()
+        try:
+            verify_jwt_in_request(optional=True)
+            tenant_id = get_jwt_identity()
+            app.logger.debug(f'Tenant ID from JWT: {tenant_id}')
+
+            if tenant_id:
+                Database(tenant_id).switch_schema()
+                app.logger.debug(f'Switched to schema for tenant {tenant_id}')
+            else:
+                app.logger.debug('No tenant ID found in JWT')
+        except Exception as e:
+            app.logger.error(f'Error in before_request: {str(e)}')
+            # Don't raise the exception here, let the request continue
+            # The appropriate error handling will be done in the specific endpoints
+
+    return app
 
     return app
 
 
 def register_extensions(app):
     db.init_app(app)
-    api.init_app(app)
+    api_rest.init_app(app, title='EveAI API', version='1.0', description='EveAI API')
     jwt.init_app(app)
     minio_client.init_app(app)
+    simple_encryption.init_app(app)
 
 
-def register_api_resources():
-    api.add_resource(AddDocumentResource, '/api/v1/documents/add_document')
-    api.add_resource(TokenResource, '/api/v1/token')
+def register_namespaces(app):
+    api_rest.add_namespace(document_ns, path='/api/v1/documents')
+    api_rest.add_namespace(auth_ns, path='/api/v1')