pam-python 0.1.27__tar.gz → 0.1.29__tar.gz

{pam_python-0.1.27 → pam_python-0.1.29}/PKG-INFO

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

{pam_python-0.1.27 → pam_python-0.1.29}/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.27 → pam_python-0.1.29}/pam/templates/service/service.test.tmpl

@@ -113,5 +113,4 @@ class Test#CLASS_NAME#(unittest.TestCase):
         #---- Run Service ----
         self.testerTask.test_service(service_instance)
 
-        while not service_instance.is_finished:
-            pass
+        self.testerTask.wait_for_task_done()

{pam_python-0.1.27 → pam_python-0.1.29}/pam/templates/service/service_class.tmpl

@@ -11,8 +11,6 @@ class #CLASS_NAME#(Service):
     def __init__(self, task_manager, req):
         super().__init__(task_manager, req)
 
-        self.is_finished = False
-
     def on_start(self):
         log("on_start")
 
@@ -43,8 +41,6 @@ class #CLASS_NAME#(Service):
             report_name = "#CLASS_NAME#_report1"
             self._upload_report(report_name, report_df)
             
-            self.is_finished = True
-            
             self._exit()
 
     def __process_data(self, input_files):

{pam_python-0.1.27 → pam_python-0.1.29}/pam/tester_task.py

@@ -23,6 +23,7 @@ class TesterTask(ITaskManager):
         self.upload_sqlite_callback: Optional[UploadSqliteCallbackType] = None
         self.upload_result_callback: Optional[UploadResultCallbackType] = None
         self.upload_report_callback: Optional[UploadReportCallbackType] = None
+        self.is_exit = False
 
     def set_on_request_data(self, request_data_callback: RequestDataCallbackType):
         """
@@ -73,8 +74,13 @@ class TesterTask(ITaskManager):
         pass
 
     def service_exit(self, service: Service):
+        self.is_exit = True
         print(f"{service.request.service_name} Exit.")
 
+    def wait_for_task_done(self):
+        while not self.is_exit:
+            pass
+
     def service_request_data(self, service: Service, page: str):
         """
         Simulate a service data request.

{pam_python-0.1.27 → pam_python-0.1.29}/pam_python.egg-info/PKG-INFO

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

{pam_python-0.1.27 → pam_python-0.1.29}/setup.py

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