analytic-workspace-client 1.29.4__tar.gz → 1.29.6__tar.gz

{analytic_workspace_client-1.29.4 → analytic_workspace_client-1.29.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: analytic_workspace_client
-Version: 1.29.4
+Version: 1.29.6
 Summary: Библиотека для подключения к Analytic Workspace
 Home-page: https://analyticworkspace.ru/
 Author: Analytic Workspace

{analytic_workspace_client-1.29.4 → analytic_workspace_client-1.29.6}/setup.py

@@ -10,7 +10,7 @@ long_description = (here / "README.md").read_text(encoding="utf-8")
 
 setup(
     name='analytic_workspace_client',
-    version='1.29.4',
+    version='1.29.6',
 
     description='Библиотека для подключения к Analytic Workspace',
     long_description=long_description,

{analytic_workspace_client-1.29.4 → analytic_workspace_client-1.29.6}/src/analytic_workspace_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: analytic_workspace_client
-Version: 1.29.4
+Version: 1.29.6
 Summary: Библиотека для подключения к Analytic Workspace
 Home-page: https://analyticworkspace.ru/
 Author: Analytic Workspace

{analytic_workspace_client-1.29.4 → analytic_workspace_client-1.29.6}/src/aw_client/data_master/base.py

@@ -38,17 +38,17 @@ class DataMasterApi(metaclass=abc.ABCMeta):
         """ """
 
     @contextmanager
-    def get_http_client(self) -> Iterator[httpx.Client]:
+    def get_http_client(self, **options) -> Iterator[httpx.Client]:
         """ """
         if not self.api_config.aw_url:
             raise DataMasterApi.MisconfiguredError('Не указан URL к Analytic Workspace')
 
         if not self.api_config.token:
             raise DataMasterApi.MisconfiguredError('Не указано токен доступа к Analytic Workspace')
-
+        
         headers = {"Authorization": f"Bearer {self.api_config.token}"}
 
-        client = httpx.Client(base_url=self.api_config.aw_url, headers=headers)
+        client = httpx.Client(base_url=self.api_config.aw_url, headers=headers, **options)
 
         try:
             yield client

{analytic_workspace_client-1.29.4 → analytic_workspace_client-1.29.6}/src/aw_client/data_master/v1.py

@@ -21,7 +21,11 @@ class DataMasterV1(DataMasterApi):
         if timeout is not None:
             timeout = int(timeout)
 
-        with self.get_http_client() as client:
+        http_client_options = {}
+        if 'verify' in options:
+            http_client_options['verify'] = options['verify']
+
+        with self.get_http_client(**http_client_options) as client:
 
             model_schema = None
             if apply_schema:

{analytic_workspace_client-1.29.4 → analytic_workspace_client-1.29.6}/src/aw_client/etl_blocks/runtime.py

@@ -32,7 +32,7 @@ def get_etl_block_meta(block_path: Path) -> ETLBlockMeta:
     if not block_meta_path.exists():
         raise Exception(f'Файл с метаданным блока не найден: {block_meta_path}')
 
-    with open(block_meta_path, 'rt') as f:
+    with open(block_meta_path, 'rt', encoding='utf-8') as f:
         return ETLBlockMeta.model_validate_json(f.read())
 
 
@@ -51,7 +51,7 @@ def get_etl_block_schema(block_path: Path,
     if not block_code_path.exists():
         raise Exception(f'Файл с исходным кодом блока не найден: {block_code_path}')
     
-    with open(block_code_path, 'rt') as f:
+    with open(block_code_path, 'rt', encoding='utf-8') as f:
         block_code = f.read()
 
     # Компиляция кода блока
@@ -152,7 +152,7 @@ def get_etl_block_data(block_path: Path,
     if not block_code_path.exists():
         raise Exception(f'Файл с исходным кодом блока не найден: {block_code_path}')
     
-    with open(block_code_path, 'rt') as f:
+    with open(block_code_path, 'rt', encoding='utf-8') as f:
         block_code = f.read()
 
     # Компиляция кода блока
@@ -242,7 +242,7 @@ def run_block_action(
     if not block_code_path.exists():
         raise Exception(f'Файл с исходным кодом блока не найден: {block_code_path}')
     
-    with open(block_code_path, 'rt') as f:
+    with open(block_code_path, 'rt', encoding='utf-8') as f:
         block_code = f.read()
 
     # Компиляция кода блока

{analytic_workspace_client-1.29.4 → analytic_workspace_client-1.29.6}/src/aw_client/model_dev/cache.py

@@ -1,6 +1,7 @@
 from hashlib import md5
 from urllib.parse import urlparse
 from pathlib import Path
+import json
 
 from aw_client.models.model_schema import ModelSchema, ModelObject
 
@@ -54,4 +55,4 @@ class ModelDevCache:
 
     @staticmethod
     def _model_object_hash(model_object: ModelObject) -> str:
-        return md5(model_object.json(ensure_ascii=False, sort_keys=True).encode()).hexdigest()
+        return md5(json.dumps(model_object.model_dump(), ensure_ascii=False, sort_keys=True).encode()).hexdigest()