pam-python 0.1.15__tar.gz → 0.1.17__tar.gz

{pam_python-0.1.15 → pam_python-0.1.17}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pam-python
-Version: 0.1.15
+Version: 0.1.17
 Summary: Pam Python Library
 Home-page: https://github.com/heart/pam-python
 Author: Narongrit Kanhanoi
@@ -32,6 +32,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{pam_python-0.1.15 → pam_python-0.1.17}/pam/api.py

@@ -26,12 +26,13 @@ class API:
             log(f"HTTP POST request failed. URL: {url}, Error: {e}")
             return None
 
-    def http_upload(self, url: str, file_path: str) -> requests.Response | None:
+    def http_upload(self, url: str, file_path: str, payload: dict = None) -> requests.Response | None:
         """
-        Uploads a file to the specified URL.
+        Uploads a file to the specified URL with optional form data (payload).
 
         :param url: The URL to upload the file to.
         :param file_path: The path to the file to be uploaded.
+        :param payload: Optional dictionary of form fields to include in the request.
         :return: The response from the server, or None if an error occurred.
         """
         if not Path(file_path).is_file():
@@ -41,13 +42,46 @@ class API:
         try:
             with open(file_path, 'rb') as file:
                 files = {'file': file}
-                response = self.session.post(url, files=files, timeout=300)
+                response = self.session.post(
+                    url,
+                    files=files,
+                    data=payload or {},  # optional form data
+                    timeout=300
+                )
                 response.raise_for_status()
                 return response
         except requests.RequestException as e:
             log(f"File upload failed. URL: {url}, File: {file_path}, Error: {e}")
             return None
 
+    def download_sqlite_from_post(self, url: str, data: dict, output_path: str) -> bool:
+        """
+        Sends a POST request with JSON data and expects a SQLite file in response.
+        Saves the response content as a .sqlite file.
+
+        :param url: The URL to send the POST request to.
+        :param data: Dictionary to send as JSON in the body.
+        :param output_path: File path to save the .sqlite file.
+        :return: True if successful, False otherwise.
+        """
+        headers = {'Content-Type': 'application/json'}
+        try:
+            response = self.session.post(url, json=data, timeout=60, headers=headers)
+            response.raise_for_status()
+
+            # Save response content to file
+            with open(output_path, "wb") as f:
+                f.write(response.content)
+
+            log(f"SQLite file saved to {output_path}")
+            return True
+        except requests.RequestException as e:
+            log(f"Failed to download SQLite. URL: {url}, Error: {e}")
+            return False
+        except IOError as e:
+            log(f"Failed to save SQLite file. Path: {output_path}, Error: {e}")
+            return False
+
     def close(self):
         """Close the session."""
         self.session.close()

{pam_python-0.1.15 → pam_python-0.1.17}/pam/models/request_command.py

@@ -31,6 +31,8 @@ class RequestCommand:
     """
     Wraps an HTTP request to simplify access to its parameters and files.
     """
+    sqlite_download: str
+    sqlite_upload: str
     runtime_parameters: dict
     token: str
     cmd: str
@@ -129,6 +131,10 @@ class RequestCommand:
         token = params.pop("token", "")
         cmd = params.pop("cmd", "")
         data_api = params.pop("data", "")
+
+        sqlite_upload = params.pop("sqlite_upload", "")
+        sqlite_download = params.pop("sqlite_download", "")
+
         response_api = params.pop("response", "")
         is_end = RequestCommand.__safe_str_to_bool(params.pop("is_end", "true"))
         next_page = params.pop("next", "")
@@ -148,6 +154,8 @@ class RequestCommand:
                 )
 
         return RequestCommand(
+            sqlite_download=sqlite_download,
+            sqlite_upload=sqlite_upload,
             runtime_parameters=params,
             token=token,
             cmd=cmd,

{pam_python-0.1.15 → pam_python-0.1.17}/pam/service.py

@@ -1,4 +1,5 @@
 from abc import abstractmethod
+from pathlib import Path
 import json
 from typing import TYPE_CHECKING, Union
 import pandas as pd
@@ -94,6 +95,69 @@ class Service:
             raise
         
         return report_csv_path
+    
+    def _request_sqlite(self, file_name: str = "", is_shared: bool = False) -> None:
+        """Requests last sqlite file that this plugin has uploaded from the last time."""
+        log(f"{self.request.service_name}: Requesting sqlite for file_name={file_name}")
+        
+        endpoint = self.request.sqlite_download
+        token = self.request.token
+        json_data = {"file_name": file_name, "is_shared": is_shared, "token": token}
+
+        # Create a temp file path for the downloaded .sqlite file
+        output_path = TempfileUtils.get_temp_file_name(
+            self.request.service_name,
+            token,
+            f"sqlite_{file_name or 'latest'}_",
+            ".sqlite"
+        )
+
+        # Download SQLite file
+        success = self.task_manager.api.download_sqlite_from_post(endpoint, json_data, output_path)
+
+        if success:
+            log(f"{self.request.service_name}: Successfully downloaded SQLite file to {output_path}")
+        else:
+            log(f"{self.request.service_name}: Failed to download SQLite file.")
+
+
+    def _upload_sqlite(self, file_name: str = "", is_shared: bool = False, sqlite_file: str = "") -> str:
+        """
+        Uploads the result SQLite file to CDP.
+
+        :param file_name: The logical file name being uploaded.
+        :param is_shared: Whether this file should be treated as shared.
+        :param sqlite_file: Path to the SQLite file to upload.
+        :return: The uploaded file name if successful, or empty string if failed.
+        """
+        if not sqlite_file:
+            log(f"{self.request.service_name}: No sqlite file provided for upload.")
+            return ""
+
+        if not Path(sqlite_file).is_file():
+            log(f"{self.request.service_name}: SQLite file does not exist: {sqlite_file}")
+            return ""
+
+        endpoint = self.request.sqlite_upload
+        payload = {
+            "file_name": file_name,
+            "is_shared": str(is_shared).lower(),  # form data values must be string
+            "token": self.request.token
+        }
+
+        try:
+            log(f"{self.request.service_name}: Uploading sqlite file: {sqlite_file} with payload: {payload}")
+            response = self.task_manager.api.http_upload(endpoint, sqlite_file, payload)
+
+            if response and response.ok:
+                log(f"{self.request.service_name}: SQLite file uploaded successfully.")
+                return file_name or Path(sqlite_file).name
+            else:
+                log(f"{self.request.service_name}: Failed to upload sqlite. Status: {response.status_code if response else 'N/A'}")
+                return ""
+        except Exception as e:
+            log(f"{self.request.service_name}: Exception while uploading sqlite: {e}")
+            return ""
 
     def _exit(self) -> None:
         """Signals the task manager to exit the service."""

{pam_python-0.1.15 → pam_python-0.1.17}/pam/tester_task.py

@@ -71,6 +71,8 @@ class TesterTask(ITaskManager):
             try:
                 files, is_end, next_page = self.request_data_callback(page)
                 req = RequestCommand(
+                    sqlite_download="",
+                    sqlite_upload="",
                     runtime_parameters={},
                     token=service.request.token,
                     cmd="dataset",

{pam_python-0.1.15 → pam_python-0.1.17}/pam_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pam-python
-Version: 0.1.15
+Version: 0.1.17
 Summary: Pam Python Library
 Home-page: https://github.com/heart/pam-python
 Author: Narongrit Kanhanoi
@@ -32,6 +32,7 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{pam_python-0.1.15 → pam_python-0.1.17}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="pam-python",  
-    version="0.1.15",    
+    version="0.1.17",    
     author="Narongrit Kanhanoi",
     author_email="narongrit@pams.ai",
     description="Pam Python Library",