polyanalyst6api 0.35.3__tar.gz → 0.36.0__tar.gz

{polyanalyst6api-0.35.3 → polyanalyst6api-0.36.0}/PKG-INFO

@@ -1,28 +1,25 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: polyanalyst6api
-Version: 0.35.3
+Version: 0.36.0
 Summary: polyanalyst6api is a PolyAnalyst API client for Python.
-Home-page: https://github.com/Megaputer/polyanalyst6api-py
 License: MIT
+License-File: LICENSE
 Keywords: megaputer,polyanalyst,polyanalyst6api,api
 Author: yatmanov
 Author-email: yatmanov@megaputer.ru
-Requires-Python: >=3.7,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Internet
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: pytus (>=0.2.1,<0.3.0)
-Requires-Dist: requests (>=2.31,<3.0)
-Requires-Dist: urllib3 (==1.26.18) ; python_version == "3.7"
-Requires-Dist: urllib3 ; python_version >= "3.8"
+Requires-Dist: requests (>=2.32,<3.0)
 Project-URL: Changelog, https://github.com/Megaputer/polyanalyst6api-py/blob/master/CHANGELOG.md
 Project-URL: Documentation, https://polyanalyst6api-py.rtfd.io/
 Project-URL: Repository, https://github.com/Megaputer/polyanalyst6api-py

{polyanalyst6api-0.35.3 → polyanalyst6api-0.36.0}/polyanalyst6api/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.35.2'
+__version__ = '0.36.0'
 
 from .api import *
 from .exceptions import *

{polyanalyst6api-0.35.3 → polyanalyst6api-0.36.0}/polyanalyst6api/api.py

@@ -204,7 +204,7 @@ class API:
         project_space: Optional[str] = None,
         on_conflict: str = 'Cancel',
         wait: bool = False
-        ) -> Union[str, Dict]:
+    ) -> Union[str, Dict]:
         """
         Import project from file on server file system.
 
@@ -254,6 +254,13 @@ class API:
         if not wait:
             return import_id
 
+        # Started,
+        # Unpacking,
+        # CheckingReferences,
+        # Error,
+        # Imported,
+        # Cancelled
+
         while True:
             time.sleep(1)
             status = self.get_project_import_status(import_id)

{polyanalyst6api-0.35.3 → polyanalyst6api-0.36.0}/polyanalyst6api/project.py

@@ -80,7 +80,7 @@ class Project:
             task['startTime'] = datetime.datetime.utcfromtimestamp(task['startTime'] / 1000)
         return json
 
-    def save(self) -> None:
+    def save(self, wait: bool = False) -> None:  # TODO project/save/status do exist
         """Initiates saving of all changes that have been made in the project."""
         self.api.post('project/save', json={'prjUUID': self.uuid})
 
@@ -514,7 +514,7 @@ class Project:
            Use :meth:`Project.get_execution_stats` instead.
         """
         warnings.warn(
-            'Project.get_execution_statistics() is deprecated, use' 'Project.get_execution_stats() instead.',
+            'Project.get_execution_statistics() is deprecated, use Project.get_execution_stats() instead.',
             DeprecationWarning,
             stacklevel=2,
         )
@@ -714,12 +714,18 @@ class DataSet:
 
         return self._api.get('dataset/preview', params=params)
 
-    def iter_rows(self, start: int = 0, stop: Optional[int] = None) -> Iterator[Dict[str, JSON_VAL]]:
+    def iter_rows(
+            self,
+            start: int = 0,
+            stop: Optional[int] = None,
+            fetch_files: bool = False
+        ) -> Iterator[Dict[str, JSON_VAL]]:
         """
         Iterate over rows in dataset.
 
-        :param start:
-        :param stop:
+        :param start: starting row index. 0 by default (the first row)
+        :param stop: ending index. None by default, which means iterates to the last row
+        :param fetch_files: whatever to download file attachments as bytes. False by default
 
         :raises: ValueError if `start` or `stop` is out of datasets' row range
 
@@ -742,8 +748,9 @@ class DataSet:
         if not 0 <= start <= stop <= max_row:
             raise ValueError(f'start and stop arguments must be within dataset row range: (0, {max_row})')
 
-        rows = self._values(stop)['table']
+        values = self._values(stop)
         get_text = self._cell_text
+        get_file = self._binary_content
 
         class RowIterator:
             def __init__(self):
@@ -760,10 +767,10 @@ class DataSet:
                 columns = info.get('columnsInfo') or info['columns']
                 for column in columns:
                     if column['flags'].get('getTextAlways'):
-                        result[column['title']] = get_text(self.idx, column['id'])
+                        _value = get_text(self.idx, column['id'])
                     # elif column['type'] == 'DateTime':  # todo convert to python datetime?
                     else:
-                        _value = rows[self.idx][column['id']]
+                        _value = values['table'][self.idx][column['id']]
                         if _value == 1e100:
                             _value = None
                         elif _value == 8e100:
@@ -771,7 +778,10 @@ class DataSet:
                         elif _value == -8e100:
                             _value = -math.inf
 
-                        result[column['title']] = _value
+                    if fetch_files and str(column['id']) in values['binaryContent']:
+                        _value = get_file(values['textIDs'][str(column['id'])][str(self.idx)], '_')
+
+                    result[column['title']] = _value
 
                 self.idx += 1
                 return result
@@ -801,3 +811,15 @@ class DataSet:
                 'col': col,
             },
         )['text']
+
+    @retry_on_invalid_guid
+    def _binary_content(self, key: str, filename: str) -> bytes:
+        return self._api.request(
+            'dataset/get-binary-content',
+            method='GET',
+            params={
+                'wrapperGuid': self.guid,
+                'key': key,
+                'fileName': filename,
+            },
+        )[0].content

{polyanalyst6api-0.35.3 → polyanalyst6api-0.36.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "polyanalyst6api"
-version = "0.35.3"
+version = "0.36.0"
 description = "polyanalyst6api is a PolyAnalyst API client for Python."
 authors = ["yatmanov <yatmanov@megaputer.ru>"]
 license = "MIT"
@@ -20,13 +20,9 @@ classifiers = [
 "Changelog" = "https://github.com/Megaputer/polyanalyst6api-py/blob/master/CHANGELOG.md"
 
 [tool.poetry.dependencies]
-python = "^3.7"
-requests = "^2.31"
+python = "^3.9"
+requests = "^2.32"
 pytus = "^0.2.1"
-urllib3 = [
-    {version = "1.26.18", python = "3.7"},
-    {version = "*", python = ">=3.8"}
-]
 
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"