Merge branch 'main' into ui/refactor-huge

setup.py

@@ -53,7 +53,7 @@
     install_requires=[
         "plotly>=5.10.0",
         "statsmodels>=0.12.2",
-        "scikit-learn>=1.0.1",
+        "scikit-learn>=1.0.1,<1.6.0",
         "pandas[parquet]>=1.3.5",
         "numpy>=1.22.0,<2.1",
         "nltk>=3.6.7",

src/evidently/_pydantic_compat.py

@@ -12,6 +12,7 @@
     from pydantic.v1 import PrivateAttr
     from pydantic.v1 import SecretStr
     from pydantic.v1 import ValidationError
+    from pydantic.v1 import create_model
     from pydantic.v1 import parse_obj_as
     from pydantic.v1 import validator
     from pydantic.v1.fields import SHAPE_DICT
@@ -37,6 +38,7 @@
     from pydantic import PrivateAttr
     from pydantic import SecretStr  # type: ignore[assignment]
     from pydantic import ValidationError  # type: ignore[assignment]
+    from pydantic import create_model  # type: ignore[attr-defined,no-redef]
     from pydantic import parse_obj_as
     from pydantic import validator
     from pydantic.fields import SHAPE_DICT  # type: ignore[attr-defined,no-redef]
@@ -77,4 +79,5 @@
     "DictStrAny",
     "PrivateAttr",
     "Extra",
+    "create_model",
 ]

src/evidently/_version.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-version_info = (0, 5, 0)
+version_info = (0, 5, 1)
 __version__ = ".".join(map(str, version_info))
 
 

src/evidently/ui/api/models.py

@@ -18,10 +18,10 @@
 from evidently.ui.base import EntityType
 from evidently.ui.base import Org
 from evidently.ui.base import Project
-from evidently.ui.base import Role
 from evidently.ui.base import SnapshotMetadata
 from evidently.ui.base import Team
 from evidently.ui.base import User
+from evidently.ui.managers.auth import Role
 from evidently.ui.type_aliases import ZERO_UUID
 from evidently.ui.type_aliases import OrgID
 from evidently.ui.type_aliases import RoleID