added dictionary sorting #28

davidberenstein1957 · Feb 27, 2023 · 58fb254 · 58fb254
1 parent 3eece98
commit 58fb254
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/classy_classification/classifiers/classy_skeleton.py b/classy_classification/classifiers/classy_skeleton.py
@@ -1,3 +1,4 @@
+import collections
 import importlib.util
 from typing import List, Union
 
@@ -48,9 +49,11 @@ def __init__(
                     "max_cross_validation_folds": 5
                 }.
         """
+
         self.multi_label = multi_label
 
-        self.data = data
+        self.data = collections.OrderedDict(sorted(data.items()))
+
         self.name = name
         self.nlp = nlp
         self.verbose = verbose
@@ -125,7 +128,7 @@ def set_config(self, config: Union[dict, None] = None):
             if len(self.label_list) > 1:
                 config = {
                     "C": [1, 2, 5, 10, 20, 50, 100],
-                    "kernel": ["linear"],
+                    "kernel": ["linear", "rbf", "poly", "sigmoid"],
                     "max_cross_validation_folds": 5,
                     "seed": None,
                 }

diff --git a/classy_classification/classifiers/classy_standalone.py b/classy_classification/classifiers/classy_standalone.py
@@ -1,3 +1,4 @@
+import collections
 from typing import List, Union
 
 from .classy_spacy import ClassyExternal, ClassySkeletonFewShot
@@ -59,7 +60,7 @@ def __init__(
                 }.
         """
         self.multi_label = multi_label
-        self.data = data
+        self.data = collections.OrderedDict(sorted(data.items()))
         self.model = model
         self.device = device
         self.verbose = verbose

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -31,6 +31,7 @@ sentence-transformers = "^2.0"
 scikit-learn = "^1.0"
 pandas = "^1.4"
 fast-sentence-transformers = { version = "^0.4.1", optional = true }
+InstructorEmbedding = "^1.0.0"
 
 [tool.poetry.extras]
 onnx = ["fast-sentence-transformers"]