kra-etims-sdk 0.1.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

kra_etims_sdk/base_client.py

@@ -3,26 +3,77 @@ from .exceptions import ApiException, AuthenticationException
 
 
 class BaseClient:
+    endpoints = {
+        # INITIALIZATION
+        'selectInitOsdcInfo': '/selectInitOsdcInfo',
+
+        # CODE LIST
+        'selectCodeList': '/selectCodeList',
+
+        # CUSTOMER
+        'selectCustomer': '/selectCustomer',
+
+        # NOTICE
+        'selectNoticeList': '/selectNoticeList',
+
+        # ITEM
+        'selectItemClsList': '/selectItemClsList',
+        'selectItemList': '/selectItemList',
+        'saveItem': '/saveItem',
+        'SaveItemComposition': '/saveItemComposition',
+
+        # BRANCH / CUSTOMER
+        'selectBhfList': '/selectBhfList',
+        'saveBhfCustomer': '/saveBhfCustomer',
+        'saveBhfUser': '/saveBhfUser',
+        'saveBhfInsurance': '/saveBhfInsurance',
+
+        # IMPORTED ITEMS
+        'selectImportItemList': '/selectImportItemList',
+        'updateImportItem': '/updateImportItem',
+
+        # SALES / PURCHASES
+        'TrnsSalesSaveWrReq': '/saveTrnsSalesOsdc',
+        'selectTrnsPurchaseSalesList': '/selectTrnsPurchaseSalesList',
+        'insertTrnsPurchase': '/insertTrnsPurchase',
+
+        # STOCK
+        'selectStockMoveList': '/selectStockMoveList',
+        'insertStockIO': '/insertStockIO',
+        'saveStockMaster': '/saveStockMaster',
+    }
+
     def __init__(self, config, auth):
         self.config = config
         self.auth = auth
 
     def base_url(self):
-        return self.config["api"][self.config["env"]]["base_url"].rstrip("/")
+        env = self.config["env"]
+        return self.config["api"][env]["base_url"].rstrip("/")
+
+    def timeout(self):
+        return self.config.get("http", {}).get("timeout", 30)
+
+    def endpoint(self, key: str):
+        if key.startswith("/"):
+            raise ApiException(f"Endpoint key expected, path given [{key}]. Pass endpoint keys only.", 500)
 
-    def endpoint(self, key):
-        if key not in self.config["endpoints"]:
+        if key not in self.endpoints:
             raise ApiException(f"Endpoint [{key}] not configured", 500)
-        return self.config["endpoints"][key]
 
-    def post(self, endpoint_key, data):
-        return self._send("POST", endpoint_key, data)
+        return self.endpoints[key]
+
+    def get(self, endpoint_key, params=None):
+        return self._send("GET", endpoint_key, params or {})
+
+    def post(self, endpoint_key, data=None):
+        return self._send("POST", endpoint_key, data or {})
 
     def _send(self, method, endpoint_key, data):
         endpoint = self.endpoint(endpoint_key)
         response = self._request(method, endpoint, data)
 
-        if response.status_code == 401:
+        if self._is_token_expired(response):
             self.auth.forget_token()
             self.auth.token(force=True)
             response = self._request(method, endpoint, data)
@@ -32,8 +83,19 @@ class BaseClient:
     def _request(self, method, endpoint, data):
         url = self.base_url() + endpoint
         headers = self._headers(endpoint)
-        print(url, headers, data)
-        return requests.request(method, url, json=data, headers=headers, timeout=30)
+
+        if method.upper() == "GET" and data:
+            response = requests.get(url, params=data, headers=headers, timeout=self.timeout())
+        else:
+            response = requests.request(
+                method.upper(),
+                url,
+                json=data,
+                headers=headers,
+                timeout=self.timeout()
+            )
+
+        return response
 
     def _headers(self, endpoint):
         if endpoint.endswith("/selectInitOsdcInfo"):
@@ -47,21 +109,41 @@ class BaseClient:
             "Authorization": f"Bearer {self.auth.token()}",
             "Content-Type": "application/json",
             "Accept": "application/json",
-            "tin": self.config["oscu"]["tin"],
-            "bhfId": self.config["oscu"]["bhf_id"],
-            "cmcKey": self.config["oscu"]["cmc_key"],
+            "tin": self.config.get("oscu", {}).get("tin", ""),
+            "bhfId": self.config.get("oscu", {}).get("bhf_id", ""),
+            "cmcKey": self.config.get("oscu", {}).get("cmc_key", ""),
         }
 
+    def _is_token_expired(self, response):
+        if response.status_code == 401:
+            return True
+        try:
+            fault = response.json().get("fault", {}).get("faultstring", "")
+            return "access token expired" in fault.lower() or "invalid token" in fault.lower()
+        except Exception:
+            return False
+
     def _unwrap(self, response):
         try:
-            json = response.json()
+            json_data = response.json()
         except Exception:
             raise ApiException(response.text, response.status_code)
 
-        if json.get("resultCd") and json["resultCd"] != "0000":
-            raise ApiException(json.get("resultMsg"), 400, json["resultCd"], json)
+        # KRA business error
+        if json_data.get("resultCd") and json_data["resultCd"] != "000":
+            raise ApiException(
+                json_data.get("resultMsg", "KRA business error"),
+                400,
+                json_data.get("resultCd"),
+                json_data
+            )
+
+        # HTTP errors
+        if 200 <= response.status_code < 300:
+            return json_data
 
         if response.status_code == 401:
-            raise AuthenticationException("Unauthorized")
+            raise AuthenticationException("Unauthorized: Invalid or expired token")
 
-        return json
+        message = json_data.get("fault", {}).get("faultstring", response.text)
+        raise ApiException(message, response.status_code)

kra_etims_sdk/client.py

@@ -3,7 +3,6 @@ from .validator import Validator
 
 
 class EtimsClient(BaseClient):
-
     def __init__(self, config: dict, auth):
         super().__init__(config, auth)
         self.validator = Validator()
@@ -11,96 +10,86 @@ class EtimsClient(BaseClient):
     def _validate(self, data: dict, schema: str) -> dict:
         return self.validator.validate(data, schema)
 
+    # -----------------------------
+    # INITIALIZATION
+    # -----------------------------
     def select_init_osdc_info(self, data: dict) -> dict:
-        """
-        Initialize the OSCU device with KRA.
-        Returns cmcKey and device information.
-        """
         return self.post("selectInitOsdcInfo", self._validate(data, "initialization"))
 
     # -----------------------------
-    # BASIC DATA ENDPOINTS
+    # CODE LISTS
     # -----------------------------
     def select_code_list(self, data: dict) -> dict:
-        return self.post("selectCodeList", self._validate(data, "codeList"))
+        return self.post("selectCodeList", self._validate(data, "lastReqOnly"))
 
-    def select_item_cls_list(self, data: dict) -> dict:
-        return self.post("selectItemClsList", self._validate(data, "itemClsList"))
+    # -----------------------------
+    # CUSTOMER / BRANCH
+    # -----------------------------
+    def select_customer(self, data: dict) -> dict:
+        return self.post("selectCustomer", self._validate(data, "custSearchReq"))
 
-    def select_bhf_list(self, data: dict) -> dict:
-        return self.post("selectBhfList", self._validate(data, "bhfList"))
+    def select_branches(self, data: dict) -> dict:
+        return self.post("selectBhfList", self._validate(data, "lastReqOnly"))
 
-    def select_notice_list(self, data: dict) -> dict:
-        return self.post("selectNoticeList", self._validate(data, "noticeList"))
+    def save_branch_customer(self, data: dict) -> dict:
+        return self.post("saveBhfCustomer", self._validate(data, "branchCustomer"))
 
-    def select_taxpayer_info(self, data: dict) -> dict:
-        return self.post("selectTaxpayerInfo", self._validate(data, "taxpayerInfo"))
+    def save_branch_user(self, data: dict) -> dict:
+        return self.post("saveBhfUser", self._validate(data, "branchUser"))
 
-    def select_customer_list(self, data: dict) -> dict:
-        return self.post("selectCustomerList", self._validate(data, "customerList"))
+    def save_branch_insurance(self, data: dict) -> dict:
+        return self.post("saveBhfInsurance", self._validate(data, "branchInsurance"))
 
     # -----------------------------
-    # PURCHASE ENDPOINTS
+    # ITEM
     # -----------------------------
-    def select_purchase_trns(self, data: dict) -> dict:
-        return self.post("selectPurchaseTrns", self._validate(data, "purchaseTrns"))
+    def select_item_classes(self, data: dict) -> dict:
+        return self.post("selectItemClsList", self._validate(data, "lastReqOnly"))
+
+    def select_items(self, data: dict) -> dict:
+        return self.post("selectItemList", self._validate(data, "lastReqOnly"))
+
+    def save_item(self, data: dict) -> dict:
+        return self.post("saveItem", self._validate(data, "saveItem"))
 
-    def send_purchase_transaction_info(self, data: dict) -> dict:
-        return self.post(
-            "sendPurchaseTransactionInfo",
-            self._validate(data, "purchaseTransaction"),
-        )
+    def save_item_composition(self, data: dict) -> dict:
+        return self.post("SaveItemComposition", self._validate(data, "itemComposition"))
 
     # -----------------------------
-    # SALES ENDPOINTS
+    # IMPORTED ITEMS
     # -----------------------------
-    def send_sales_trns(self, data: dict) -> dict:
-        return self.post("sendSalesTrns", self._validate(data, "salesTrns"))
-
-    def send_sales_transaction(self, data: dict) -> dict:
-        return self.post(
-            "sendSalesTransaction",
-            self._validate(data, "salesTransaction"),
-        )
+    def select_imported_items(self, data: dict) -> dict:
+        return self.post("selectImportItemList", self._validate(data, "lastReqOnly"))
 
-    def select_sales_trns(self, data: dict) -> dict:
-        return self.post("selectSalesTrns", self._validate(data, "selectSalesTrns"))
+    def update_imported_item(self, data: dict) -> dict:
+        return self.post("updateImportItem", self._validate(data, "importItemUpdate"))
 
     # -----------------------------
-    # STOCK ENDPOINTS
+    # PURCHASES
     # -----------------------------
-    def select_move_list(self, data: dict) -> dict:
-        return self.post("selectMoveList", self._validate(data, "moveList"))
+    def select_purchases(self, data: dict) -> dict:
+        return self.post("selectTrnsPurchaseSalesList", self._validate(data, "lastReqOnly"))
 
-    def save_stock_master(self, data: dict) -> dict:
-        return self.post("saveStockMaster", self._validate(data, "stockMaster"))
+    def save_purchase(self, data: dict) -> dict:
+        return self.post("insertTrnsPurchase", self._validate(data, "insertTrnsPurchase"))
 
-    def insert_stock_io(self, data: dict) -> dict:
-        return self.post("insertStockIO", self._validate(data, "stockIO"))
+    def save_sales_transaction(self, data: dict) -> dict:
+        return self.post("TrnsSalesSaveWrReq", self._validate(data, "lastReqOnly"))
 
     # -----------------------------
-    # BRANCH / MANAGEMENT ENDPOINTS
+    # STOCK
     # -----------------------------
-    def branch_insurance_info(self, data: dict) -> dict:
-        return self.post(
-            "branchInsuranceInfo",
-            self._validate(data, "branchInsurance"),
-        )
+    def select_stock_movement(self, data: dict) -> dict:
+        return self.post("selectStockMoveList", self._validate(data, "lastReqOnly"))
 
-    def branch_user_account(self, data: dict) -> dict:
-        return self.post(
-            "branchUserAccount",
-            self._validate(data, "branchUserAccount"),
-        )
+    def save_stock_io(self, data: dict) -> dict:
+        return self.post("insertStockIO", self._validate(data, "saveStockIO"))
 
-    def branch_send_customer_info(self, data: dict) -> dict:
-        return self.post(
-            "branchSendCustomerInfo",
-            self._validate(data, "customerInfo"),
-        )
+    def save_stock_master(self, data: dict) -> dict:
+        return self.post("saveStockMaster", self._validate(data, "stockMaster"))
 
     # -----------------------------
-    # ITEM / MASTER DATA
+    # NOTICES
     # -----------------------------
-    def save_item(self, data: dict) -> dict:
-        return self.post("saveItem", self._validate(data, "item"))
+    def select_notice_list(self, data: dict) -> dict:
+        return self.post("selectNoticeList", self._validate(data, "lastReqOnly"))