Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@
<groupId>ai.wanaku.sdk</groupId>
<artifactId>capabilities-services-client</artifactId>
</dependency>
<dependency>
<groupId>ai.wanaku.sdk</groupId>
<artifactId>capabilities-runtime-camel-common</artifactId>
</dependency>


<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@
import ai.wanaku.capabilities.sdk.discovery.config.DefaultRegistrationConfig;
import ai.wanaku.capabilities.sdk.discovery.deserializer.JacksonDeserializer;
import ai.wanaku.capabilities.sdk.discovery.util.DiscoveryHelper;
import ai.wanaku.capabilities.sdk.runtime.camel.grpc.ProvisionBase;
import ai.wanaku.capabilities.sdk.runtime.camel.init.Initializer;
import ai.wanaku.capabilities.sdk.runtime.camel.init.InitializerFactory;
import ai.wanaku.capabilities.sdk.security.TokenEndpoint;
import ai.wanaku.capabilities.sdk.services.ServicesHttpClient;
import ai.wanaku.code.engine.camel.codegen.CodeGenDiscoveryCallback;
import ai.wanaku.code.engine.camel.codegen.CodeGenToolService;
import ai.wanaku.code.engine.camel.grpc.CodeExecutorService;
import ai.wanaku.code.engine.camel.grpc.CodeGenToolInvokerService;
import ai.wanaku.code.engine.camel.grpc.ProvisionBase;
import ai.wanaku.code.engine.camel.init.Initializer;
import ai.wanaku.code.engine.camel.init.InitializerFactory;
import ai.wanaku.code.engine.camel.util.VersionHelper;
import picocli.CommandLine;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import ai.wanaku.code.engine.camel.downloader.ResourceType;
import ai.wanaku.code.engine.camel.util.WanakuRoutesLoader;
import ai.wanaku.capabilities.sdk.runtime.camel.downloader.ResourceType;
import ai.wanaku.capabilities.sdk.runtime.camel.util.WanakuRoutesLoader;

public class WanakuCamelManager {
private final CamelContext context;
Expand Down Expand Up @@ -49,6 +49,10 @@ private void loadRoutes() throws Exception {
String routeFileUrl = String.format("file://%s", routesPath);
routesLoader.loadRoute(context, routeFileUrl);
context.start();

if (context.getRoutes().isEmpty()) {
throw new RuntimeException("Failed to load routes from " + routeFileUrl);
}
}

public CamelContext getCamelContext() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,14 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ai.wanaku.capabilities.sdk.api.discovery.DiscoveryCallback;
import ai.wanaku.capabilities.sdk.api.discovery.RegistrationManager;
import ai.wanaku.capabilities.sdk.api.types.providers.ServiceTarget;
import ai.wanaku.capabilities.sdk.services.ServicesHttpClient;
import ai.wanaku.code.engine.camel.downloader.DownloaderFactory;
import ai.wanaku.code.engine.camel.downloader.ResourceRefs;
import ai.wanaku.code.engine.camel.downloader.ResourceType;
import ai.wanaku.code.engine.camel.downloader.TarBz2Downloader;

/**
* Discovery callback that initializes and registers code generation tools.
Expand Down Expand Up @@ -147,15 +143,10 @@ private Path validateLocalPackage(Path localPath) {
*/
private Path downloadPackage() {
try {
DownloaderFactory downloaderFactory = new DownloaderFactory(servicesHttpClient, dataDirPath);

TarBz2Downloader archiveDownloader = new TarBz2Downloader(servicesHttpClient, dataDirPath);
URI packageUri = URI.create(codegenPackageUri);
ResourceRefs<URI> resourceRef = new ResourceRefs<>(ResourceType.CODEGEN_PACKAGE, packageUri);
Map<ResourceType, Path> downloadedResources = new HashMap<>();

downloaderFactory.getDownloader(packageUri).downloadResource(resourceRef, downloadedResources);

Path downloaded = downloadedResources.get(ResourceType.CODEGEN_PACKAGE);
Path downloaded = archiveDownloader.downloadAndExtract(packageUri);
if (downloaded == null) {
LOG.error("Code generation package download failed");
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading