Merge branch 'main' into feature/ODSC-68351

Author: prasankh

.github/workflows/run-forecast-unit-tests.yml

@@ -56,6 +56,6 @@ jobs:
           $CONDA/bin/conda init
           source /home/runner/.bashrc
           pip install -r test-requirements-operators.txt
-          pip install "oracle-automlx[forecasting]>=24.4.1"
+          pip install "oracle-automlx[forecasting]>=25.1.1"
           pip install pandas>=2.2.0
           python -m pytest -v -p no:warnings --durations=5 tests/operators/forecast

.github/workflows/run-unittests-py39-py310.yml renamed to .github/workflows/run-unittests-py310-py311.yml

@@ -1,4 +1,4 @@
-name: "[Py3.9-3.11] - All Unit Tests"
+name: "[Py3.10-3.11] - All Unit Tests"
 
 on:
   workflow_dispatch:
@@ -33,15 +33,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11"]
         name: ["unitary", "slow_tests"]
         include:
           - name: "unitary"
             test-path: "tests/unitary"
             # `model` tests running in "slow_tests",
             # `feature_store` tests has its own test suite
-            # `forecast` tests not supported in python 3.9,3.10 (automlx dependency). Tests are running in python3.8 test env, see run-unittests-py38-cov-report.yml
-            # 'pii' tests run only with py3.8, 'datapane' library conflicts with pandas>2.2.0, which used in py3.9/3.10 setup
+            # `forecast` tests not run in this suite
             # 'hpo' tests hangs if run together with all unitary tests. Tests running in separate command before running all unitary
             ignore-path: |
               --ignore tests/unitary/with_extras/model \

.github/workflows/run-unittests-py38-cov-report.yml renamed to .github/workflows/run-unittests-py39-cov-report.yml

@@ -1,4 +1,4 @@
-name: "[Py3.8][COV REPORT] - All Unit Tests"
+name: "[Py3.9][COV REPORT] - All Unit Tests"
 
 on:
   workflow_dispatch:
@@ -26,7 +26,7 @@ env:
 
 jobs:
   test:
-    name: python 3.8, ${{ matrix.name }}
+    name: python 3.9, ${{ matrix.name }}
     runs-on: ubuntu-latest
     timeout-minutes: 90
 
@@ -58,7 +58,7 @@ jobs:
 
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.8"
+          python-version: "3.9"
           cache: "pip"
           cache-dependency-path: |
             pyproject.toml
@@ -71,7 +71,7 @@ jobs:
         name: "Test env setup"
         timeout-minutes: 30
 
-      # Installing pii deps for python3.8 test setup only, it will not work with python3.9/3.10, because
+      # Installing pii deps for python3.9 test setup only, it will not work with python3.9/3.10, because
       # 'datapane' library conflicts with pandas>2.2.0, which used in py3.9/3.10 setup
       - name: "Install PII dependencies"
         run: |

ads/aqua/extension/base_handler.py

@@ -37,6 +37,10 @@ def __init__(
         except Exception:
             pass
 
+    def prepare(self, *args, **kwargs):
+        """The base class prepare is not required for Aqua"""
+        pass
+        
     @staticmethod
     def serialize(obj: Any):
         """Serialize the object.

ads/aqua/server/__init__.py

@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2025 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/

ads/aqua/server/__main__.py

@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2025 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
+import os
+from logging import getLogger
+
+from dotenv import load_dotenv
+
+from ads.aqua.server.app import start_server
+
+logger = getLogger(__name__)
+config_location = os.path.join(os.getcwd(), ".env")
+if os.path.exists(config_location):
+    logger.info(f"Loading environment variables from {config_location}")
+    load_dotenv(dotenv_path=config_location)
+    logger.info("Environment variables loaded successfully")
+else:
+    logger.warning(
+        f"{config_location} not found. Consider using `.env` file to setup default environment variables"
+    )
+
+start_server()

ads/aqua/server/app.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2025 Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
+
+import os
+from logging import getLogger
+
+import tornado.ioloop
+import tornado.web
+
+from ads.aqua.extension import __handlers__
+
+logger = getLogger(__name__)
+AQUA_PORT = "AQUA_PORT"
+AQUA_HOST = "AQUA_HOST"
+AQUA_PROCESS_COUNT = "AQUA_PROCESS_COUNT"
+AQUA_CORS_ENABLE = "AQUA_CORS_ENABLE"
+
+URL_PATTERN = r"/aqua/"
+
+
+def prepare(self):
+    self.set_header("Access-Control-Allow-Origin", "*")
+
+
+def make_app():
+    # Patch the prepare method to allow CORS request
+    if os.environ.get(AQUA_CORS_ENABLE, "0") == "1":
+        for _, handler in __handlers__:
+            handler.prepare = prepare
+    handlers = [(URL_PATTERN + url, handler) for url, handler in __handlers__]
+    # logger.debug(handlers)
+    return tornado.web.Application(handlers)
+
+
+def start_server():
+    app = make_app()
+    server = tornado.httpserver.HTTPServer(app)
+    port = int(os.environ.get(AQUA_PORT, 8080))
+    host = os.environ.get(AQUA_HOST, "0.0.0.0")
+    processes = int(os.environ.get(AQUA_PROCESS_COUNT, 0))
+    server.bind(port=port, address=host)
+    server.start(processes)
+    logger.info(f"Starting the server from directory: {os.getcwd()}")
+    logger.info(f"Aqua API server running on http://{host}:{port}")
+    tornado.ioloop.IOLoop.current().start()