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

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

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

{pam_python-0.1.20 → pam_python-0.1.22}/pam/server.py

@@ -12,7 +12,7 @@ from pam.models.request_command import RequestCommand
 from pam.task_manager import TaskManager
 from pam.temp_file_utils import TempfileUtils
 from threading import Lock
-
+from pam.utils import log
 
 class Server:
     """
@@ -35,15 +35,16 @@ class Server:
 
         @app.route('/service/<service_name>', methods=['POST'])
         def run(service_name):
+            log(f"[run] service = {service_name}")
             TempfileUtils.clean_temp()
-
+            log(f"[run] service = {service_name} after clean_temp")
             req, error_request = RequestCommand.parse(request, service_name)
-
             if error_request:
                 response = {'message': error_request}
                 return self.response_error(response, 400)
-
+            log(f"[run] service = {service_name} after parse")
             response, code = self.handle_service_cmd(service_name, req)
+            log(f"[run] service = {service_name} after handle_service_cmd")
             return self.response_error(response, code)
 
         @app.route('/tasks', methods=['GET'])

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

@@ -22,6 +22,12 @@ class Service:
         self.request = req
         self.task_manager = task_manager
 
+    def get_adapter_id(self) -> str:
+        """
+        Returns the adapter ID for the service based on the request's response API.
+        """
+        return get_adapter_id(self.request.response_api)
+    
     # == REQUEST DATA ===
     def _request_data(self, page: str = "") -> None:
         """Requests data for the specified page."""
@@ -57,10 +63,15 @@ class Service:
 
         return tmp_file_name
 
-    # == UPLOAD REPORT ===
-    def _upload_report(self, report_name: str, report_json: dict) -> None:
+    def _upload_report(self, report_name: str, report_json: dict, tracker_name: str = "") -> str:
         """
         Uploads a report in JSON format to a temporary file and notifies the task manager.
+        Args:
+            report_name (str): Name of the report.
+            report_json (dict): The report content as a dictionary.
+            tracker_name (str, optional): Tracker name to include in the report. Defaults to empty string.
+        Returns:
+            str: Path to the uploaded report CSV file.
         """
         if not isinstance(report_json, dict):
             raise ValueError("report_json must be a dictionary")
@@ -75,6 +86,7 @@ class Service:
         formatted_report_name = f"data_{report_name}_no_index"
         df = pd.DataFrame({
             'customer': [adapter_id],
+            '_tracker_name': [tracker_name],
             formatted_report_name: [json_string]
         })
 
@@ -97,6 +109,7 @@ 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.
 

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

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

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

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