pam-python 0.1.28__tar.gz → 0.1.30__tar.gz

{pam_python-0.1.28 → pam_python-0.1.30}/PKG-INFO

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

{pam_python-0.1.28 → pam_python-0.1.30}/pam/cli.py

@@ -3,8 +3,7 @@ import sys
 import re
 import shutil
 import subprocess
-import pkg_resources
-
+import importlib.resources as resources
 
 def main():
     args = sys.argv[1:]
@@ -40,13 +39,11 @@ def to_pascal_case(input_string: str) -> str:
 
     return pascal_case
 
-
 def cpy(src, dest):
-    template_dir = pkg_resources.resource_filename("pam", "templates")
+    template_dir = resources.files("pam") / "templates"
     src_file = os.path.join(template_dir, src)
     shutil.copy(src_file, dest)
 
-
 def replace_template_content(service_name, class_name, file_name):
     file_path = os.path.join(service_name, file_name)
     with open(file_path, 'r+', encoding='utf-8') as file:

{pam_python-0.1.28 → pam_python-0.1.30}/pam/interface_task_manager.py

@@ -18,7 +18,7 @@ class ITaskManager(ABC):
         pass
 
     @abstractmethod
-    def service_request_data(self, service: Service, page):
+    def service_request_data(self, service: Service, page, filter_contact_ids=None):
         pass
 
     @abstractmethod
@@ -30,7 +30,7 @@ class ITaskManager(ABC):
         pass
 
     @abstractmethod
-    def service_upload_result(self, service: Service, file_path):
+    def service_upload_result(self, service: Service, file_path, options=None):
         pass
 
     @abstractmethod

{pam_python-0.1.28 → pam_python-0.1.30}/pam/service.py

@@ -2,7 +2,7 @@ from abc import abstractmethod
 from pathlib import Path
 from datetime import datetime
 import json
-from typing import TYPE_CHECKING, Union
+from typing import TYPE_CHECKING, Union, Optional, List
 import pandas as pd
 import dask.dataframe as dd
 from pam.utils import log, deep_convert_numbers_to_strings, get_adapter_id
@@ -29,13 +29,17 @@ class Service:
         return get_adapter_id(self.request.response_api)
     
     # == REQUEST DATA ===
-    def _request_data(self, page: str = "") -> None:
+    def _request_data(self, page: str = "", filter_contact_ids: Optional[List[str]] = None) -> None:
         """Requests data for the specified page."""
         log(f"{self.request.service_name}: Requesting data for page={page}")
-        self.task_manager.service_request_data(self, page)
+        self.task_manager.service_request_data(self, page, filter_contact_ids)
 
     # == UPLOAD RESULT ===
-    def _upload_result(self, df: Union[pd.DataFrame, dd.DataFrame]) -> str:
+    def _upload_result(
+        self,
+        df: Union[pd.DataFrame, dd.DataFrame],
+        options: Optional[dict] = None,
+    ) -> str:
         """
         Uploads the result DataFrame to a temporary file and notifies the task manager.
         """
@@ -56,7 +60,7 @@ class Service:
         try:
             df.to_csv(tmp_file_name, index=False)
             log(f"{self.request.service_name}: Uploading result file: {tmp_file_name}")
-            self.task_manager.service_upload_result(self, tmp_file_name)
+            self.task_manager.service_upload_result(self, tmp_file_name, options)
         except Exception as e:
             log(f"Failed to upload result file: {e}")
             raise

{pam_python-0.1.28 → pam_python-0.1.30}/pam/task_manager.py

@@ -127,7 +127,7 @@ class TaskManager(ITaskManager):
             self._remove_service(token)
 
     # ==== Service Callbacks ====
-    def service_request_data(self, service: Service, page):
+    def service_request_data(self, service: Service, page, filter_contact_ids=None):
         """
         Makes an asynchronous request for data from a service.
         Logs the response without blocking the main thread.
@@ -135,6 +135,8 @@ class TaskManager(ITaskManager):
         endpoint = service.request.data_api
         token = service.request.token
         json_data = {"page": page, "token": token}
+        if filter_contact_ids is not None:
+            json_data["filter_contact_ids"] = filter_contact_ids
 
         def handle_response(response):
             """Logs the response from the API."""
@@ -225,11 +227,20 @@ class TaskManager(ITaskManager):
             log(f"{service.request.service_name}: Exception while uploading sqlite: {e}")
             return ""
 
-    def service_upload_result(self, service: Service, file_path):
+    def service_upload_result(self, service: Service, file_path, options=None):
         """
         Uploads a result file asynchronously and logs the response.
         """
         endpoint = service.request.response_api
+        payload = None
+        if options is not None:
+            payload = {}
+            if "is_realtime" in options:
+                is_realtime = options.get("is_realtime")
+                payload["is_realtime"] = str(is_realtime).lower() if isinstance(is_realtime, bool) else is_realtime
+            if "is_priority" in options:
+                is_priority = options.get("is_priority")
+                payload["is_priority"] = str(is_priority).lower() if isinstance(is_priority, bool) else is_priority
 
         def handle_upload_response(response):
             """Logs the response after the upload completes."""
@@ -241,7 +252,7 @@ class TaskManager(ITaskManager):
 
         def upload_wrapper():
             """Wrapper for the upload to handle response logging."""
-            response = self.api.http_upload(endpoint, file_path)
+            response = self.api.http_upload(endpoint, file_path, payload)
             handle_upload_response(response)
 
         log(f"Uploading Result to: {endpoint}")

{pam_python-0.1.28 → pam_python-0.1.30}/pam/templates/service/service.test.tmpl

@@ -35,7 +35,7 @@ def create_mock_csv(page, mockDir):
         df.to_csv(file_name, index=False)
 
 
-def on_request_data(page) -> Tuple[List[str], bool, str]:
+def on_request_data(page, filter_contact_ids=None) -> Tuple[List[str], bool, str]:
     if page is None or page == "" :
         page = "1"
 

{pam_python-0.1.28 → pam_python-0.1.30}/pam/tester_task.py

@@ -4,7 +4,7 @@ from pam.interface_task_manager import ITaskManager
 from pam.service import Service
 
 
-RequestDataCallbackType = Callable[[str], Tuple[List[str], bool, str]]
+RequestDataCallbackType = Callable[..., Tuple[List[str], bool, str]]
 RequestSqliteCallbackType = Callable[[str, bool], Tuple[str]]
 UploadSqliteCallbackType = Callable[[str, bool, str], Tuple[str]]
 UploadResultCallbackType = Callable[[str], None]
@@ -81,16 +81,23 @@ class TesterTask(ITaskManager):
         while not self.is_exit:
             pass
 
-    def service_request_data(self, service: Service, page: str):
+    def service_request_data(self, service: Service, page: str, filter_contact_ids: Optional[List[str]] = None):
         """
         Simulate a service data request.
 
         :param service: The service requesting data.
         :param page: The page identifier for the data request.
+        :param filter_contact_ids: Optional list of contact IDs to filter the request.
         """
         if self.request_data_callback is not None:
             try:
-                files, is_end, next_page = self.request_data_callback(page)
+                if filter_contact_ids is None:
+                    files, is_end, next_page = self.request_data_callback(page)
+                else:
+                    try:
+                        files, is_end, next_page = self.request_data_callback(page, filter_contact_ids)
+                    except TypeError:
+                        files, is_end, next_page = self.request_data_callback(page)
                 req = RequestCommand(
                     sqlite_download="",
                     sqlite_upload="",
@@ -128,12 +135,18 @@ class TesterTask(ITaskManager):
         else:
             print("Upload sqlite callback is not set.")
 
-    def service_upload_result(self, service: Service, file_path: str):
+    def service_upload_result(
+        self,
+        service: Service,
+        file_path: str,
+        options: Optional[dict] = None,
+    ):
         """
         Simulate a service result upload.
 
         :param service: The service uploading the result.
         :param file_path: The path of the file being uploaded.
+        :param options: Optional upload options (e.g. is_realtime, is_priority).
         """
         if self.upload_result_callback is not None:
             try:

{pam_python-0.1.28 → pam_python-0.1.30}/pam_python.egg-info/PKG-INFO

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

{pam_python-0.1.28 → pam_python-0.1.30}/setup.py

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