ml-management 0.5.1rc9__tar.gz → 0.5.1rc11__tar.gz

{ml-management-0.5.1rc9 → ml_management-0.5.1rc11}/ML_management/mlmanagement/load_api.py

@@ -20,6 +20,7 @@ from ML_management.variables import (
     CONFIG_KEY_ARTIFACTS,
     DATA,
     FLAVOR_NAME,
+    LEGACY_DATA,
     MLCONFIG,
     MLMODEL_FILE_NAME,
     get_log_service_url,
@@ -225,7 +226,13 @@ def _load_model_src(local_path: str, kwargs_for_init: Optional[dict]):
         with open(os.path.join(local_path, MLMODEL_FILE_NAME)) as file:
             conf = yaml.safe_load(file)
 
-        load_model_path = os.path.join(local_path, conf["flavors"][FLAVOR_NAME][DATA])
+        # legacy data entity code path for backward compatibility
+        code_data_path = (
+            conf["flavors"][FLAVOR_NAME][DATA]
+            if DATA in conf["flavors"][FLAVOR_NAME]
+            else conf["flavors"][FLAVOR_NAME][LEGACY_DATA]
+        )
+        load_model_path = os.path.join(local_path, code_data_path)
 
     else:
         raise RuntimeError("MLConfig does not exist.")

{ml-management-0.5.1rc9 → ml_management-0.5.1rc11}/ML_management/mlmanagement/log_api.py

@@ -78,6 +78,9 @@ def _log_object_src(
     if not os.path.exists(model_path):
         raise FileNotFoundError(f"Path: {model_path} does not exist.")
 
+    if os.path.basename(model_path) == DATA:
+        raise RuntimeError(f"The folder should not be named '{DATA}'. Please rename.") from None
+
     conda_path = os.path.join(model_path, "conda.yaml")
 
     if not os.path.exists(conda_path):

{ml-management-0.5.1rc9 → ml_management-0.5.1rc11}/ML_management/session.py

@@ -15,7 +15,7 @@ from websocket import WebSocket, create_connection
 import ML_management
 from ML_management.base_exceptions import MLMClientError
 from ML_management.singleton_pattern import Singleton
-from ML_management.variables import SERVER_META, get_mlm_credentials, get_server_ml_api, get_server_url
+from ML_management.variables import SERVER_META, get_mlm_credentials, get_server_url
 
 
 class InvalidCredentialsError(MLMClientError):
@@ -29,15 +29,8 @@ class AuthSession(metaclass=Singleton):
 
     def __init__(self) -> None:
         self.cookies = {}
-        try:
-            if (
-                httpx.get(get_server_ml_api()).status_code == HTTPStatus.METHOD_NOT_ALLOWED
-                or self._try_set_cookies()
-                or self._try_authenticate_by_credentials()
-            ):
-                self.check_version()
-        except (httpx.ConnectError, httpx.HTTPStatusError):
-            raise RuntimeError("Server is unavailable or server url is incorrect.") from None
+        if self._try_set_cookies() or self._try_authenticate_by_credentials():
+            self.check_version()
 
     def check_version(self):
         client_version = ML_management.__version__
@@ -119,18 +112,22 @@ class AuthSession(metaclass=Singleton):
 
     def _try_authenticate_by_credentials(self) -> bool:
         login, password = get_mlm_credentials()
-        if login is None or password is None:
-            raise InvalidCredentialsError("You must provide both login and password credentials.")
 
-        response = httpx.post(
-            posixpath.join(get_server_url(), "oauth", "login"), data={"username": login, "password": password}
-        )
+        try:
+            response = httpx.post(
+                posixpath.join(get_server_url(), "oauth", "login"), data={"username": login, "password": password}
+            )
+        except httpx.ConnectError:
+            raise RuntimeError("Server is unavailable or server url is incorrect.") from None
+
         if response.status_code == HTTPStatus.UNAUTHORIZED:
             raise InvalidCredentialsError(f"User with login {login} and password {password} does not exist.")
         if response.status_code != HTTPStatus.OK:
+            if not login or not password:
+                raise InvalidCredentialsError("You must provide both login and password credentials.")
             response.raise_for_status()
         self.cookies = {
-            "kc-state": response.cookies["kc-state"],
-            "kc-access": response.cookies["kc-access"],
+            "kc-state": response.cookies.get("kc-state"),
+            "kc-access": response.cookies.get("kc-access"),
         }
         return True

{ml-management-0.5.1rc9 → ml_management-0.5.1rc11}/ML_management/variables.py

@@ -16,7 +16,8 @@ CONFIG_KEY_ARTIFACTS = "artifacts"
 DEFAULT_EXPERIMENT = "Default"
 MLCONFIG = "MLConfig.yaml"
 MLMODEL_FILE_NAME = "MLmodel"
-DATA = "data"
+DATA = "entity_code_data"
+LEGACY_DATA = "data"
 FLAVOR_NAME = "python_function"
 CONDA_SIZE_LIMIT = 50000
 INFERENCE_CONFIG_LIMIT = 50000

ml_management-0.5.1rc11/PKG-INFO

@@ -0,0 +1,27 @@
+Metadata-Version: 2.1
+Name: ml-management
+Version: 0.5.1rc11
+Summary: Python implementation of model pattern, dataset
+Author: ISPRAS MODIS
+Author-email: modis@ispras.ru
+Maintainer: Maxim Ryndin
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+Requires-Dist: sgqlc==16.1
+Requires-Dist: boto3==1.34.70
+Requires-Dist: aioboto3==13.1.1
+Requires-Dist: jsonschema==4.18.4
+Requires-Dist: tqdm==4.66.6
+Requires-Dist: pydantic<2,>=1
+Requires-Dist: jsf==0.7.1
+Requires-Dist: pylint<4,>=3
+Requires-Dist: httpx<1
+Requires-Dist: websocket-client==1.6.1
+Requires-Dist: pandas==2.0.3
+Requires-Dist: PyYAML==6.0.1
+Requires-Dist: numpy==1.26.4
+Requires-Dist: matplotlib==3.7.2
+
+# mlmanagement
+
+implementation of model pattern, dataset

ml_management-0.5.1rc11/VERSION

@@ -0,0 +1 @@
+0.5.1rc11

ml_management-0.5.1rc11/ml_management.egg-info/PKG-INFO

@@ -0,0 +1,27 @@
+Metadata-Version: 2.1
+Name: ml-management
+Version: 0.5.1rc11
+Summary: Python implementation of model pattern, dataset
+Author: ISPRAS MODIS
+Author-email: modis@ispras.ru
+Maintainer: Maxim Ryndin
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+Requires-Dist: sgqlc==16.1
+Requires-Dist: boto3==1.34.70
+Requires-Dist: aioboto3==13.1.1
+Requires-Dist: jsonschema==4.18.4
+Requires-Dist: tqdm==4.66.6
+Requires-Dist: pydantic<2,>=1
+Requires-Dist: jsf==0.7.1
+Requires-Dist: pylint<4,>=3
+Requires-Dist: httpx<1
+Requires-Dist: websocket-client==1.6.1
+Requires-Dist: pandas==2.0.3
+Requires-Dist: PyYAML==6.0.1
+Requires-Dist: numpy==1.26.4
+Requires-Dist: matplotlib==3.7.2
+
+# mlmanagement
+
+implementation of model pattern, dataset

ml-management-0.5.1rc9/PKG-INFO

@@ -1,13 +0,0 @@
-Metadata-Version: 2.1
-Name: ml-management
-Version: 0.5.1rc9
-Summary: Python implementation of model pattern, dataset
-Author: ISPRAS MODIS
-Author-email: modis@ispras.ru
-Maintainer: Maxim Ryndin
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-
-# mlmanagement
-
-implementation of model pattern, dataset

ml-management-0.5.1rc9/VERSION

@@ -1 +0,0 @@
-0.5.1rc9

ml-management-0.5.1rc9/ml_management.egg-info/PKG-INFO

@@ -1,13 +0,0 @@
-Metadata-Version: 2.1
-Name: ml-management
-Version: 0.5.1rc9
-Summary: Python implementation of model pattern, dataset
-Author: ISPRAS MODIS
-Author-email: modis@ispras.ru
-Maintainer: Maxim Ryndin
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-
-# mlmanagement
-
-implementation of model pattern, dataset