analytic-workspace-client 1.29.0rc2__tar.gz → 1.29.2__tar.gz

{analytic_workspace_client-1.29.0rc2 → analytic_workspace_client-1.29.2}/PKG-INFO

@@ -1,10 +1,12 @@
 Metadata-Version: 2.1
 Name: analytic_workspace_client
-Version: 1.29.0rc2
+Version: 1.29.2
 Summary: Библиотека для подключения к Analytic Workspace
 Home-page: https://analyticworkspace.ru/
 Author: Analytic Workspace
 Author-email: aw_help@analyticworkspace.ru
+License: UNKNOWN
+Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -39,3 +41,4 @@ df = session.load(model_id=123)  # df: pandas.DataFrame
 
 display(df)
 ```
+

{analytic_workspace_client-1.29.0rc2 → analytic_workspace_client-1.29.2}/setup.py

@@ -10,7 +10,7 @@ long_description = (here / "README.md").read_text(encoding="utf-8")
 
 setup(
     name='analytic_workspace_client',
-    version='1.29.0rc2',
+    version='1.29.2',
 
     description='Библиотека для подключения к Analytic Workspace',
     long_description=long_description,
@@ -36,13 +36,13 @@ setup(
         'python-dotenv>=1.0,<1.1',
         'httpx>=0.25,<1.0',
         'pandas',
-        'pydantic>=1.10,<2.0',
+        'pydantic>=2.0',
         'colorama>=0.4,<0.5'
     ],
 
     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.0rc2 → analytic_workspace_client-1.29.2}/src/analytic_workspace_client.egg-info/PKG-INFO

@@ -1,10 +1,12 @@
 Metadata-Version: 2.1
 Name: analytic-workspace-client
-Version: 1.29.0rc2
+Version: 1.29.2
 Summary: Библиотека для подключения к Analytic Workspace
 Home-page: https://analyticworkspace.ru/
 Author: Analytic Workspace
 Author-email: aw_help@analyticworkspace.ru
+License: UNKNOWN
+Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -39,3 +41,4 @@ df = session.load(model_id=123)  # df: pandas.DataFrame
 
 display(df)
 ```
+

{analytic_workspace_client-1.29.0rc2 → analytic_workspace_client-1.29.2}/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.0rc2 → analytic_workspace_client-1.29.2}/src/analytic_workspace_client.egg-info/requires.txt

@@ -1,12 +1,12 @@
-python-dotenv<1.1,>=1.0
+colorama<0.5,>=0.4
 httpx<1.0,>=0.25
 pandas
-pydantic<2.0,>=1.10
-colorama<0.5,>=0.4
+pydantic>=2.0
+python-dotenv<1.1,>=1.0
 
 [dev]
 pyspark==3.5.0
 pytest<8.3,>=8.2
 
 [ml]
-mlflow<2.15,>=2.14
+mlflow==2.14.3

{analytic_workspace_client-1.29.0rc2 → analytic_workspace_client-1.29.2}/src/aw_client/data_master/base.py

@@ -1,4 +1,4 @@
-from typing import Optional
+from typing import Optional, Iterator
 
 import abc
 from pathlib import Path
@@ -38,7 +38,7 @@ class DataMasterApi(metaclass=abc.ABCMeta):
         """ """
 
     @contextmanager
-    def get_http_client(self) -> httpx.Client:
+    def get_http_client(self) -> Iterator[httpx.Client]:
         """ """
         if not self.api_config.aw_url:
             raise DataMasterApi.MisconfiguredError('Не указан URL к Analytic Workspace')

{analytic_workspace_client-1.29.0rc2 → analytic_workspace_client-1.29.2}/src/aw_client/data_master/v2.py

@@ -34,7 +34,7 @@ class DataMasterV2(DataMasterApi):
                     raise AwModelForbidden(f'Доступ к модели {model_id} запрещен')
                 raise Exception(f'Ошибка запроса схемы модели HTTP {r.status_code} GET {r.url}: {r.text}')
 
-            return ModelSchema.parse_obj(r.json())
+            return ModelSchema.model_validate(r.json())
 
     def load_model_object_data(self, folder: Path, model_id: int, model_object_name: str, limit: Optional[int]):
         """ """

{analytic_workspace_client-1.29.0rc2 → analytic_workspace_client-1.29.2}/src/aw_client/etl_blocks/dto.py

@@ -3,7 +3,7 @@ from typing import Optional, Any, List, Union
 import datetime
 from enum import Enum
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 
 class ETLBlockParamType(str, Enum):

{analytic_workspace_client-1.29.0rc2 → analytic_workspace_client-1.29.2}/src/aw_client/etl_blocks/runtime.py

@@ -32,7 +32,7 @@ def get_etl_block_meta(block_path: Path) -> ETLBlockMeta:
         raise Exception(f'Файл с метаданным блока не найден: {block_meta_path}')
 
     with open(block_meta_path, 'rt') as f:
-        return ETLBlockMeta.parse_raw(f.read())
+        return ETLBlockMeta.model_validate_json(f.read())
 
 
 def get_etl_block_schema(block_path: Path, 

analytic_workspace_client-1.29.2/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.0rc2 → analytic_workspace_client-1.29.2}/src/aw_client/model_dev/runner.py

@@ -150,7 +150,8 @@ if __name__ == '__main__':
         if cache.model_schema_path().exists() and not args.no_cache:
             print(Fore.YELLOW + f'Не удалось получить схему модели {model_id}: {e}. '
                                 f'Для запуска скрипта используется схема модели из кеша.' + Fore.RESET)
-            model_schema = ModelSchema.parse_file(cache.model_schema_path())
+            with open(cache.model_schema_path(), 'rt') as f:
+                model_schema = ModelSchema.model_validate_json(f.read())
         else:
             print(Fore.RED + f'ОШИБКА: Не удалось получить схему модели {model_id}: {e}' + Fore.RESET)
             sys.exit(1)
@@ -162,7 +163,7 @@ if __name__ == '__main__':
     cache_folder = cache.get_model_folder()
     os.makedirs(cache_folder, exist_ok=True)
     with open(cache.model_schema_path(), 'wt') as f:
-        f.write(model_schema.json(ensure_ascii=False, indent=2))
+        f.write(model_schema.model_dump_json(indent=2))
 
     # ------------------------------------------------------------------------------
     # Загрузка данных объектов модели

{analytic_workspace_client-1.29.0rc2 → analytic_workspace_client-1.29.2}/src/aw_client/models/model_schema.py

@@ -1,6 +1,6 @@
 from typing import Optional, List, Dict
 
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 
 class ModelObjectField(BaseModel):
@@ -9,6 +9,10 @@ class ModelObjectField(BaseModel):
     model_name: str
     simple_type: str
 
+    model_config = ConfigDict(
+        protected_namespaces=()
+    )
+
 
 class ModelObject(BaseModel):
     """ """
@@ -18,6 +22,10 @@ class ModelObject(BaseModel):
     sql_text: Optional[str] = None
     fields: List[ModelObjectField] = []
 
+    model_config = ConfigDict(
+        protected_namespaces=()
+    )
+
 
 class ModelSql(BaseModel):
     """

{analytic_workspace_client-1.29.0rc2 → analytic_workspace_client-1.29.2}/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