pam-python 0.1.5__tar.gz → 0.1.7__tar.gz

{pam_python-0.1.5 → pam_python-0.1.7}/PKG-INFO

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

{pam_python-0.1.5 → pam_python-0.1.7}/pam/cli.py

@@ -78,11 +78,11 @@ def cpy(src, dest):
     src_file = os.path.join(template_dir, src)
     shutil.copy(src_file, dest)
 
-def replace_template_content(service_name, file_name):
+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:
         filedata = file.read()
-        updated_data = filedata.replace('#CLASS_NAME#', to_pascal_case(service_name))
+        updated_data = filedata.replace('#CLASS_NAME#', class_name)
         updated_data = updated_data.replace('#MODULE_NAME#', service_name)
         file.seek(0)  # Move the file pointer to the beginning of the file
         file.write(updated_data)
@@ -99,14 +99,16 @@ def create_service(name):
 
     os.mkdir(name)
     open(os.path.join(name, "__init__.py"), 'a', encoding='utf-8').close()
-    cpy("service/service_class.tmpl", os.path.join(name, name+"_service.py") )
+
+    cpy("service/service_class.tmpl", os.path.join(name, to_pascal_case(name)+"Svc.py") )
+
     cpy("service/service.yaml", os.path.join(name, "service.yaml") )
     cpy("service/functions.tmpl", os.path.join(name, "functions.py") )
     cpy("service/service.test.tmpl", os.path.join(name, name+".test.py") )
 
-    replace_template_content(name, name+"_service.py")
-    replace_template_content(name, "service.yaml")
-    replace_template_content(name, name+".test.py")
+    replace_template_content(name, to_pascal_case(name)+"Svc", to_pascal_case(name)+"Svc.py")
+    replace_template_content(name, to_pascal_case(name)+"Svc", "service.yaml")
+    replace_template_content(name, to_pascal_case(name)+"Svc", name+".test.py")
 
     print(f"Service {name} created.")
     print(f"Run `pam test {name}` to run tests for the service.")

{pam_python-0.1.5 → pam_python-0.1.7}/pam/task_manager.py

@@ -129,31 +129,62 @@ class TaskManager(ITaskManager):
     def service_request_data(self, service: Service, page):
         """
         Makes an asynchronous request for data from a service.
+        Logs the response without blocking the main thread.
         """
         endpoint = service.request.data_api
         token = service.request.token
         json_data = {"page": page, "token": token}
 
+        def handle_response(response):
+            """Logs the response from the API."""
+            log(f"Response from {endpoint}: {response}")
+
+        def api_call_wrapper():
+            """Wrapper for the API call to handle response."""
+            response = self.api.http_post(endpoint, json_data)
+            handle_response(response)
+
         log(f"Requesting Data from: {endpoint}, page: {page}, token={token}")
-        http_thread = threading.Thread(target=self.api.http_post, args=(endpoint, json_data))
+        http_thread = threading.Thread(target=api_call_wrapper)
         http_thread.start()
 
+
     def service_upload_result(self, service: Service, file_path):
         """
-        Uploads a result file asynchronously.
+        Uploads a result file asynchronously and logs the response.
         """
         endpoint = service.request.response_api
+
+        def handle_upload_response(response):
+            """Logs the response after the upload completes."""
+            log(f"Response from upload to {endpoint}: {response}")
+
+        def upload_wrapper():
+            """Wrapper for the upload to handle response logging."""
+            response = self.api.http_upload(endpoint, file_path)
+            handle_upload_response(response)
+
         log(f"Uploading Result to: {endpoint}")
-        http_thread = threading.Thread(target=self.api.http_upload, args=(endpoint, file_path))
+        http_thread = threading.Thread(target=upload_wrapper)
         http_thread.start()
 
     def service_upload_report(self, service: Service, file_path):
         """
-        Uploads a report file asynchronously.
+        Uploads a report file asynchronously and logs the response.
         """
         endpoint = service.request.response_api
+
+        def handle_report_response(response):
+            """Logs the response after the report upload completes."""
+            log(f"Response from report upload to {endpoint}: {response}")
+
+        def upload_wrapper():
+            """Wrapper for the report upload to handle response logging."""
+            response = self.api.http_upload(endpoint, file_path)
+            handle_report_response(response)
+
         log(f"Uploading Report to: {endpoint}")
-        http_thread = threading.Thread(target=self.api.http_upload, args=(endpoint, file_path))
+        http_thread = threading.Thread(target=upload_wrapper)
         http_thread.start()
 
     def service_exit(self, service: Service):

{pam_python-0.1.5 → pam_python-0.1.7}/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 #MODULE_NAME#_service import #CLASS_NAME#Svc
+from #CLASS_NAME# import #CLASS_NAME#
 
 def __create_mock_csv(page):
     fake = Faker()

{pam_python-0.1.5 → pam_python-0.1.7}/pam/templates/service/service_class.tmpl

@@ -2,9 +2,9 @@ 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 .functions import create_report, load_csv_file
 
-class #CLASS_NAME#Svc(Service):
+class #CLASS_NAME#(Service):
 
     #pylint: disable=useless-parent-delegation
     def __init__(self, task_manager, req):

{pam_python-0.1.5 → pam_python-0.1.7}/pam_python.egg-info/PKG-INFO

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

{pam_python-0.1.5 → pam_python-0.1.7}/setup.py

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