fiuai-sdk-python 0.16.0__tar.gz → 0.16.1__tar.gz

{fiuai_sdk_python-0.16.0 → fiuai_sdk_python-0.16.1}/CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.16.1] - 2026-07-18
+
+### Fixed
+- Bank Account 已存在但未关联标准 Bank/Branch 时仍返回 `exists=True`，关联字段作为可选 enrichment。
+- 修正 `CompanyBankAccountSearchResult.bank_id` 错误返回银行账号 ID。
+
 ## [0.16.0] - 2026-07-15
 
 ### Added

{fiuai_sdk_python-0.16.0 → fiuai_sdk_python-0.16.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fiuai_sdk_python
-Version: 0.16.0
+Version: 0.16.1
 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.16.0 → fiuai_sdk_python-0.16.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fiuai_sdk_python"
-version = "0.16.0"
+version = "0.16.1"
 description = "FiuAI Python SDK - 企业级AI服务集成开发工具包"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -74,4 +74,3 @@ dev-dependencies = [
     "mypy>=1.0.0",
     "pre-commit>=3.0.0",
 ]
-

{fiuai_sdk_python-0.16.0 → fiuai_sdk_python-0.16.1}/src/fiuai_sdk_python/__init__.py

@@ -18,7 +18,7 @@ from .error_code import (
 )
 from .resp import ApiError, ApiResponse, parse_response
 
-__version__ = "0.16.0"
+__version__ = "0.16.1"
 
 __all__ = [
     'FiuaiSDK',

fiuai_sdk_python-0.16.1/src/fiuai_sdk_python/bank.py

@@ -0,0 +1,175 @@
+# -- coding: utf-8 --
+# Project: fiuaiclient
+# Created Date: 2025 06 Fr
+# Author: liming
+# Email: lmlala@aliyun.com
+# Copyright (c) 2025 FiuAI
+import logging
+from typing import Optional
+
+from pydantic import BaseModel, Field
+
+from .client import FiuaiSDK
+from .type import BankAccount
+
+logger = logging.getLogger(__name__)
+
+
+class CompanyBankAccountSearchResult(BaseModel):
+    bank_account_id: str = Field(description="银行账号id", default="")
+    bank_account_no: str = Field(description="银行账号", default="")
+    bank_account_name: str = Field(description="银行账号", default="")
+    bank_id: str = Field(description="银行id", default="")
+    bank_name: str = Field(description="银行名称", default="")
+    opening_bank_branch_id: str = Field(description="开户行id", default="")
+    opening_bank_branch_name: str = Field(description="开户行名称", default="")
+
+
+    exists: bool = Field(description="是否存在", default=False)
+
+    comment: str = Field(description="备注", default="")
+
+
+def get_bank_account(
+    client: FiuaiSDK,
+    bank_account_no: str,
+) -> Optional[CompanyBankAccountSearchResult]:
+    """
+    根据银行账号获取银行账号信息
+    
+    Args:
+        bank_account_no: 银行账号
+        
+    Returns:
+        CompanyBankAccountSearchResult: 银行账号信息
+    """
+
+    if not bank_account_no:
+        logger.error("bank_account_no is empty, return None")
+        return None
+
+    bank_account_response = client.internal_get(
+        doctype="Bank Account",
+        name=bank_account_no,
+        fields=[
+            "name",
+            "bank_account_no",
+            "account_name",
+            "bank",
+            "opening_bank_branch",
+        ],
+    )
+
+    if not bank_account_response.is_success():
+        return CompanyBankAccountSearchResult(exists=False)
+
+    bank_account = bank_account_response.data
+    if not bank_account:
+        return CompanyBankAccountSearchResult(exists=False)
+
+    bank_id = str(bank_account.get("bank") or "")
+    bank_name = ""
+    if bank_id:
+        bank_response = client.internal_get(
+            doctype="Bank",
+            name=bank_id,
+            fields=["name", "bank_name"],
+        )
+        if bank_response.is_success() and bank_response.data:
+            bank_name = str(bank_response.data.get("bank_name") or "")
+        else:
+            logger.warning("bank enrichment failed for id %s", bank_id)
+
+    opening_value = str(bank_account.get("opening_bank_branch") or "")
+    opening_bank_branch_id = ""
+    opening_bank_branch_name = opening_value
+    if bank_id and opening_value:
+        branch_response = client.internal_get(
+            doctype="Bank Branch",
+            name=opening_value,
+            fields=["name", "bank_branch_name"],
+        )
+        if branch_response.is_success() and branch_response.data:
+            opening_bank_branch_id = str(branch_response.data.get("name") or "")
+            opening_bank_branch_name = str(
+                branch_response.data.get("bank_branch_name") or ""
+            )
+        else:
+            logger.warning("bank branch enrichment failed for id %s", opening_value)
+
+    return CompanyBankAccountSearchResult(
+        exists=True,
+        bank_account_id=str(bank_account.get("name") or ""),
+        bank_account_no=str(bank_account.get("bank_account_no") or ""),
+        bank_account_name=str(bank_account.get("account_name") or ""),
+        bank_id=bank_id,
+        bank_name=bank_name,
+        opening_bank_branch_id=opening_bank_branch_id,
+        opening_bank_branch_name=opening_bank_branch_name,
+    )
+
+
+def get_bank_account_by_account_no(
+    client: FiuaiSDK,
+    account_no: str,
+) -> BankAccount | None:
+    """
+    根据银行账号id获取银行账号信息
+    """
+    response = client.internal_get_list(
+        doctype="Bank Account",
+        filters=[["bank_account_no", "=", account_no]],
+        fields=[
+            "name",
+            "account_name",
+            "bank",
+            "bank_account_no",
+            "opening_bank_branch",
+        ],
+    )
+
+    if not response.is_success():
+        logger.warning("bank account is not found by account no %s", account_no)
+        return None
+
+    rows = response.data
+    if not rows:
+        logger.warning("bank account is not found by account no %s", account_no)
+        return None
+
+    bank_account = rows[0]
+    bank_id = str(bank_account.get("bank") or "")
+    bank_name = ""
+    if bank_id:
+        bank_response = client.internal_get(
+            doctype="Bank",
+            name=bank_id,
+            fields=["name", "bank_name"],
+        )
+        if bank_response.is_success() and bank_response.data:
+            bank_name = str(bank_response.data.get("bank_name") or "")
+        else:
+            logger.warning("bank enrichment failed for id %s", bank_id)
+
+    opening_value = str(bank_account.get("opening_bank_branch") or "")
+    opening_bank_branch_name = opening_value
+    if bank_id and opening_value:
+        branch_response = client.internal_get(
+            doctype="Bank Branch",
+            name=opening_value,
+            fields=["name", "bank_branch_name"],
+        )
+        if branch_response.is_success() and branch_response.data:
+            opening_bank_branch_name = str(
+                branch_response.data.get("bank_branch_name") or ""
+            )
+        else:
+            logger.warning("bank branch enrichment failed for id %s", opening_value)
+
+    return BankAccount(
+        name=str(bank_account.get("name") or ""),
+        account_name=str(bank_account.get("account_name") or ""),
+        bank=bank_name,
+        bank_account_no=account_no,
+        bank_branch=opening_bank_branch_name,
+    )

fiuai_sdk_python-0.16.0/src/fiuai_sdk_python/bank.py

@@ -1,175 +0,0 @@
-# -- coding: utf-8 --
-# Project: fiuaiclient
-# Created Date: 2025 06 Fr
-# Author: liming
-# Email: lmlala@aliyun.com
-# Copyright (c) 2025 FiuAI
-
-
-
-from pydantic import BaseModel, Field
-import logging
-from .type import BankAccount
-from .client import FiuaiSDK
-from typing import Literal, Optional
-
-logger = logging.getLogger(__name__)
-
-
-class CompanyBankAccountSearchResult(BaseModel):
-    bank_account_id: str = Field(description="银行账号id", default="")
-    bank_account_no: str = Field(description="银行账号", default="")
-    bank_account_name: str = Field(description="银行账号", default="")
-    bank_id: str = Field(description="银行id", default="")
-    bank_name: str = Field(description="银行名称", default="")
-    opening_bank_branch_id: str = Field(description="开户行id", default="")
-    opening_bank_branch_name: str = Field(description="开户行名称", default="")
-
-
-    exists: bool = Field(description="是否存在", default=False)
-
-    comment: str = Field(description="备注", default="")
-
-
-def get_bank_account(client: FiuaiSDK, bank_account_no: str) -> Optional[CompanyBankAccountSearchResult]:
-    """
-    根据银行账号获取银行账号信息
-    
-    Args:
-        back_account: 银行账号
-        
-    Returns:
-        CompanyBankAccountSearchResult: 银行账号信息
-    """
-
-    if not bank_account_no:
-        logger.error(f"bank_account_no is empty, return None")
-        return None
-    
-    _bank_account_response = client.internal_get(
-        doctype="Bank Account",
-        name=bank_account_no,
-        fields=["name","bank_account_no", "account_name", "bank", "opening_bank_branch"]
-    )
-
-    
-    if not _bank_account_response.is_success():
-        return CompanyBankAccountSearchResult(exists=False)
-    
-    _bank_account = _bank_account_response.data
-    if not _bank_account:
-        return CompanyBankAccountSearchResult(exists=False)
-    
-
-    # 获取银行信息
-    _bank_detail_response = client.internal_get(
-        doctype="Bank",
-        name=_bank_account["bank"],
-        fields=["name", "bank_name"]
-    )
-    if not _bank_detail_response.is_success():
-        return CompanyBankAccountSearchResult(exists=False)
-    
-    _bank_detail = _bank_detail_response.data
-    if not _bank_detail:
-        logger.error(f"bank is not found by id {_bank_account["bank"]}")
-        return CompanyBankAccountSearchResult(exists=False)
-    
-    # 获取支行信息
-    _bank_branch_response = client.internal_get(
-        doctype="Bank Branch",
-        name=_bank_account["opening_bank_branch"],
-        fields=["name", "bank_branch_name"]
-    )
-    if not _bank_branch_response.is_success():
-        return CompanyBankAccountSearchResult(exists=False)
-    
-    _bank_branch = _bank_branch_response.data
-    if not _bank_branch:
-        logger.error(f"bank branch is not found by id {_bank_account["opening_bank_branch"]}")
-        return CompanyBankAccountSearchResult(exists=False)
-    
-    return CompanyBankAccountSearchResult(
-        exists=True, 
-        bank_account_id=_bank_account["name"], 
-        bank_account_no=_bank_account["bank_account_no"],
-        bank_account_name=_bank_account["account_name"],
-        bank_id=_bank_account["name"], 
-        bank_name=_bank_detail["bank_name"],
-        opening_bank_branch_id=_bank_branch["name"],
-        opening_bank_branch_name=_bank_branch["bank_branch_name"]
-    )
-
-
-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=[["bank_account_no", "=", account_no]],
-            fields=[
-                "name",
-                "account_name",
-                "bank",
-                "bank_account_no",
-                "opening_bank_branch",
-            ],
-        )
-
-    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]
-
-    # 获取支行信息
-    if resp["opening_bank_branch"] != "":
-        _bank_branch_response = client.internal_get_list(
-            doctype="Bank Branch",
-            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
-        
-        if not _bank_branch_response.data:
-            logger.warning(f"bank branch is not found by id {resp["opening_bank_branch"]}")
-            return None
-
-
-        _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=_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.warning(f"bank is not found by id {_parent_bank_id}")
-        return None
-
-    return BankAccount(
-        name=resp["name"],
-        account_name=resp["account_name"],
-        bank=_bank_detail["bank_name"],
-        bank_account_no=account_no,
-        bank_branch=resp["opening_bank_branch"],
-    )