@financial-times/cp-content-pipeline-schema 3.5.1 → 3.6.0

package/src/model/Image.ts

@@ -11,8 +11,7 @@ import {
   validLiteralUnionValue,
 } from '../resolvers/literal-union'
 import { ImageFormat, ImageType } from '../resolvers/scalars'
-import isError from '../helpers/isError'
-import { BaseError, OperationalError } from '@dotcom-reliability-kit/errors'
+import { BaseError } from '@dotcom-reliability-kit/errors'
 import type { ImageSource } from '../generated'
 
 export type ImageSourceArgs = {
@@ -126,7 +125,7 @@ export class CAPIImage implements Image {
           args.maxDpr || Infinity,
           Math.floor(dimensions.width / maxAllowedWidth)
         )
-      : 1
+      : 2
 
     const resolutions = [...Array(maxDpr + 1).keys()].slice(1)
 
@@ -158,40 +157,17 @@ export class CAPIImage implements Image {
       }
     }
 
-    // HACK:KB:20241029 graphics don't publish pixelWidth/pixelHeight due to a
-    // known issue in Spark. we want to avoid calling Image Service to improve
-    // performance. skip calling Image Service for graphics for the time being
-    // https://financialtimes.slack.com/archives/C02NXHEEN7J/p1729770129991129
-    if(this.type() === 'graphic') {
-      this.context.logger.warn({
-        event: 'SKIPPING_GRAPHICS_DIMENSIONS',
-        message: 'Not calling Image Service to get graphics dimensions',
-        url: this.capiImage.binaryUrl
-      })
-
-      return null
-    }
-
-    try {
-      const imageMetadata = await this.#dataSources.origami.getImageMetadata(
-        this.capiImage.binaryUrl
-      )
-      return imageMetadata
-    } catch (error) {
-      if (isError(error)) {
-        this.context.logger.warn({
-          event: 'RECOVERABLE_ERROR',
-          error: new OperationalError({
-            code: 'IMAGE_DIMENSIONS_ERROR',
-            message: `Failed to get dimensions for ${this.capiImage.binaryUrl}`,
-            url: this.capiImage.binaryUrl,
-            cause: error,
-          }),
-        })
-      }
+    // HACK:KB:20241029 graphics and images in layouts don't have pixelWidth/
+    // pixelHeight because of reasons. we want to avoid calling Image Service
+    // to improve performance. skip calling Image Service for the time being
+    this.context.logger.warn({
+      event: 'SKIPPING_IMAGE_DIMENSIONS',
+      message: 'Not calling Image Service to get graphics dimensions',
+      url: this.capiImage.binaryUrl,
+      type: this.type(),
+    })
 
-      return null
-    }
+    return null
   }
 
   credit() {