ml-management 0.6.3rc12__tar.gz → 0.6.3rc13__tar.gz

ml_management-0.6.3rc13/ML_management/__init__.py

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

{ml_management-0.6.3rc12 → ml_management-0.6.3rc13}/ML_management/sdk/__init__.py

@@ -12,7 +12,6 @@ list_executor_version = executor.list_executor_version
 get_model_version = model.get_model_version
 rebuild_model_version_image = model.rebuild_model_version_image
 print_model_schema_for_executor = executor.print_model_schema_for_executor
-generate_model_params_for_executor = executor.generate_model_params_for_executor
 print_dataset_loader_schema = dataset_loader.print_dataset_loader_schema
 print_executor_schema = executor.print_executor_schema
 print_executor_roles = executor.print_executor_roles

{ml_management-0.6.3rc12 → ml_management-0.6.3rc13}/ML_management/sdk/executor.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Union
+from typing import List, Optional
 
 import pandas as pd
 from sgqlc.operation import Operation
@@ -10,8 +10,7 @@ from ML_management.graphql.send_graphql_request import send_graphql_request
 from ML_management.mlmanagement.visibility_options import VisibilityOptions
 from ML_management.model.model_type_to_methods_map import ModelMethodName
 from ML_management.sdk.model import get_latest_model_version
-from ML_management.sdk.parameters import AnyModelForm, ModelMethodParams, ModelVersionChoice, ModelWithRole
-from ML_management.sdk.sdk import _generate_fake_schema, _print_params_by_schema, _to_datetime
+from ML_management.sdk.sdk import _print_params_by_schema, _to_datetime
 
 
 def list_executor() -> pd.DataFrame:
@@ -313,136 +312,6 @@ def _get_model_schema_for_executor(executor_name: str, executor_version: Optiona
     return json_data["executorVersionFromNameVersion"]["jobJsonSchemaForModels"]["listRoleModelMethodSchemas"]
 
 
-def generate_model_params_for_executor(
-    executor_name: str, models: List[dict], executor_version: Optional[int] = None
-) -> Union[List[ModelMethodParams], AnyModelForm]:
-    """
-    Return example of model's methods parameters for executor.
-
-    Parameters
-    ----------
-    executor_name: str
-        Name of the executor.
-    models: List[dict]
-        Necessary information about the model.
-
-        Example1::
-
-            [
-                {"name": "simple_model"}
-            ];
-
-        Example2::
-
-            [
-                {
-                    "name": "model_name1", # str
-                    "role": "role1", # Optional[str]
-                    "version": version # Optional[int]
-                },
-                {
-                    "name": "model_name2", # str
-                    "role": "role2", # Optional[str]
-                    "version": version # Optional[int]
-                }
-            ]
-
-    executor_version: Optional[int] = None
-        Version of the executor. Default: None, "latest" version is used.
-
-    Returns
-    -------
-    List[ModelMethodParams]:
-        Example of model's methods parameters in case simple executor.
-        Example output::
-
-            [
-                ModelMethodParams(
-                    method=ModelMethodName.evaluate_function,
-                    params={key1: value1, key2: value2}
-                )
-            ]
-
-    AnyModelForm:
-        Example of models parameter for add_ml_job function.
-        Example::
-
-            AnyModelForm(
-                models=[
-                    ModelWithRole(
-                        role="role_one",
-                        model_version_choice=ModelVersionChoice(
-                            name="model_1_name",
-                            version=1
-                        )
-                        params=[
-                            ModelMethodParams(
-                                method=ModelMethodName.evaluate_function,
-                                params={key1: value1, key2: value2}
-                            ),
-                            ModelMethodParams(
-                                method=ModelMethodName.finetune_function,
-                                params={key1: value1, key2: value2}
-                            )
-                        ]
-                    ),
-                    ModelWithRole(
-                        role="role_two",
-                        model_version_choice=ModelVersionChoice(
-                            name="model_2_name",
-                            version=1
-                        )
-                        params=[
-                            ModelMethodParams(
-                                method=ModelMethodName.evaluate_function,
-                                params={key1: value1, key2: value2}
-                            ),
-                            ModelMethodParams(
-                                method=ModelMethodName.finetune_function,
-                                params={key1: value1, key2: value2}
-                            )
-                        ]
-                    ),
-                ]
-            )
-
-    """
-    models_methods_schemas = _get_model_schema_for_executor(
-        executor_name=executor_name,
-        executor_version=executor_version,
-        models=models,
-    )
-
-    sdk_models = []
-
-    for model_methods_schemas in models_methods_schemas:
-        list_model_params = []
-        for model_methods_schema in model_methods_schemas["listMethodSchemas"]:
-            list_model_params.append(
-                ModelMethodParams(
-                    method=ModelMethodName(model_methods_schema["schemaName"]),
-                    params=_generate_fake_schema(model_methods_schema["jsonSchema"]),
-                )
-            )
-        if len(models_methods_schemas) == 1:
-            return list_model_params
-        role = model_methods_schemas["role"]
-        for model in models:
-            if model["role"] == role:
-                model_name = model["name"]
-                model_version = model.get("version", None)
-                break
-        current_model = ModelWithRole(
-            role=role,
-            model_version_choice=ModelVersionChoice(name=model_name, version=model_version),
-            params=list_model_params,
-        )
-
-        sdk_models.append(current_model)
-
-    return AnyModelForm(models=sdk_models)
-
-
 def print_executor_schema(name: str, version: Optional[int] = None) -> None:
     """
     Print executor schema.

{ml_management-0.6.3rc12 → ml_management-0.6.3rc13}/ML_management/sdk/sdk.py

@@ -3,7 +3,6 @@ import json
 from typing import Dict, List
 
 import pandas as pd
-from jsf import JSF
 
 
 def _to_datetime(df: pd.DataFrame, column_names: List[str]) -> pd.DataFrame:
@@ -28,20 +27,8 @@ def _to_datetime(df: pd.DataFrame, column_names: List[str]) -> pd.DataFrame:
     return df
 
 
-def _generate_fake_schema(json_schema: dict) -> dict:
-    if "required" not in json_schema.keys():
-        return {}
-
-    required_properties = {key: json_schema["properties"][key] for key in json_schema["required"]}
-    json_schema["properties"] = required_properties
-
-    faker = JSF(json_schema)
-    fake_json = faker.generate()
-    return fake_json
-
-
 def _print_params_by_schema(json_schema: Dict, schema_type: str) -> None:
-    """Print entity JSON Schema and example with required params."""
+    """Print entity JSON Schema with required params."""
     properties_and_required_dict = {key: json_schema[key] for key in ("properties", "required") if key in json_schema}
 
     json_formatted_str = json.dumps(properties_and_required_dict, indent=2)
@@ -51,7 +38,3 @@ def _print_params_by_schema(json_schema: Dict, schema_type: str) -> None:
     print(json_formatted_str)
 
     print(f"{schema_type} parameters example:")
-
-    fake_json = _generate_fake_schema(json_schema)
-
-    print(fake_json)

{ml_management-0.6.3rc12 → ml_management-0.6.3rc13}/ML_management/test_sdk/test_sdk.py

@@ -14,7 +14,6 @@ from ML_management.sdk.parameters import (
     AnyModelForm,
     DatasetLoaderForm,
     DatasetLoaderMethodParams,
-    ModelMethodParams,
     ModelVersionChoice,
     ModelWithRole,
 )
@@ -148,23 +147,6 @@ class TestSDK(unittest.TestCase):
             executor_name=NAME, models=[{"name": NAME, "version": VERSION, "role": ROLE}], executor_version=VERSION
         )
 
-    def test_generate_model_params_for_executor(self):
-        """Test sdk.generate_model_params_for_executor method returns correct answer."""
-        model_params = ML_management.sdk.executor.generate_model_params_for_executor(
-            executor_name=NAME, models=[{"name": NAME, "version": VERSION, "role": ROLE}], executor_version=VERSION
-        )
-        self.assertTrue(isinstance(model_params, list) or isinstance(model_params, AnyModelForm))
-        if isinstance(model_params, list):
-            for model in model_params:
-                self.assertIsInstance(model, ModelMethodParams)
-        else:
-            self.assertGreaterEqual(len(model_params.models), 1)
-            self.assertEqual(model_params.models[0].role, ROLE)
-            self.assertEqual(NAME, model_params.models[0].model_version_choice.name)
-            self.assertIsInstance(model_params.models[0].params, list)
-            self.assertGreaterEqual(len(model_params.models[0].params), 1)
-            self.assertIsInstance(model_params.models[0].params[0], ModelMethodParams)
-
     def test_print_datasetloader_schema(self):
         """Test a successful sdk.print_datasetloader_schema call."""
         ML_management.sdk.dataset_loader.print_dataset_loader_schema(name=NAME, version=VERSION)

{ml_management-0.6.3rc12 → ml_management-0.6.3rc13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ml-management
-Version: 0.6.3rc12
+Version: 0.6.3rc13
 Summary: Python implementation of model pattern, dataset
 Author-Email: ISPRAS MODIS <modis@ispras.ru>
 Maintainer: Maxim Ryndin
@@ -10,8 +10,7 @@ Requires-Dist: boto3<2,>1
 Requires-Dist: aioboto3<14,>=13
 Requires-Dist: jsonschema<5,>=4.18
 Requires-Dist: tqdm<5,>=4.66.6
-Requires-Dist: pydantic<2,>=1
-Requires-Dist: jsf==0.7.1
+Requires-Dist: pydantic<3,>=1.10
 Requires-Dist: pylint<4,>=3
 Requires-Dist: httpx<1
 Requires-Dist: websocket-client<2,>1

{ml_management-0.6.3rc12 → ml_management-0.6.3rc13}/pyproject.toml

@@ -11,8 +11,7 @@ dependencies = [
     "aioboto3>=13,<14",
     "jsonschema>=4.18,<5",
     "tqdm>=4.66.6,<5",
-    "pydantic>=1,<2",
-    "jsf==0.7.1",
+    "pydantic>=1.10,<3",
     "pylint>=3,<4",
     "httpx<1",
     "websocket-client>1,<2",
@@ -26,7 +25,7 @@ readme = "README.md"
 maintainers = [
     { name = "Maxim Ryndin" },
 ]
-version = "0.6.3rc12"
+version = "0.6.3rc13"
 
 [build-system]
 requires = [

ml_management-0.6.3rc12/ML_management/__init__.py

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