Merge pull request #316 from HuongNV13/support_python_mlbackend

Support Python Machine learning backend
moodlehq · Feb 27, 2025 · 1c4c1a4 · 1c4c1a4
2 parents f0f774f + 1bc4d73
commit 1c4c1a4
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -92,7 +92,6 @@ jobs:
           - { branch: MOODLE_311_STABLE, php: "8.0", database: mysql,  suite: phpunit }
           - { branch: MOODLE_310_STABLE, php: "7.4", database: mysql,  suite: phpunit }
           - { branch: MOODLE_39_STABLE,  php: "7.4", database: mysql,  suite: phpunit }
-          - { branch: main,              php: "8.3", database: oracle, suite: phpunit }
           - { branch: MOODLE_405_STABLE, php: "8.3", database: oracle, suite: phpunit }
           - { branch: MOODLE_404_STABLE, php: "8.3", database: oracle, suite: phpunit }
           - { branch: MOODLE_403_STABLE, php: "8.2", database: oracle, suite: phpunit }
@@ -195,7 +194,6 @@ jobs:
           - { branch: MOODLE_311_STABLE, php: "8.0", database: mysql,  browser: chrome,  suite: behat }
           - { branch: MOODLE_310_STABLE, php: "7.4", database: mysql,  browser: firefox, suite: behat }
           - { branch: MOODLE_39_STABLE,  php: "7.4", database: mysql,  browser: chrome,  suite: behat }
-          - { branch: main,              php: "8.3", database: oracle, browser: firefox, suite: behat }
           - { branch: MOODLE_405_STABLE, php: "8.3", database: oracle, browser: chrome,  suite: behat }
           - { branch: MOODLE_404_STABLE, php: "8.3", database: oracle, browser: chrome,  suite: behat }
           - { branch: MOODLE_403_STABLE, php: "8.2", database: oracle, browser: chrome,  suite: behat }

diff --git a/README.md b/README.md
@@ -221,6 +221,7 @@ When you change them, use `bin/moodle-docker-compose down && bin/moodle-docker-c
 | `MOODLE_DOCKER_PHPUNIT_EXTERNAL_SERVICES` | no        | any value                             | not set       | If set, dependencies for memcached, redis, solr, and openldap are added      |
 | `MOODLE_DOCKER_BBB_MOCK`                  | no        | any value                             | not set       | If set the BigBlueButton mock image is started and configured                |
 | `MOODLE_DOCKER_MATRIX_MOCK`               | no        | any value                             | not set       | If set the Matrix mock image is started and configured                       |
+| `MOODLE_DOCKER_MLBACKEND`                 | no        | any value                             | not set       | If set the Python Machine Learning image is started and configured |
 | `MOODLE_DOCKER_BEHAT_FAILDUMP`            | no        | Path on your file system              | not set       | Behat faildumps are already available at http://localhost:8000/_/faildumps/ by default, this allows for mapping a specific filesystem folder to retrieve the faildumps in bulk / automated ways |
 | `MOODLE_DOCKER_DB_PORT`                   | no        | any integer value                     | none          | If you want to bind to any host IP different from the default 127.0.0.1, you can specify it with the bind_ip:port format (0.0.0.0 means bind to all). Username is "moodle" (or "sa" for mssql) and password is "m@0dl3ing". |
 | `MOODLE_DOCKER_WEB_HOST`                  | no        | any valid hostname                    | localhost     | The hostname for web                                |

diff --git a/bin/moodle-docker-compose b/bin/moodle-docker-compose
@@ -203,6 +203,12 @@ then
     dockercompose="${dockercompose} -f ${basedir}/matrix-mock.yml"
 fi
 
+# Machine Learning backend
+if [[ ! -z "$MOODLE_DOCKER_MLBACKEND" ]];
+then
+    dockercompose="${dockercompose} -f ${basedir}/mlbackend.yml"
+fi
+
 #  Faildump directory
 if [[ ! -z "$MOODLE_DOCKER_BEHAT_FAILDUMP" ]];
 then

diff --git a/bin/moodle-docker-compose.cmd b/bin/moodle-docker-compose.cmd
@@ -140,6 +140,10 @@ IF NOT "%MOODLE_DOCKER_MATRIX_MOCK%"=="" (
     SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\matrix-mock.yml"
 )
 
+IF NOT "%MOODLE_DOCKER_MLBACKEND%"=="" (
+    SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\mlbackend.yml"
+)
+
 IF NOT "%MOODLE_DOCKER_BEHAT_FAILDUMP%"=="" (
     IF NOT EXIST "%MOODLE_DOCKER_BEHAT_FAILDUMP%" (
         ECHO Error: MOODLE_DOCKER_BEHAT_FAILDUMP is not an existing directory

diff --git a/config.docker-template.php b/config.docker-template.php
@@ -139,4 +139,11 @@
     define('TEST_COMMUNICATION_MATRIX_MOCK_SERVER', "http://matrixmock/{$mockhash}");
 }
 
+if (getenv('MOODLE_DOCKER_MLBACKEND')) {
+    define('TEST_MLBACKEND_PYTHON_HOST', 'mlbackendpython');
+    define('TEST_MLBACKEND_PYTHON_PORT', 5000);
+    define('TEST_MLBACKEND_PYTHON_USERNAME', 'default');
+    define('TEST_MLBACKEND_PYTHON_PASSWORD', 'sshhhh');
+}
+
 require_once(__DIR__ . '/lib/setup.php');
diff --git a/mlbackend.yml b/mlbackend.yml
@@ -0,0 +1,6 @@
+services:
+  webserver:
+    environment:
+      MOODLE_DOCKER_MLBACKEND: "true"
+  mlbackendpython:
+    image: moodlehq/moodle-mlbackend-python:3.0.5-python3.7.5
diff --git a/tests/phpunit-setup.sh b/tests/phpunit-setup.sh
@@ -10,6 +10,7 @@ then
 elif [ "$SUITE" = "phpunit-full" ];
 then
     export MOODLE_DOCKER_PHPUNIT_EXTERNAL_SERVICES=true
+    export MOODLE_DOCKER_MLBACKEND=true
     initcmd="bin/moodle-docker-compose exec -T webserver php admin/tool/phpunit/cli/init.php"
 else
     echo "Error, unknown suite '$SUITE'"

diff --git a/tests/phpunit-test.sh b/tests/phpunit-test.sh
@@ -10,7 +10,7 @@ then
     testcmd="bin/moodle-docker-compose exec -T webserver vendor/bin/phpunit --filter core_dml_testcase"
 elif [ "$SUITE" = "phpunit-full" ];
 then
-    testcmd="bin/moodle-docker-compose exec -T webserver vendor/bin/phpunit --verbose"
+    testcmd="bin/moodle-docker-compose exec -T webserver vendor/bin/phpunit"
 else
     echo "Error, unknown suite '$SUITE'"
     exit 1