analytic-workspace-client 1.31.3__tar.gz → 1.31.4__tar.gz

{analytic_workspace_client-1.31.3 → analytic_workspace_client-1.31.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: analytic_workspace_client
-Version: 1.31.3
+Version: 1.31.4
 Summary: Библиотека для подключения к Analytic Workspace
 Home-page: https://analyticworkspace.ru/
 Author: Analytic Workspace
@@ -15,7 +15,7 @@ Requires-Dist: httpx<1.0,>=0.25
 Requires-Dist: pandas
 Requires-Dist: pydantic>=2.0
 Requires-Dist: colorama<0.5,>=0.4
-Requires-Dist: jwt==1.3.1
+Requires-Dist: pyjwt==2.10.1
 Provides-Extra: dev
 Requires-Dist: pyspark==3.5.1; extra == "dev"
 Requires-Dist: pytest<8.3,>=8.2; extra == "dev"

{analytic_workspace_client-1.31.3 → analytic_workspace_client-1.31.4}/setup.py

@@ -10,7 +10,7 @@ long_description = (here / "README.md").read_text(encoding="utf-8")
 
 setup(
     name='analytic_workspace_client',
-    version='1.31.3',
+    version='1.31.4',
 
     description='Библиотека для подключения к Analytic Workspace',
     long_description=long_description,
@@ -38,7 +38,7 @@ setup(
         'pandas',
         'pydantic>=2.0',
         'colorama>=0.4,<0.5',
-        'jwt==1.3.1',
+        'pyjwt==2.10.1',
     ],
 
     extras_require={

{analytic_workspace_client-1.31.3 → analytic_workspace_client-1.31.4}/src/analytic_workspace_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: analytic_workspace_client
-Version: 1.31.3
+Version: 1.31.4
 Summary: Библиотека для подключения к Analytic Workspace
 Home-page: https://analyticworkspace.ru/
 Author: Analytic Workspace
@@ -15,7 +15,7 @@ Requires-Dist: httpx<1.0,>=0.25
 Requires-Dist: pandas
 Requires-Dist: pydantic>=2.0
 Requires-Dist: colorama<0.5,>=0.4
-Requires-Dist: jwt==1.3.1
+Requires-Dist: pyjwt==2.10.1
 Provides-Extra: dev
 Requires-Dist: pyspark==3.5.1; extra == "dev"
 Requires-Dist: pytest<8.3,>=8.2; extra == "dev"

{analytic_workspace_client-1.31.3 → analytic_workspace_client-1.31.4}/src/analytic_workspace_client.egg-info/requires.txt

@@ -3,7 +3,7 @@ httpx<1.0,>=0.25
 pandas
 pydantic>=2.0
 colorama<0.5,>=0.4
-jwt==1.3.1
+pyjwt==2.10.1
 
 [dev]
 pyspark==3.5.1

{analytic_workspace_client-1.31.3 → analytic_workspace_client-1.31.4}/src/aw_client/data_master/base.py

@@ -30,11 +30,11 @@ class DataMasterApi(metaclass=abc.ABCMeta):
         """ """
 
     @abc.abstractmethod
-    def model_schema(self, model_id: int) -> ModelSchema:
+    def model_schema(self, model_id: int, **options) -> ModelSchema:
         """ """
 
     @abc.abstractmethod
-    def load_model_object_data(self, folder: Path, model_id: int, model_object_name: str, limit: Optional[int]):
+    def load_model_object_data(self, folder: Path, model_id: int, model_object_name: str, limit: Optional[int], **options):
         """ """
 
     @contextmanager

{analytic_workspace_client-1.31.3 → analytic_workspace_client-1.31.4}/src/aw_client/data_master/v0.py

@@ -13,7 +13,11 @@ class DataMasterV0(DataMasterApi):
 
     def load_model(self, model_id: int, **options) -> pandas.DataFrame:
         """ """
-        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:
             url = f"data-master/v0/model/data?model_id={model_id}&format=csv"
             r = client.get(url, timeout=None)
             if not r.is_success:
@@ -21,9 +25,9 @@ class DataMasterV0(DataMasterApi):
 
         return pandas.read_csv(io.StringIO(r.content.decode("utf-8")))
 
-    def model_schema(self, model_id: int) -> ModelSchema:
-        raise WrongDataMasterApiVersion(f'Получение схемы модели доступно для AW с версии 1.19')
+    def model_schema(self, model_id: int, **options) -> ModelSchema:
+        raise WrongDataMasterApiVersion('Получение схемы модели доступно для AW с версии 1.19')
 
-    def load_model_object_data(self, folder: Path, model_id: int, model_object_name: str, limit: Optional[int]):
+    def load_model_object_data(self, folder: Path, model_id: int, model_object_name: str, limit: Optional[int], **options):
         """ """
-        raise WrongDataMasterApiVersion(f'Получение данных объекта модели доступно для AW с версии 1.19')
+        raise WrongDataMasterApiVersion('Получение данных объекта модели доступно для AW с версии 1.19')

{analytic_workspace_client-1.31.3 → analytic_workspace_client-1.31.4}/src/aw_client/data_master/v1.py

@@ -63,9 +63,9 @@ class DataMasterV1(DataMasterApi):
 
         return df
 
-    def model_schema(self, model_id: int) -> ModelSchema:
-        raise WrongDataMasterApiVersion(f'Получение схемы модели доступно для Analytic Workspace с версии 1.19')
+    def model_schema(self, model_id: int, **options) -> ModelSchema:
+        raise WrongDataMasterApiVersion('Получение схемы модели доступно для Analytic Workspace с версии 1.19')
 
-    def load_model_object_data(self, folder: Path, model_id: int, model_object_name: str, limit: Optional[int]):
+    def load_model_object_data(self, folder: Path, model_id: int, model_object_name: str, limit: Optional[int], **options):
         """ """
-        raise WrongDataMasterApiVersion(f'Получение данных объекта модели доступно для AW с версии 1.19')
+        raise WrongDataMasterApiVersion('Получение данных объекта модели доступно для AW с версии 1.19')

{analytic_workspace_client-1.31.3 → analytic_workspace_client-1.31.4}/src/aw_client/data_master/v2.py

@@ -25,9 +25,13 @@ class DataMasterV2(DataMasterApi):
     def load_model(self, model_id: int, **options) -> pandas.DataFrame:
         return self.api_v1.load_model(model_id, **options)
 
-    def model_schema(self, model_id: int) -> ModelSchema:
+    def model_schema(self, model_id: int, **options) -> ModelSchema:
         """ """
-        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:
             r = client.get(url='data-master/v2/model/schema', params={'model_id': model_id})
             if not r.is_success:
                 if r.status_code == 403:
@@ -36,9 +40,13 @@ class DataMasterV2(DataMasterApi):
 
             return ModelSchema.model_validate(r.json())
 
-    def load_model_object_data(self, folder: Path, model_id: int, model_object_name: str, limit: Optional[int]):
+    def load_model_object_data(self, folder: Path, model_id: int, model_object_name: str, limit: Optional[int], **options):
         """ """
-        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:
             params = {
                 'model_id': model_id,
                 'model_object_name': model_object_name

{analytic_workspace_client-1.31.3 → analytic_workspace_client-1.31.4}/src/aw_client/session.py

@@ -37,10 +37,10 @@ class Session:
         self.version = version if version is not None else None
         self._mlflow_wrapper = None
 
-    def get_aw_version(self) -> int:
+    def get_aw_version(self, **options) -> int:
         """ """
         if self.version is None:
-            with self.get_aw_client() as client:
+            with self.get_aw_client(**options) as client:
                 r = client.get('data-master/_version')
                 if r.is_success:
                     self.version = r.json().get('version')
@@ -68,7 +68,11 @@ class Session:
             token=self.token
         )
 
-        api, version = get_nearest_api(aw_version=self.get_aw_version(), api_config=api_config)
+        http_client_options = {}
+        if 'verify' in options:
+            http_client_options['verify'] = options['verify']
+
+        api, version = get_nearest_api(aw_version=self.get_aw_version(**http_client_options), api_config=api_config)
         if api is None:
             raise Session.Error(f'Не удалось получить API для версии AW {self.version}')
 
@@ -78,7 +82,7 @@ class Session:
 
         return df
 
-    def model_schema(self, model_id: int) -> ModelSchema:
+    def model_schema(self, model_id: int, **options) -> ModelSchema:
         """ """
         if not self.aw_url:
             raise Session.Error('Не указан URL к Analytic Workspace (параметр aw_url)')
@@ -91,13 +95,17 @@ class Session:
             token=self.token
         )
 
-        api, version = get_nearest_api(aw_version=self.get_aw_version(), api_config=api_config)
+        http_client_options = {}
+        if 'verify' in options:
+            http_client_options['verify'] = options['verify']
+
+        api, version = get_nearest_api(aw_version=self.get_aw_version(**http_client_options), api_config=api_config)
         if api is None:
             raise Session.Error(f'Не удалось получить API для версии AW {self.version}')
 
-        return api.model_schema(model_id)
+        return api.model_schema(model_id, **options)
 
-    def load_model_object_data(self, folder: Path, model_id: int, model_object_name: str, limit: Optional[int]):
+    def load_model_object_data(self, folder: Path, model_id: int, model_object_name: str, limit: Optional[int], **options):
         """ """
         if not self.aw_url:
             raise Session.Error('Не указан URL к Analytic Workspace (параметр aw_url)')
@@ -110,21 +118,25 @@ class Session:
             token=self.token
         )
 
-        api, version = get_nearest_api(aw_version=self.get_aw_version(), api_config=api_config)
+        http_client_options = {}
+        if 'verify' in options:
+            http_client_options['verify'] = options['verify']
+
+        api, version = get_nearest_api(aw_version=self.get_aw_version(**http_client_options), api_config=api_config)
         if api is None:
             raise Session.Error(f'Не удалось получить API для версии AW {self.version}')
 
-        return api.load_model_object_data(folder, model_id, model_object_name, limit)
+        return api.load_model_object_data(folder, model_id, model_object_name, limit, **options)
 
     @contextmanager
-    def get_aw_client(self) -> httpx.Client:
+    def get_aw_client(self, **options) -> httpx.Client:
         """ """
         if not self.aw_url:
             raise Session.Error('Не указан URL к Analytic Workspace')
 
         headers = {"Authorization": f"Bearer {self.token}"}
 
-        client = httpx.Client(base_url=self.aw_url, headers=headers)
+        client = httpx.Client(base_url=self.aw_url, headers=headers, **options)
 
         try:
             yield client