pam-python 0.1.9__tar.gz → 0.1.11__tar.gz

{pam_python-0.1.9/pam_python.egg-info → pam_python-0.1.11}/PKG-INFO

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

{pam_python-0.1.9 → pam_python-0.1.11}/pam/cli.py

@@ -104,11 +104,11 @@ def create_service(name):
 
     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") )
+    cpy("service/service.test.tmpl", os.path.join(name, f"test_{name}.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")
+    replace_template_content(name, to_pascal_case(name)+"Svc", f"test_{name}.py")
 
     print(f"Service {name} created.")
     print(f"Run `pam test {name}` to run tests for the service.")

{pam_python-0.1.9 → pam_python-0.1.11}/pam/service.py

@@ -40,7 +40,7 @@ class Service:
             self.request.service_name, self.request.token, "result_", ".csv"
         )
 
-        dry_run = self.request.runtime_parameters["dry_run"]
+        dry_run = self.request.runtime_parameters.get("dry_run", "false")
         if dry_run is not None and dry_run.lower() == "true":
             log("Dry run mode will not upload results.")
             return tmp_file_name
@@ -80,7 +80,7 @@ class Service:
             service_name, token, f"report_{report_name}_", '.csv'
         )
 
-        dry_run = self.request.runtime_parameters["dry_run"]
+        dry_run = self.request.runtime_parameters.get("dry_run", "false")
         if dry_run is not None and dry_run.lower() == "true":
             log("Dry run mode will not upload report.")
             return report_csv_path

{pam_python-0.1.9 → pam_python-0.1.11}/pam/templates/docker/Dockerfile

@@ -8,6 +8,7 @@ ENV DATA_FOLDER=/app/data
 RUN mkdir -p $DATA_FOLDER
 
 RUN pip install --upgrade pip
+RUN pip cache purge
 RUN pip install -r requirements.txt
 
 EXPOSE 8000

pam_python-0.1.11/pam/templates/service/service.test.tmpl

@@ -0,0 +1,103 @@
+import os
+import shutil
+import uuid
+import unittest
+from typing import List, Tuple
+from faker import Faker
+import pandas as pd
+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#
+
+
+# ==================== GLOBAL VARIABLES ====================
+TOTAL_PAGES=3
+MOCK_DIR = "./TEMP_TEST_DATA"
+TempfileUtils.temp_base_path = f"{MOCK_DIR}/app/data"
+TempfileUtils.temp_datasource_path = f"{MOCK_DIR}/app/data/data_sources"
+
+
+# ==================== UTILITY FUNCTIONS ====================
+def __create_mock_csv(page, mockDir):
+    fake = Faker()
+    for i in range(page):
+        data = {
+            "id": range(1, 11),  # 10 rows
+            "name": [fake.name() for _ in range(10)],
+            "age": [fake.random_int(min=18, max=65) for _ in range(10)],
+            "email": [fake.email() for _ in range(10)],
+            "created_date": [fake.date_time_this_year() for _ in range(10)]
+        }
+        file_name = f"{mockDir}/mock_data_{i+1}.csv"
+        df = pd.DataFrame(data)
+        df.to_csv(file_name, index=False)
+
+
+def on_request_data(page) -> Tuple[List[str], bool, str]:
+    if page is None or page == "" :
+        page = "1"
+
+    page_num = int(page)
+    next_page = page_num+1
+
+    is_end = False
+    if page_num == TOTAL_PAGES:
+        is_end = True
+        next_page = ""
+
+    mock_csv = f"{MOCK_DIR}/mock_data_{page}.csv"
+    return [mock_csv], is_end, next_page
+
+
+def on_upload_report(report_file):
+    print(f"Uploaded Report {report_file}")
+
+
+def on_upload_result(result_file):
+    print(f"Uploaded {result_file}")
+
+
+def createMockDir(mockDir):
+    if os.path.exists(mockDir):
+        shutil.rmtree(mockDir)
+    os.makedirs(mockDir)
+
+
+# ======================================================================
+
+class TestService1(unittest.TestCase):
+    
+    def setUp(self):
+        createMockDir(MOCK_DIR)
+        __create_mock_csv(TOTAL_PAGES, MOCK_DIR)
+
+        self.testerTask = TesterTask()
+        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)
+
+    def test_run_service(self):
+        #---- Create Request Command
+        token = uuid.uuid4()
+        runtime_parameters = {
+            "some_param": "some_value"
+        }
+        DATA_API="https://localhost.test/api/dataadapter/test"
+        RESPONSE_API="https://localhost.test/api/dataadapter/test"
+
+        req = RequestCommand(
+                            runtime_parameters=runtime_parameters,
+                            token=token,
+                            cmd="start",
+                            data_api=DATA_API,
+                            response_api=RESPONSE_API,
+                            is_end=None,
+                            next=None,
+                            input_files=None,
+                            service_name='FinishSvc',
+                        )
+        service_instance = #CLASS_NAME#(self.testerTask, req)
+        #---- Run Service ----
+        self.testerTask.test_service(service_instance)

{pam_python-0.1.9 → pam_python-0.1.11}/pam/templates/service/service.yaml

@@ -1,2 +1,2 @@
 endpoint: /#CLASS_NAME#
-class: #CLASS_NAME#Svc
+class: #CLASS_NAME#

{pam_python-0.1.9 → pam_python-0.1.11}/pam/templates/service/service_class.tmpl

@@ -4,7 +4,7 @@ from pam.utils import log
 #pylint: disable=import-error
 from .functions import create_report, load_csv_file
 
-class #CLASS_NAME#(Service):
+class #CLASS_NAME#Svc(Service):
 
     #pylint: disable=useless-parent-delegation
     def __init__(self, task_manager, req):

{pam_python-0.1.9 → pam_python-0.1.11/pam_python.egg-info}/PKG-INFO

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

{pam_python-0.1.9 → pam_python-0.1.11}/setup.py

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

pam_python-0.1.9/pam/templates/service/service.test.tmpl

@@ -1,102 +0,0 @@
-
-import os
-import shutil
-import uuid
-from typing import List, Tuple
-from faker import Faker
-import pandas as pd
-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#
-
-def __create_mock_csv(page):
-    fake = Faker()
-    data = {
-        "id": range(1, 11),  # 10 rows
-        "name": [fake.name() for _ in range(10)],
-        "age": [fake.random_int(min=18, max=65) for _ in range(10)],
-        "email": [fake.email() for _ in range(10)],
-        "created_date": [fake.date_time_this_year() for _ in range(10)]
-    }
-    file_name = f"{MOCK_DIR}/mock_data_faker_{page}.csv"
-    df = pd.DataFrame(data)
-    df.to_csv(file_name, index=False)
-    return file_name
-        
-def can_convert_to_int(x):
-    try:
-        int(x)
-        return True
-    except (ValueError, TypeError):
-        return False
-    
-def on_request_data(page) -> Tuple[List[str], bool, str]:
-    page_num = 1
-    if can_convert_to_int(page):
-        page_num = int(page)
-
-    next_page = str(page_num + 1)
-    is_end = False
-    if page_num == MAXPAGE:
-        is_end = True
-        next_page = ""
-
-    mock_csv = __create_mock_csv(page_num)
-    
-    return [mock_csv], is_end, next_page
-
-
-def on_upload_report(report_file):
-    print(f"Uploaded Report {report_file}")
-
-
-def on_upload_result(result_file):
-    print(f"Uploaded {result_file}")
-
-
-
-#---- Constants ----
-MAXPAGE=3
-MOCK_DIR = "./TEMP_TEST_DATA"
-TempfileUtils.temp_base_path = f"{MOCK_DIR}/app/data"
-TempfileUtils.temp_datasource_path = f"{MOCK_DIR}/app/data/data_sources"
-
-
-#---- Create Mock Dir ----
-if os.path.exists(MOCK_DIR):
-    shutil.rmtree(MOCK_DIR)
-os.makedirs(MOCK_DIR)
-
-#---- Create Tester Task ----
-testerTask = TesterTask()
-testerTask.set_on_upload_result(on_upload_result)
-testerTask.set_on_request_data(on_request_data)
-testerTask.set_on_upload_report(on_upload_report)
-
-#---- Create Request Command ----
-token=unique_id = uuid.uuid4()
-runtime_parameters = {
-    "some_param": "some_value"
-}
-
-DATA_API="https://localhost.test/api/dataadapter/test"
-RESPONSE_API="https://localhost.test/api/dataadapter/test"
-
-req = RequestCommand(
-                    runtime_parameters=runtime_parameters,
-                    token=token,
-                    cmd="start",
-                    data_api=DATA_API,
-                    response_api=RESPONSE_API,
-                    is_end=None,
-                    next=None,
-                    input_files=None,
-                    service_name='#CLASS_NAME#',
-                )
-
-service_instance = #CLASS_NAME#Svc(testerTask, req)
-
-#---- Start Test ----
-testerTask.test_service(service_instance)