fix: failing tests on workflow creation

Clarifai · Mar 27, 2024 · 0237542 · 0237542
1 parent 80c4664
commit 0237542
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 37 deletions.
diff --git a/examples/app/createModel.ts b/examples/app/createModel.ts
@@ -1,5 +1,8 @@
 import { Model, App } from "../../src/index";
-import { OutputInfo } from "clarifai-nodejs-grpc/proto/clarifai/api/resources_pb";
+import {
+  ModelVersion,
+  OutputInfo,
+} from "clarifai-nodejs-grpc/proto/clarifai/api/resources_pb";
 import { Struct } from "google-protobuf/google/protobuf/struct_pb";
 
 const app = new App({
@@ -33,11 +36,12 @@ const model = new Model({
 const outputInfo = new OutputInfo().setParams(
   Struct.fromJavaScript({ margin: 1.5 }),
 );
+// GRPC compatible ModelVersion object with previously created output info config
+const modelVersion = new ModelVersion()
+  .setDescription("Setting output info margin parameters to 1.5")
+  .setOutputInfo(outputInfo);
 
 // Creating a new version of the model with previously created output info config
-const modelObjectWithVersion = await model.createVersion({
-  description: "Setting output info margin parameters to 1.5",
-  outputInfo: outputInfo.toObject(),
-});
+const modelObjectWithVersion = await model.createVersion(modelVersion);
 
 console.log(modelObjectWithVersion);
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -66,6 +66,7 @@
     "from-protobuf-object": "^1.0.2",
     "google-protobuf": "^3.21.2",
     "js-yaml": "^4.1.0",
+    "safe-flat": "^2.1.0",
     "uuidv4": "^6.2.13",
     "winston": "^3.11.0",
     "zod": "^3.22.4"

diff --git a/src/client/app.ts b/src/client/app.ts
@@ -35,6 +35,7 @@ import {
   Concept,
   Dataset,
   WorkflowNode,
+  ModelVersion,
 } from "clarifai-nodejs-grpc/proto/clarifai/api/resources_pb";
 import { TRAINABLE_MODEL_TYPES } from "../constants/model";
 import { StatusCode } from "clarifai-nodejs-grpc/proto/clarifai/api/status/status_code_pb";
@@ -46,6 +47,7 @@ import { Model as ModelConstructor } from "./model";
 import { uuid } from "uuidv4";
 import { fromProtobufObject } from "from-protobuf-object";
 import { fromPartialProtobufObject } from "../utils/fromPartialProtobufObject";
+import { flatten } from "safe-flat";
 
 export type AppConfig =
   | {
@@ -587,38 +589,14 @@ export class App extends Lister {
               userId: this.userAppId.getUserId(),
             },
           });
-          const modelWithVersion = await model.createVersion({
-            outputInfo: outputInfo.toObject(),
-          });
+          const modelVersion = new ModelVersion().setOutputInfo(outputInfo);
+          const modelWithVersion = await model.createVersion(modelVersion);
           if (modelWithVersion) {
             allModels.push(modelWithVersion);
             continue;
           }
         }
       }
-
-      // If the model version ID is specified, or if the yaml model is the same as the one in the api
-      // if (
-      //   (node.model.modelVersionId ?? "") ||
-      //   (modelObject && isSameYamlModel(modelObject, node.model))
-      // ) {
-      //   allModels.push(modelObject!);
-      // } else if (modelObject && outputInfo) {
-      //   const model = new ModelConstructor({
-      //     modelId: modelObject.id,
-      //     authConfig: {
-      //       pat: this.pat,
-      //       appId: this.userAppId.getAppId(),
-      //       userId: this.userAppId.getUserId(),
-      //     },
-      //   });
-      //   const modelWithVersion = await model.createVersion({
-      //     outputInfo: outputInfo.toObject(),
-      //   });
-      //   if (modelWithVersion) {
-      //     allModels.push(modelWithVersion);
-      //   }
-      // }
     }
 
     // Convert nodes to resources_pb2.WorkflowNodes.
@@ -671,7 +649,7 @@ export class App extends Lister {
 
     // Display the workflow nodes tree.
     if (display) {
-      console.table(responseObject.workflowsList?.[0]?.nodesList);
+      console.table(flatten(responseObject.workflowsList?.[0]?.nodesList));
     }
     return responseObject.workflowsList?.[0];
   }

diff --git a/src/client/model.ts b/src/client/model.ts
@@ -354,7 +354,7 @@ export class Model extends Lister {
   }
 
   async createVersion(
-    args: Partial<ModelVersion.AsObject>,
+    modelVersion: ModelVersion,
   ): Promise<GrpcModel.AsObject | undefined> {
     if (this.modelInfo.getModelTypeId() in TRAINABLE_MODEL_TYPES) {
       throw new UserError(
@@ -365,7 +365,6 @@ export class Model extends Lister {
     const request = new PostModelVersionsRequest();
     request.setUserAppId(this.userAppId);
     request.setModelId(this.id);
-    const modelVersion = fromPartialProtobufObject(ModelVersion, args);
     request.setModelVersionsList([modelVersion]);
 
     const postModelVersions = promisifyGrpcCall(

diff --git a/tests/client/workflow/workflowCrud.integration.test.ts b/tests/client/workflow/workflowCrud.integration.test.ts
@@ -59,14 +59,12 @@ describe("Workflow CRUD", () => {
   it(
     "should create workflow",
     {
-      timeout: 20000,
+      timeout: 50000,
     },
     async () => {
       for (let i = 0; i < workflowFixtureFiles.length; i++) {
         const file = workflowFixtureFiles[i];
         console.log("Testing file: ", file);
-        // TODO: remove this condition once the test case failure in custom_cropper models are fixed
-        if (file.includes("custom_cropper")) continue;
         const generateNewId = file.endsWith("general.yml") ? false : true;
         const workflow = await app.createWorkflow({
           configFilePath: file,