upgrade package version to fix security issues and format code (opens…

…earch-project#51) * upgrade package version Signed-off-by: Mingshi Liu <mingshl@amazon.com> * upgrade package version Signed-off-by: Mingshi Liu <mingshl@amazon.com> * upgrade package version Signed-off-by: Mingshi Liu <mingshl@amazon.com> * lint format Signed-off-by: Mingshi Liu <mingshl@amazon.com> * lint format Signed-off-by: Mingshi Liu <mingshl@amazon.com> Signed-off-by: Mingshi Liu <mingshl@amazon.com>
dhrubo-os · Dec 7, 2022 · 8cfdea5 · 8cfdea5
1 parent 91a35bd
commit 8cfdea5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/opensearch_py_ml/sentence_transformer_model/sentencetransformermodel.py b/opensearch_py_ml/sentence_transformer_model/sentencetransformermodel.py
@@ -55,21 +55,20 @@ def __init__(
         """
         default_folder_path = os.path.join(os.getcwd(), "model_files")
 
-        # check folder exist in default_folder_path
-        if os.path.exists(default_folder_path) and not overwrite:
+        if folder_path is None:
+            self.folder_path = default_folder_path
+        else:
+            self.folder_path = folder_path
+
+        # check folder exist in self.folder_path
+        if os.path.exists(self.folder_path) and not overwrite:
             print(
-                "To prevent overwritten, please enter a different folder path or delete the 'model_files' folder or enable overwrite = True"
+                "To prevent overwritten, please enter a different folder path or delete the folder or enable overwrite = True"
             )
             raise Exception(
-                str(
-                    "The default folder path already exists at : " + default_folder_path
-                )
+                str("The default folder path already exists at : " + self.folder_path)
             )
 
-        if folder_path is None:
-            self.folder_path = default_folder_path
-        else:
-            self.folder_path = folder_path
         if model_id is None:
             self.model_id = "sentence-transformers/msmarco-distilbert-base-tas-b"
         else:

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -5,7 +5,7 @@ pandas>=1.5,<2
 matplotlib>=3.6.0,<4
 numpy>=1.23.3,<2
 opensearch-py>=2
-torch
+torch>=1.13.0
 accelerate
 sentence_transformers
 tqdm

diff --git a/requirements.txt b/requirements.txt
@@ -5,7 +5,7 @@ pandas>=1.5,<2
 matplotlib>=3.6.0,<4
 numpy>=1.23.3,<2
 opensearch-py>=2
-torch
+torch>=1.13.0
 accelerate
 sentence_transformers
 tqdm

diff --git a/tests/sentence_transformer_model/__init__.py b/tests/sentence_transformer_model/__init__.py
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: Apache-2.0
+# The OpenSearch Contributors require contributions made to
+# this file be licensed under the Apache-2.0 license or a
+# compatible open source license.
+# Any modifications Copyright OpenSearch Contributors. See
+# GitHub history for details.