analytic-workspace-client 1.29.0rc1__tar.gz → 1.29.1__tar.gz

{analytic_workspace_client-1.29.0rc1 → analytic_workspace_client-1.29.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: analytic_workspace_client
-Version: 1.29.0rc1
+Version: 1.29.1
 Summary: Библиотека для подключения к Analytic Workspace
 Home-page: https://analyticworkspace.ru/
 Author: Analytic Workspace
@@ -35,7 +35,7 @@ session = Session(token=aw_token, aw_url='https://aw.example.ru')
 # Если токен доступа указан в переменной окружения AW_DATA_TOKEN, то объект сессии можно создавать 
 # без явного указания параметра token: session = Session(aw_url='https://aw.example.ru')
 
-df = session.load()  # df: pandas.DataFrame
+df = session.load(model_id=123)  # df: pandas.DataFrame
 
 display(df)
 ```

{analytic_workspace_client-1.29.0rc1 → analytic_workspace_client-1.29.1}/README.md

@@ -20,7 +20,7 @@ session = Session(token=aw_token, aw_url='https://aw.example.ru')
 # Если токен доступа указан в переменной окружения AW_DATA_TOKEN, то объект сессии можно создавать 
 # без явного указания параметра token: session = Session(aw_url='https://aw.example.ru')
 
-df = session.load()  # df: pandas.DataFrame
+df = session.load(model_id=123)  # df: pandas.DataFrame
 
 display(df)
 ```

{analytic_workspace_client-1.29.0rc1 → analytic_workspace_client-1.29.1}/setup.py

@@ -10,7 +10,7 @@ long_description = (here / "README.md").read_text(encoding="utf-8")
 
 setup(
     name='analytic_workspace_client',
-    version='1.29.0rc1',
+    version='1.29.1',
 
     description='Библиотека для подключения к Analytic Workspace',
     long_description=long_description,
@@ -42,7 +42,7 @@ setup(
 
     extras_require={
         'dev': ['pyspark==3.5.0', 'pytest>=8.2,<8.3'],
-        'ml': ['mlflow>=2.14,<2.15']
+        'ml': ['mlflow==2.14.3']
     },
     
     setup_requires=['wheel'],  

{analytic_workspace_client-1.29.0rc1 → analytic_workspace_client-1.29.1}/src/analytic_workspace_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: analytic-workspace-client
-Version: 1.29.0rc1
+Version: 1.29.1
 Summary: Библиотека для подключения к Analytic Workspace
 Home-page: https://analyticworkspace.ru/
 Author: Analytic Workspace
@@ -35,7 +35,7 @@ session = Session(token=aw_token, aw_url='https://aw.example.ru')
 # Если токен доступа указан в переменной окружения AW_DATA_TOKEN, то объект сессии можно создавать 
 # без явного указания параметра token: session = Session(aw_url='https://aw.example.ru')
 
-df = session.load()  # df: pandas.DataFrame
+df = session.load(model_id=123)  # df: pandas.DataFrame
 
 display(df)
 ```

{analytic_workspace_client-1.29.0rc1 → analytic_workspace_client-1.29.1}/src/analytic_workspace_client.egg-info/SOURCES.txt

@@ -29,6 +29,8 @@ src/aw_client/etl_blocks/runtime.py
 src/aw_client/etl_blocks/services.py
 src/aw_client/etl_blocks/test_data.py
 src/aw_client/etl_blocks/tools.py
+src/aw_client/ml/__init__.py
+src/aw_client/ml/mlflow_wrapper.py
 src/aw_client/model_dev/__init__.py
 src/aw_client/model_dev/application.py
 src/aw_client/model_dev/cache.py

{analytic_workspace_client-1.29.0rc1 → analytic_workspace_client-1.29.1}/src/analytic_workspace_client.egg-info/requires.txt

@@ -9,4 +9,4 @@ pyspark==3.5.0
 pytest<8.3,>=8.2
 
 [ml]
-mlflow<2.15,>=2.14
+mlflow==2.14.3

{analytic_workspace_client-1.29.0rc1 → analytic_workspace_client-1.29.1}/src/aw_client/etl_blocks/runtime.py

@@ -105,7 +105,7 @@ def get_etl_block_schema(block_path: Path,
     if 'app' in block_schema_parameters:
         block_schema_kwargs['app'] = app
     if 'model_object' in block_schema_parameters:
-        block_schema_kwargs['model_object'] = build_model_object(test_data)
+        block_schema_kwargs['model_object'] = build_model_object(test_data[0] if isinstance(test_data, list) else test_data)
     if 'schema' in block_schema_parameters:
         block_schema_kwargs['schema'] = upstream_schemas.first()
     if 'schemas' in block_schema_parameters:
@@ -188,7 +188,7 @@ def get_etl_block_data(block_path: Path,
     if 'app' in block_data_parameters:
         block_schema_kwargs['app'] = app
     if 'model_object' in block_data_parameters:
-        block_schema_kwargs['model_object'] = build_model_object(test_data)
+        block_schema_kwargs['model_object'] = build_model_object(test_data[0] if isinstance(test_data, list) else test_data)
     if 'df' in block_data_parameters:
         block_schema_kwargs['df'] = upstream_dataframes.first()
     if 'dfs' in block_data_parameters:

analytic_workspace_client-1.29.1/src/aw_client/ml/mlflow_wrapper.py

@@ -0,0 +1,50 @@
+import os
+from urllib.parse import urljoin
+
+from aw_client.exceptions import AwClientMisconfigured
+
+
+class MlflowWrapper:
+    """ """
+    def __init__(self, aw_url: str, auth_token: str):
+        """ """
+        self.aw_url = aw_url
+        self.auth_token = auth_token
+        self.mlflow = None
+
+    def _mlflow(self):
+        """ """
+        if not self.mlflow:
+            try:
+                import mlflow
+            except ImportError:
+                raise AwClientMisconfigured(
+                    'Для использованиея MLFlow установите библиотеку с опцией ml: pip install analytic-workspace-client[ml]')
+            
+            if not self.auth_token:
+                data_master_url = urljoin(self.aw_url, 'data-master/get-token')
+                raise AwClientMisconfigured(
+                    f'Не указан токен доступа к AnalyticWorkspace. Пройдите по адресу {data_master_url} для получения '
+                    f'токена.')
+            
+            tracking_url = urljoin(self.aw_url, 'mlflow')
+
+            if mlflow.get_tracking_uri() != tracking_url:
+                mlflow.set_tracking_uri(tracking_url)
+
+            os.environ['MLFLOW_TRACKING_TOKEN'] = self.auth_token
+            self.mlflow = mlflow
+
+        return self.mlflow
+
+    def setup_experiment(self, experiment_name: str) -> str:
+        """ """
+        mlflow = self._mlflow()
+
+        experiment = mlflow.get_experiment_by_name(experiment_name)
+        return mlflow.create_experiment(experiment_name) if experiment is None else experiment.experiment_id
+
+    def __getattr__(self, name: str):
+        """ """
+        mlflow = self._mlflow()
+        return getattr(mlflow, name)

{analytic_workspace_client-1.29.0rc1 → analytic_workspace_client-1.29.1}/src/aw_client/session.py

@@ -12,6 +12,7 @@ from aw_client.data_master import get_nearest_api
 from aw_client.domain import APIConfig
 from aw_client.models.model_schema import ModelSchema
 from aw_client.exceptions import AwClientMisconfigured
+from aw_client.ml.mlflow_wrapper import MlflowWrapper
 
 from aw_client.tools import strip_column_name_prefix
 
@@ -34,6 +35,7 @@ class Session:
         if not self.aw_url.endswith('/'):
             self.aw_url += '/'
         self.version = version if version is not None else None
+        self._mlflow_wrapper = None
 
     def get_aw_version(self) -> int:
         """ """
@@ -132,23 +134,7 @@ class Session:
     @property
     def mlflow(self):
         """ """
-        try:
-            import mlflow
-        except ImportError:
-            raise AwClientMisconfigured(
-                'Для использованиея MLFlow установите библиотеку с опцией ml: pip install analytic-workspace-client[ml]')
-
-        if not self.token:
-            data_master_url = urljoin(self.aw_url, 'data-master/get-token')
-            raise AwClientMisconfigured(
-                f'Не указан токен доступа к AnalyticWorkspace. Пройдите по адресу {data_master_url} для получения '
-                f'токена')
-
-        tracking_url = urljoin(self.aw_url, 'mlflow')
-
-        if mlflow.get_tracking_uri() != tracking_url:
-            mlflow.set_tracking_uri(tracking_url)
-
-        os.environ['MLFLOW_TRACKING_TOKEN'] = self.token
-
-        return mlflow
+        if self._mlflow_wrapper is None:
+            self._mlflow_wrapper = MlflowWrapper(aw_url=self.aw_url, auth_token=self.token)
+            
+        return self._mlflow_wrapper