This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push: new 49d13d9de69 CAMEL-21508: Create a KServe component (#1345) 49d13d9de69 is described below commit 49d13d9de69e570fa5e30acc685fee3a2bc11cd2 Author: Tadayoshi Sato <sato.tadayo...@gmail.com> AuthorDate: Fri Jan 17 21:00:59 2025 +0900 CAMEL-21508: Create a KServe component (#1345) * Regen * CAMEL-21508: Create a KServe component --- .../camel/springboot/catalog/components.properties | 1 + .../camel/springboot/catalog/components/kafka.json | 4 +- .../springboot/catalog/components/kserve.json | 49 +++++ .../catalog/components/tensorflow-serving.json | 6 +- .../camel-kafka-starter/src/main/docs/kafka.json | 2 +- .../springboot/KafkaComponentConfiguration.java | 2 +- components-starter/camel-kserve-starter/pom.xml | 48 +++++ .../camel-kserve-starter/src/main/docs/kserve.json | 88 +++++++++ .../KServeComponentAutoConfiguration.java | 77 ++++++++ .../springboot/KServeComponentConfiguration.java} | 93 +++++----- .../springboot/KServeComponentConverter.java | 65 +++++++ .../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 11 ++ ...rk.boot.autoconfigure.AutoConfiguration.imports | 19 ++ .../src/main/docs/tensorflow-serving.json | 2 +- .../TensorFlowServingComponentConfiguration.java | 2 +- components-starter/pom.xml | 1 + tooling/camel-spring-boot-bom/pom.xml | 5 + tooling/camel-spring-boot-dependencies/pom.xml | 10 + 19 files changed, 633 insertions(+), 55 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties index de006f88508..fe119489140 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties @@ -189,6 +189,7 @@ jte kafka kamelet knative +kserve kubernetes-config-maps kubernetes-cronjob kubernetes-custom-resources diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json index 048ca688279..c07c3966079 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json @@ -24,7 +24,7 @@ "remote": true }, "componentProperties": { - "additionalProperties": { "index": 0, "kind": "property", "displayName": "Additional Properties", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "additionalProperties.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Sets [...] + "additionalProperties": { "index": 0, "kind": "property", "displayName": "Additional Properties", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "additionalProperties.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Sets [...] "brokers": { "index": 1, "kind": "property", "displayName": "Brokers", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "URL of the Kafka brokers to use. The format is host1:port1,host2:port2, and the list can be a subset of brokers or a VIP [...] "clientId": { "index": 2, "kind": "property", "displayName": "Client Id", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The client id is a user-specified string sent in each request to help trace calls. It should logically identify the a [...] "configuration": { "index": 3, "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.kafka.KafkaConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "Allows to pre-configure the Kafka component with common options that the endpoints will reuse." }, @@ -158,7 +158,7 @@ }, "properties": { "topic": { "index": 0, "kind": "path", "displayName": "Topic", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Name of the topic to use. On the consumer you can use comma to separate multiple topics. A producer can on [...] - "additionalProperties": { "index": 1, "kind": "parameter", "displayName": "Additional Properties", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "additionalProperties.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Sets [...] + "additionalProperties": { "index": 1, "kind": "parameter", "displayName": "Additional Properties", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "additionalProperties.", "multiValue": true, "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Sets [...] "brokers": { "index": 2, "kind": "parameter", "displayName": "Brokers", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "URL of the Kafka brokers to use. The format is host1:port1,host2:port2, and the list can be a subset of brokers or a VI [...] "clientId": { "index": 3, "kind": "parameter", "displayName": "Client Id", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The client id is a user-specified string sent in each request to help trace calls. It should logically identify the [...] "headerFilterStrategy": { "index": 4, "kind": "parameter", "displayName": "Header Filter Strategy", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "To use a custom HeaderFilterStrategy to filter header to and from [...] diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kserve.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kserve.json new file mode 100644 index 00000000000..3d43ffa899f --- /dev/null +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kserve.json @@ -0,0 +1,49 @@ +{ + "component": { + "kind": "component", + "name": "kserve", + "title": "KServe", + "description": "Provide access to AI model servers with the KServe standard to run inference with remote models", + "deprecated": false, + "firstVersion": "4.10.0", + "label": "ai", + "javaType": "org.apache.camel.component.kserve.KServeComponent", + "supportLevel": "Preview", + "groupId": "org.apache.camel.springboot", + "artifactId": "camel-kserve-starter", + "version": "4.10.0-SNAPSHOT", + "scheme": "kserve", + "extendsScheme": "", + "syntax": "kserve:api", + "async": false, + "api": false, + "consumerOnly": false, + "producerOnly": true, + "lenientProperties": false, + "browsable": false, + "remote": true + }, + "componentProperties": { + "configuration": { "index": 0, "kind": "property", "displayName": "Configuration", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.kserve.KServeConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "The configuration." }, + "modelName": { "index": 1, "kind": "property", "displayName": "Model Name", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kserve.KServeConfiguration", "configurationField": "configuration", "description": "The name of the model used for inference." }, + "modelVersion": { "index": 2, "kind": "property", "displayName": "Model Version", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kserve.KServeConfiguration", "configurationField": "configuration", "description": "The version of the model used for inference." }, + "target": { "index": 3, "kind": "property", "displayName": "Target", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "localhost:8001", "configurationClass": "org.apache.camel.component.kserve.KServeConfiguration", "configurationField": "configuration", "description": "The target URI of the client. See: https:\/\/grpc.github.io\/grpc-java\/javadoc\/io\/g [...] + "lazyStartProducer": { "index": 4, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...] + "autowiredEnabled": { "index": 5, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching t [...] + "healthCheckConsumerEnabled": { "index": 6, "kind": "property", "displayName": "Health Check Consumer Enabled", "group": "health", "label": "health", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Used for enabling or disabling all consumer based health checks from this component" }, + "healthCheckProducerEnabled": { "index": 7, "kind": "property", "displayName": "Health Check Producer Enabled", "group": "health", "label": "health", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Used for enabling or disabling all producer based health checks from this component. Notice: Camel has by default disabled all producer based health-checks. You can turn on producer [...] + "credentials": { "index": 8, "kind": "property", "displayName": "Credentials", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "io.grpc.ChannelCredentials", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kserve.KServeConfiguration", "configurationField": "configuration", "description": "The credentials of the client." } + }, + "headers": { + "CamelKServeModelName": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The name of the model used for inference.", "constantName": "org.apache.camel.component.kserve.KServeConstants#MODEL_NAME" }, + "CamelKServeModelVersion": { "index": 1, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The version of the model used for inference.", "constantName": "org.apache.camel.component.kserve.KServeConstants#MODEL_VERSION" } + }, + "properties": { + "api": { "index": 0, "kind": "path", "displayName": "Api", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "infer", "model\/ready", "model\/metadata", "server\/ready", "server\/live", "server\/metadata" ], "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The KServe API" }, + "modelName": { "index": 1, "kind": "parameter", "displayName": "Model Name", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kserve.KServeConfiguration", "configurationField": "configuration", "description": "The name of the model used for inference." }, + "modelVersion": { "index": 2, "kind": "parameter", "displayName": "Model Version", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kserve.KServeConfiguration", "configurationField": "configuration", "description": "The version of the model used for inference." }, + "target": { "index": 3, "kind": "parameter", "displayName": "Target", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "localhost:8001", "configurationClass": "org.apache.camel.component.kserve.KServeConfiguration", "configurationField": "configuration", "description": "The target URI of the client. See: https:\/\/grpc.github.io\/grpc-java\/javadoc\/io\/ [...] + "lazyStartProducer": { "index": 4, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produc [...] + "credentials": { "index": 5, "kind": "parameter", "displayName": "Credentials", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "io.grpc.ChannelCredentials", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.kserve.KServeConfiguration", "configurationField": "configuration", "description": "The credentials of the client." } + } +} diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/tensorflow-serving.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/tensorflow-serving.json index 0a132a7fb0c..e1a597ae72d 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/tensorflow-serving.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/tensorflow-serving.json @@ -29,13 +29,13 @@ "modelVersion": { "index": 2, "kind": "property", "displayName": "Model Version", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration", "configurationField": "configuration", "description": "Optional choice of which version of the model to use. Use this specific version number." }, "modelVersionLabel": { "index": 3, "kind": "property", "displayName": "Model Version Label", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration", "configurationField": "configuration", "description": "Optional choice of which version of the model to use. Use the version ass [...] "signatureName": { "index": 4, "kind": "property", "displayName": "Signature Name", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration", "configurationField": "configuration", "description": "A named signature to evaluate. If unspecified, the default signature will be used." }, - "target": { "index": 5, "kind": "property", "displayName": "Target", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "localhost:8500", "configurationClass": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration", "configurationField": "configuration", "description": "The target URI of the client. See: https:\/\/grpc.github.io\/gr [...] + "target": { "index": 5, "kind": "property", "displayName": "Target", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "localhost:8500", "configurationClass": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration", "configurationField": "configuration", "description": "The target URI of the client. See: https:\/\/grpc.github.io\/gr [...] "lazyStartProducer": { "index": 6, "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail [...] "autowiredEnabled": { "index": 7, "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching t [...] "credentials": { "index": 8, "kind": "property", "displayName": "Credentials", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "io.grpc.ChannelCredentials", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration", "configurationField": "configuration", "description": "The credentials of the client." } }, "headers": { - "CamelTensorFlowServingTarget": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The target of the client. See: https:\/\/grpc.github.io\/grpc-java\/javadoc\/io\/grpc\/Grpc.html#newChannelBuilder(java.lang.String,io.grpc.ChannelCredentials)", "constantName": "org.apache.camel.component.tensorflow.serving.TensorFl [...] + "CamelTensorFlowServingTarget": { "index": 0, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The target of the client. See: https:\/\/grpc.github.io\/grpc-java\/javadoc\/io\/grpc\/Grpc.html#newChannelBuilder%28java.lang.String,io.grpc.ChannelCredentials%29", "constantName": "org.apache.camel.component.tensorflow.serving.Tens [...] "CamelTensorFlowServingCredentials": { "index": 1, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "io.grpc.ChannelCredentials", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The credentials of the client.", "constantName": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConstants#CREDENTIALS" }, "CamelTensorFlowServingModelName": { "index": 2, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Required servable name.", "constantName": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConstants#MODEL_NAME" }, "CamelTensorFlowServingModelVersion": { "index": 3, "kind": "header", "displayName": "", "group": "producer", "label": "", "required": false, "javaType": "long", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "Optional choice of which version of the model to use. Use this specific version number.", "constantName": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConstants#MODEL_VERSION" }, @@ -48,7 +48,7 @@ "modelVersion": { "index": 2, "kind": "parameter", "displayName": "Model Version", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration", "configurationField": "configuration", "description": "Optional choice of which version of the model to use. Use this specific version number." }, "modelVersionLabel": { "index": 3, "kind": "parameter", "displayName": "Model Version Label", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration", "configurationField": "configuration", "description": "Optional choice of which version of the model to use. Use the version as [...] "signatureName": { "index": 4, "kind": "parameter", "displayName": "Signature Name", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration", "configurationField": "configuration", "description": "A named signature to evaluate. If unspecified, the default signature will be used." }, - "target": { "index": 5, "kind": "parameter", "displayName": "Target", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "localhost:8500", "configurationClass": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration", "configurationField": "configuration", "description": "The target URI of the client. See: https:\/\/grpc.github.io\/g [...] + "target": { "index": 5, "kind": "parameter", "displayName": "Target", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "localhost:8500", "configurationClass": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration", "configurationField": "configuration", "description": "The target URI of the client. See: https:\/\/grpc.github.io\/g [...] "lazyStartProducer": { "index": 6, "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a produc [...] "credentials": { "index": 7, "kind": "parameter", "displayName": "Credentials", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "io.grpc.ChannelCredentials", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration", "configurationField": "configuration", "description": "The credentials of the client." } } diff --git a/components-starter/camel-kafka-starter/src/main/docs/kafka.json b/components-starter/camel-kafka-starter/src/main/docs/kafka.json index 5873a9f99b8..f33334236ed 100644 --- a/components-starter/camel-kafka-starter/src/main/docs/kafka.json +++ b/components-starter/camel-kafka-starter/src/main/docs/kafka.json @@ -16,7 +16,7 @@ { "name": "camel.component.kafka.additional-properties", "type": "java.util.Map<java.lang.String,java.lang.Object>", - "description": "Sets additional properties for either kafka consumer or kafka producer in case they can't be set directly on the camel configurations (e.g.: new Kafka properties that are not reflected yet in Camel configurations), the properties have to be prefixed with additionalProperties.., e.g.: additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http:\/\/localhost:8811\/avro", + "description": "Sets additional properties for either kafka consumer or kafka producer in case they can't be set directly on the camel configurations (e.g.: new Kafka properties that are not reflected yet in Camel configurations), the properties have to be prefixed with additionalProperties.., e.g.: additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http:\/\/localhost:8811\/avro. If the properties are set in the application.properties file, they mu [...] "sourceType": "org.apache.camel.component.kafka.springboot.KafkaComponentConfiguration" }, { diff --git a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java index 6ae88cef091..e1e7076dbfa 100644 --- a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java +++ b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java @@ -53,7 +53,7 @@ public class KafkaComponentConfiguration * case they can't be set directly on the camel configurations (e.g.: new * Kafka properties that are not reflected yet in Camel configurations), the * properties have to be prefixed with additionalProperties.., e.g.: - * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro + * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro. If the properties are set in the application.properties file, they must be prefixed with camel.component.kafka.additional-properties and the property enclosed in square brackets, like this example: camel.component.kafka.additional-propertiesdelivery.timeout.ms=15000. */ private Map<String, Object> additionalProperties; /** diff --git a/components-starter/camel-kserve-starter/pom.xml b/components-starter/camel-kserve-starter/pom.xml new file mode 100644 index 00000000000..07cd3a6a374 --- /dev/null +++ b/components-starter/camel-kserve-starter/pom.xml @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + 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. + +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.camel.springboot</groupId> + <artifactId>components-starter</artifactId> + <version>4.10.0-SNAPSHOT</version> + </parent> + <artifactId>camel-kserve-starter</artifactId> + <packaging>jar</packaging> + <name>Camel SB Starters :: kserve</name> + <dependencies> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter</artifactId> + <version>${spring-boot-version}</version> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-kserve</artifactId> + <version>${camel-version}</version> + </dependency> + <!--START OF GENERATED CODE--> + <dependency> + <groupId>org.apache.camel.springboot</groupId> + <artifactId>camel-core-starter</artifactId> + </dependency> + <!--END OF GENERATED CODE--> + </dependencies> +</project> diff --git a/components-starter/camel-kserve-starter/src/main/docs/kserve.json b/components-starter/camel-kserve-starter/src/main/docs/kserve.json new file mode 100644 index 00000000000..d4db12cafc7 --- /dev/null +++ b/components-starter/camel-kserve-starter/src/main/docs/kserve.json @@ -0,0 +1,88 @@ +{ + "groups": [ + { + "name": "camel.component.kserve", + "type": "org.apache.camel.component.kserve.springboot.KServeComponentConfiguration", + "sourceType": "org.apache.camel.component.kserve.springboot.KServeComponentConfiguration" + }, + { + "name": "camel.component.kserve.customizer", + "type": "org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties", + "sourceType": "org.apache.camel.component.kserve.springboot.KServeComponentConfiguration", + "sourceMethod": "getCustomizer()" + } + ], + "properties": [ + { + "name": "camel.component.kserve.autowired-enabled", + "type": "java.lang.Boolean", + "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which then gets configured on the component. This can be used for automatic configuring JDBC data sources, JMS connection factories, AWS Clients, etc.", + "sourceType": "org.apache.camel.component.kserve.springboot.KServeComponentConfiguration", + "defaultValue": true + }, + { + "name": "camel.component.kserve.configuration", + "type": "org.apache.camel.component.kserve.KServeConfiguration", + "description": "The configuration. The option is a org.apache.camel.component.kserve.KServeConfiguration type.", + "sourceType": "org.apache.camel.component.kserve.springboot.KServeComponentConfiguration" + }, + { + "name": "camel.component.kserve.credentials", + "type": "io.grpc.ChannelCredentials", + "description": "The credentials of the client. The option is a io.grpc.ChannelCredentials type.", + "sourceType": "org.apache.camel.component.kserve.springboot.KServeComponentConfiguration" + }, + { + "name": "camel.component.kserve.customizer.enabled", + "type": "java.lang.Boolean", + "sourceType": "org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon$CustomizerProperties" + }, + { + "name": "camel.component.kserve.enabled", + "type": "java.lang.Boolean", + "description": "Whether to enable auto configuration of the kserve component. This is enabled by default.", + "sourceType": "org.apache.camel.component.kserve.springboot.KServeComponentConfiguration" + }, + { + "name": "camel.component.kserve.health-check-consumer-enabled", + "type": "java.lang.Boolean", + "description": "Used for enabling or disabling all consumer based health checks from this component", + "sourceType": "org.apache.camel.component.kserve.springboot.KServeComponentConfiguration", + "defaultValue": true + }, + { + "name": "camel.component.kserve.health-check-producer-enabled", + "type": "java.lang.Boolean", + "description": "Used for enabling or disabling all producer based health checks from this component. Notice: Camel has by default disabled all producer based health-checks. You can turn on producer checks globally by setting camel.health.producersEnabled=true.", + "sourceType": "org.apache.camel.component.kserve.springboot.KServeComponentConfiguration", + "defaultValue": true + }, + { + "name": "camel.component.kserve.lazy-start-producer", + "type": "java.lang.Boolean", + "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and starting the [...] + "sourceType": "org.apache.camel.component.kserve.springboot.KServeComponentConfiguration", + "defaultValue": false + }, + { + "name": "camel.component.kserve.model-name", + "type": "java.lang.String", + "description": "The name of the model used for inference.", + "sourceType": "org.apache.camel.component.kserve.springboot.KServeComponentConfiguration" + }, + { + "name": "camel.component.kserve.model-version", + "type": "java.lang.String", + "description": "The version of the model used for inference.", + "sourceType": "org.apache.camel.component.kserve.springboot.KServeComponentConfiguration" + }, + { + "name": "camel.component.kserve.target", + "type": "java.lang.String", + "description": "The target URI of the client. See: https:\/\/grpc.github.io\/grpc-java\/javadoc\/io\/grpc\/Grpc.html#newChannelBuilder%28java.lang.String,io.grpc.ChannelCredentials%29", + "sourceType": "org.apache.camel.component.kserve.springboot.KServeComponentConfiguration", + "defaultValue": "localhost:8001" + } + ], + "hints": [] +} \ No newline at end of file diff --git a/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentAutoConfiguration.java b/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentAutoConfiguration.java new file mode 100644 index 00000000000..793bbbefd42 --- /dev/null +++ b/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentAutoConfiguration.java @@ -0,0 +1,77 @@ +/* + * 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.camel.component.kserve.springboot; + +import org.apache.camel.CamelContext; +import org.apache.camel.Component; +import org.apache.camel.component.kserve.KServeComponent; +import org.apache.camel.spi.ComponentCustomizer; +import org.apache.camel.spring.boot.CamelAutoConfiguration; +import org.apache.camel.spring.boot.ComponentConfigurationProperties; +import org.apache.camel.spring.boot.util.CamelPropertiesHelper; +import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans; +import org.apache.camel.spring.boot.util.ConditionalOnHierarchicalProperties; +import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfigureAfter; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Conditional; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Lazy; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration(proxyBeanMethods = false) +@Conditional(ConditionalOnCamelContextAndAutoConfigurationBeans.class) +@EnableConfigurationProperties({ComponentConfigurationProperties.class,KServeComponentConfiguration.class}) +@ConditionalOnHierarchicalProperties({"camel.component", "camel.component.kserve"}) +@AutoConfigureAfter({CamelAutoConfiguration.class, KServeComponentConverter.class}) +public class KServeComponentAutoConfiguration { + + @Autowired + private ApplicationContext applicationContext; + private final CamelContext camelContext; + @Autowired + private KServeComponentConfiguration configuration; + + public KServeComponentAutoConfiguration( + org.apache.camel.CamelContext camelContext) { + this.camelContext = camelContext; + } + + @Lazy + @Bean + public ComponentCustomizer configureKServeComponent() { + return new ComponentCustomizer() { + @Override + public void configure(String name, Component target) { + CamelPropertiesHelper.copyProperties(camelContext, configuration, target); + } + @Override + public boolean isEnabled(String name, Component target) { + return HierarchicalPropertiesEvaluator.evaluate( + applicationContext, + "camel.component.customizer", + "camel.component.kserve.customizer") + && target instanceof KServeComponent; + } + }; + } +} \ No newline at end of file diff --git a/components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentConfiguration.java b/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentConfiguration.java similarity index 66% copy from components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentConfiguration.java copy to components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentConfiguration.java index 9cdc8811632..84055af4829 100644 --- a/components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentConfiguration.java +++ b/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentConfiguration.java @@ -14,58 +14,47 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.camel.component.tensorflow.serving.springboot; +package org.apache.camel.component.kserve.springboot; import io.grpc.ChannelCredentials; -import org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration; +import org.apache.camel.component.kserve.KServeConfiguration; import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Provide access to TensorFlow Serving model servers to run inference with - * TensorFlow saved models remotely + * Provide access to AI model servers with the KServe standard to run inference + * with remote models * * Generated by camel-package-maven-plugin - do not edit this file! */ -@ConfigurationProperties(prefix = "camel.component.tensorflow-serving") -public class TensorFlowServingComponentConfiguration +@ConfigurationProperties(prefix = "camel.component.kserve") +public class KServeComponentConfiguration extends ComponentConfigurationPropertiesCommon { /** - * Whether to enable auto configuration of the tensorflow-serving component. - * This is enabled by default. + * Whether to enable auto configuration of the kserve component. This is + * enabled by default. */ private Boolean enabled; /** * The configuration. The option is a - * org.apache.camel.component.tensorflow.serving.TensorFlowServingConfiguration type. + * org.apache.camel.component.kserve.KServeConfiguration type. */ - private TensorFlowServingConfiguration configuration; + private KServeConfiguration configuration; /** - * Required servable name. + * The name of the model used for inference. */ private String modelName; /** - * Optional choice of which version of the model to use. Use this specific - * version number. + * The version of the model used for inference. */ - private Long modelVersion; - /** - * Optional choice of which version of the model to use. Use the version - * associated with the given label. - */ - private String modelVersionLabel; - /** - * A named signature to evaluate. If unspecified, the default signature will - * be used. - */ - private String signatureName; + private String modelVersion; /** * The target URI of the client. See: - * https://grpc.github.io/grpc-java/javadoc/io/grpc/Grpc.html#newChannelBuilder(java.lang.String,io.grpc.ChannelCredentials) + * https://grpc.github.io/grpc-java/javadoc/io/grpc/Grpc.html#newChannelBuilder%28java.lang.String,io.grpc.ChannelCredentials%29 */ - private String target = "localhost:8500"; + private String target = "localhost:8001"; /** * Whether the producer should be started lazy (on the first message). By * starting lazy you can use this to allow CamelContext and routes to @@ -86,17 +75,29 @@ public class TensorFlowServingComponentConfiguration * etc. */ private Boolean autowiredEnabled = true; + /** + * Used for enabling or disabling all consumer based health checks from this + * component + */ + private Boolean healthCheckConsumerEnabled = true; + /** + * Used for enabling or disabling all producer based health checks from this + * component. Notice: Camel has by default disabled all producer based + * health-checks. You can turn on producer checks globally by setting + * camel.health.producersEnabled=true. + */ + private Boolean healthCheckProducerEnabled = true; /** * The credentials of the client. The option is a io.grpc.ChannelCredentials * type. */ private ChannelCredentials credentials; - public TensorFlowServingConfiguration getConfiguration() { + public KServeConfiguration getConfiguration() { return configuration; } - public void setConfiguration(TensorFlowServingConfiguration configuration) { + public void setConfiguration(KServeConfiguration configuration) { this.configuration = configuration; } @@ -108,30 +109,14 @@ public class TensorFlowServingComponentConfiguration this.modelName = modelName; } - public Long getModelVersion() { + public String getModelVersion() { return modelVersion; } - public void setModelVersion(Long modelVersion) { + public void setModelVersion(String modelVersion) { this.modelVersion = modelVersion; } - public String getModelVersionLabel() { - return modelVersionLabel; - } - - public void setModelVersionLabel(String modelVersionLabel) { - this.modelVersionLabel = modelVersionLabel; - } - - public String getSignatureName() { - return signatureName; - } - - public void setSignatureName(String signatureName) { - this.signatureName = signatureName; - } - public String getTarget() { return target; } @@ -156,6 +141,22 @@ public class TensorFlowServingComponentConfiguration this.autowiredEnabled = autowiredEnabled; } + public Boolean getHealthCheckConsumerEnabled() { + return healthCheckConsumerEnabled; + } + + public void setHealthCheckConsumerEnabled(Boolean healthCheckConsumerEnabled) { + this.healthCheckConsumerEnabled = healthCheckConsumerEnabled; + } + + public Boolean getHealthCheckProducerEnabled() { + return healthCheckProducerEnabled; + } + + public void setHealthCheckProducerEnabled(Boolean healthCheckProducerEnabled) { + this.healthCheckProducerEnabled = healthCheckProducerEnabled; + } + public ChannelCredentials getCredentials() { return credentials; } diff --git a/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentConverter.java b/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentConverter.java new file mode 100644 index 00000000000..2f3fc74235d --- /dev/null +++ b/components-starter/camel-kserve-starter/src/main/java/org/apache/camel/component/kserve/springboot/KServeComponentConverter.java @@ -0,0 +1,65 @@ +/* + * 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.camel.component.kserve.springboot; + +import java.util.LinkedHashSet; +import java.util.Set; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.properties.ConfigurationPropertiesBinding; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.convert.TypeDescriptor; +import org.springframework.core.convert.converter.GenericConverter; +import org.springframework.stereotype.Component; + +/** + * Generated by camel-package-maven-plugin - do not edit this file! + */ +@Configuration(proxyBeanMethods = false) +@ConfigurationPropertiesBinding +@Component +public class KServeComponentConverter implements GenericConverter { + + @Autowired + private ApplicationContext applicationContext; + + public Set<ConvertiblePair> getConvertibleTypes() { + Set<ConvertiblePair> answer = new LinkedHashSet<>(); + answer.add(new ConvertiblePair(String.class, org.apache.camel.component.kserve.KServeConfiguration.class)); + answer.add(new ConvertiblePair(String.class, io.grpc.ChannelCredentials.class)); + return answer; + } + + public Object convert( + Object source, + TypeDescriptor sourceType, + TypeDescriptor targetType) { + if (source == null) { + return null; + } + String ref = source.toString(); + if (!ref.startsWith("#")) { + return null; + } + ref = ref.startsWith("#bean:") ? ref.substring(6) : ref.substring(1); + switch (targetType.getName()) { + case "org.apache.camel.component.kserve.KServeConfiguration": return applicationContext.getBean(ref, org.apache.camel.component.kserve.KServeConfiguration.class); + case "io.grpc.ChannelCredentials": return applicationContext.getBean(ref, io.grpc.ChannelCredentials.class); + } + return null; + } +} \ No newline at end of file diff --git a/components-starter/camel-kserve-starter/src/main/resources/META-INF/LICENSE.txt b/components-starter/camel-kserve-starter/src/main/resources/META-INF/LICENSE.txt new file mode 100644 index 00000000000..6b0b1270ff0 --- /dev/null +++ b/components-starter/camel-kserve-starter/src/main/resources/META-INF/LICENSE.txt @@ -0,0 +1,203 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + diff --git a/components-starter/camel-kserve-starter/src/main/resources/META-INF/NOTICE.txt b/components-starter/camel-kserve-starter/src/main/resources/META-INF/NOTICE.txt new file mode 100644 index 00000000000..2e215bf2e6b --- /dev/null +++ b/components-starter/camel-kserve-starter/src/main/resources/META-INF/NOTICE.txt @@ -0,0 +1,11 @@ + ========================================================================= + == NOTICE file corresponding to the section 4 d of == + == the Apache License, Version 2.0, == + == in this case for the Apache Camel distribution. == + ========================================================================= + + This product includes software developed by + The Apache Software Foundation (http://www.apache.org/). + + Please read the different LICENSE files present in the licenses directory of + this distribution. diff --git a/components-starter/camel-kserve-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/components-starter/camel-kserve-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000000..8ced7b09065 --- /dev/null +++ b/components-starter/camel-kserve-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,19 @@ +## --------------------------------------------------------------------------- +## 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. +## --------------------------------------------------------------------------- + +org.apache.camel.component.kserve.springboot.KServeComponentConverter +org.apache.camel.component.kserve.springboot.KServeComponentAutoConfiguration diff --git a/components-starter/camel-tensorflow-serving-starter/src/main/docs/tensorflow-serving.json b/components-starter/camel-tensorflow-serving-starter/src/main/docs/tensorflow-serving.json index 6c6386d09ea..f43e6c5f398 100644 --- a/components-starter/camel-tensorflow-serving-starter/src/main/docs/tensorflow-serving.json +++ b/components-starter/camel-tensorflow-serving-starter/src/main/docs/tensorflow-serving.json @@ -77,7 +77,7 @@ { "name": "camel.component.tensorflow-serving.target", "type": "java.lang.String", - "description": "The target URI of the client. See: https:\/\/grpc.github.io\/grpc-java\/javadoc\/io\/grpc\/Grpc.html#newChannelBuilder(java.lang.String,io.grpc.ChannelCredentials)", + "description": "The target URI of the client. See: https:\/\/grpc.github.io\/grpc-java\/javadoc\/io\/grpc\/Grpc.html#newChannelBuilder%28java.lang.String,io.grpc.ChannelCredentials%29", "sourceType": "org.apache.camel.component.tensorflow.serving.springboot.TensorFlowServingComponentConfiguration", "defaultValue": "localhost:8500" } diff --git a/components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentConfiguration.java b/components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentConfiguration.java index 9cdc8811632..b71e07273b9 100644 --- a/components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentConfiguration.java +++ b/components-starter/camel-tensorflow-serving-starter/src/main/java/org/apache/camel/component/tensorflow/serving/springboot/TensorFlowServingComponentConfiguration.java @@ -63,7 +63,7 @@ public class TensorFlowServingComponentConfiguration private String signatureName; /** * The target URI of the client. See: - * https://grpc.github.io/grpc-java/javadoc/io/grpc/Grpc.html#newChannelBuilder(java.lang.String,io.grpc.ChannelCredentials) + * https://grpc.github.io/grpc-java/javadoc/io/grpc/Grpc.html#newChannelBuilder%28java.lang.String,io.grpc.ChannelCredentials%29 */ private String target = "localhost:8500"; /** diff --git a/components-starter/pom.xml b/components-starter/pom.xml index 08cf7345c8c..e787f1e439b 100644 --- a/components-starter/pom.xml +++ b/components-starter/pom.xml @@ -300,6 +300,7 @@ <module>camel-kafka-starter</module> <module>camel-kamelet-starter</module> <module>camel-knative-starter</module> + <module>camel-kserve-starter</module> <module>camel-kubernetes-cluster-service-starter</module> <module>camel-kubernetes-starter</module> <module>camel-kudu-starter</module> diff --git a/tooling/camel-spring-boot-bom/pom.xml b/tooling/camel-spring-boot-bom/pom.xml index 2638e09f3dd..b0a0d3473de 100644 --- a/tooling/camel-spring-boot-bom/pom.xml +++ b/tooling/camel-spring-boot-bom/pom.xml @@ -1038,6 +1038,11 @@ <artifactId>camel-knative-starter</artifactId> <version>4.10.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.camel.springboot</groupId> + <artifactId>camel-kserve-starter</artifactId> + <version>4.10.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-kubernetes-cluster-service-starter</artifactId> diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 1ba9a73f30d..eaac399e611 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -5547,6 +5547,11 @@ <artifactId>camel-knative-starter</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.camel.springboot</groupId> + <artifactId>camel-kserve-starter</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-kubernetes-cluster-service-starter</artifactId> @@ -7634,6 +7639,11 @@ <artifactId>camel-knative-http</artifactId> <version>4.10.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-kserve</artifactId> + <version>4.10.0-SNAPSHOT</version> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-kubernetes</artifactId>