fix

LangStream · May 20, 2024 · 4deeca9 · 4deeca9
1 parent 9b5bd4c
commit 4deeca9
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 38 deletions.
diff --git a/langstream-api-gateway/src/test/java/ai/langstream/apigateway/http/GatewayResourceTest.java b/langstream-api-gateway/src/test/java/ai/langstream/apigateway/http/GatewayResourceTest.java
@@ -30,6 +30,7 @@
 import ai.langstream.api.runner.topics.TopicConsumer;
 import ai.langstream.api.runner.topics.TopicProducer;
 import ai.langstream.api.runtime.ClusterRuntimeRegistry;
+import ai.langstream.api.runtime.DeployContext;
 import ai.langstream.api.runtime.PluginsRegistry;
 import ai.langstream.api.storage.ApplicationStore;
 import ai.langstream.apigateway.api.ConsumePushMessage;
@@ -658,6 +659,7 @@ private void prepareTopicsForTest(String... topic) throws Exception {
                         .pluginsRegistry(new PluginsRegistry())
                         .registry(new ClusterRuntimeRegistry())
                         .topicConnectionsRuntimeRegistry(topicConnectionsRuntimeRegistry)
+                        .deployContext(DeployContext.NO_DEPLOY_CONTEXT)
                         .build();
         final StreamingCluster streamingCluster = getStreamingCluster();
         topicConnectionsRuntimeRegistry

diff --git a/.../src/test/java/ai/langstream/apigateway/websocket/handlers/ProduceConsumeHandlerTest.java b/.../src/test/java/ai/langstream/apigateway/websocket/handlers/ProduceConsumeHandlerTest.java
@@ -35,6 +35,7 @@
 import ai.langstream.api.model.StreamingCluster;
 import ai.langstream.api.runner.topics.TopicConnectionsRuntimeRegistry;
 import ai.langstream.api.runtime.ClusterRuntimeRegistry;
+import ai.langstream.api.runtime.DeployContext;
 import ai.langstream.api.runtime.PluginsRegistry;
 import ai.langstream.api.storage.ApplicationStore;
 import ai.langstream.apigateway.api.ConsumePushMessage;
@@ -267,6 +268,7 @@ private void prepareTopicsForTest(String... topic) throws Exception {
                         .pluginsRegistry(new PluginsRegistry())
                         .registry(new ClusterRuntimeRegistry())
                         .topicConnectionsRuntimeRegistry(topicConnectionsRuntimeRegistry)
+                        .deployContext(DeployContext.NO_DEPLOY_CONTEXT)
                         .build();
         final StreamingCluster streamingCluster = getStreamingCluster();
         topicConnectionsRuntimeRegistry

diff --git a/langstream-api/src/main/java/ai/langstream/api/runtime/DeployContext.java b/langstream-api/src/main/java/ai/langstream/api/runtime/DeployContext.java
@@ -15,40 +15,62 @@
  */
 package ai.langstream.api.runtime;
 
-import ai.langstream.api.runner.assets.AssetManagerRegistry;
 import ai.langstream.api.webservice.application.ApplicationCodeInfo;
 
 public interface DeployContext extends AutoCloseable {
 
-    default ApplicationCodeInfo getApplicationCodeInfo(
-            String tenant, String applicationId, String codeArchiveId) {
-        throw new UnsupportedOperationException();
-    }
+    DeployContext NO_DEPLOY_CONTEXT = new NoOpDeployContext();
 
-    default AssetManagerRegistry getAssetManagerRegistry() {
-        throw new UnsupportedOperationException();
-    }
+    class NoOpDeployContext implements DeployContext {
 
-    default boolean isAutoUpgradeRuntimeImage() {
-        return false;
-    }
+        @Override
+        public ApplicationCodeInfo getApplicationCodeInfo(
+                String tenant, String applicationId, String codeArchiveId) {
+            return null;
+        }
 
-    default boolean isAutoUpgradeRuntimeImagePullPolicy() {
-        return false;
-    }
+        @Override
+        public boolean isAutoUpgradeRuntimeImage() {
+            return false;
+        }
 
-    default boolean isAutoUpgradeAgentResources() {
-        return false;
-    }
+        @Override
+        public boolean isAutoUpgradeRuntimeImagePullPolicy() {
+            return false;
+        }
 
-    default boolean isAutoUpgradeAgentPodTemplate() {
-        return false;
-    }
+        @Override
+        public boolean isAutoUpgradeAgentResources() {
+            return false;
+        }
+
+        @Override
+        public boolean isAutoUpgradeAgentPodTemplate() {
+            return false;
+        }
 
-    default long getApplicationSeed() {
-        throw new UnsupportedOperationException();
+        @Override
+        public long getApplicationSeed() {
+            return -1L;
+        }
+
+        @Override
+        public void close() {}
     }
 
+    ApplicationCodeInfo getApplicationCodeInfo(
+            String tenant, String applicationId, String codeArchiveId);
+
+    boolean isAutoUpgradeRuntimeImage();
+
+    boolean isAutoUpgradeRuntimeImagePullPolicy();
+
+    boolean isAutoUpgradeAgentResources();
+
+    boolean isAutoUpgradeAgentPodTemplate();
+
+    long getApplicationSeed();
+
     @Override
     default void close() {}
 }
diff --git a/langstream-core/src/test/java/ai/langstream/impl/deploy/ApplicationDeployerTest.java b/langstream-core/src/test/java/ai/langstream/impl/deploy/ApplicationDeployerTest.java
@@ -25,11 +25,7 @@
 import ai.langstream.api.runner.topics.TopicConnectionsRuntime;
 import ai.langstream.api.runner.topics.TopicConnectionsRuntimeAndLoader;
 import ai.langstream.api.runner.topics.TopicConnectionsRuntimeRegistry;
-import ai.langstream.api.runtime.ClusterRuntimeRegistry;
-import ai.langstream.api.runtime.ComputeClusterRuntime;
-import ai.langstream.api.runtime.ExecutionPlan;
-import ai.langstream.api.runtime.PluginsRegistry;
-import ai.langstream.api.runtime.StreamingClusterRuntime;
+import ai.langstream.api.runtime.*;
 import ai.langstream.impl.noop.NoOpComputeClusterRuntimeProvider;
 import ai.langstream.impl.parser.ModelBuilder;
 import java.util.Map;
@@ -82,6 +78,7 @@ void testDeploy() throws Exception {
                 ApplicationDeployer.builder()
                         .pluginsRegistry(new PluginsRegistry())
                         .registry(registry)
+                        .deployContext(DeployContext.NO_DEPLOY_CONTEXT)
                         .topicConnectionsRuntimeRegistry(
                                 new TopicConnectionsRuntimeRegistry() {
                                     @Override

diff --git a/...core/src/test/java/ai/langstream/runtime/impl/k8s/KubernetesClusterRuntimeDockerTest.java b/...core/src/test/java/ai/langstream/runtime/impl/k8s/KubernetesClusterRuntimeDockerTest.java
@@ -309,7 +309,7 @@ public void testCodeArchiveId() throws Exception {
 
         ApplicationDeployer deployer =
                 getDeployer(
-                        new DeployContext() {
+                        new DeployContext.NoOpDeployContext() {
                             @Override
                             public ApplicationCodeInfo getApplicationCodeInfo(
                                     String tenant, String applicationId, String codeArchiveId) {

diff --git a/...ntime-core/src/test/java/ai/langstream/runtime/impl/k8s/KubernetesClusterRuntimeTest.java b/...ntime-core/src/test/java/ai/langstream/runtime/impl/k8s/KubernetesClusterRuntimeTest.java
@@ -116,7 +116,7 @@ private void assertCode(
             String oldCode,
             boolean expectKeep) {
         final DeployContext deployContext =
-                new DeployContext() {
+                new DeployContext.NoOpDeployContext() {
                     @Override
                     public ApplicationCodeInfo getApplicationCodeInfo(
                             String tenant, String applicationId, String codeArchiveId) {

diff --git a/...-runtime-impl/src/main/java/ai/langstream/runtime/application/ApplicationSetupRunner.java b/...-runtime-impl/src/main/java/ai/langstream/runtime/application/ApplicationSetupRunner.java
@@ -22,6 +22,7 @@
 import ai.langstream.api.runner.assets.AssetManagerRegistry;
 import ai.langstream.api.runner.topics.TopicConnectionsRuntimeRegistry;
 import ai.langstream.api.runtime.ClusterRuntimeRegistry;
+import ai.langstream.api.runtime.DeployContext;
 import ai.langstream.api.runtime.ExecutionPlan;
 import ai.langstream.api.runtime.PluginsRegistry;
 import ai.langstream.impl.deploy.ApplicationDeployer;
@@ -124,6 +125,7 @@ private ApplicationDeployer buildDeployer(
                 .pluginsRegistry(new PluginsRegistry())
                 .topicConnectionsRuntimeRegistry(topicConnectionsRuntimeRegistry)
                 .assetManagerRegistry(assetManagerRegistry)
+                .deployContext(DeployContext.NO_DEPLOY_CONTEXT)
                 .build();
     }
 

diff --git a/...langstream-runtime-impl/src/main/java/ai/langstream/runtime/deployer/RuntimeDeployer.java b/...langstream-runtime-impl/src/main/java/ai/langstream/runtime/deployer/RuntimeDeployer.java
@@ -110,6 +110,7 @@ public void delete(
                 ApplicationDeployer.builder()
                         .registry(new ClusterRuntimeRegistry(clusterRuntimeConfiguration))
                         .pluginsRegistry(new PluginsRegistry())
+                        .deployContext(DeployContext.NO_DEPLOY_CONTEXT)
                         .build()) {
 
             log.info("Deleting application {}", applicationId);

diff --git a/...eam-runtime-tester/src/main/java/ai/langstream/runtime/tester/LocalApplicationRunner.java b/...eam-runtime-tester/src/main/java/ai/langstream/runtime/tester/LocalApplicationRunner.java
@@ -19,10 +19,7 @@
 import ai.langstream.api.runner.assets.AssetManagerRegistry;
 import ai.langstream.api.runner.code.MetricsReporter;
 import ai.langstream.api.runner.topics.TopicConnectionsRuntimeRegistry;
-import ai.langstream.api.runtime.AgentNode;
-import ai.langstream.api.runtime.ClusterRuntimeRegistry;
-import ai.langstream.api.runtime.ExecutionPlan;
-import ai.langstream.api.runtime.PluginsRegistry;
+import ai.langstream.api.runtime.*;
 import ai.langstream.deployer.k8s.agents.AgentResourcesFactory;
 import ai.langstream.impl.deploy.ApplicationDeployer;
 import ai.langstream.impl.nar.NarFileHandler;
@@ -101,6 +98,7 @@ public LocalApplicationRunner(
                         .pluginsRegistry(new PluginsRegistry())
                         .topicConnectionsRuntimeRegistry(topicConnectionsRuntimeRegistry)
                         .assetManagerRegistry(assetManagerRegistry)
+                        .deployContext(DeployContext.NO_DEPLOY_CONTEXT)
                         .build();
     }
 

diff --git a/...eam-webservice/src/main/java/ai/langstream/webservice/application/ApplicationService.java b/...eam-webservice/src/main/java/ai/langstream/webservice/application/ApplicationService.java
@@ -23,11 +23,7 @@
 import ai.langstream.api.model.StoredApplication;
 import ai.langstream.api.model.TopicDefinition;
 import ai.langstream.api.runner.topics.TopicConnectionsRuntimeRegistry;
-import ai.langstream.api.runtime.AgentNode;
-import ai.langstream.api.runtime.ClusterRuntimeRegistry;
-import ai.langstream.api.runtime.ExecutionPlan;
-import ai.langstream.api.runtime.PluginsRegistry;
-import ai.langstream.api.runtime.Topic;
+import ai.langstream.api.runtime.*;
 import ai.langstream.api.storage.ApplicationStore;
 import ai.langstream.api.webservice.tenant.TenantConfiguration;
 import ai.langstream.impl.common.DefaultAgentNode;
@@ -57,6 +53,7 @@ public class ApplicationService {
                     .registry(new ClusterRuntimeRegistry())
                     .pluginsRegistry(new PluginsRegistry())
                     .topicConnectionsRuntimeRegistry(new TopicConnectionsRuntimeRegistry())
+                    .deployContext(DeployContext.NO_DEPLOY_CONTEXT)
                     .build();
 
     private final GlobalMetadataService globalMetadataService;