fiuai-sdk-python 0.8.9__tar.gz → 0.9.0__tar.gz

{fiuai_sdk_python-0.8.9 → fiuai_sdk_python-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fiuai_sdk_python
-Version: 0.8.9
+Version: 0.9.0
 Summary: FiuAI Python SDK - 企业级AI服务集成开发工具包
 Project-URL: Homepage, https://github.com/fiuai/fiuai-sdk-python
 Project-URL: Documentation, https://github.com/fiuai/fiuai-sdk-python#readme

{fiuai_sdk_python-0.8.9 → fiuai_sdk_python-0.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fiuai_sdk_python"
-version = "0.8.9"
+version = "0.9.0"
 description = "FiuAI Python SDK - 企业级AI服务集成开发工具包"
 readme = "README.md"
 requires-python = ">=3.12"

{fiuai_sdk_python-0.8.9 → fiuai_sdk_python-0.9.0}/src/fiuai_sdk_python/bank.py

@@ -101,13 +101,13 @@ def get_bank_account(client: FiuaiSDK, bank_account_no: str) -> Optional[Company
     )
 
 
-def get_bank_account_by_bank_id(client: FiuaiSDK, bank_id: str) -> BankAccount|None:
+def get_bank_account_by_account_no(client: FiuaiSDK, account_no: str) -> BankAccount|None:
     """
     根据银行账号id获取银行账号信息
     """
     resp_response = client.internal_get_list(
             doctype="Bank Account",
-            filters=[["name", "=", bank_id]],
+            filters=[["bank_account_no", "=", account_no]],
             fields=[
                 "name",
                 "account_name",
@@ -118,52 +118,58 @@ def get_bank_account_by_bank_id(client: FiuaiSDK, bank_id: str) -> BankAccount|N
         )
 
     if not resp_response.is_success():
+        logger.warning(f"bank account is not found by account no {account_no}")
         return None
     
     resp = resp_response.data
     if not resp:
+        logger.warning(f"bank account is not found by account no {account_no}")
         return None
     
     resp = resp[0]
 
     # 获取支行信息
-    bank_branch = ""
     if resp["opening_bank_branch"] != "":
-        _bank_branch_response = client.internal_get(
+        _bank_branch_response = client.internal_get_list(
             doctype="Bank Branch",
-            name=resp["opening_bank_branch"],
-            fields=["name", "bank_branch_name"]
+            filters=[["bank_branch_name", "=", resp["opening_bank_branch"]]],
+            fields=["parent_bank", "bank_branch_name"]
         )
         if not _bank_branch_response.is_success():
+            logger.warning(f"bank branch is not found by id {resp["opening_bank_branch"]}")
             return None
         
-        _bank_branch = _bank_branch_response.data
-        if not _bank_branch:
-            logger.error(f"bank branch is not found by id {resp["opening_bank_branch"]}")
+        if not _bank_branch_response.data:
+            logger.warning(f"bank branch is not found by id {resp["opening_bank_branch"]}")
             return None
-        else:
-            bank_branch = _bank_branch["bank_branch_name"]
 
+
+        _parent_bank_id = _bank_branch_response.data[0]["parent_bank"]
+        if not _parent_bank_id:
+            logger.warning(f"parent bank is not found by id {resp["opening_bank_branch"]}")
+            return None
+        
+       
     # 获取银行信息
     _bank_detail_response = client.internal_get(
         doctype="Bank",
-        name=resp["bank"],
+        name=_parent_bank_id,
         fields=["name", "bank_name"]
     )
 
     if not _bank_detail_response.is_success():
+        logger.warning(f"bank is not found by id {_parent_bank_id}")
         return None
     
     _bank_detail = _bank_detail_response.data
     if not _bank_detail:
-        logger.error(f"bank is not found by id {resp["bank"]}")
+        logger.warning(f"bank is not found by id {_parent_bank_id}")
         return None
 
-    _bank_account = resp
     return BankAccount(
-        name=_bank_account["name"],
-        account_name=_bank_account.get("account_name", "") if _bank_account.get("account_name", "") else "",
+        name=resp["name"],
+        account_name=resp["account_name"],
         bank=_bank_detail["bank_name"],
-        bank_account_no=_bank_account["bank_account_no"] if _bank_account["bank_account_no"] else "",
-        bank_branch=bank_branch,
+        bank_account_no=account_no,
+        bank_branch=resp["opening_bank_branch"],
     )

{fiuai_sdk_python-0.8.9 → fiuai_sdk_python-0.9.0}/src/fiuai_sdk_python/company.py

@@ -10,7 +10,7 @@ from .client import FiuaiSDK
 from logging import getLogger
 from typing import Literal
 from .type import CompanyProfile
-from .bank import get_bank_account_by_bank_id
+from .bank import get_bank_account_by_account_no
 
 logger = getLogger(__name__)
 
@@ -111,7 +111,7 @@ def get_company_profile(client: FiuaiSDK, auth_company_id: str)-> CompanyProfile
    
     default_bank_account = None
     if r["default_bank_account"]:
-        rr_response = get_bank_account_by_bank_id(client, r["default_bank_account"])
+        rr_response = get_bank_account_by_account_no(client, r["default_bank_account"])
         if not rr_response:
             logger.warning(f"get_company_profile: default_bank_account {r['default_bank_account']} not found")
         else:
@@ -132,4 +132,5 @@ def get_company_profile(client: FiuaiSDK, auth_company_id: str)-> CompanyProfile
         email=r.get("email", "") if r.get("email", "") else "",
         address=r.get("address", "") if r.get("address", "") else "",
         default_bank_account=default_bank_account,
+        bank_accounts=[default_bank_account] if default_bank_account else [],
     )