Remove mathoid PNG image support (#1324)

Remove mathoid PNG image support from RESTBase endpoint. * Stop storing PNG response from mathoid * Redirect PNG endpoint to SVG endpoint Bug: T334842
wikimedia · Jul 6, 2023 · 50152c4 · 50152c4
1 parent a1edf24
commit 50152c4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/sys/mathoid.js b/sys/mathoid.js
@@ -6,7 +6,7 @@ const URI = HyperSwitch.URI;
 const HTTPError = HyperSwitch.HTTPError;
 const mwUtil = require('../lib/mwUtil');
 
-const FORMATS = ['mml', 'svg', 'png'];
+const FORMATS = ['mml', 'svg'];
 
 function prefixHeaders(headers, prefix = 'x-store-') {
     const prefixedHeaders = {};
@@ -141,12 +141,6 @@ class MathoidService {
                 }, prefixHeaders(completeBody[format].headers)),
                 body: completeBody[format].body
             };
-            if (format === 'png' && reqObj.body && reqObj.body.type === 'Buffer') {
-                // for png, we need to convert the encoded data manually
-                // because we are receiving it wrapped inside a JSON
-                reqObj.body = Buffer.from(reqObj.body.data);
-                completeBody[format].body = reqObj.body;
-            }
             // store the emit Promise
             reqs[idx] = hyper.put(reqObj);
         }
@@ -162,7 +156,10 @@ class MathoidService {
     requestAndStore(hyper, req) {
         const rp = req.params;
         const hash = req.headers['x-resource-location'];
-
+        // T334842 redirect png traffic to svg endpoint.
+        if (rp.format === 'png') {
+            rp.format = 'svg';
+        }
         // first ask for all the renders from Mathoid
         return hyper.post({
             uri: `${this.options.host}/complete`,
@@ -297,7 +294,7 @@ module.exports = (options) => {
                 },
                 body: {
                     keyType: 'string',
-                    valueType: 'blob'
+                    valueType: 'string'
                 }
             }
         ]

diff --git a/test/features/mathoid.js b/test/features/mathoid.js
@@ -9,8 +9,8 @@ describe('Mathoid', function() {
     const server = new Server();
     const f = 'c^2 = a^2 + b^2';
     const nf = 'c^{2}=a^{2}+b^{2}';
-    const formats = ['mml', 'svg', 'png'];
-    const formats_regex = [/mathml/, /svg/, /png/];
+    const formats = ['mml', 'svg'];
+    const formatRegexp = [/mathml/, /svg/];
     let hash;
 
     before(() => server.start());
@@ -84,7 +84,7 @@ describe('Mathoid', function() {
 
     for (let i = 0; i < formats.length; i++) {
         const format = formats[i];
-        const regex = formats_regex[i];
+        const regex = formatRegexp[i];
         it(`gets the render in ${format}`, () => { // eslint-disable-line no-loop-func
             return preq.get({
                 uri: `${server.config.baseURL('wikimedia.org')}/media/math/render/${format}/${hash}`

diff --git a/v1/mathoid.yaml b/v1/mathoid.yaml
@@ -171,10 +171,6 @@ paths:
             application/mathml+xml:
               schema:
                 type: string
-            image/png:
-              schema:
-                type: string
-                format: binary
         404:
           description: Unknown format or hash ID
           content: