learning_model 1.0.33 → 1.0.36

package/dist/index.d.ts

@@ -1,4 +1,2 @@
-import LearningImage from './learning/image';
-import LearningMobilenetImage from './learning/mobilenet_image';
 import LearningMobilenet from './learning/mobilenet';
-export { LearningImage, LearningMobilenetImage, LearningMobilenet };
+export { LearningMobilenet };

package/dist/index.js

@@ -3,10 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LearningMobilenet = exports.LearningMobilenetImage = exports.LearningImage = void 0;
-const image_1 = __importDefault(require("./learning/image"));
-exports.LearningImage = image_1.default;
-const mobilenet_image_1 = __importDefault(require("./learning/mobilenet_image"));
-exports.LearningMobilenetImage = mobilenet_image_1.default;
+exports.LearningMobilenet = void 0;
 const mobilenet_1 = __importDefault(require("./learning/mobilenet"));
 exports.LearningMobilenet = mobilenet_1.default;

package/dist/learning/base.d.ts

@@ -16,5 +16,10 @@ interface LearningInterface {
     saveModel(handlerOrURL: io.IOHandler | string, config?: io.SaveConfig): Promise<void>;
     running(): boolean;
     ready(): boolean;
+    load({ jsonURL, binFile, labels }: {
+        jsonURL: string;
+        binFile: io.LoadOptions | undefined;
+        labels: Array<string>;
+    }): Promise<void>;
 }
 export default LearningInterface;

package/dist/learning/mobilenet.d.ts

@@ -34,6 +34,11 @@ declare class LearningMobilenet implements LearningInterface {
     onTrainBegin: (log: any) => void;
     onTrainEnd: (log: any) => void;
     onEpochEnd: (epoch: number, logs: any) => void;
+    load({ jsonURL, binFile, labels }: {
+        jsonURL: string;
+        binFile: io.LoadOptions | undefined;
+        labels: Array<string>;
+    }): Promise<void>;
     addData(label: string, data: any): Promise<void>;
     init(): Promise<void>;
     train(): Promise<tf.History>;

package/dist/learning/mobilenet.js

@@ -67,6 +67,25 @@ class LearningMobilenet {
         this.mobilenetModule = null;
         this.imageTensors = [];
     }
+    //
+    // 기존의 모델 로드
+    load({ jsonURL, binFile, labels }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (labels.length <= 0) {
+                return Promise.reject(new Error('Labels length is 0'));
+            }
+            try {
+                this.model = yield tf.loadLayersModel(jsonURL, binFile);
+                this.labels = labels;
+                this.isReady = true;
+                this.model.summary();
+            }
+            catch (error) {
+                console.error('Model load failed', error);
+                throw error;
+            }
+        });
+    }
     // 학습 데이타 등록 
     addData(label, data) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -163,6 +182,7 @@ class LearningMobilenet {
                 const inputData = this._preprocessedInputData(this.model);
                 console.log('this.imageTensors', this.imageTensors, inputData);
                 const targetData = this._preprocessedTargetData();
+                console.log('targetData', targetData);
                 const history = yield this.model.fit(inputData, targetData, {
                     epochs: this.epochs,
                     batchSize: this.batchSize,
@@ -210,6 +230,7 @@ class LearningMobilenet {
                 console.log('classId', classId, this.labels[classId]);
                 const predictionsData = yield predictions.data(); // 예측 텐서의 데이터를 비동기로 가져옴
                 const classProbabilities = new Map(); // 클래스별 확률 누적값을 저장할 맵
+                console.log('predictionsData', predictionsData);
                 const EPSILON = 1e-6; // 매우 작은 값을 표현하기 위한 엡실론
                 for (let i = 0; i < predictionsData.length; i++) {
                     let probability = Math.max(0, Math.min(1, predictionsData[i])); // 확률 값을 0과 1 사이로 조정

package/dist/lib/index.d.ts

@@ -1,4 +1,2 @@
-import LearningImage from './learning/image';
-import LearningMobilenetImage from './learning/mobilenet_image';
 import LearningMobilenet from './learning/mobilenet';
-export { LearningImage, LearningMobilenetImage, LearningMobilenet };
+export { LearningMobilenet };

package/dist/lib/learning/base.d.ts

@@ -16,5 +16,10 @@ interface LearningInterface {
     saveModel(handlerOrURL: io.IOHandler | string, config?: io.SaveConfig): Promise<void>;
     running(): boolean;
     ready(): boolean;
+    load({ jsonURL, binFile, labels }: {
+        jsonURL: string;
+        binFile: io.LoadOptions | undefined;
+        labels: Array<string>;
+    }): Promise<void>;
 }
 export default LearningInterface;

package/dist/lib/learning/mobilenet.d.ts

@@ -34,6 +34,11 @@ declare class LearningMobilenet implements LearningInterface {
     onTrainBegin: (log: any) => void;
     onTrainEnd: (log: any) => void;
     onEpochEnd: (epoch: number, logs: any) => void;
+    load({ jsonURL, binFile, labels }: {
+        jsonURL: string;
+        binFile: io.LoadOptions | undefined;
+        labels: Array<string>;
+    }): Promise<void>;
     addData(label: string, data: any): Promise<void>;
     init(): Promise<void>;
     train(): Promise<tf.History>;

package/lib/index.ts

@@ -1,5 +1,3 @@
-import LearningImage from './learning/image';
-import LearningMobilenetImage from './learning/mobilenet_image';    
-import LearningMobilenet from './learning/mobilenet';    
+  import LearningMobilenet from './learning/mobilenet';    
 
-export { LearningImage, LearningMobilenetImage, LearningMobilenet };
+export { LearningMobilenet };

package/lib/learning/base.ts

@@ -43,6 +43,9 @@ interface LearningInterface {
 
     // 모델 준비 여부
     ready(): boolean;
+
+    // 모델 로드
+    load({jsonURL, binFile, labels}: {jsonURL :string, binFile: io.LoadOptions | undefined, labels : Array<string>}): Promise<void>;
 }  
 
 export default LearningInterface;

package/lib/learning/mobilenet.ts

@@ -7,7 +7,6 @@
 import * as tf from '@tensorflow/tfjs';
 import { io } from '@tensorflow/tfjs-core';
 import LearningInterface from './base';
-import { ImageToTensor } from './util';
 
 class LearningMobilenet implements LearningInterface {
   model: tf.LayersModel | null;
@@ -65,6 +64,26 @@ class LearningMobilenet implements LearningInterface {
 
   public onEpochEnd: (epoch: number, logs: any) => void = () => {};
   
+  //
+  // 기존의 모델 로드
+  public async load({jsonURL, binFile, labels}: {jsonURL :string, binFile: io.LoadOptions | undefined, labels : Array<string>}): Promise<void> {
+    if (labels.length <= 0) {
+      return Promise.reject(new Error('Labels length is 0'));
+    }
+
+    try {
+      this.model = await tf.loadLayersModel(jsonURL, binFile);
+      this.labels = labels;
+      this.isReady = true;
+      this.model.summary();
+    } catch (error) {
+      console.error('Model load failed', error);
+      throw error;
+    }
+    
+  }
+
+
   // 학습 데이타 등록 
   public async addData(label: string, data: any): Promise<void> {
     try {
@@ -160,6 +179,7 @@ class LearningMobilenet implements LearningInterface {
 
       console.log('this.imageTensors', this.imageTensors, inputData);
       const targetData = this._preprocessedTargetData();
+      console.log('targetData', targetData);
       const history = await this.model.fit(inputData, targetData, {
         epochs: this.epochs,
         batchSize: this.batchSize,
@@ -207,7 +227,8 @@ class LearningMobilenet implements LearningInterface {
       console.log('classId', classId, this.labels[classId]);
       const predictionsData = await predictions.data(); // 예측 텐서의 데이터를 비동기로 가져옴
       const classProbabilities = new Map<string, number>(); // 클래스별 확률 누적값을 저장할 맵
-
+      
+      console.log('predictionsData', predictionsData);
       const EPSILON = 1e-6; // 매우 작은 값을 표현하기 위한 엡실론
       for (let i = 0; i < predictionsData.length; i++) {
         let probability = Math.max(0, Math.min(1, predictionsData[i])); // 확률 값을 0과 1 사이로 조정
@@ -262,6 +283,7 @@ class LearningMobilenet implements LearningInterface {
     console.log('oneHotEncode', oneHotEncode);
     return oneHotEncode
   }
+  
 
   // 입력 이미지 데이타 
   private _preprocessedInputData(model: tf.LayersModel): tf.Tensor<tf.Rank> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "learning_model",
-  "version": "1.0.33",
+  "version": "1.0.36",
   "description": "learning model develop",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/learning/image.d.ts

@@ -1,45 +0,0 @@
-import * as tf from '@tensorflow/tfjs';
-import { io } from '@tensorflow/tfjs-core';
-import LearningInterface from './base';
-declare class LearningImage implements LearningInterface {
-    model: tf.LayersModel | null;
-    epochs: number;
-    batchSize: number;
-    learningRate: number;
-    validateRate: number;
-    labels: string[];
-    isRunning: boolean;
-    isReady: boolean;
-    isTrainedDone: boolean;
-    limitSize: number;
-    trainImages: tf.Tensor3D[];
-    readonly MOBILE_NET_INPUT_WIDTH = 224;
-    readonly MOBILE_NET_INPUT_HEIGHT = 224;
-    readonly MOBILE_NET_INPUT_CHANNEL = 3;
-    readonly IMAGE_NORMALIZATION_FACTOR = 255;
-    constructor({ epochs, batchSize, limitSize, learningRate, validateRate, }?: {
-        modelURL?: string;
-        epochs?: number;
-        batchSize?: number;
-        limitSize?: number;
-        learningRate?: number;
-        validateRate?: number;
-    });
-    onProgress: (progress: number) => void;
-    onLoss: (loss: number) => void;
-    onEvents: (logs: any) => void;
-    onTrainBegin: (log: any) => void;
-    onTrainEnd: (log: any) => void;
-    onEpochEnd: (epoch: number, logs: any) => void;
-    addData(label: string, data: any): Promise<void>;
-    train(): Promise<tf.History>;
-    infer(data: any): Promise<Map<string, number>>;
-    saveModel(handlerOrURL: io.IOHandler | string, config?: io.SaveConfig): Promise<void>;
-    running(): boolean;
-    ready(): boolean;
-    private _preprocessedTargetData;
-    private _preprocessedInputData;
-    private _preprocessData;
-    private _createModel;
-}
-export default LearningImage;

package/dist/learning/image.js

@@ -1,285 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const tf = __importStar(require("@tensorflow/tfjs"));
-class LearningImage {
-    constructor({ epochs = 10, batchSize = 16, limitSize = 2, learningRate = 0.001, validateRate = 0.2, } = {}) {
-        this.trainImages = [];
-        this.MOBILE_NET_INPUT_WIDTH = 224;
-        this.MOBILE_NET_INPUT_HEIGHT = 224;
-        this.MOBILE_NET_INPUT_CHANNEL = 3;
-        this.IMAGE_NORMALIZATION_FACTOR = 255.0;
-        this.onProgress = () => { };
-        this.onLoss = () => { };
-        this.onEvents = () => { };
-        this.onTrainBegin = () => { };
-        this.onTrainEnd = () => { };
-        this.onEpochEnd = () => { };
-        this.model = null;
-        this.epochs = epochs;
-        this.batchSize = batchSize;
-        this.learningRate = learningRate;
-        this.validateRate = validateRate;
-        this.labels = [];
-        this.isRunning = false;
-        this.isReady = false;
-        this.isTrainedDone = false;
-        this.limitSize = 2;
-    }
-    // 학습 데이타 등록 
-    addData(label, data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const tensor = tf.browser.fromPixels(data);
-                console.log('addData', tensor);
-                this.trainImages.push(tensor);
-                this.labels.push(label);
-                if (this.labels.length >= this.limitSize) {
-                    this.isReady = true;
-                }
-                return Promise.resolve();
-            }
-            catch (error) {
-                console.error('Model training failed', error);
-                throw error;
-            }
-        });
-    }
-    // 모델 학습 처리
-    train() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.isRunning) {
-                return Promise.reject(new Error('Training is already in progress.'));
-            }
-            // 콜백 정의
-            const customCallback = {
-                onTrainBegin: (log) => {
-                    this.isTrainedDone = false;
-                    this.onTrainBegin(log);
-                    console.log('Training has started.');
-                },
-                onTrainEnd: (log) => {
-                    this.isTrainedDone = true;
-                    this.onTrainEnd(log);
-                    console.log('Training has ended.');
-                    this.isRunning = false;
-                },
-                onBatchBegin: (batch, logs) => {
-                    console.log(`Batch ${batch} is starting.`);
-                },
-                onBatchEnd: (batch, logs) => {
-                    console.log(`Batch ${batch} has ended.`);
-                },
-                onEpochBegin: (epoch, logs) => {
-                    console.log(`Epoch ${epoch + 1} is starting.`, logs);
-                },
-                onEpochEnd: (epoch, logs) => {
-                    console.log(`Epoch ${epoch + 1} has ended.`);
-                    this.onLoss(logs.loss);
-                    console.log('Loss:', logs);
-                    this.onEvents(logs);
-                    this.onProgress(epoch + 1);
-                }
-            };
-            try {
-                this.isRunning = true;
-                if (this.labels.length < this.limitSize) {
-                    return Promise.reject(new Error('Please train Data need over 2 data length'));
-                }
-                this.model = yield this._createModel(this.labels.length);
-                const inputData = this._preprocessedInputData(this.model);
-                console.log('inputData', inputData);
-                const targetData = this._preprocessedTargetData();
-                console.log('targetData', targetData);
-                const history = yield this.model.fit(inputData, targetData, {
-                    epochs: this.epochs,
-                    batchSize: this.batchSize,
-                    validationSplit: this.validateRate,
-                    callbacks: customCallback
-                });
-                console.log('Model training completed', history);
-                return history;
-            }
-            catch (error) {
-                this.isRunning = false;
-                console.error('Model training failed', error);
-                throw error;
-            }
-        });
-    }
-    // 추론하기
-    infer(data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.model === null) {
-                throw new Error('Model is null');
-            }
-            try {
-                const tensor = tf.browser.fromPixels(data);
-                const resizedTensor = tf.image.resizeBilinear(tensor, [this.MOBILE_NET_INPUT_WIDTH, this.MOBILE_NET_INPUT_HEIGHT]);
-                const reshapedTensor = resizedTensor.expandDims(0); // 배치 크기 1을 추가하여 4차원으로 변환
-                const predictions = this.model.predict(reshapedTensor);
-                const predictionsData = yield predictions.data(); // 예측 텐서의 데이터를 비동기로 가져옴
-                const classProbabilities = new Map(); // 클래스별 확률 누적값을 저장할 맵
-                for (let i = 0; i < predictionsData.length; i++) {
-                    const className = this.labels[i]; // 클래스 이름
-                    const probability = predictionsData[i];
-                    const existingProbability = classProbabilities.get(className);
-                    if (existingProbability !== undefined) {
-                        classProbabilities.set(className, existingProbability + probability);
-                    }
-                    else {
-                        classProbabilities.set(className, probability);
-                    }
-                }
-                console.log('Class Probabilities:', classProbabilities);
-                return classProbabilities;
-            }
-            catch (error) {
-                throw error;
-            }
-        });
-    }
-    // 모델 저장
-    saveModel(handlerOrURL, config) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            console.log('saved model');
-            if (!this.isTrainedDone) {
-                return Promise.reject(new Error('Train is not done status'));
-            }
-            yield ((_a = this.model) === null || _a === void 0 ? void 0 : _a.save(handlerOrURL, config));
-        });
-    }
-    // 진행중 여부
-    running() {
-        return this.isRunning;
-    }
-    ready() {
-        return this.isReady;
-    }
-    // target 라벨 데이타
-    _preprocessedTargetData() {
-        // 라벨 unique 처리 & 배열 리턴
-        console.log('uniqueLabels.length', this.labels, this.labels.length);
-        const labelIndices = this.labels.map((label) => this.labels.indexOf(label));
-        console.log('labelIndices', labelIndices);
-        const oneHotEncode = tf.oneHot(tf.tensor1d(labelIndices, 'int32'), this.labels.length);
-        console.log('oneHotEncode', oneHotEncode);
-        return oneHotEncode;
-    }
-    // 입력 이미지 데이타 
-    _preprocessedInputData(model) {
-        // 이미지 배열을 배치로 변환 - [null, 224, 224, 3]
-        const inputShape = model.inputs[0].shape;
-        console.log('inputShape', inputShape);
-        // inputShape를 이와 같이 포멧 맞춘다. for reshape to [224, 224, 3]
-        const inputShapeArray = inputShape.slice(1);
-        console.log('inputShapeArray', inputShapeArray);
-        const inputBatch = tf.stack(this.trainImages.map((image) => {
-            // 이미지 전처리 및 크기 조정 등을 수행한 후에
-            // 모델의 입력 형태로 변환하여 반환
-            const xs = this._preprocessData(image); // 전처리 함수는 사용자 정의해야 함
-            return tf.reshape(xs, inputShapeArray);
-        }));
-        return inputBatch;
-    }
-    // 모델 학습하기 위한 데이타 전처리 단계
-    _preprocessData(tensor) {
-        try {
-            // mobilenet model summary를 하면 위와 같이 224,224 사이즈의 입력값 설정되어 있다. ex) input_1 (InputLayer) [null,224,224,3]
-            const resizedImage = tf.image.resizeBilinear(tensor, [this.MOBILE_NET_INPUT_WIDTH, this.MOBILE_NET_INPUT_HEIGHT]);
-            // 이미지를 [0,1] 범위로 정규화 255로 나뉜 픽셀값
-            const normalizedImage = resizedImage.div(this.IMAGE_NORMALIZATION_FACTOR);
-            // expandDims(0)을 하여 차원을 추가하여 4D텐서 반환
-            return normalizedImage.expandDims(0);
-        }
-        catch (error) {
-            console.error('Failed to _preprocessData data', error);
-            throw error;
-        }
-    }
-    // 모델 저장
-    _createModel(numClasses) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const inputShape = [this.MOBILE_NET_INPUT_WIDTH, this.MOBILE_NET_INPUT_HEIGHT, this.MOBILE_NET_INPUT_CHANNEL];
-                const model = tf.sequential();
-                model.add(tf.layers.conv2d({
-                    activation: "relu",
-                    filters: 32,
-                    inputShape: inputShape,
-                    kernelSize: 3,
-                }));
-                model.add(tf.layers.conv2d({
-                    activation: "relu",
-                    filters: 32,
-                    kernelSize: 3,
-                }));
-                model.add(tf.layers.maxPooling2d({ poolSize: [2, 2] }));
-                model.add(tf.layers.conv2d({
-                    activation: "relu",
-                    filters: 64,
-                    kernelSize: 3,
-                }));
-                model.add(tf.layers.conv2d({
-                    activation: "relu",
-                    filters: 64,
-                    kernelSize: 3,
-                }));
-                model.add(tf.layers.maxPooling2d({ poolSize: [2, 2] }));
-                model.add(tf.layers.flatten());
-                model.add(tf.layers.dropout({ rate: 0.25 }));
-                model.add(tf.layers.dense({ units: 512, activation: "relu" }));
-                model.add(tf.layers.dropout({ rate: 0.5 }));
-                model.add(tf.layers.dense({
-                    units: numClasses,
-                    activation: 'softmax'
-                }));
-                const optimizer = tf.train.adam(this.learningRate); // Optimizer를 생성하고 학습률을 설정합니다.
-                model.compile({
-                    loss: (numClasses === 2) ? 'binaryCrossentropy' : 'categoricalCrossentropy',
-                    optimizer: optimizer,
-                    metrics: ['accuracy', 'acc']
-                });
-                model.summary();
-                return model;
-            }
-            catch (error) {
-                console.error('Failed to load model', error);
-                throw error;
-            }
-        });
-    }
-}
-exports.default = LearningImage;

package/dist/learning/mobilenet_image.d.ts

@@ -1,47 +0,0 @@
-import * as tf from '@tensorflow/tfjs';
-import { io } from '@tensorflow/tfjs-core';
-import LearningInterface from './base';
-declare class LearningMobilenetImage implements LearningInterface {
-    model: tf.LayersModel | null;
-    epochs: number;
-    batchSize: number;
-    learningRate: number;
-    validateRate: number;
-    labels: string[];
-    modelURL: string;
-    isRunning: boolean;
-    isReady: boolean;
-    isTrainedDone: boolean;
-    limitSize: number;
-    trainImages: tf.Tensor3D[];
-    readonly MOBILE_NET_INPUT_WIDTH = 224;
-    readonly MOBILE_NET_INPUT_HEIGHT = 224;
-    readonly MOBILE_NET_INPUT_CHANNEL = 3;
-    readonly IMAGE_NORMALIZATION_FACTOR = 255;
-    constructor({ modelURL, // 디폴트 mobilenet 이미지 
-    epochs, batchSize, limitSize, learningRate, validateRate, }?: {
-        modelURL?: string;
-        epochs?: number;
-        batchSize?: number;
-        limitSize?: number;
-        learningRate?: number;
-        validateRate?: number;
-    });
-    onProgress: (progress: number) => void;
-    onLoss: (loss: number) => void;
-    onEvents: (logs: any) => void;
-    onTrainBegin: (log: any) => void;
-    onTrainEnd: (log: any) => void;
-    onEpochEnd: (epoch: number, logs: any) => void;
-    addData(label: string, data: any): Promise<void>;
-    train(): Promise<tf.History>;
-    infer(data: any): Promise<Map<string, number>>;
-    saveModel(handlerOrURL: io.IOHandler | string, config?: io.SaveConfig): Promise<void>;
-    running(): boolean;
-    ready(): boolean;
-    private _preprocessedTargetData;
-    private _preprocessedInputData;
-    private _preprocessData;
-    private _createModel;
-}
-export default LearningMobilenetImage;