Merge pull request #601 from mspruc/main

custom ports for json api & python api

Author: mspruc

python/src/pywy/core/core.py

@@ -109,7 +109,7 @@ def execute(self):
         json_data["operators"] = []
 
         nodes = []
-        pipeline = list()
+        pipeline = []
         self.graph.traversal(self.graph.starting_nodes, lambda x, parent: nodes.append(x))
         id_table = {(obj.current[0]): index + 1 for index, obj in enumerate(nodes)}
         serializer = JSONSerializer(id_table)
@@ -123,10 +123,14 @@ def execute(self):
                     json_data["operators"].append(serializer.serialize_pipeline(pipeline))
 
                 json_data["operators"].append(serializer.serialize(operator))
-                pipeline = list()
+                pipeline = []
 
-        # This should either be configurable on the WayangContext or env
-        url = 'http://localhost:8080/wayang-api-json/submit-plan/json'
+        port = self.configuration.get_property("wayang.api.python.port")
+
+        if port is None: 
+            port = 8080
+
+        url = f'http://localhost:{port}/wayang-api-json/submit-plan/json'
         headers = {'Content-type': 'application/json'}
         json_body = json.dumps(json_data)
         print(json_body)

wayang-api/wayang-api-json/src/main/scala/Main.scala

@@ -70,5 +70,8 @@ object Main extends ZIOAppDefault {
   val app = Routes(drawRoute, jsonRoute).toHttpApp
 
   // Run it like any simple app
-  override val run = Server.serve(app).provide(Server.default)
+  def run = for {
+    args <- getArgs
+    _ <- Server.serve(app).provide(Server.defaultWithPort((args.headOption getOrElse "8080" toInt)))
+  } yield ()
 }

wayang-commons/wayang-core/src/main/java/org/apache/wayang/core/api/Configuration.java

@@ -75,6 +75,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.OptionalDouble;
+import java.util.OptionalInt;
 import java.util.OptionalLong;
 import java.util.Properties;
 import java.util.Random;
@@ -778,6 +779,20 @@ public long getLongProperty(String key) {
         return optionalLongProperty.getAsLong();
     }
 
+    
+    public OptionalInt getOptionalIntProperty(String key) {
+        final Optional<String> intValue = this.properties.optionallyProvideFor(key);
+        if (intValue.isPresent()) {
+            return OptionalInt.of(Integer.valueOf(intValue.get()));
+        } else {
+            return OptionalInt.empty();
+        }
+    }
+
+    public int getIntProperty(String key) {
+        return getOptionalIntProperty(key).orElseThrow(() -> new WayangException(String.format("No value for \"%s\".", key)));
+    }
+
     public long getLongProperty(String key, long fallback) {
         return this.getOptionalLongProperty(key).orElse(fallback);
     }