ml-management 0.5.1rc4__tar.gz → 0.5.1rc6__tar.gz

ml-management-0.5.1rc6/ML_management/__init__.py

@@ -0,0 +1,3 @@
+import ML_management.version
+
+__version__ = ML_management.version.__version__

{ml-management-0.5.1rc4 → ml-management-0.5.1rc6}/ML_management/collectors/s3/s3collector.py

@@ -16,8 +16,8 @@ class S3Collector(CollectorPattern):
             "type": "object",
             "properties": {
                 "bucket": {"type": "string"},
-                "untar_data": {"type": "boolean"},
-                "remote_paths": {"type": "array", "items": {"type": "string"}},
+                "untar_data": {"type": "boolean", "default": False},
+                "remote_paths": {"type": ["array", None], "items": {"type": "string"}, "default": None},
             },
             "required": ["bucket"],
             "additionalProperties": False,

{ml-management-0.5.1rc4 → ml-management-0.5.1rc6}/ML_management/mlmanagement/log_api.py

@@ -236,7 +236,8 @@ def _log_object_src(
     if create_venv_pack:
         validate_predict_config(path=os.path.join(f"{model_path}", "artifacts", f"{FILENAME_FOR_INFERENCE_CONFIG}"))
     start_run_if_not_exist()
-    python_path = sys.path
+    old_python_path = sys.path.copy()
+    old_sys_modules = sys.modules.copy()
     try:
         model_path = os.path.abspath(model_path)
         parts = Path(model_path).parts
@@ -267,7 +268,11 @@ def _log_object_src(
     except Exception as err:
         raise err
     finally:
-        sys.path = python_path
+        sys.path = old_python_path
+        for module in set(sys.modules) - set(old_sys_modules):
+            if hasattr(sys.modules[module], __file__):
+                if str(Path(*parts[:-2])) in sys.modules[module].__file__:
+                    sys.modules.pop(module)
 
     if additional_local_packages:
         if isinstance(additional_local_packages, list):

{ml-management-0.5.1rc4 → ml-management-0.5.1rc6}/ML_management/mlmanagement/session.py

@@ -1,6 +1,7 @@
 """Module with session for authenticated requests to server."""
 import os
 import posixpath
+import warnings
 from contextlib import contextmanager
 from http import HTTPStatus
 from typing import Generator
@@ -11,9 +12,10 @@ from sgqlc.endpoint.http import HTTPEndpoint
 from sgqlc.operation import Operation
 from websocket import WebSocket, create_connection
 
+import ML_management
 from ML_management.mlmanagement.base_exceptions import MLMClientError
 from ML_management.mlmanagement.singleton_pattern import Singleton
-from ML_management.mlmanagement.variables import get_mlm_credentials, get_server_ml_api, get_server_url
+from ML_management.mlmanagement.variables import SERVER_META, get_mlm_credentials, get_server_ml_api, get_server_url
 
 
 class InvalidCredentialsError(MLMClientError):
@@ -33,10 +35,28 @@ class AuthSession(metaclass=Singleton):
                 or self._try_set_cookies()
                 or self._try_authenticate_by_credentials()
             ):
-                return
+                self.check_version()
         except (httpx.ConnectError, httpx.HTTPStatusError):
             raise RuntimeError("Server is unavailable or server url is incorrect.") from None
 
+    def check_version(self):
+        client_version = ML_management.__version__
+        response = httpx.get(posixpath.join(get_server_url(), SERVER_META), cookies=self.cookies)
+        try:
+            response.raise_for_status()
+        except Exception:
+            warnings.warn(
+                "Can't get ml-management version of the server. "
+                f"Server status {response.status_code} with content {response.text}."
+            )
+            return
+        server_version = response.json().get("PLATFORM_VERSION", "unknown")
+        if client_version != server_version:
+            warnings.warn(
+                f"Your ml-management version ({client_version}) does not match the "
+                f"version on the server ({server_version})."
+            )
+
     @contextmanager
     def get(self, url: str, stream: bool = False, **kwargs) -> Generator[httpx.Response, None, None]:
         """Proxy get request."""

{ml-management-0.5.1rc4 → ml-management-0.5.1rc6}/ML_management/mlmanagement/variables.py

@@ -16,6 +16,7 @@ active_experiment: dict = {}
 EXPERIMENT_NAME_FOR_EXECUTOR = "executors"
 EXPERIMENT_NAME_FOR_DATASET_LOADER = "dataset_loaders"
 FILENAME_FOR_INFERENCE_CONFIG = "predict_config.json"
+SERVER_META = posixpath.join("bff", "meta.json")
 
 
 def get_server_ml_api() -> str:

{ml-management-0.5.1rc4 → ml-management-0.5.1rc6}/ML_management/s3/manager.py

@@ -346,6 +346,7 @@ class S3Manager:
         bucket: str,
         remote_paths: Optional[List[str]] = None,
     ) -> str:
+        remote_paths = remote_paths if remote_paths else None
         if remote_paths is not None and len(remote_paths) != 1:
             raise RuntimeError(f"Expected one tar object, but {len(remote_paths)} were given.")
 

{ml-management-0.5.1rc4 → ml-management-0.5.1rc6}/ML_management/sdk/experiment.py

@@ -5,14 +5,14 @@ from ML_management.sdk.schema import Experiment
 from ML_management.sdk.sdk import send_graphql_request
 
 
-def set_experiment_description(experiment_name: str, description: str) -> Experiment:
+def set_experiment_description(experiment_id: int, description: str) -> Experiment:
     """
     Set experiment description.
 
     Parameters
     ----------
-    experiment_name: str
-        Name of an experiment.
+    experiment_id: int
+        Id of an experiment.
     description: str
         Description of an experiment.
 
@@ -22,7 +22,7 @@ def set_experiment_description(experiment_name: str, description: str) -> Experi
         Instance of a experiment with meta information.
     """
     op = Operation(schema.Mutation)
-    set_description = op.set_experiment_description(name=experiment_name, description=description)
+    set_description = op.set_experiment_description(experiment_id=experiment_id, description=description)
     set_description.name()
     set_description.description()
 
@@ -30,14 +30,14 @@ def set_experiment_description(experiment_name: str, description: str) -> Experi
     return experiment["setExperimentDescription"]
 
 
-def set_experiment_tag(experiment_name: str, key: str, value: str) -> Experiment:
+def set_experiment_tag(experiment_id: int, key: str, value: str) -> Experiment:
     """
     Set experiment tag.
 
     Parameters
     ----------
-    experiment_name: str
-        Name of an experiment.
+    experiment_id: int
+        Id of an experiment.
     key: str
         Key of a tag.
     value: str
@@ -49,7 +49,7 @@ def set_experiment_tag(experiment_name: str, key: str, value: str) -> Experiment
         Instance of an experiment with meta information.
     """
     op = Operation(schema.Mutation)
-    set_experiment_tags = op.set_experiment_tag(name=experiment_name, key=key, value=value)
+    set_experiment_tags = op.set_experiment_tag(experiment_id=experiment_id, key=key, value=value)
     set_experiment_tags.name()
     set_experiment_tags.tags()
 
@@ -57,14 +57,14 @@ def set_experiment_tag(experiment_name: str, key: str, value: str) -> Experiment
     return experiment["setExperimentTag"]
 
 
-def delete_experiment_tag(experiment_name: str, key: str) -> Experiment:
+def delete_experiment_tag(experiment_id: int, key: str) -> Experiment:
     """
     Delete experiment tag.
 
     Parameters
     ----------
-    experiment_name: str
-        Name of an experiment.
+    experiment_id: int
+        Id of an experiment.
     key: str
         Key of a tag to delete.
 
@@ -74,7 +74,7 @@ def delete_experiment_tag(experiment_name: str, key: str) -> Experiment:
         Instance of an experiment with meta information.
     """
     op = Operation(schema.Mutation)
-    set_experiment_tags = op.delete_experiment_tag(name=experiment_name, key=key)
+    set_experiment_tags = op.delete_experiment_tag(experiment_id=experiment_id, key=key)
     set_experiment_tags.name()
     set_experiment_tags.tags()
 
@@ -107,13 +107,13 @@ def get_experiment_by_name(experiment_name: str) -> Experiment:
     return experiment["experimentFromName"]
 
 
-def get_experiment_by_id(experiment_id: str) -> Experiment:
+def get_experiment_by_id(experiment_id: int) -> Experiment:
     """
     Get experiment by it's id.
 
     Parameters
     ----------
-    experiment_id: str
+    experiment_id: int
         Id of an experiment.
 
     Returns

{ml-management-0.5.1rc4 → ml-management-0.5.1rc6}/ML_management/sdk/schema.py

@@ -167,7 +167,7 @@ class JobParameters(sgqlc.types.Input):
 
     executor_params = sgqlc.types.Field(sgqlc.types.non_null(ExecutorParamsInput), graphql_name='executorParams')
 
-    experiment_name = sgqlc.types.Field(sgqlc.types.non_null(String), graphql_name='experimentName')
+    experiment_name = sgqlc.types.Field(String, graphql_name='experimentName')
 
     gpu = sgqlc.types.Field(sgqlc.types.non_null(Boolean), graphql_name='gpu')
 
@@ -318,6 +318,15 @@ class TimestampInterval(sgqlc.types.Input):
 
 
 
+class UpdateExperimentForm(sgqlc.types.Input):
+    __schema__ = schema
+    __field_names__ = ('new_description', 'new_name')
+    new_description = sgqlc.types.Field(sgqlc.types.non_null(String), graphql_name='newDescription')
+
+    new_name = sgqlc.types.Field(sgqlc.types.non_null(String), graphql_name='newName')
+
+
+
 
 ########################################################################
 # Output Objects and Interfaces
@@ -1040,13 +1049,15 @@ class JobPagination(sgqlc.types.Type):
 
 class JobParams(sgqlc.types.Type):
     __schema__ = schema
-    __field_names__ = ('additional_system_packages', 'cron_expression', 'executor_params', 'experiment_name', 'gpu', 'list_role_data_params', 'list_role_model_params', 'periodic_type')
+    __field_names__ = ('additional_system_packages', 'cron_expression', 'executor_params', 'experiment_id', 'experiment_name', 'gpu', 'list_role_data_params', 'list_role_model_params', 'periodic_type')
     additional_system_packages = sgqlc.types.Field(sgqlc.types.list_of(sgqlc.types.non_null(String)), graphql_name='additionalSystemPackages')
 
     cron_expression = sgqlc.types.Field(String, graphql_name='cronExpression')
 
     executor_params = sgqlc.types.Field(sgqlc.types.non_null(ExecutorParams), graphql_name='executorParams')
 
+    experiment_id = sgqlc.types.Field(Int, graphql_name='experimentId')
+
     experiment_name = sgqlc.types.Field(String, graphql_name='experimentName')
 
     gpu = sgqlc.types.Field(Boolean, graphql_name='gpu')
@@ -1470,7 +1481,7 @@ class ModelVersionPagination(sgqlc.types.Type):
 
 class Mutation(sgqlc.types.Type):
     __schema__ = schema
-    __field_names__ = ('add_ml_job', 'cancel_build_job_for_executor_version', 'cancel_build_job_for_model_version', 'cancel_job', 'cancel_venv_build_job_for_model_version', 'delete_dataset_loader', 'delete_dataset_loader_tag', 'delete_dataset_loader_version_from_name_version', 'delete_dataset_loader_version_tag', 'delete_executor', 'delete_executor_tag', 'delete_executor_version_from_name_version', 'delete_executor_version_tag', 'delete_experiment_tag', 'delete_model', 'delete_model_tag', 'delete_model_version_from_name_version', 'delete_model_version_tag', 'rebuild_model_version_image', 'rebuild_no_model_executor_version_image', 'rename_experiment', 'serve_model', 'set_dataset_loader_description', 'set_dataset_loader_tag', 'set_dataset_loader_version_description', 'set_dataset_loader_version_tag', 'set_executor_description', 'set_executor_tag', 'set_executor_version_description', 'set_executor_version_tag', 'set_experiment_description', 'set_experiment_tag', 'set_model_description', 'set_model_tag', 'set_model_version_description', 'set_model_version_tag', 'stop_model_serving')
+    __field_names__ = ('add_ml_job', 'cancel_build_job_for_executor_version', 'cancel_build_job_for_model_version', 'cancel_job', 'cancel_venv_build_job_for_model_version', 'delete_dataset_loader', 'delete_dataset_loader_tag', 'delete_dataset_loader_version_from_name_version', 'delete_dataset_loader_version_tag', 'delete_executor', 'delete_executor_tag', 'delete_executor_version_from_name_version', 'delete_executor_version_tag', 'delete_experiment_tag', 'delete_model', 'delete_model_tag', 'delete_model_version_from_name_version', 'delete_model_version_tag', 'rebuild_model_version_image', 'rebuild_no_model_executor_version_image', 'rename_experiment', 'serve_model', 'set_dataset_loader_description', 'set_dataset_loader_tag', 'set_dataset_loader_version_description', 'set_dataset_loader_version_tag', 'set_executor_description', 'set_executor_tag', 'set_executor_version_description', 'set_executor_version_tag', 'set_experiment_description', 'set_experiment_tag', 'set_model_description', 'set_model_tag', 'set_model_version_description', 'set_model_version_tag', 'stop_model_serving', 'update_experiment')
     add_ml_job = sgqlc.types.Field(sgqlc.types.non_null(ExecutionJob), graphql_name='addMlJob', args=sgqlc.types.ArgDict((
         ('form', sgqlc.types.Arg(sgqlc.types.non_null(JobParameters), graphql_name='form', default=None)),
 ))
@@ -1603,14 +1614,14 @@ class Mutation(sgqlc.types.Type):
     '''
 
     delete_experiment_tag = sgqlc.types.Field(sgqlc.types.non_null(Experiment), graphql_name='deleteExperimentTag', args=sgqlc.types.ArgDict((
+        ('experiment_id', sgqlc.types.Arg(sgqlc.types.non_null(Int), graphql_name='experimentId', default=None)),
         ('key', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='key', default=None)),
-        ('name', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='name', default=None)),
 ))
     )
     '''Arguments:
 
+    * `experiment_id` (`Int!`)None
     * `key` (`String!`)None
-    * `name` (`String!`)None
     '''
 
     delete_model = sgqlc.types.Field(sgqlc.types.non_null(Boolean), graphql_name='deleteModel', args=sgqlc.types.ArgDict((
@@ -1672,13 +1683,13 @@ class Mutation(sgqlc.types.Type):
     '''
 
     rename_experiment = sgqlc.types.Field(sgqlc.types.non_null(Experiment), graphql_name='renameExperiment', args=sgqlc.types.ArgDict((
-        ('name', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='name', default=None)),
+        ('experiment_id', sgqlc.types.Arg(sgqlc.types.non_null(Int), graphql_name='experimentId', default=None)),
         ('new_name', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='newName', default=None)),
 ))
     )
     '''Arguments:
 
-    * `name` (`String!`)None
+    * `experiment_id` (`Int!`)None
     * `new_name` (`String!`)None
     '''
 
@@ -1789,25 +1800,25 @@ class Mutation(sgqlc.types.Type):
 
     set_experiment_description = sgqlc.types.Field(sgqlc.types.non_null(Experiment), graphql_name='setExperimentDescription', args=sgqlc.types.ArgDict((
         ('description', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='description', default=None)),
-        ('name', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='name', default=None)),
+        ('experiment_id', sgqlc.types.Arg(sgqlc.types.non_null(Int), graphql_name='experimentId', default=None)),
 ))
     )
     '''Arguments:
 
     * `description` (`String!`)None
-    * `name` (`String!`)None
+    * `experiment_id` (`Int!`)None
     '''
 
     set_experiment_tag = sgqlc.types.Field(sgqlc.types.non_null(Experiment), graphql_name='setExperimentTag', args=sgqlc.types.ArgDict((
+        ('experiment_id', sgqlc.types.Arg(sgqlc.types.non_null(Int), graphql_name='experimentId', default=None)),
         ('key', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='key', default=None)),
-        ('name', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='name', default=None)),
         ('value', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='value', default=None)),
 ))
     )
     '''Arguments:
 
+    * `experiment_id` (`Int!`)None
     * `key` (`String!`)None
-    * `name` (`String!`)None
     * `value` (`String!`)None
     '''
 
@@ -1868,6 +1879,17 @@ class Mutation(sgqlc.types.Type):
     * `model_version` (`ObjectVersionInput!`)None
     '''
 
+    update_experiment = sgqlc.types.Field(sgqlc.types.non_null(Experiment), graphql_name='updateExperiment', args=sgqlc.types.ArgDict((
+        ('experiment_id', sgqlc.types.Arg(sgqlc.types.non_null(Int), graphql_name='experimentId', default=None)),
+        ('update_experiment_form', sgqlc.types.Arg(sgqlc.types.non_null(UpdateExperimentForm), graphql_name='updateExperimentForm', default=None)),
+))
+    )
+    '''Arguments:
+
+    * `experiment_id` (`Int!`)None
+    * `update_experiment_form` (`UpdateExperimentForm!`)None
+    '''
+
 
 
 class ObjectVersion(sgqlc.types.Type):
@@ -1946,12 +1968,12 @@ class Query(sgqlc.types.Type):
     '''
 
     experiment_from_id = sgqlc.types.Field(sgqlc.types.non_null(Experiment), graphql_name='experimentFromId', args=sgqlc.types.ArgDict((
-        ('experiment_id', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='experimentId', default=None)),
+        ('experiment_id', sgqlc.types.Arg(sgqlc.types.non_null(Int), graphql_name='experimentId', default=None)),
 ))
     )
     '''Arguments:
 
-    * `experiment_id` (`String!`)None
+    * `experiment_id` (`Int!`)None
     '''
 
     experiment_from_name = sgqlc.types.Field(sgqlc.types.non_null(Experiment), graphql_name='experimentFromName', args=sgqlc.types.ArgDict((
@@ -2271,7 +2293,7 @@ class RunPagination(sgqlc.types.Type):
 class Subscription(sgqlc.types.Type):
     __schema__ = schema
     __field_names__ = ('build_job_status', 'job_status')
-    build_job_status = sgqlc.types.Field(sgqlc.types.non_null(String), graphql_name='buildJobStatus', args=sgqlc.types.ArgDict((
+    build_job_status = sgqlc.types.Field(sgqlc.types.non_null(JobStatus), graphql_name='buildJobStatus', args=sgqlc.types.ArgDict((
         ('name', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='name', default=None)),
 ))
     )
@@ -2280,7 +2302,7 @@ class Subscription(sgqlc.types.Type):
     * `name` (`String!`)None
     '''
 
-    job_status = sgqlc.types.Field(sgqlc.types.non_null(String), graphql_name='jobStatus', args=sgqlc.types.ArgDict((
+    job_status = sgqlc.types.Field(sgqlc.types.non_null(JobStatus), graphql_name='jobStatus', args=sgqlc.types.ArgDict((
         ('name', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='name', default=None)),
 ))
     )

ml-management-0.5.1rc6/ML_management/version.py

@@ -0,0 +1,6 @@
+from importlib.metadata import version
+
+try:
+    __version__ = version("ml-management")
+except Exception:
+    __version__ = "unknown"

{ml-management-0.5.1rc4 → ml-management-0.5.1rc6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ml-management
-Version: 0.5.1rc4
+Version: 0.5.1rc6
 Summary: Python implementation of model pattern, dataset
 Author: ISPRAS MODIS
 Author-email: modis@ispras.ru

ml-management-0.5.1rc6/VERSION

@@ -0,0 +1 @@
+0.5.1rc6

{ml-management-0.5.1rc4 → ml-management-0.5.1rc6}/ml_management.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ml-management
-Version: 0.5.1rc4
+Version: 0.5.1rc6
 Summary: Python implementation of model pattern, dataset
 Author: ISPRAS MODIS
 Author-email: modis@ispras.ru

{ml-management-0.5.1rc4 → ml-management-0.5.1rc6}/ml_management.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 VERSION
 setup.py
 ML_management/__init__.py
+ML_management/version.py
 ML_management/collectors/__init__.py
 ML_management/collectors/collector_pattern.py
 ML_management/collectors/collector_pattern_to_methods_map.py

{ml-management-0.5.1rc4 → ml-management-0.5.1rc6}/ml_management.egg-info/requires.txt

@@ -3,7 +3,7 @@ mlflow==2.4.0
 boto3==1.34.70
 aioboto3==13.1.1
 jsonschema==4.18.4
-tqdm==4.65.0
+tqdm==4.66.6
 pydantic<2,>=1
 jsf==0.7.1
 pylint<4,>=3

{ml-management-0.5.1rc4 → ml-management-0.5.1rc6}/setup.py

@@ -24,7 +24,7 @@ setup(
         "boto3==1.34.70",
         "aioboto3==13.1.1",
         "jsonschema==4.18.4",
-        "tqdm==4.65.0",
+        "tqdm==4.66.6",
         "pydantic>=1,<2",
         "jsf==0.7.1",  # update when TDM will support pydantic>=2.0.0
         "pylint>=3,<4",

ml-management-0.5.1rc4/VERSION

@@ -1 +0,0 @@
-0.5.1rc4