pam-python 0.2.17__tar.gz → 0.2.18__tar.gz

{pam_python-0.2.17/pam_python.egg-info → pam_python-0.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pam-python
-Version: 0.2.17
+Version: 0.2.18
 Summary: Pam Python Library
 Author-email: Narongrit Kanhanoi <narongrit@pams.ai>
 Project-URL: Homepage, https://github.com/heart/pam-python
@@ -15,6 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: Flask>=3.0.2
 Requires-Dist: requests>=2.32.3
+Requires-Dist: requests-toolbelt>=1.0.0
 Requires-Dist: PyYAML>=6.0.2
 Dynamic: license-file
 

{pam_python-0.2.17 → pam_python-0.2.18}/pam/__init__.py

@@ -1,3 +1,3 @@
 """PAM Data Plugin framework."""
 
-__version__ = "0.2.17"
+__version__ = "0.2.18"

{pam_python-0.2.17 → pam_python-0.2.18}/pam/api.py

@@ -2,6 +2,7 @@ from pathlib import Path
 import os
 import sqlite3
 import requests
+from requests_toolbelt.multipart.encoder import MultipartEncoder
 from pam.models.sqlite_download import SQLiteDownloadResult, SQLiteDownloadStatus
 from pam.utils import log
 
@@ -36,7 +37,7 @@ class API:
 
     def http_upload(self, url: str, file_path: str, payload: dict = None) -> requests.Response | None:
         """
-        Uploads a file to the specified URL with optional form data (payload).
+        Streams a file as multipart form data without buffering the whole file.
 
         :param url: The URL to upload the file to.
         :param file_path: The path to the file to be uploaded.
@@ -49,11 +50,15 @@ class API:
 
         try:
             with open(file_path, 'rb') as file:
-                files = {'file': file}
+                fields = dict(payload or {})
+                fields['file'] = (Path(file_path).name, file)
+                # requests' files= buffers the entire multipart body. This encoder
+                # reads the open file incrementally and provides Content-Length.
+                body = MultipartEncoder(fields=fields)
                 response = self.session.post(
                     url,
-                    files=files,
-                    data=payload or {},  # optional form data
+                    data=body,
+                    headers={'Content-Type': body.content_type},
                     timeout=300
                 )
                 response.raise_for_status()

{pam_python-0.2.17 → pam_python-0.2.18/pam_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pam-python
-Version: 0.2.17
+Version: 0.2.18
 Summary: Pam Python Library
 Author-email: Narongrit Kanhanoi <narongrit@pams.ai>
 Project-URL: Homepage, https://github.com/heart/pam-python
@@ -15,6 +15,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: Flask>=3.0.2
 Requires-Dist: requests>=2.32.3
+Requires-Dist: requests-toolbelt>=1.0.0
 Requires-Dist: PyYAML>=6.0.2
 Dynamic: license-file
 

{pam_python-0.2.17 → pam_python-0.2.18}/pam_python.egg-info/requires.txt

@@ -1,3 +1,4 @@
 Flask>=3.0.2
 requests>=2.32.3
+requests-toolbelt>=1.0.0
 PyYAML>=6.0.2

{pam_python-0.2.17 → pam_python-0.2.18}/pyproject.toml

@@ -22,6 +22,7 @@ classifiers = [
 dependencies = [
     "Flask>=3.0.2",
     "requests>=2.32.3",
+    "requests-toolbelt>=1.0.0",
     "PyYAML>=6.0.2",
 ]
 

pam_python-0.2.18/tests/test_api.py

@@ -0,0 +1,102 @@
+import unittest
+import tempfile
+from pathlib import Path
+from email.parser import BytesParser
+from email.policy import default
+from unittest import mock
+
+import requests
+
+from pam.api import API
+
+
+class APITest(unittest.TestCase):
+    def test_http_upload_streams_file_and_preserves_multipart_fields(self):
+        api = API()
+        content = b'SQLite format 3\x00' * 65536
+        payload = {'token': 'test-token', 'file_name': 'state', 'is_shared': 'false'}
+        response = requests.Response()
+        response.status_code = 200
+        with tempfile.TemporaryDirectory() as directory:
+            path = Path(directory) / 'state.sqlite'
+            path.write_bytes(content)
+            real_open = open
+            opened = []
+
+            def guarded_open(*args, **kwargs):
+                file = real_open(*args, **kwargs)
+                opened.append(file)
+                original_read = file.read
+
+                def bounded_read(size=-1):
+                    self.assertGreaterEqual(size, 0)
+                    self.assertLessEqual(size, 16384)
+                    return original_read(size)
+
+                file.read = bounded_read
+                return file
+
+            def post(url, **kwargs):
+                self.assertNotIn('files', kwargs)
+                prepared = requests.Request('POST', url, **{
+                    key: kwargs[key] for key in ('data', 'headers')
+                }).prepare()
+                self.assertIs(prepared.body, kwargs['data'])
+                chunks = []
+                while chunk := prepared.body.read(16384):
+                    chunks.append(chunk)
+                body = b''.join(chunks)
+                self.assertEqual(int(prepared.headers['Content-Length']), len(body))
+                message = BytesParser(policy=default).parsebytes(
+                    ('Content-Type: ' + prepared.headers['Content-Type'] + '\r\n\r\n').encode() + body
+                )
+                parts = {part.get_param('name', header='content-disposition'): part
+                         for part in message.iter_parts()}
+                for key, value in payload.items():
+                    self.assertEqual(parts[key].get_payload(decode=True).decode(), value)
+                self.assertEqual(parts['file'].get_filename(), path.name)
+                self.assertEqual(parts['file'].get_payload(decode=True), content)
+                self.assertEqual(kwargs['timeout'], 300)
+                return response
+
+            api.session.post = mock.Mock(side_effect=post)
+            with mock.patch('pam.api.open', side_effect=guarded_open):
+                self.assertIs(api.http_upload('http://pam/sqlite_upload', str(path), payload), response)
+            self.assertTrue(opened[0].closed)
+            self.assertNotIn('file', payload)
+
+    def test_http_post_logs_error_response_body(self):
+        api = API()
+        response = requests.Response()
+        response.status_code = 404
+        response.url = "http://pam/api/dataadapter/adapter-1/log"
+        response._content = (
+            b'{"code":"NOT_FOUND","error_code":"ADAPTER_LOG_NOT_FOUND",'
+            b'"message":"Adapter execution log was not found"}'
+        )
+        api.session.post = mock.Mock(return_value=response)
+
+        with mock.patch("pam.api.log") as log_mock:
+            result = api.http_post(response.url, {"token": "secret"})
+
+        self.assertIsNone(result)
+        logged_message = log_mock.call_args.args[0]
+        self.assertIn("404 Client Error", logged_message)
+        self.assertIn('"error_code":"ADAPTER_LOG_NOT_FOUND"', logged_message)
+        self.assertNotIn("secret", logged_message)
+
+    def test_http_post_without_response_does_not_add_response_detail(self):
+        api = API()
+        api.session.post = mock.Mock(side_effect=requests.ConnectionError("offline"))
+
+        with mock.patch("pam.api.log") as log_mock:
+            result = api.http_post("http://pam/log", {})
+
+        self.assertIsNone(result)
+        logged_message = log_mock.call_args.args[0]
+        self.assertIn("offline", logged_message)
+        self.assertNotIn("Response:", logged_message)
+
+
+if __name__ == "__main__":
+    unittest.main()

pam_python-0.2.17/tests/test_api.py

@@ -1,44 +0,0 @@
-import unittest
-from unittest import mock
-
-import requests
-
-from pam.api import API
-
-
-class APITest(unittest.TestCase):
-    def test_http_post_logs_error_response_body(self):
-        api = API()
-        response = requests.Response()
-        response.status_code = 404
-        response.url = "http://pam/api/dataadapter/adapter-1/log"
-        response._content = (
-            b'{"code":"NOT_FOUND","error_code":"ADAPTER_LOG_NOT_FOUND",'
-            b'"message":"Adapter execution log was not found"}'
-        )
-        api.session.post = mock.Mock(return_value=response)
-
-        with mock.patch("pam.api.log") as log_mock:
-            result = api.http_post(response.url, {"token": "secret"})
-
-        self.assertIsNone(result)
-        logged_message = log_mock.call_args.args[0]
-        self.assertIn("404 Client Error", logged_message)
-        self.assertIn('"error_code":"ADAPTER_LOG_NOT_FOUND"', logged_message)
-        self.assertNotIn("secret", logged_message)
-
-    def test_http_post_without_response_does_not_add_response_detail(self):
-        api = API()
-        api.session.post = mock.Mock(side_effect=requests.ConnectionError("offline"))
-
-        with mock.patch("pam.api.log") as log_mock:
-            result = api.http_post("http://pam/log", {})
-
-        self.assertIsNone(result)
-        logged_message = log_mock.call_args.args[0]
-        self.assertIn("offline", logged_message)
-        self.assertNotIn("Response:", logged_message)
-
-
-if __name__ == "__main__":
-    unittest.main()