pam-python 0.1.22__tar.gz → 0.1.24__tar.gz

{pam_python-0.1.22/pam_python.egg-info → pam_python-0.1.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pam-python
-Version: 0.1.22
+Version: 0.1.24
 Summary: Pam Python Library
 Home-page: https://github.com/heart/pam-python
 Author: Narongrit Kanhanoi

{pam_python-0.1.22 → pam_python-0.1.24}/pam/interface_task_manager.py

@@ -21,6 +21,14 @@ class ITaskManager(ABC):
     def service_request_data(self, service: Service, page):
         pass
 
+    @abstractmethod
+    def service_request_sqlite(self, service: Service, file_name: str = "", is_shared: bool = False) -> str:
+        pass
+
+    @abstractmethod
+    def service_upload_sqlite(self, service: Service, file_name: str = "", is_shared: bool = False, sqlite_file: str = "") -> str:
+        pass
+
     @abstractmethod
     def service_upload_result(self, service: Service, file_path):
         pass

{pam_python-0.1.22 → pam_python-0.1.24}/pam/service.py

@@ -109,41 +109,12 @@ class Service:
         
         return report_csv_path
 
-
     def _request_sqlite(self, file_name: str = "", is_shared: bool = False) -> str:
         """Requests last sqlite file that this plugin has uploaded from the last time.
-
         Returns:
             The file path to the downloaded SQLite file, or None if the download failed.
         """
-        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 unique suffix using current datetime
-        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-        unique_file_name = f"{file_name or 'latest'}_{timestamp}"
-
-        # Create a temp file path for the downloaded .sqlite file
-        output_path = TempfileUtils.get_temp_file_name(
-            self.request.service_name,
-            token,
-            f"sqlite_{unique_file_name}_",
-            ".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}")
-            return output_path
-        else:
-            log(f"{self.request.service_name}: Failed to download SQLite file.")
-            return output_path
-
+        return self.task_manager.service_request_sqlite(self, file_name, is_shared)
 
     def _upload_sqlite(self, file_name: str = "", is_shared: bool = False, sqlite_file: str = "") -> str:
         """
@@ -154,34 +125,7 @@ class Service:
         :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 ""
+        return self.task_manager.service_upload_sqlite(self, file_name, is_shared, sqlite_file)
 
     def _exit(self) -> None:
         """Signals the task manager to exit the service."""

{pam_python-0.1.22 → pam_python-0.1.24}/pam/task_manager.py

@@ -1,4 +1,5 @@
 from datetime import datetime, timedelta
+from pathlib import Path
 import time
 import threading
 from typing import Dict
@@ -7,7 +8,7 @@ from pam.api import API
 from pam.service import Service
 from pam.models.request_command import RequestCommand
 from pam.interface_task_manager import ITaskManager
-
+from pam.temp_file_utils import TempfileUtils
 
 class ServiceHolder:
     def __init__(self, service: Service):
@@ -152,6 +153,77 @@ class TaskManager(ITaskManager):
         http_thread = threading.Thread(target=api_call_wrapper)
         http_thread.start()
 
+    def service_request_sqlite(self, service: Service, file_name="", is_shared=False):
+        """Requests last sqlite file that this plugin has uploaded from the last time.
+        Returns:
+            The file path to the downloaded SQLite file, or None if the download failed.
+        """
+    
+        log(f"{service.request.service_name}: Requesting sqlite for file_name={file_name}")
+        
+        endpoint = service.request.sqlite_download
+        token = service.request.token
+        json_data = {"file_name": file_name, "is_shared": is_shared, "token": token}
+
+        # Create a unique suffix using current datetime
+        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+        unique_file_name = f"{file_name or 'latest'}_{timestamp}"
+
+        # Create a temp file path for the downloaded .sqlite file
+        output_path = TempfileUtils.get_temp_file_name(
+            service.request.service_name,
+            token,
+            f"sqlite_{unique_file_name}_",
+            ".sqlite"
+        )
+
+        # Download SQLite file
+        success = self.api.download_sqlite_from_post(endpoint, json_data, output_path)
+
+        if success:
+            log(f"{service.request.service_name}: Successfully downloaded SQLite file to {output_path}")
+            return output_path
+        else:
+            log(f"{service.request.service_name}: Failed to download SQLite file.")
+            return output_path
+
+    def service_upload_sqlite(self, service: Service, 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"{service.request.service_name}: No sqlite file provided for upload.")
+            return ""
+
+        if not Path(sqlite_file).is_file():
+            log(f"{service.request.service_name}: SQLite file does not exist: {sqlite_file}")
+            return ""
+
+        endpoint = service.request.sqlite_upload
+        payload = {
+            "file_name": file_name,
+            "is_shared": str(is_shared).lower(),  # form data values must be string
+            "token": service.request.token
+        }
+
+        try:
+            log(f"{service.request.service_name}: Uploading sqlite file: {sqlite_file} with payload: {payload}")
+            response = self.api.http_upload(endpoint, sqlite_file, payload)
+
+            if response and response.ok:
+                log(f"{service.request.service_name}: SQLite file uploaded successfully.")
+                return file_name or Path(sqlite_file).name
+            else:
+                log(f"{service.request.service_name}: Failed to upload sqlite. Status: {response.status_code if response else 'N/A'}")
+                return ""
+        except Exception as e:
+            log(f"{service.request.service_name}: Exception while uploading sqlite: {e}")
+            return ""
 
     def service_upload_result(self, service: Service, file_path):
         """

{pam_python-0.1.22 → pam_python-0.1.24}/pam/templates/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.12-slim
+FROM python:3.13-alpine
 
 COPY . /app
 
@@ -15,4 +15,4 @@ EXPOSE 8000
 
 ENV PYTHONUNBUFFERED=1
 
-CMD ["gunicorn", "-w", "1", "-b", "0.0.0.0:8000", "main:app"]
+CMD ["gunicorn", "-w", "4", "-b", "0.0.0.0:8000", "main:app"]

pam_python-0.1.24/pam/templates/init/run_test.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ -n "$1" ]; then
+  python -m unittest discover -s "$1" -p "test_*.py"
+else
+  python -m unittest discover
+fi

{pam_python-0.1.22 → pam_python-0.1.24}/pam/templates/service/service.test.tmpl

@@ -9,7 +9,7 @@ from pam.tester_task import TesterTask
 from pam.models.request_command import RequestCommand
 from pam.temp_file_utils import TempfileUtils
 #pylint: disable=import-error
-from .#CLASS_NAME# import #CLASS_NAME#
+from #MODULE_NAME#.#CLASS_NAME# import #CLASS_NAME#
 
 
 # ==================== GLOBAL VARIABLES ====================
@@ -50,6 +50,13 @@ def on_request_data(page) -> Tuple[List[str], bool, str]:
     mock_csv = f"{MOCK_DIR}/mock_data_{page}.csv"
     return [mock_csv], is_end, next_page
 
+def on_request_sqlite():
+    sqlite_path = f"{MOCK_DIR}/sqlite_path.sqlite"
+    return sqlite_path
+
+
+def on_upload_sqlite(sqlite_path):
+    print(f"Upload SQLite {sqlite_path}")
 
 def on_upload_report(report_file):
     print(f"Uploaded Report {report_file}")
@@ -77,6 +84,8 @@ class Test#CLASS_NAME#(unittest.TestCase):
         self.testerTask.set_on_upload_result(on_upload_result)
         self.testerTask.set_on_request_data(on_request_data)
         self.testerTask.set_on_upload_report(on_upload_report)
+        self.testerTask.set_on_upload_sqlite(on_upload_sqlite)
+        self.testerTask.set_on_request_sqlite(on_request_sqlite)
 
     def test_run_service(self):
         #---- Create Request Command
@@ -88,6 +97,8 @@ class Test#CLASS_NAME#(unittest.TestCase):
         RESPONSE_API="https://localhost.test/api/dataadapter/test"
 
         req = RequestCommand(
+                            sqlite_download="",
+                            sqlite_upload="",
                             runtime_parameters=runtime_parameters,
                             token=token,
                             cmd="start",

{pam_python-0.1.22 → pam_python-0.1.24}/pam/templates/service/service_class.tmpl

@@ -1,8 +1,9 @@
+import threading
 from pam.service import Service
 from pam.models.request_command import RequestCommand
 from pam.utils import log
 #pylint: disable=import-error
-from .functions import create_report, load_csv_file
+from #MODULE_NAME#.functions import create_report, load_csv_file
 
 class #CLASS_NAME#(Service):
 
@@ -22,6 +23,14 @@ class #CLASS_NAME#(Service):
     def on_data_input(self, req: RequestCommand):
         log(f"on_data_input req.is_end = {req.is_end}")
 
+        #RUN IN A SEPERATED THREAD TO PREVENT HTTP REQUEST BLOCKING
+        thread = threading.Thread(
+            target=lambda: self.__run_process_data_in_thread(req),
+            daemon=True,
+        )
+        thread.start()
+
+    def __run_process_data_in_thread(self, req: RequestCommand):
         dataframe = self.__process_data(req.input_files)
         self._upload_result(dataframe)
 

{pam_python-0.1.22 → pam_python-0.1.24}/pam/tester_task.py

@@ -5,10 +5,11 @@ from pam.service import Service
 
 
 RequestDataCallbackType = Callable[[str], Tuple[List[str], bool, str]]
+RequestSqliteCallbackType = Callable[[str, bool], Tuple[str]]
+UploadSqliteCallbackType = Callable[[str, bool, str], Tuple[str]]
 UploadResultCallbackType = Callable[[str], None]
 UploadReportCallbackType = Callable[[str], None]
 
-
 class TesterTask(ITaskManager):
     """
     Mock implementation of ITaskManager for testing services.
@@ -18,6 +19,8 @@ class TesterTask(ITaskManager):
 
     def __init__(self):
         self.request_data_callback: Optional[RequestDataCallbackType] = None
+        self.request_sqlite_callback: Optional[RequestSqliteCallbackType] = None
+        self.upload_sqlite_callback: Optional[UploadSqliteCallbackType] = None
         self.upload_result_callback: Optional[UploadResultCallbackType] = None
         self.upload_report_callback: Optional[UploadReportCallbackType] = None
 
@@ -27,6 +30,18 @@ class TesterTask(ITaskManager):
         """
         self.request_data_callback = request_data_callback
 
+    def set_on_request_sqlite(self, request_sqlite_callback: RequestSqliteCallbackType):
+        """
+        Set the callback for simulating data requests.
+        """
+        self.request_sqlite_callback = request_sqlite_callback
+
+    def set_on_upload_sqlite(self, upload_sqlite_callback: UploadSqliteCallbackType):
+        """
+        Set the callback for simulating SQLite uploads.
+        """
+        self.upload_sqlite_callback = upload_sqlite_callback
+
     def set_on_upload_result(self, upload_result_callback: UploadResultCallbackType):
         """
         Set the callback for simulating result uploads.
@@ -89,6 +104,24 @@ class TesterTask(ITaskManager):
         else:
             print("Request data callback is not set.")
 
+    def service_request_sqlite(self, service: Service, file_name: str = "", is_shared: bool = False) -> str:
+        if self.request_sqlite_callback is not None:
+            try:
+                return self.request_sqlite_callback(file_name, is_shared)     
+            except Exception as e:
+                print(f"Error in service_request_sqlite: {e}")
+        else:
+            print("Request sqlite callback is not set.")
+    
+    def service_upload_sqlite(self, service: Service, file_name: str = "", is_shared: bool = False, sqlite_file: str = "") -> str:
+        if self.upload_sqlite_callback is not None:
+            try:
+                return self.upload_sqlite_callback(file_name, is_shared, sqlite_file)     
+            except Exception as e:
+                print(f"Error in service_upload_sqlite: {e}")
+        else:
+            print("Upload sqlite callback is not set.")
+
     def service_upload_result(self, service: Service, file_path: str):
         """
         Simulate a service result upload.

{pam_python-0.1.22 → pam_python-0.1.24/pam_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pam-python
-Version: 0.1.22
+Version: 0.1.24
 Summary: Pam Python Library
 Home-page: https://github.com/heart/pam-python
 Author: Narongrit Kanhanoi

{pam_python-0.1.22 → pam_python-0.1.24}/setup.py

@@ -1,27 +1,27 @@
 from setuptools import setup, find_packages
 
 setup(
-    name="pam-python",  
-    version="0.1.22",    
+    name="pam-python",
+    version="0.1.24",
     author="Narongrit Kanhanoi",
     author_email="narongrit@pams.ai",
     description="Pam Python Library",
     long_description=open("README.md", encoding='utf-8').read(),
     long_description_content_type="text/markdown",
-    url="https://github.com/heart/pam-python",  
-    packages=find_packages(), 
+    url="https://github.com/heart/pam-python",
+    packages=find_packages(),
     classifiers=[
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
-        "License :: Other/Proprietary License",  
+        "License :: Other/Proprietary License",
         "Operating System :: OS Independent",
         "Intended Audience :: Developers",
         "Intended Audience :: Customer Service",
         "Topic :: Software Development :: Libraries",
     ],
     package_data={
-        "pam": ["templates/**/*"], 
+        "pam": ["templates/**/*"],
     },
     install_requires=[
         "setuptools>=70.0.0",
@@ -37,8 +37,8 @@ setup(
     ],
     entry_points={
         "console_scripts": [
-            "pam=pam.cli:main",  
+            "pam=pam.cli:main",
         ],
     },
-    python_requires=">=3.8",  
+    python_requires=">=3.8",
 )

pam_python-0.1.22/pam/templates/init/run_test.sh

@@ -1 +0,0 @@
-python -m unittest discover