-
Notifications
You must be signed in to change notification settings - Fork 2.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
NIFI-10953: Implement GCP Vision AI processors #6762
Changes from 1 commit
b230f2c
b4c6b5f
cf0b261
13d5c7a
edeea96
5319cdf
46ef59e
1148fed
bd6ff01
9ad69d5
7c9886b
8a44b4e
6b45ed7
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.nifi.processors.gcp.vision; | ||
|
||
import static org.apache.nifi.processors.gcp.util.GoogleUtils.GCP_CREDENTIALS_PROVIDER_SERVICE; | ||
|
||
import com.google.api.gax.core.FixedCredentialsProvider; | ||
import com.google.auth.oauth2.GoogleCredentials; | ||
import com.google.cloud.vision.v1.ImageAnnotatorClient; | ||
import com.google.cloud.vision.v1.ImageAnnotatorSettings; | ||
import java.io.IOException; | ||
import java.io.InputStream; | ||
import java.util.Arrays; | ||
import java.util.Collections; | ||
import java.util.HashSet; | ||
import java.util.List; | ||
import java.util.Set; | ||
import org.apache.commons.io.IOUtils; | ||
import org.apache.nifi.annotation.lifecycle.OnScheduled; | ||
import org.apache.nifi.components.PropertyDescriptor; | ||
import org.apache.nifi.flowfile.FlowFile; | ||
import org.apache.nifi.gcp.credentials.service.GCPCredentialsService; | ||
import org.apache.nifi.processor.AbstractProcessor; | ||
import org.apache.nifi.processor.ProcessContext; | ||
import org.apache.nifi.processor.ProcessSession; | ||
import org.apache.nifi.processor.Relationship; | ||
import org.apache.nifi.processor.exception.ProcessException; | ||
|
||
public abstract class AbstractGcpVisionProcessor extends AbstractProcessor { | ||
public static final String GCP_OPERATION_KEY = "operationKey"; | ||
|
||
public static final Relationship REL_SUCCESS = new Relationship.Builder().name("success") | ||
.description("FlowFiles are routed to success relationship").build(); | ||
public static final Relationship REL_FAILURE = new Relationship.Builder().name("failure") | ||
.description("FlowFiles are routed to failure relationship").build(); | ||
|
||
protected static final Set<Relationship> relationships = Collections.unmodifiableSet(new HashSet<>(Arrays.asList( | ||
REL_SUCCESS, | ||
REL_FAILURE | ||
))); | ||
|
||
private ImageAnnotatorClient vision; | ||
|
||
@Override | ||
public List<PropertyDescriptor> getSupportedPropertyDescriptors() { | ||
return Collections.unmodifiableList(Arrays.asList( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This collection should be extracted to a |
||
GCP_CREDENTIALS_PROVIDER_SERVICE) | ||
); | ||
} | ||
|
||
@Override | ||
public Set<Relationship> getRelationships() { | ||
return relationships; | ||
} | ||
|
||
@OnScheduled | ||
public void onScheduled(ProcessContext context) { | ||
final GCPCredentialsService gcpCredentialsService = | ||
context.getProperty(GCP_CREDENTIALS_PROVIDER_SERVICE).asControllerService(GCPCredentialsService.class); | ||
try { | ||
GoogleCredentials credentials = gcpCredentialsService.getGoogleCredentials(); | ||
FixedCredentialsProvider credentialsProvider = FixedCredentialsProvider.create(credentials); | ||
ImageAnnotatorSettings.Builder builder = ImageAnnotatorSettings.newBuilder().setCredentialsProvider(credentialsProvider); | ||
vision = ImageAnnotatorClient.create(builder.build()); | ||
} catch (Exception e) { | ||
getLogger().error("Failed to create vision client.", e); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The framework should know that the processor is incapable of doing it's job when this happens. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thx, fixed. |
||
} | ||
} | ||
|
||
protected String readFlowFile(final ProcessSession session, final FlowFile flowFile) { | ||
try (InputStream inputStream = session.read(flowFile)) { | ||
return new String(IOUtils.toByteArray(inputStream)); | ||
} catch (final IOException e) { | ||
throw new ProcessException("Read FlowFile Failed", e); | ||
} | ||
} | ||
|
||
protected ImageAnnotatorClient getVisionClient() { | ||
return this.vision; | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,104 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.nifi.processors.gcp.vision; | ||
|
||
import static org.apache.nifi.processors.gcp.util.GoogleUtils.GCP_CREDENTIALS_PROVIDER_SERVICE; | ||
|
||
import com.google.longrunning.Operation; | ||
import com.google.protobuf.ByteString; | ||
import com.google.protobuf.GeneratedMessageV3; | ||
import com.google.protobuf.InvalidProtocolBufferException; | ||
import com.google.protobuf.util.JsonFormat; | ||
import com.google.rpc.Status; | ||
import java.nio.charset.StandardCharsets; | ||
import java.util.Arrays; | ||
import java.util.Collections; | ||
import java.util.HashSet; | ||
import java.util.List; | ||
import java.util.Set; | ||
import org.apache.nifi.components.PropertyDescriptor; | ||
import org.apache.nifi.flowfile.FlowFile; | ||
import org.apache.nifi.processor.ProcessContext; | ||
import org.apache.nifi.processor.ProcessSession; | ||
import org.apache.nifi.processor.Relationship; | ||
import org.apache.nifi.processor.exception.ProcessException; | ||
|
||
abstract public class AbstractGetGcpVisionAnnotateOperationStatus extends AbstractGcpVisionProcessor { | ||
|
||
private static final String GCP_OPERATION_KEY = "operationKey"; | ||
|
||
public static final Relationship REL_RUNNING = new Relationship.Builder() | ||
.name("running") | ||
.description("The job is currently still being processed") | ||
.build(); | ||
public static final Relationship REL_ORIGINAL = new Relationship.Builder() | ||
.name("original") | ||
.description("Upon successful completion, the original FlowFile will be routed to this relationship.") | ||
.autoTerminateDefault(true) | ||
.build(); | ||
|
||
private static final Set<Relationship> relationships = Collections.unmodifiableSet(new HashSet<>(Arrays.asList( | ||
REL_ORIGINAL, | ||
REL_SUCCESS, | ||
REL_FAILURE, | ||
REL_RUNNING | ||
))); | ||
|
||
@Override | ||
public List<PropertyDescriptor> getSupportedPropertyDescriptors() { | ||
return Collections.unmodifiableList(Arrays.asList( | ||
GCP_CREDENTIALS_PROVIDER_SERVICE) | ||
); | ||
} | ||
|
||
@Override | ||
public Set<Relationship> getRelationships() { | ||
return relationships; | ||
} | ||
|
||
@Override | ||
public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException { | ||
FlowFile flowFile = session.get(); | ||
if (flowFile == null) { | ||
return; | ||
} | ||
try { | ||
String operationKey = flowFile.getAttribute(GCP_OPERATION_KEY); | ||
Operation operation = getVisionClient().getOperationsClient().getOperation(operationKey); | ||
getLogger().info(operation.toString()); | ||
if (operation.getDone() && !operation.hasError()) { | ||
GeneratedMessageV3 response = deserializeResponse(operation.getResponse().getValue()); | ||
FlowFile childFlowFile = session.create(flowFile); | ||
session.write(childFlowFile, out -> out.write(JsonFormat.printer().print(response).getBytes(StandardCharsets.UTF_8))); | ||
session.transfer(flowFile, REL_ORIGINAL); | ||
session.transfer(childFlowFile, REL_SUCCESS); | ||
} else if (!operation.getDone()) { | ||
session.transfer(flowFile, REL_RUNNING); | ||
} else { | ||
Status error = operation.getError(); | ||
getLogger().error("Failed to execute vision operation. Error code: {}, Error message: {}", error.getCode(), error.getMessage()); | ||
session.transfer(flowFile, REL_FAILURE); | ||
} | ||
} catch (Exception e) { | ||
getLogger().error("Fail to get GCP Vision operation's status", e); | ||
session.transfer(flowFile, REL_FAILURE); | ||
} | ||
} | ||
|
||
abstract protected GeneratedMessageV3 deserializeResponse(ByteString responseValue) throws InvalidProtocolBufferException; | ||
} |
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,53 @@ | ||||||||||||||||||||||||||||||||||||||
/* | ||||||||||||||||||||||||||||||||||||||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||||||||||||||||||||||||||||||||||||||
* contributor license agreements. See the NOTICE file distributed with | ||||||||||||||||||||||||||||||||||||||
* this work for additional information regarding copyright ownership. | ||||||||||||||||||||||||||||||||||||||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||||||||||||||||||||||||||||||||||||||
* (the "License"); you may not use this file except in compliance with | ||||||||||||||||||||||||||||||||||||||
* the License. You may obtain a copy of the License at | ||||||||||||||||||||||||||||||||||||||
* | ||||||||||||||||||||||||||||||||||||||
* http://www.apache.org/licenses/LICENSE-2.0 | ||||||||||||||||||||||||||||||||||||||
* | ||||||||||||||||||||||||||||||||||||||
* Unless required by applicable law or agreed to in writing, software | ||||||||||||||||||||||||||||||||||||||
* distributed under the License is distributed on an "AS IS" BASIS, | ||||||||||||||||||||||||||||||||||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||||||||||||||||||||||||||||||||||||
* See the License for the specific language governing permissions and | ||||||||||||||||||||||||||||||||||||||
* limitations under the License. | ||||||||||||||||||||||||||||||||||||||
*/ | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
package org.apache.nifi.processors.gcp.vision; | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
import com.google.api.gax.longrunning.OperationFuture; | ||||||||||||||||||||||||||||||||||||||
import com.google.api.gax.longrunning.OperationSnapshot; | ||||||||||||||||||||||||||||||||||||||
import com.google.protobuf.InvalidProtocolBufferException; | ||||||||||||||||||||||||||||||||||||||
import com.google.protobuf.Message; | ||||||||||||||||||||||||||||||||||||||
import java.io.IOException; | ||||||||||||||||||||||||||||||||||||||
import org.apache.nifi.flowfile.FlowFile; | ||||||||||||||||||||||||||||||||||||||
import org.apache.nifi.processor.ProcessContext; | ||||||||||||||||||||||||||||||||||||||
import org.apache.nifi.processor.ProcessSession; | ||||||||||||||||||||||||||||||||||||||
import org.apache.nifi.processor.exception.ProcessException; | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
public abstract class AbstractStartGcpVisionOperation extends AbstractGcpVisionProcessor { | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
@Override | ||||||||||||||||||||||||||||||||||||||
public void onTrigger(ProcessContext context, ProcessSession session) throws ProcessException { | ||||||||||||||||||||||||||||||||||||||
FlowFile flowFile = session.get(); | ||||||||||||||||||||||||||||||||||||||
if (flowFile == null) { | ||||||||||||||||||||||||||||||||||||||
return; | ||||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||||
try { | ||||||||||||||||||||||||||||||||||||||
OperationFuture asyncResponse = startOperation(session, flowFile); | ||||||||||||||||||||||||||||||||||||||
String operationName = ((OperationSnapshot) asyncResponse.getInitialFuture().get()).getName(); | ||||||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||||||||||||||||||||||||||||||||
session.putAttribute(flowFile, GCP_OPERATION_KEY, operationName); | ||||||||||||||||||||||||||||||||||||||
session.transfer(flowFile, REL_SUCCESS); | ||||||||||||||||||||||||||||||||||||||
} catch (Exception e) { | ||||||||||||||||||||||||||||||||||||||
getLogger().error("Fail to start GCP Vision operation", e); | ||||||||||||||||||||||||||||||||||||||
session.transfer(flowFile, REL_FAILURE); | ||||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
abstract protected Message fromJson(String json) throws IOException; | ||||||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. No need for this method to be declared here. In fact their implementation might be better off inlined into the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks, fixed. |
||||||||||||||||||||||||||||||||||||||
|
||||||||||||||||||||||||||||||||||||||
abstract protected OperationFuture startOperation(ProcessSession session, FlowFile flowFile) throws InvalidProtocolBufferException; | ||||||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There are multiple issues here. Each one is minor on it's own but overall an improvement is warranted in my option. First the issues:
My recommended improvement is to remove the
Suggested change
The two implementation would be fairly straightforward: public class StartGcpVisionAnnotateFilesOperation extends AbstractStartGcpVisionOperation<AsyncBatchAnnotateFilesRequest.Builder> {
@Override
AsyncBatchAnnotateFilesRequest.Builder newBuilder() {
return AsyncBatchAnnotateFilesRequest.newBuilder();
}
@Override
OperationFuture<?, ?> startOperation(AsyncBatchAnnotateFilesRequest.Builder builder) {
return getVisionClient().asyncBatchAnnotateFilesAsync(builder.build());
}
}
public class StartGcpVisionAnnotateImagesOperation extends AbstractStartGcpVisionOperation<AsyncBatchAnnotateImagesRequest.Builder> {
@Override
AsyncBatchAnnotateImagesRequest.Builder newBuilder() {
return AsyncBatchAnnotateImagesRequest.newBuilder();
}
@Override
OperationFuture<?, ?> startOperation(AsyncBatchAnnotateImagesRequest.Builder builder) {
return getVisionClient().asyncBatchAnnotateImagesAsync(builder.build());
}
} There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thank you, fixed based on you suggestion. |
||||||||||||||||||||||||||||||||||||||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.nifi.processors.gcp.vision; | ||
|
||
import com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse; | ||
import com.google.protobuf.ByteString; | ||
import com.google.protobuf.GeneratedMessageV3; | ||
import com.google.protobuf.InvalidProtocolBufferException; | ||
import org.apache.nifi.annotation.documentation.CapabilityDescription; | ||
import org.apache.nifi.annotation.documentation.SeeAlso; | ||
import org.apache.nifi.annotation.documentation.Tags; | ||
|
||
@Tags({"Google", "Cloud", "Vision", "Machine Learning"}) | ||
@CapabilityDescription("Retrieves the current status of an Google Vision operation.") | ||
@SeeAlso({StartGcpVisionAnnotateFilesOperation.class}) | ||
public class GetGcpVisionAnnotateFilesOperationStatus extends AbstractGetGcpVisionAnnotateOperationStatus { | ||
@Override | ||
protected GeneratedMessageV3 deserializeResponse(ByteString responseValue) throws InvalidProtocolBufferException { | ||
return AsyncBatchAnnotateFilesResponse.parseFrom(responseValue); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.nifi.processors.gcp.vision; | ||
|
||
import com.google.cloud.vision.v1.AsyncBatchAnnotateImagesResponse; | ||
import com.google.protobuf.ByteString; | ||
import com.google.protobuf.GeneratedMessageV3; | ||
import com.google.protobuf.InvalidProtocolBufferException; | ||
import org.apache.nifi.annotation.documentation.CapabilityDescription; | ||
import org.apache.nifi.annotation.documentation.SeeAlso; | ||
import org.apache.nifi.annotation.documentation.Tags; | ||
|
||
@Tags({"Google", "Cloud", "Vision", "Machine Learning"}) | ||
@CapabilityDescription("Retrieves the current status of an Google Vision operation.") | ||
@SeeAlso({StartGcpVisionAnnotateImagesOperation.class}) | ||
public class GetGcpVisionAnnotateImagesOperationStatus extends AbstractGetGcpVisionAnnotateOperationStatus { | ||
@Override | ||
protected GeneratedMessageV3 deserializeResponse(ByteString responseValue) throws InvalidProtocolBufferException { | ||
return AsyncBatchAnnotateImagesResponse.parseFrom(responseValue); | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
vision
should be closed in an@OnStopped
method.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you, fixed.