Merge pull request #55 from ainize-team/feat/woojae/deployEventHandler

feat: add eventHandler
ainize-team · Sep 21, 2023 · 4e92490 · 4e92490
2 parents 97a6915 + 1718fc0
commit 4e92490
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/src/ainize.ts b/src/ainize.ts
@@ -48,21 +48,28 @@ export default class Ainize {
   }
 
   // FIXME(yoojin): add config type and change param type.
+  // TODO(yoojin, woojae): Deploy container, advanced.
   async deploy({modelName, billingConfig, serviceUrl}: deployConfig): Promise<Model> {
-    // TODO(yoojin, woojae): Deploy container, advanced.
-    const deployer = this.ain.getAddress();
-    if (!billingConfig) {
-      billingConfig = {
-        ...DEFAULT_BILLING_CONFIG,
-        depositAddress: deployer,
-      };
+    if(!this.ain.isDefaultAccountExist()) {
+      throw new Error('you should login first');
     }
-    // NOTE(yoojin): For test. We make fixed url on service.
-    if (!serviceUrl) {
-      serviceUrl = `https://${modelName}.ainetwork.xyz`;
-    }
-
-    await this.appController.createApp({ appName: modelName, serviceUrl, billingConfig });
+    const result = await new Promise(async (resolve, reject) => {
+      const deployer = this.ain.getAddress();
+      if (!billingConfig) {
+        billingConfig = {
+          ...DEFAULT_BILLING_CONFIG,
+          depositAddress: deployer,
+        };
+      }
+      // NOTE(yoojin): For test. We make fixed url on service.
+      if (!serviceUrl) {
+        serviceUrl = `https://${modelName}.ainetwork.xyz`;
+      }
+      const modelPath = Path.app(modelName).root();
+      await this.handler.subscribe(modelPath, resolve);
+      await this.appController.createApp({ appName: modelName, serviceUrl, billingConfig });
+    });
+    console.log(`${modelName} deploy success!`);
     return this.model(modelName);
   }
 

diff --git a/src/controllers/modelController.ts b/src/controllers/modelController.ts
@@ -82,7 +82,8 @@ export default class ModelController {
     const result = await new Promise(async (resolve, reject) => {
       const requestKey = Date.now();
       const requesterAddress = this.ain.getAddress();
-      await this.handler.subscribe(requesterAddress, requestKey.toString(), modelName, resolve);
+      const responsePath = Path.app(modelName).response(requesterAddress, requestKey.toString());
+      await this.handler.subscribe(responsePath, resolve);
       const requestPath = Path.app(modelName).request(requesterAddress, requestKey);
       const requestOp = buildSetOperation("SET_VALUE", requestPath, {prompt: requestData});
       const txBody = buildTxBody(requestOp);

diff --git a/src/handlers/handler.ts b/src/handlers/handler.ts
@@ -41,13 +41,13 @@ export default class Handler {
     }
   }
 
-  async subscribe(requester:string, recordId:string, appName: string, resolve: any) {
+  async subscribe(subscribePath: string, resolve: any) {
     this.checkEventManager();
-    const responsePath = Path.app(appName).response(requester, recordId);
+
     const subscribeId = await this.ain.getEventManager().subscribe(
       "VALUE_CHANGED",
       {
-        path: responsePath,
+        path: subscribePath,
         event_source: "USER",
       },
       (valueChangedEvent: any) => {