pr feedback fixes

Signed-off-by: kalyanr <[email protected]>
rawwar · Nov 13, 2023 · ba60da7 · ba60da7
1 parent 99a3660
commit ba60da7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.ci/opensearch/Dockerfile b/.ci/opensearch/Dockerfile
@@ -10,9 +10,10 @@ ARG opensearch_yml=$opensearch_path/config/opensearch.yml
 ARG SECURE_INTEGRATION
 RUN echo "plugins.ml_commons.only_run_on_ml_node: false" >> $opensearch_yml;
 RUN echo "plugins.ml_commons.native_memory_threshold: 100" >> $opensearch_yml;
-RUN if [ "$OPENSEARCH_VERSION" == "2.11.0" ] ; then \
+RUN if [[ "$(printf '%s\n' "2.8.0" "$OPENSEARCH_VERSION" | sort -V | head -n 1)" == "$OPENSEARCH_VERSION" ]]; then \
+    echo "Enabling model access control"; \
     echo "plugins.ml_commons.model_access_control_enabled: true" >> $opensearch_yml; \
     echo "plugins.ml_commons.allow_registering_model_via_local_file: true" >> $opensearch_yml; \
     echo "plugins.ml_commons.allow_registering_model_via_url: true" >> $opensearch_yml; \
-fi
+    fi
 RUN if [ "$SECURE_INTEGRATION" != "true" ] ; then echo "plugins.security.disabled: true" >> $opensearch_yml; fi
diff --git a/opensearch_py_ml/ml_commons/model_access_control.py b/opensearch_py_ml/ml_commons/model_access_control.py
@@ -84,8 +84,9 @@ def get_model_group_id_by_name(self, model_group_name: str):
             if res["hits"]["hits"]:
                 return res["hits"]["hits"][0]["_id"]
             else:
-                return None
+                raise NotFoundError
         except NotFoundError:
+            print(f"No model group found with name:{model_group_name}")
             return None
         except Exception as ex:
             print(f"Error in get_model_group_id_by_name: {ex}")

diff --git a/tests/ml_commons/test_model_access_control.py b/tests/ml_commons/test_model_access_control.py
@@ -16,10 +16,12 @@
 from opensearch_py_ml.ml_commons.model_access_control import ModelAccessControl
 from tests import OPENSEARCH_TEST_CLIENT
 
-OPENSEARCH_VERSION = parse_version(os.environ.get("OPENSEARCH_VERSION", "2.7.0"))
+OPENSEARCH_VERSION = parse_version(os.environ.get("OPENSEARCH_VERSION", "2.11.0"))
+
 # MAC = Model Access Control
 # Minimum opensearch version that supports Model Access Control.
 MAC_MIN_VERSION = parse_version("2.8.0")
+
 # Minimum Opensearch version that supports Model group updates
 MAC_UPDATE_MIN_VERSION = parse_version("2.11.0")