ml-management 0.6.3rc16__tar.gz → 0.6.3rc18__tar.gz

ml_management-0.6.3rc18/ML_management/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.6.3rc18"

{ml_management-0.6.3rc16 → ml_management-0.6.3rc18}/ML_management/graphql/schema.py

@@ -215,11 +215,13 @@ class MethodParamsInput(sgqlc.types.Input):
 
 class MetricInput(sgqlc.types.Input):
     __schema__ = schema
-    __field_names__ = ('key', 'step', 'value')
+    __field_names__ = ('key', 'step', 'timestamp', 'value')
     key = sgqlc.types.Field(sgqlc.types.non_null(String), graphql_name='key')
 
     step = sgqlc.types.Field(sgqlc.types.non_null(Int), graphql_name='step')
 
+    timestamp = sgqlc.types.Field(Long, graphql_name='timestamp')
+
     value = sgqlc.types.Field(sgqlc.types.non_null(Float), graphql_name='value')
 
 
@@ -1110,6 +1112,15 @@ class JobInfoResponse(sgqlc.types.Type):
 
 
 
+class JobMetric(sgqlc.types.Type):
+    __schema__ = schema
+    __field_names__ = ('job_name', 'metrics')
+    job_name = sgqlc.types.Field(sgqlc.types.non_null(String), graphql_name='jobName')
+
+    metrics = sgqlc.types.Field(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null('Metric'))), graphql_name='metrics')
+
+
+
 class JobModelsSchema(sgqlc.types.Type):
     __schema__ = schema
     __field_names__ = ('list_role_model_method_schemas',)
@@ -1193,6 +1204,24 @@ class Metric(sgqlc.types.Type):
 
 
 
+class MetricToJobs(sgqlc.types.Type):
+    __schema__ = schema
+    __field_names__ = ('job_metrics', 'metric_name')
+    job_metrics = sgqlc.types.Field(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null(JobMetric))), graphql_name='jobMetrics')
+
+    metric_name = sgqlc.types.Field(sgqlc.types.non_null(String), graphql_name='metricName')
+
+
+
+class MetricToJson(sgqlc.types.Type):
+    __schema__ = schema
+    __field_names__ = ('job_metrics', 'metric_name')
+    job_metrics = sgqlc.types.Field(sgqlc.types.non_null(JSON), graphql_name='jobMetrics')
+
+    metric_name = sgqlc.types.Field(sgqlc.types.non_null(String), graphql_name='metricName')
+
+
+
 class ModelInfo(sgqlc.types.Type):
     __schema__ = schema
     __field_names__ = ('creation_timestamp', 'description', 'init_model_version', 'last_updated_timestamp', 'latest_model_version', 'list_model_version', 'name', 'owner', 'pagination_model_version', 'tags', 'visibility')
@@ -2093,7 +2122,7 @@ class Param(sgqlc.types.Type):
 
 class Query(sgqlc.types.Type):
     __schema__ = schema
-    __field_names__ = ('dataset_loader_from_name', 'dataset_loader_version_from_name_version', 'dataset_loader_version_from_obj_uuid', 'executor_from_name', 'executor_version_from_name_version', 'executor_version_from_obj_uuid', 'experiment_from_id', 'experiment_from_name', 'graph_node', 'is_inference_model_ready', 'job_from_name', 'list_artifacts_by_source_paths', 'list_build_job', 'list_dataset_loader', 'list_executor', 'list_experiment', 'list_graph_node', 'list_initial_executor_version', 'list_initial_model_version', 'list_job', 'list_model', 'list_subtree_graph_node', 'model_from_name', 'model_version_from_name_version', 'model_version_from_obj_uuid', 'pagination_dataset_loader', 'pagination_executor', 'pagination_experiment', 'pagination_initial_executor_version', 'pagination_initial_model_version', 'pagination_job', 'pagination_model', 'warning_delete_model_query')
+    __field_names__ = ('dataset_loader_from_name', 'dataset_loader_version_from_name_version', 'dataset_loader_version_from_obj_uuid', 'executor_from_name', 'executor_version_from_name_version', 'executor_version_from_obj_uuid', 'experiment_from_id', 'experiment_from_name', 'graph_node', 'is_inference_model_ready', 'job_from_name', 'list_all_metric_names', 'list_artifacts_by_source_paths', 'list_build_job', 'list_dataset_loader', 'list_executor', 'list_experiment', 'list_graph_node', 'list_initial_executor_version', 'list_initial_model_version', 'list_job', 'list_latest_metric_jobs', 'list_latest_metric_jobs_json', 'list_metric_jobs', 'list_model', 'list_subtree_graph_node', 'model_from_name', 'model_version_from_name_version', 'model_version_from_obj_uuid', 'pagination_dataset_loader', 'pagination_executor', 'pagination_experiment', 'pagination_initial_executor_version', 'pagination_initial_model_version', 'pagination_job', 'pagination_model', 'warning_delete_model_query')
     dataset_loader_from_name = sgqlc.types.Field(sgqlc.types.non_null(DatasetLoaderInfo), graphql_name='datasetLoaderFromName', args=sgqlc.types.ArgDict((
         ('name', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='name', default=None)),
 ))
@@ -2193,6 +2222,15 @@ class Query(sgqlc.types.Type):
     * `name` (`String!`)None
     '''
 
+    list_all_metric_names = sgqlc.types.Field(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null(String))), graphql_name='listAllMetricNames', args=sgqlc.types.ArgDict((
+        ('job_names', sgqlc.types.Arg(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null(String))), graphql_name='jobNames', default=None)),
+))
+    )
+    '''Arguments:
+
+    * `job_names` (`[String!]!`)None
+    '''
+
     list_artifacts_by_source_paths = sgqlc.types.Field(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null(Artifacts))), graphql_name='listArtifactsBySourcePaths', args=sgqlc.types.ArgDict((
         ('source_paths', sgqlc.types.Arg(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null(String))), graphql_name='sourcePaths', default=None)),
 ))
@@ -2239,6 +2277,35 @@ class Query(sgqlc.types.Type):
 
     list_job = sgqlc.types.Field(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null(ExecutionJob))), graphql_name='listJob')
 
+    list_latest_metric_jobs = sgqlc.types.Field(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null(MetricToJobs))), graphql_name='listLatestMetricJobs', args=sgqlc.types.ArgDict((
+        ('job_names', sgqlc.types.Arg(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null(String))), graphql_name='jobNames', default=None)),
+))
+    )
+    '''Arguments:
+
+    * `job_names` (`[String!]!`)None
+    '''
+
+    list_latest_metric_jobs_json = sgqlc.types.Field(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null(MetricToJson))), graphql_name='listLatestMetricJobsJson', args=sgqlc.types.ArgDict((
+        ('job_names', sgqlc.types.Arg(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null(String))), graphql_name='jobNames', default=None)),
+))
+    )
+    '''Arguments:
+
+    * `job_names` (`[String!]!`)None
+    '''
+
+    list_metric_jobs = sgqlc.types.Field(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null(JobMetric))), graphql_name='listMetricJobs', args=sgqlc.types.ArgDict((
+        ('job_names', sgqlc.types.Arg(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null(String))), graphql_name='jobNames', default=None)),
+        ('metric_name', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='metricName', default=None)),
+))
+    )
+    '''Arguments:
+
+    * `job_names` (`[String!]!`)None
+    * `metric_name` (`String!`)None
+    '''
+
     list_model = sgqlc.types.Field(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null(ModelInfo))), graphql_name='listModel', args=sgqlc.types.ArgDict((
         ('sorting', sgqlc.types.Arg(sgqlc.types.list_of(sgqlc.types.non_null(ObjectSortBySortingInput)), graphql_name='sorting', default=None)),
 ))

{ml_management-0.6.3rc16 → ml_management-0.6.3rc18}/ML_management/mlmanagement/active_job.py

@@ -53,14 +53,14 @@ class ActiveJob:
 
 
 def start_job(
-    job_name: Optional[str], experiment_name: str = DEFAULT_EXPERIMENT, visibility=VisibilityOptions.PRIVATE
+    job_name: Optional[str] = None, experiment_name: str = DEFAULT_EXPERIMENT, visibility=VisibilityOptions.PRIVATE
 ) -> ActiveJob:
     """
     Create local job.
 
     Parameters
     ----------
-    job_name: str | None
+    job_name: str | None=None
         Name of the new job. If not passed, it will be generated.
     experiment_name: str = "Default"
         Name of the experiment. Default: "Default"

{ml_management-0.6.3rc16 → ml_management-0.6.3rc18}/ML_management/mlmanagement/batcher.py

@@ -20,12 +20,12 @@ class Batcher(metaclass=Singleton):
         self.thread = None
         self.stop_event = Event()
 
-    def log_metric(self, key: str, value: float, step: int):
-        self.batch.append((key, value, step))
+    def log_metric(self, key: str, value: float, step: int, timestamp: int):
+        self.batch.append((key, value, step, timestamp))
         self._start_thread()
 
-    def log_metrics(self, metrics: Dict[str, float], step: int):
-        self.batch.extend((key, value, step) for key, value in metrics.items())
+    def log_metrics(self, metrics: Dict[str, float], step: int, timestamp: int):
+        self.batch.extend((key, value, step, timestamp) for key, value in metrics.items())
         self._start_thread()
 
     def _start_thread(self):
@@ -49,7 +49,10 @@ class Batcher(metaclass=Singleton):
             metrics_to_log = self.batch.copy()
             op = Operation(schema.Mutation)
             op.log_metrics(
-                metrics=[MetricInput(key=key, value=value, step=step) for key, value, step in metrics_to_log],
+                metrics=[
+                    MetricInput(key=key, value=value, step=step, timestamp=timestamp)
+                    for key, value, step, timestamp in metrics_to_log
+                ],
                 secret_uuid=variables.secret_uuid,
             )
             try:

{ml_management-0.6.3rc16 → ml_management-0.6.3rc18}/ML_management/mlmanagement/load_api.py

@@ -57,9 +57,10 @@ def download_artifacts_by_name_version(
     params = {
         "path": os.path.normpath(path) if path else path,
         "name": name,
-        "version": version,
         "model_type": model_type.value,
     }
+    if version:
+        params["version"] = version
     return _request_download_artifacts(url, params, dst_path)
 
 

{ml_management-0.6.3rc16 → ml_management-0.6.3rc18}/ML_management/mlmanagement/log_api.py

@@ -5,6 +5,7 @@ import os
 import sys
 import tarfile
 import threading
+import time
 import warnings
 from contextlib import _GeneratorContextManager
 from pathlib import Path
@@ -117,8 +118,13 @@ def _log_object_src(
     try:
         model_path = os.path.abspath(model_path)
         parts = Path(model_path).parts
-        sys.path.append(str(Path(*parts[:-2])))
-        get_object_func = getattr(importlib.import_module(".".join(parts[-2:])), INIT_FUNCTION_NAME)
+        extra_sys_path = str(Path(*parts[:-1]))
+        module_for_importlib = ".".join(parts[-1:])
+        if additional_local_packages:
+            extra_sys_path = str(Path(*parts[:-2]))
+            module_for_importlib = ".".join(parts[-2:])
+        sys.path.append(extra_sys_path)
+        get_object_func = getattr(importlib.import_module(module_for_importlib), INIT_FUNCTION_NAME)
         python_model = get_object_func()  # noqa: F841
         kwargs = {
             "artifact_path": artifact_path,
@@ -148,7 +154,7 @@ def _log_object_src(
         sys.path = old_python_path
         for module in set(sys.modules) - set(old_sys_modules):
             if hasattr(sys.modules[module], "__file__"):
-                if sys.modules[module].__file__ and str(Path(*parts[:-2])) in sys.modules[module].__file__:
+                if sys.modules[module].__file__ and extra_sys_path in sys.modules[module].__file__:
                     sys.modules.pop(module)
 
     if additional_local_packages:
@@ -637,15 +643,18 @@ def log_metric(key: str, value: float, step: int = 0, no_wait=False):
             f"{key}: {value} is not log."
         )
         return
+    timestamp = int(time.time() * 10e6)
     if no_wait:
         op = Operation(schema.Mutation)
-        op.log_metric(metric=MetricInput(key=key, value=value, step=step), secret_uuid=variables.secret_uuid)
+        op.log_metric(
+            metric=MetricInput(key=key, value=value, step=step, timestamp=timestamp), secret_uuid=variables.secret_uuid
+        )
         try:
             return send_graphql_request(op, json_response=False).log_metric
         except Exception as err:
             warnings.warn(str(err))
     else:
-        Batcher().log_metric(key, value, step)
+        Batcher().log_metric(key, value, step, timestamp)
 
 
 def log_metrics(metrics: Dict[str, float], step: int = 0, no_wait=False):
@@ -689,10 +698,14 @@ def log_metrics(metrics: Dict[str, float], step: int = 0, no_wait=False):
             )
             continue
         metrics_to_log[key] = value
+    timestamp = int(time.time() * 10e6)
     if no_wait:
         op = Operation(schema.Mutation)
         op.log_metrics(
-            metrics=[MetricInput(key=key, value=value, step=step) for key, value in metrics_to_log.items()],
+            metrics=[
+                MetricInput(key=key, value=value, step=step, timestamp=timestamp)
+                for key, value in metrics_to_log.items()
+            ],
             secret_uuid=variables.secret_uuid,
         )
         try:
@@ -700,7 +713,7 @@ def log_metrics(metrics: Dict[str, float], step: int = 0, no_wait=False):
         except Exception as err:
             warnings.warn(str(err))
     else:
-        Batcher().log_metrics(metrics_to_log, step)
+        Batcher().log_metrics(metrics_to_log, step, timestamp)
 
 
 def _log_param(key: str, value: str):

{ml_management-0.6.3rc16 → ml_management-0.6.3rc18}/ML_management/sdk/job.py

@@ -5,7 +5,6 @@ from enum import Enum
 from typing import Any, Dict, List, Optional, Tuple, Union
 from urllib.parse import quote
 
-import numpy as np
 import pandas as pd
 import websocket
 from matplotlib import pyplot as plt
@@ -162,11 +161,7 @@ def metric_history(
         raise ValueError("x_axis value must be step or time")
     if x_axis == "step":
         x_values = [metric.step for metric in metrics]
-        if np.nonzero(x_values)[0].size == 0:
-            metrics = sorted(metrics, key=lambda x: x.timestamp)
-            x_values = [step[0] for step in enumerate(metrics)]
-        else:
-            metrics = sorted(metrics, key=lambda x: x.step)
+        metrics = sorted(metrics, key=lambda x: x.step)
     elif x_axis == "time":
         metrics = sorted(metrics, key=lambda x: x.timestamp)
         start_timestamp = metrics[0].timestamp

{ml_management-0.6.3rc16 → ml_management-0.6.3rc18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ml-management
-Version: 0.6.3rc16
+Version: 0.6.3rc18
 Summary: Python implementation of model pattern, dataset
 Author-Email: ISPRAS MODIS <modis@ispras.ru>
 Maintainer: Maxim Ryndin

{ml_management-0.6.3rc16 → ml_management-0.6.3rc18}/pyproject.toml

@@ -25,7 +25,7 @@ readme = "README.md"
 maintainers = [
     { name = "Maxim Ryndin" },
 ]
-version = "0.6.3rc16"
+version = "0.6.3rc18"
 
 [build-system]
 requires = [

ml_management-0.6.3rc16/ML_management/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.6.3rc16"