diff --git a/VERSION b/VERSION index 5f0cfd2..08f8616 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -10.1.5 +10.1.6 diff --git a/package.json b/package.json index 7659bef..be56f70 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "clarifai-nodejs-grpc", - "version": "10.1.5", + "version": "10.1.6", "description": "The official Clarifai Node.js gRPC client", "main": "src/index.js", "repository": "https://github.com/Clarifai/clarifai-javascript-grpc", diff --git a/proto/clarifai/api/resources.proto b/proto/clarifai/api/resources.proto index c25f9c2..8ae9893 100644 --- a/proto/clarifai/api/resources.proto +++ b/proto/clarifai/api/resources.proto @@ -2224,8 +2224,6 @@ message And { Annotation annotation = 4; } - - // This is the search query used in /searches, model training requests, bulk data exports, etc. message Query { // The query syntax is simply a list of And operatiosn that will be ANDed together to fetch @@ -2822,6 +2820,7 @@ message NodeInput { } // WorkflowResult +// One result per input in the workflow. message WorkflowResult { string id = 1; clarifai.api.status.Status status = 2; @@ -2831,8 +2830,13 @@ message WorkflowResult { // the following from the API: // "2017-04-11T21:50:50.223962Z" google.protobuf.Timestamp created_at = 3; - Model model = 4; + // The model that this WorkflowResult is for. + // DEPRECATED: not sure why there ever was a model here because each output shows the model + // that process this given input. + Model model = 4 [deprecated = true]; + // The input that ran through the workflow to generate the outputs in this WorkflowResult. Input input = 5; + // For each model in the workflow we return an Output. repeated Output outputs = 6; // Indicate if the output of this model is suppressed. bool suppress_output = 7; diff --git a/proto/clarifai/api/service.proto b/proto/clarifai/api/service.proto index 87f74a0..26fc2cf 100644 --- a/proto/clarifai/api/service.proto +++ b/proto/clarifai/api/service.proto @@ -612,7 +612,6 @@ service V2 { - // Patch one or more inputs. rpc PatchInputs (PatchInputsRequest) returns (MultiInputResponse) { option (google.api.http) = { @@ -1740,6 +1739,11 @@ service V2 { // Add a workflow to an app. + // Note(zeiler): the order of the workflows that are returned from this endpoint + // may be different than the order in which the user provides them. This is because + // we reorder by a sort that optimizes for performance of the graph and its dependencies. + // When using the workflow in any future call the order returned by this endpoint + // will be used. rpc PostWorkflows (PostWorkflowsRequest) returns (MultiWorkflowResponse) { option (google.api.http) = { post: "/v2/users/{user_app_id.user_id}/apps/{user_app_id.app_id}/workflows" @@ -2372,7 +2376,6 @@ service V2 { option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Delete; } - // List all the annotation filters. rpc ListAnnotationFilters (ListAnnotationFiltersRequest) returns (MultiAnnotationFilterResponse) { option (google.api.http) = { @@ -4481,7 +4484,6 @@ message PostInputsRequest { - // PatchInputsRequest message PatchInputsRequest { clarifai.api.UserAppIDSet user_app_id = 1; @@ -5590,6 +5592,7 @@ message MultiModelReferenceResponse { // MultiOutputResponse message MultiOutputResponse { clarifai.api.status.Status status = 1; + // For each input processed during model prediction we create one output. repeated Output outputs = 2 [(clarifai.api.utils.cl_show_if_empty) = true]; } @@ -5753,6 +5756,7 @@ message DeleteSearchRequest { } + // Execute a new annotation search and optionally save it // annotation search over annotations using rank and filter proto message PostAnnotationsSearchesRequest { diff --git a/proto/clarifai/api/service_grpc_pb.js b/proto/clarifai/api/service_grpc_pb.js index bc8ef54..95122c3 100644 --- a/proto/clarifai/api/service_grpc_pb.js +++ b/proto/clarifai/api/service_grpc_pb.js @@ -4687,6 +4687,11 @@ listWorkflows: { responseDeserialize: deserialize_clarifai_api_MultiWorkflowResponse, }, // Add a workflow to an app. +// Note(zeiler): the order of the workflows that are returned from this endpoint +// may be different than the order in which the user provides them. This is because +// we reorder by a sort that optimizes for performance of the graph and its dependencies. +// When using the workflow in any future call the order returned by this endpoint +// will be used. postWorkflows: { path: '/clarifai.api.V2/PostWorkflows', requestStream: false, diff --git a/proto/clarifai/api/service_processed.proto b/proto/clarifai/api/service_processed.proto index f4cb6e0..44b6b37 100644 --- a/proto/clarifai/api/service_processed.proto +++ b/proto/clarifai/api/service_processed.proto @@ -612,7 +612,6 @@ service V2 { - // Patch one or more inputs. rpc PatchInputs (PatchInputsRequest) returns (MultiInputResponse) { option (google.api.http) = { @@ -1740,6 +1739,11 @@ service V2 { // Add a workflow to an app. + // Note(zeiler): the order of the workflows that are returned from this endpoint + // may be different than the order in which the user provides them. This is because + // we reorder by a sort that optimizes for performance of the graph and its dependencies. + // When using the workflow in any future call the order returned by this endpoint + // will be used. rpc PostWorkflows (PostWorkflowsRequest) returns (MultiWorkflowResponse) { option (google.api.http) = { post: "/v2/users/{user_app_id.user_id}/apps/{user_app_id.app_id}/workflows" @@ -2372,7 +2376,6 @@ service V2 { option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Delete; } - // List all the annotation filters. rpc ListAnnotationFilters (ListAnnotationFiltersRequest) returns (MultiAnnotationFilterResponse) { option (google.api.http) = { @@ -4481,7 +4484,6 @@ message PostInputsRequest { - // PatchInputsRequest message PatchInputsRequest { clarifai.api.UserAppIDSet user_app_id = 1; @@ -5590,6 +5592,7 @@ message MultiModelReferenceResponse { // MultiOutputResponse message MultiOutputResponse { clarifai.api.status.Status status = 1; + // For each input processed during model prediction we create one output. repeated Output outputs = 2 [(clarifai.api.utils.cl_show_if_empty) = true]; } @@ -5753,6 +5756,7 @@ message DeleteSearchRequest { } + // Execute a new annotation search and optionally save it // annotation search over annotations using rank and filter proto message PostAnnotationsSearchesRequest {