python api tests & code cleanup

.github/workflows/backend.yml

@@ -39,19 +39,30 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           java-version:  17
           distribution: 'temurin'
       - name: Install Protoc
         run: sudo apt install -y protobuf-compiler
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+          cache: 'pip'
       - uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven
+      - name: Install Python dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r python/src/pywy/requirements.txt
       - name: Build And Install
         run: ./mvnw clean install -B -Dmaven.test.skip=true
-      - name: Run Unit tests
+      - name: Run Maven Unit tests
         run: ./mvnw clean verify -B -Dmaven.test.skip=false -Dwayang.configuration=file:$(pwd)/tools/test/config/wayang.properties
+      - name: Run Python Unit tests
+        run: pytest -ra --config tools/test/config/wayang.properties python/src/pywy/tests/

python/README.md

@@ -95,3 +95,6 @@ def word_count():
 if __name__ == "__main__":
     word_count
 ```
+
+### Testing python code 
+You can run the python tests by using pytest, the requirements for the tests are listed in `python/src/pywy/requirements.txt`. To run the tests navigate to the base wayang folder, e.g. `/var/www/html` and run `pytest -s python/src/pywy` if you need to pass a specific configuration for your use case you can also add a config flag `pytest -s --config=pathToYourConfig python/src/pywy/`

python/src/pywy/tests/json_test.py → python/src/pywy/requirements.txt

@@ -14,22 +14,9 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-import subprocess
-import json
-import requests
 
-# Specify the API URL we want to send our JSON to
-url = 'http://localhost:8080/wayang-api-json/submit-plan'
-# Specify the appropriate header for the POST request
-headers = {'Content-type': 'application/json'}
-
-with open("/var/www/html/wayang-api/wayang-api-json/src/main/resources/plan-a.json") as f:
-    plan = json.load(f)
-    print(plan)
-
-    #with subprocess.Popen(["/var/www/html/wayang-assembly/target/wayang-0.7.1/bin/wayang-submit org.apache.wayang.api.json.springboot.SpringBootApplication"], stdout=subprocess.PIPE, shell=True) as proc:
-        #print("Started wayang-api-json")
-        #print(proc.stdout.read())
-    response = requests.post(url, headers=headers, json=plan)
-    print(response)
-        #print(proc.terminate())
+# we support python 3.11
+numpy==1.24.0
+cloudpickle==3.1.2
+pytest==8.3.5
+requests==2.31.0

python/src/pywy/tests/conftest.py

@@ -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.
+#
+
+def pytest_addoption(parser):
+    parser.addoption("--config", action="store", help="uses configuration path")

python/src/pywy/tests/resources/__init__.py

@@ -0,0 +1,16 @@
+#
+#  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.
+#

python/src/pywy/tests/resources/plan-a.json

@@ -0,0 +1,61 @@
+{
+    "context": {
+        "platforms": [
+            "java",
+            "spark"
+        ],
+        "origin": "python"
+    },
+    "operators": [
+      {
+        "id": 1,
+        "cat": "input",
+        "input": [],
+        "output": [2],
+        "operatorName": "textFileInput",
+        "data": {
+          "filename": "file:///var/www/html/data/wordcount-out-python.txt"
+        }
+      },
+      {
+        "id": 2,
+        "cat": "unary",
+        "input": [1],
+        "output": [3],
+        "operatorName": "map",
+        "data": {
+          "udf": "(s: String) => s.toInt"
+        }
+      },
+      {
+        "id": 3,
+        "cat": "unary",
+        "input": [2],
+        "output": [4],
+        "operatorName": "map",
+        "data": {
+          "udf": "(x: Int) => x + 1"
+        }
+      },
+      {
+        "id": 4,
+        "cat": "unary",
+        "input": [3],
+        "output": [5],
+        "operatorName": "filter",
+        "data": {
+          "udf": "(x: Int) => x >= 5"
+        }
+      },
+      {
+        "id": 5,
+        "cat": "output",
+        "input": [4],
+        "output": [],
+        "operatorName": "textFileOutput",
+        "data": {
+          "filename": "file:///var/www/html/data/wordcount-out-python.txt"
+        }
+      }
+    ]
+}