learning_model 1.0.18 → 1.0.22

package/README.md

@@ -14,4 +14,8 @@ package.json 버전을 올린다.
 yarn build
 npm login 
 npm publish
-```
+```
+
+
+## 패키지 설명 
+sharp: 라이브러리를 사용하여 'Buffer'를 'HTMLImageElement'로 변환 for testing에서 사용

package/jest.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+    preset: 'ts-jest',
+    testEnvironment: 'node',
+    // 기타 Jest 구성 옵션
+    testMatch: ['**/lib/learning/mobilenet_image.test.ts'],
+};

package/lib/learning/mobilenet_image.test.ts

@@ -0,0 +1,44 @@
+import * as path from 'path';
+import * as tf from '@tensorflow/tfjs';
+import LearningMobilenetImage from './mobilenet_image';
+import * as fs from 'fs';
+const { createCanvas, loadImage } = require('canvas');
+
+let imageTensor1: tf.Tensor3D;
+let imageTensor2: tf.Tensor3D;
+
+// 이미지경로를 기준으로
+async function ImagePathToTensor(imagePath: string): Promise<tf.Tensor3D> {
+  const imageBuffer = fs.readFileSync(imagePath);
+  const image = await loadImage(imageBuffer);
+  const canvas = createCanvas(image.width, image.height);
+  const ctx = canvas.getContext('2d');
+  ctx.drawImage(image, 0, 0);
+  const imageData = ctx.getImageData(0, 0, image.width, image.height);
+  return tf.tensor3d(imageData.data, [imageData.height, imageData.width, 4], 'int32');
+}
+
+describe('LearningMobilenetImage', () => {
+  const learning = new LearningMobilenetImage({});
+  
+  beforeAll(async () => {
+    const image1Path = path.join(__dirname, '../../public/images/image1.jpeg');
+    const image2Path = path.join(__dirname, '../../public/images/image2.jpeg');
+    imageTensor1 = await ImagePathToTensor(image1Path);
+    imageTensor2 = await ImagePathToTensor(image2Path);
+  });
+
+  test('loads an image and converts it to a tensor', () => {
+    expect(imageTensor1).toBeDefined();
+    expect(imageTensor1 instanceof tf.Tensor).toBe(true);
+    expect(imageTensor2).toBeDefined();
+    expect(imageTensor2 instanceof tf.Tensor).toBe(true);
+  });
+
+  test('mobilenet add data', () => {
+    learning.addData("라벨1", imageTensor1);
+    learning.addData("라벨1", imageTensor1);
+    learning.addData("라벨2", imageTensor2);
+    learning.addData("라벨2", imageTensor2);
+  });
+});

package/{src → lib}/learning/mobilenet_image.ts

@@ -6,6 +6,7 @@
 
 import * as tf from '@tensorflow/tfjs';
 import LearningInterface from './base';
+import { ImageToTensor } from './util';
 
 class LearningMobilenetImage implements LearningInterface {
   model: tf.LayersModel | null;
@@ -53,10 +54,11 @@ class LearningMobilenetImage implements LearningInterface {
 
   public onTrainEnd: (log: any) => void = () => {};
 
+  
   // 학습 데이타 등록 
   public async addData(label: string, data: any): Promise<void> {
     try {
-      const tensor = tf.browser.fromPixels(data);
+      const tensor = ImageToTensor(data)
       console.log('addData', tensor);
       this.trainImages.push(tensor)
       this.labels.push(label);

package/lib/learning/util.ts

@@ -0,0 +1,15 @@
+import * as tf from '@tensorflow/tfjs';
+
+export function ImageToTensor(data: any): tf.Tensor3D {
+    let tensor: tf.Tensor3D;
+
+    console.log('data', data instanceof tf.Tensor, typeof data);
+    if (data instanceof tf.Tensor) {
+        tensor = data;
+    } else {
+        tensor = tf.browser.fromPixels(data);
+    }
+
+    return tensor;
+}
+

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "learning_model",
-  "version": "1.0.18",
+  "version": "1.0.22",
   "description": "learning model develop",
   "main": "dist/index.js",
-  "types": "dist/types/index.d.ts",
+  "types": "dist/index.d.ts",
   "scripts": {
     "start": "webpack serve --open --mode development",
     "watch": "webpack --watch --mode=development",
     "build": "tsc && webpack",
     "tsc": "tsc",
-    "test": "jest"
+    "test": "npx jest"
   },
   "keywords": [
     "tensorflow"
@@ -21,7 +21,6 @@
     "@tensorflow/tfjs": "^4.6.0",
     "@tensorflow/tfjs-layers": "^4.6.0",
     "canvas": "^2.11.2",
-    "jest": "^29.5.0",
     "learning_model": "^1.0.0"
   },
   "devDependencies": {
@@ -34,8 +33,10 @@
     "css-loader": "^6.8.1",
     "glob": "^7.1.7",
     "html-webpack-plugin": "^5.5.1",
+    "jest": "^29.5.0",
     "style-loader": "^3.3.3",
     "terser-webpack-plugin": "^5.3.9",
+    "ts-jest": "^29.1.0",
     "ts-loader": "^9.4.3",
     "typescript": "^4.4.4",
     "webpack": "^5.51.1",

package/tsconfig.json

@@ -2,19 +2,17 @@
   "compilerOptions": {
     "target": "ES6",
     "module": "CommonJS",
-    "outDir": "build",
+    "outDir": "dist",
     "strict": true,
     "esModuleInterop": true,
-    "declarationDir": "./types",
+    "declarationDir": "./dist",
     "declaration": true,
     "skipLibCheck": true,
   },
   "include": [
-    "src/**/*.ts"
+    "lib/**/*.ts"
   ],
   "exclude": [
-    "node_modules", 
-    "src/**/*.test.ts",
-    "dist"
+    "node_modules"
   ]
 }