refactor(shared): move annotateRects to shared/img, remove unused bufferFromBase64

- Move annotateRects from evaluation/tests/util.ts to shared/src/img/box-select.ts
- Export annotateRects from @midscene/shared/img
- Remove unused bufferFromBase64 function from info.ts
- Remove unused imports in box-select.ts

Author: quanru

packages/evaluation/tests/util.ts

@@ -1,14 +1,15 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
 import type { PlanningAIResponse, Rect } from '@midscene/core';
-import { NodeType } from '@midscene/shared/constants';
 import {
-  compositeElementInfoImg,
+  annotateRects,
   imageInfoOfBase64,
   localImg2Base64,
 } from '@midscene/shared/img';
 import { WebPageContextParser } from '@midscene/web';
 
+export { annotateRects };
+
 export const repeatTime = 1;
 
 export type TestCase = {
@@ -220,26 +221,3 @@ export async function buildContext(pageName: string) {
   const context = await WebPageContextParser(fakePage as any, {});
   return context;
 }
-
-export async function annotateRects(
-  imgBase64: string,
-  rects: Rect[],
-  prompt?: string,
-) {
-  const markedImage = await compositeElementInfoImg({
-    inputImgBase64: imgBase64,
-    elementsPositionInfo: rects.map((rect, index) => {
-      return {
-        id: `rect-${index}`,
-        rect,
-        indexId: index + 1,
-        attributes: { nodeType: NodeType.CONTAINER },
-        content: '',
-        center: [rect.left + rect.width / 2, rect.top + rect.height / 2],
-      };
-    }),
-    annotationPadding: 0,
-    prompt,
-  });
-  return markedImage;
-}

packages/shared/src/img/box-select.ts

@@ -1,8 +1,8 @@
 import assert from 'node:assert';
 import type { PhotonImage as PhotonImageType } from '@silvia-odwyer/photon-node';
+import { NodeType } from '../constants';
 import type { BaseElement, Rect } from '../types';
 import getPhoton from './get-photon';
-import { bufferFromBase64, imageInfoOfBase64 } from './info';
 import { photonFromBase64, photonToBase64 } from './transform';
 
 // Simple 5x7 bitmap font for digits 0-9
@@ -548,3 +548,26 @@ export const processImageElementInfo = async (options: {
     compositeElementInfoImgWithoutTextBase64,
   };
 };
+
+export async function annotateRects(
+  imgBase64: string,
+  rects: Rect[],
+  prompt?: string,
+) {
+  const markedImage = await compositeElementInfoImg({
+    inputImgBase64: imgBase64,
+    elementsPositionInfo: rects.map((rect, index) => {
+      return {
+        id: `rect-${index}`,
+        rect,
+        indexId: index + 1,
+        attributes: { nodeType: NodeType.CONTAINER },
+        content: '',
+        center: [rect.left + rect.width / 2, rect.top + rect.height / 2],
+      };
+    }),
+    annotationPadding: 0,
+    prompt,
+  });
+  return markedImage;
+}

packages/shared/src/img/index.ts

@@ -1,8 +1,4 @@
-export {
-  imageInfoOfBase64,
-  bufferFromBase64,
-  isValidPNGImageBuffer,
-} from './info';
+export { imageInfoOfBase64, isValidPNGImageBuffer } from './info';
 export {
   resizeAndConvertImgBuffer,
   resizeImgBase64,
@@ -19,5 +15,9 @@ export {
   parseBase64,
   createImgBase64ByFormat,
 } from './transform';
-export { processImageElementInfo, compositeElementInfoImg } from './box-select';
+export {
+  processImageElementInfo,
+  compositeElementInfoImg,
+  annotateRects,
+} from './box-select';
 export { drawBoxOnImage, savePositionImg } from './draw-box';

packages/shared/src/img/info.ts

@@ -1,5 +1,4 @@
 import assert from 'node:assert';
-import { Buffer } from 'node:buffer';
 import type { Size } from '../types';
 import getPhoton from './get-photon';
 
@@ -25,11 +24,6 @@ export async function imageInfoOfBase64(
   return { width, height };
 }
 
-export async function bufferFromBase64(imageBase64: string): Promise<Buffer> {
-  const base64Data = imageBase64.replace(/^data:image\/\w+;base64,/, '');
-  return Buffer.from(base64Data, 'base64');
-}
-
 /**
  * Check if the Buffer is a valid PNG image
  * @param buffer The Buffer to check