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

{ml-management-0.5.1rc2 → ml-management-0.5.1rc4}/ML_management/mlmanagement/jsonschema_inference.py

@@ -19,7 +19,6 @@ from ML_management.mlmanagement.jsonschema_exceptions import (
 
 JSON_SCHEMA_DRAFT = "http://json-schema.org/draft-04/schema#"
 
-
 type_map = {
     "bool": {"type": "boolean"},
     "int": {"type": "integer"},
@@ -31,7 +30,8 @@ type_map = {
 class SkipJsonSchema:
     """Annotation wrapper for system parameters to skip them in JSON schema."""
 
-    pass
+    def __class_getitem__(cls, _type):  # for backward compatibility with older models
+        return cls()
 
 
 def __get_or_raise(type_name, from_optional: bool = False):
@@ -152,8 +152,8 @@ def infer_jsonschema(func, get_object_func):
         all_args_get_object, _ = get_function_args(spec_get_object, get_object_func)
         if not set(all_args_get_object) == set(all_args):
             warnings.warn(
-                """get_object function arguments do not match __init__ arguments.
-                You won't be able to pass none default arguments into __init__ function."""
+                "get_object function arguments do not match __init__ arguments. "
+                "You won't be able to pass none default arguments into __init__ function."
             )
             all_args = []
             all_defaults = []
@@ -168,7 +168,7 @@ def infer_jsonschema(func, get_object_func):
             typing.get_origin(spec.annotations[arg]) is typing.Annotated
             and spec.annotations[arg].__metadata__
             and spec.annotations[arg].__metadata__[0] is SkipJsonSchema
-        ):
+        ) or isinstance(spec.annotations[arg], SkipJsonSchema):
             continue
 
         schema["properties"][arg] = __get_json_schema_from_annotation(spec.annotations[arg])

{ml-management-0.5.1rc2 → ml-management-0.5.1rc4}/ML_management/sdk/executor.py

@@ -333,11 +333,11 @@ def generate_model_params_for_executor(
                 )
             ]
 
-    ArbitraryModels:
+    AnyModelForm:
         Example of models parameter for add_ml_job function.
         Example::
 
-            ArbitraryModels(
+            AnyModelForm(
                 models=[
                     ModelWithRole(
                         role="role_one",

{ml-management-0.5.1rc2 → ml-management-0.5.1rc4}/ML_management/sdk/job.py

@@ -11,6 +11,7 @@ import websocket
 from matplotlib import pyplot as plt
 from sgqlc.operation import Operation
 
+from ML_management.collectors.collector_pattern_to_methods_map import collector_method_schema_name
 from ML_management.mlmanagement import get_server_url
 from ML_management.mlmanagement.session import AuthSession
 from ML_management.mlmanagement.variables import get_server_websocket_url
@@ -384,9 +385,9 @@ def add_ml_job(
         Name of the Job.
     """
     if not isinstance(models_pattern, ModelForm) and not isinstance(models_pattern, AnyModelForm):
-        raise TypeError("Parameter models must have type SingleModel or ArbitraryModels.")
+        raise TypeError("Parameter models must have type ModelForm or AnyModelForm.")
     if not isinstance(data_pattern, DatasetLoaderForm) and not isinstance(data_pattern, AnyDatasetLoaderForm):
-        raise TypeError("Parameter data_pattern must have type SingleDatasetLoader or ArbitraryDatasetLoaders.")
+        raise TypeError("Parameter data_pattern must have type DatasetLoaderForm or AnyDatasetLoaderForm.")
     models = models_pattern.serialize()
     data_params = data_pattern.serialize()
     list_role_data_params = []
@@ -400,19 +401,9 @@ def add_ml_job(
         )
 
         collector_name = data_inner_params["collector_name"]
-        _dataset_loader_version = schema.ObjectVersionOptionalInput(
-            name=dataset_loader_name, version=dataset_loader_version
-        )
-        dataset_collector_schema = op.dataset_loader_version_from_name_version(
-            dataset_loader_version=_dataset_loader_version
-        ).data_json_schema(collector_name=collector_name)
-        dataset_collector_schema.collector_method_schema.schema_name()
-        dataset_loader_version_obj = send_graphql_request(op, json_response=False)
-        collector_method_name = (
-            dataset_loader_version_obj.dataset_loader_version_from_name_version.data_json_schema.collector_method_schema.schema_name  # noqa: E501
-        )
+
         collector_method_params = schema.MethodParamsInput(
-            method_name=collector_method_name, method_params=json.dumps(data_inner_params["collector_params"])
+            method_name=collector_method_schema_name, method_params=json.dumps(data_inner_params["collector_params"])
         )
 
         list_dataset_loader_method_params = []

{ml-management-0.5.1rc2 → ml-management-0.5.1rc4}/ML_management/sdk/parameters.py

@@ -131,7 +131,7 @@ class ModelForm(BaseModel):
 class ModelWithRole(ModelForm):
     """Class for one role model with parameters for add_ml_job function.
 
-    Same as SingleModel except parameter role: str is required.
+    Same as ModelForm except parameter role: str is required.
 
     Attributes
     ----------
@@ -288,7 +288,7 @@ class DatasetLoaderForm(BaseModel):
 class DatasetLoaderWithRole(DatasetLoaderForm):
     """Class for one role dataset loader with parameters for add_ml_job function.
 
-    Same as SingleDatasetLoader except parameter role: str is required.
+    Same as DatasetLoaderForm except parameter role: str is required.
 
     Attributes
     ----------

{ml-management-0.5.1rc2 → ml-management-0.5.1rc4}/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(String, graphql_name='experimentName')
+    experiment_name = sgqlc.types.Field(sgqlc.types.non_null(String), graphql_name='experimentName')
 
     gpu = sgqlc.types.Field(sgqlc.types.non_null(Boolean), graphql_name='gpu')
 
@@ -365,11 +365,13 @@ class DataParams(sgqlc.types.Type):
 
 class DataSchema(sgqlc.types.Type):
     __schema__ = schema
-    __field_names__ = ('collector_method_schema', 'dataset_loader_method_schemas')
+    __field_names__ = ('collector_method_schema', 'dataset_loader_method_schemas', 'role')
     collector_method_schema = sgqlc.types.Field(sgqlc.types.non_null('MethodSchema'), graphql_name='collectorMethodSchema')
 
     dataset_loader_method_schemas = sgqlc.types.Field(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null('MethodSchema'))), graphql_name='datasetLoaderMethodSchemas')
 
+    role = sgqlc.types.Field(sgqlc.types.non_null(String), graphql_name='role')
+
 
 
 class DatasetLoaderInfo(sgqlc.types.Type):
@@ -431,18 +433,9 @@ class DatasetLoaderPagination(sgqlc.types.Type):
 
 class DatasetLoaderVersionInfo(sgqlc.types.Type):
     __schema__ = schema
-    __field_names__ = ('creation_timestamp', 'data_json_schema', 'dataset_loader', 'dataset_loader_method_schema_names', 'dataset_loader_method_schemas', 'description', 'get_conda_env', 'last_updated_timestamp', 'list_deployed_jobs', 'list_requirements', 'name', 'pagination_deployed_jobs', 'run', 'source_path', 'tags', 'version')
+    __field_names__ = ('creation_timestamp', 'dataset_loader', 'dataset_loader_method_schema_names', 'dataset_loader_method_schemas', 'description', 'get_conda_env', 'last_updated_timestamp', 'list_deployed_jobs', 'list_requirements', 'name', 'pagination_deployed_jobs', 'run', 'source_path', 'tags', 'version')
     creation_timestamp = sgqlc.types.Field(sgqlc.types.non_null(LONG), graphql_name='creationTimestamp')
 
-    data_json_schema = sgqlc.types.Field(sgqlc.types.non_null(DataSchema), graphql_name='dataJsonSchema', args=sgqlc.types.ArgDict((
-        ('collector_name', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='collectorName', default=None)),
-))
-    )
-    '''Arguments:
-
-    * `collector_name` (`String!`)None
-    '''
-
     dataset_loader = sgqlc.types.Field(sgqlc.types.non_null(DatasetLoaderInfo), graphql_name='datasetLoader')
 
     dataset_loader_method_schema_names = sgqlc.types.Field(sgqlc.types.non_null(sgqlc.types.list_of(sgqlc.types.non_null(String))), graphql_name='datasetLoaderMethodSchemaNames')
@@ -709,12 +702,14 @@ class ExecutorVersionInfo(sgqlc.types.Type):
     * `models` (`[RoleObjectVersionInput!]!`)None
     '''
 
-    job_json_schema_for_role_dataset_loader = sgqlc.types.Field(sgqlc.types.non_null('RoleMethodSchema'), graphql_name='jobJsonSchemaForRoleDatasetLoader', args=sgqlc.types.ArgDict((
+    job_json_schema_for_role_dataset_loader = sgqlc.types.Field(sgqlc.types.non_null(DataSchema), graphql_name='jobJsonSchemaForRoleDatasetLoader', args=sgqlc.types.ArgDict((
+        ('collector_name', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='collectorName', default=None)),
         ('dataset_loader', sgqlc.types.Arg(sgqlc.types.non_null(RoleObjectVersionInput), graphql_name='datasetLoader', default=None)),
 ))
     )
     '''Arguments:
 
+    * `collector_name` (`String!`)None
     * `dataset_loader` (`RoleObjectVersionInput!`)None
     '''
 
@@ -2273,6 +2268,29 @@ 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((
+        ('name', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='name', default=None)),
+))
+    )
+    '''Arguments:
+
+    * `name` (`String!`)None
+    '''
+
+    job_status = sgqlc.types.Field(sgqlc.types.non_null(String), graphql_name='jobStatus', args=sgqlc.types.ArgDict((
+        ('name', sgqlc.types.Arg(sgqlc.types.non_null(String), graphql_name='name', default=None)),
+))
+    )
+    '''Arguments:
+
+    * `name` (`String!`)None
+    '''
+
+
+
 class User(sgqlc.types.Type):
     __schema__ = schema
     __field_names__ = ('id',)
@@ -2299,5 +2317,5 @@ class WarningDeleteModel(sgqlc.types.Type):
 ########################################################################
 schema.query_type = Query
 schema.mutation_type = Mutation
-schema.subscription_type = None
+schema.subscription_type = Subscription
 

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

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

ml-management-0.5.1rc4/VERSION

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

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

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

ml-management-0.5.1rc2/VERSION

@@ -1 +0,0 @@
-0.5.1rc2