- Furter refinement of the API, adding functionality for refreshing documents and returning Token expiration time when retrieving token

- Implementation of a first version of a Wordpress plugin
- Adding api service to nginx.conf

eveai_api/__init__.py

@@ -50,9 +50,26 @@ def create_app(config_file=None):
     @app.before_request
     def before_request():
         app.logger.debug(f'Before request: {request.method} {request.path}')
+        app.logger.debug(f'Request URL: {request.url}')
+        app.logger.debug(f'Request headers: {dict(request.headers)}')
+
+        # Log request arguments
+        app.logger.debug(f'Request args: {request.args}')
+
+        # Log form data if it's a POST request
+        if request.method == 'POST':
+            app.logger.debug(f'Form data: {request.form}')
+
+        # Log JSON data if the content type is application/json
+        if request.is_json:
+            app.logger.debug(f'JSON data: {request.json}')
+
+        # Log raw data for other content types
+        if request.data:
+            app.logger.debug(f'Raw data: {request.data}')
 
         # Check if this is a request to the token endpoint
-        if request.path == '/api/v1/token' and request.method == 'POST':
+        if request.path == '/api/v1/auth/token' and request.method == 'POST':
             app.logger.debug('Token request detected, skipping JWT verification')
             return
 
@@ -73,8 +90,6 @@ def create_app(config_file=None):
 
     return app
 
-    return app
-
 
 def register_extensions(app):
     db.init_app(app)
@@ -86,4 +101,4 @@ def register_extensions(app):
 
 def register_namespaces(app):
     api_rest.add_namespace(document_ns, path='/api/v1/documents')
-    api_rest.add_namespace(auth_ns, path='/api/v1')
+    api_rest.add_namespace(auth_ns, path='/api/v1/auth')

eveai_api/api/auth.py

@@ -1,3 +1,5 @@
+from datetime import timedelta
+
 from flask_restx import Namespace, Resource, fields
 from flask_jwt_extended import create_access_token
 from common.models.user import Tenant
@@ -12,7 +14,8 @@ token_model = auth_ns.model('Token', {
 })
 
 token_response = auth_ns.model('TokenResponse', {
-    'access_token': fields.String(description='JWT access token')
+    'access_token': fields.String(description='JWT access token'),
+    'expires_in': fields.Integer(description='Token expiration time in seconds')
 })
 
 
@@ -56,11 +59,17 @@ class Token(Resource):
             current_app.logger.error(f"Invalid API key for tenant: {tenant_id}")
             return {'message': "Invalid API key"}, 401
 
+        # Get the JWT_ACCESS_TOKEN_EXPIRES setting from the app config
+        expires_delta = current_app.config.get('JWT_ACCESS_TOKEN_EXPIRES', timedelta(minutes=15))
+
         try:
             current_app.logger.debug(f"Creating access token for tenant: {tenant_id}")
-            access_token = create_access_token(identity=tenant_id)
+            access_token = create_access_token(identity=tenant_id, expires_delta=expires_delta)
             current_app.logger.debug("Access token created successfully")
-            return {'access_token': access_token}, 200
+            return {
+                'access_token': access_token,
+                'expires_in': expires_delta.total_seconds()
+            }, 200
         except Exception as e:
             current_app.logger.error(f"Error creating access token: {e}")
             return {'message': "Internal server error"}, 500

eveai_api/api/document_api.py

@@ -10,7 +10,8 @@ from werkzeug.utils import secure_filename
 from common.utils.document_utils import (
     create_document_stack, process_url, start_embedding_task,
     validate_file_type, EveAIInvalidLanguageException, EveAIDoubleURLException, EveAIUnsupportedFileType,
-    process_multiple_urls, get_documents_list, edit_document, refresh_document, edit_document_version
+    process_multiple_urls, get_documents_list, edit_document, refresh_document, edit_document_version,
+    refresh_document_with_info
 )
 
 
@@ -238,3 +239,75 @@ class DocumentVersionResource(Resource):
             return {'message': f'Document Version {updated_version.id} updated successfully'}, 200
         else:
             return {'message': f'Error updating document version: {error}'}, 400
+
+
+# Define the model for the request body of refresh_with_info
+refresh_document_model = document_ns.model('RefreshDocument', {
+    'name': fields.String(required=False, description='New name for the document'),
+    'language': fields.String(required=False, description='Language of the document'),
+    'user_context': fields.String(required=False, description='User context for the document'),
+    'user_metadata': fields.Raw(required=False, description='User metadata for the document')
+})
+
+
+@document_ns.route('/<int:document_id>/refresh')
+class RefreshDocument(Resource):
+    @jwt_required()
+    @document_ns.response(200, 'Document refreshed successfully')
+    @document_ns.response(404, 'Document not found')
+    def post(self, document_id):
+        """
+        Refresh a document without additional information
+        """
+        tenant_id = get_jwt_identity()
+        current_app.logger.info(f'Refreshing document {document_id} for tenant {tenant_id}')
+
+        try:
+            new_version, result = refresh_document(document_id)
+
+            if new_version:
+                return {
+                    'message': f'Document refreshed successfully. New version: {new_version.id}. Task ID: {result}',
+                    'document_id': document_id,
+                    'document_version_id': new_version.id,
+                    'task_id': result
+                }, 200
+            else:
+                return {'message': f'Error refreshing document: {result}'}, 400
+
+        except Exception as e:
+            current_app.logger.error(f'Error refreshing document: {str(e)}')
+            return {'message': 'Internal server error'}, 500
+
+
+@document_ns.route('/<int:document_id>/refresh_with_info')
+class RefreshDocumentWithInfo(Resource):
+    @jwt_required()
+    @document_ns.expect(refresh_document_model)
+    @document_ns.response(200, 'Document refreshed successfully')
+    @document_ns.response(400, 'Validation Error')
+    @document_ns.response(404, 'Document not found')
+    def post(self, document_id):
+        """
+        Refresh a document with new information
+        """
+        tenant_id = get_jwt_identity()
+        current_app.logger.info(f'Refreshing document {document_id} with info for tenant {tenant_id}')
+
+        try:
+            api_input = request.json
+            new_version, result = refresh_document_with_info(document_id, api_input)
+
+            if new_version:
+                return {
+                    'message': f'Document refreshed successfully with new info. New version: {new_version.id}. Task ID: {result}',
+                    'document_id': document_id,
+                    'document_version_id': new_version.id,
+                    'task_id': result
+                }, 200
+            else:
+                return {'message': f'Error refreshing document with info: {result}'}, 400
+
+        except Exception as e:
+            current_app.logger.error(f'Error refreshing document with info: {str(e)}')
+            return {'message': 'Internal server error'}, 500