YDA-5956: experimental support for response and API caching

UtrechtUniversity · Mar 4, 2025 · 0b360ad · 0b360ad
1 parent 5b75f2f
commit 0b360ad
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/docker/images/yoda_portal/yoda_portal_init.sh b/docker/images/yoda_portal/yoda_portal_init.sh
@@ -97,6 +97,7 @@ DATAREQUEST_ENABLED = True
 TOKENS_ENABLED      = True
 TOKEN_LIFETIME      = 72
 SRAM_ENABLED        = False
+CACHING_ENABLED     = False
 
 # Logging configuration
 LOG_API_CALL_DURATION       = True
@@ -206,7 +207,7 @@ UPLOAD_PART_FILES              = True
 TEXT_FILE_EXTENSIONS = ['bash', 'csv', 'c', 'cpp', 'csharp', 'css', 'diff', 'fortran', 'gams', 'gauss', 'go', 'graphql', 'ini', 'irpf90', 'java', 'js', 'json', 'julia', 'julia-repl', 'kotlin', 'less', 'lua', 'makefile', 'markdown', 'md', 'mathematica', 'matlab', 'maxima', 'mizar', 'objectivec', 'openscad', 'perl', 'php', 'php-template', 'plaintext', 'txt', 'python', 'py', 'python-repl', 'r', 'ruby', 'rust', 'sas', 'scilab', 'scss', 'shell', 'sh', 'sql', 'stan', 'stata', 'swift', 'typescript', 'ts', 'vbnet', 'wasm', 'xml', 'yaml', 'html']
 
 # Monitor thread configuration
-MONITOR_OUTPUT_DIR = "/tmp"
+MONITOR_OUTPUT_DIR  = "/tmp"
 MONITOR_SIGNAL_FILE = "/var/www/yoda/show-tech.sig"
 
 FLASKCFG

diff --git a/roles/yoda_portal/defaults/main.yml b/roles/yoda_portal/defaults/main.yml
@@ -29,7 +29,7 @@ yoda_theme_mapping:
   wur: "Wageningen University & Research"
 
 # Yoda portal
-yoda_portal_version: "{{ yoda_version }}"
+yoda_portal_version: "portal-caching"
 yoda_portal_log_api_call_duration: false
 yoda_portal_path: /var/www/yoda              # Path to location of portal
 yoda_config_path: '/var/www/yoda/config' # Path to portal's shared configuration
@@ -84,6 +84,9 @@ token_lifetime: 72                                 # Lifetime of data access tok
 # SRAM Configuration
 enable_sram: false                                 # Enable SRAM configuration
 
+# Portal caching
+enable_portal_caching: false
+
 # Apache timeout for Yoda portal vhost in seconds
 yoda_portal_timeout: 60
 

diff --git a/roles/yoda_portal/meta/main.yml b/roles/yoda_portal/meta/main.yml
@@ -16,3 +16,5 @@ dependencies:
   - role: apache
   - role: apache_wsgi
   - role: certificates
+  - role: redis
+    when: "enable_portal_caching"
diff --git a/roles/yoda_portal/templates/flask.cfg.j2 b/roles/yoda_portal/templates/flask.cfg.j2
@@ -14,6 +14,7 @@ DATAREQUEST_ENABLED = {{ enable_datarequest }}
 TOKENS_ENABLED      = {{ enable_tokens }}
 TOKEN_LIFETIME      = {{ token_lifetime }}
 SRAM_ENABLED        = {{ enable_sram }}
+CACHING_ENABLED     = {{ enable_portal_caching }}
 
 # Logging configuration
 LOG_API_CALL_DURATION       = {{ yoda_portal_log_api_call_duration }}