fiuai-sdk-python 0.3.4__tar.gz → 0.3.6__tar.gz

{fiuai_sdk_python-0.3.4 → fiuai_sdk_python-0.3.6}/PKG-INFO

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

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

{fiuai_sdk_python-0.3.4 → fiuai_sdk_python-0.3.6}/src/fiuai_sdk_python/bank.py

@@ -46,33 +46,45 @@ def get_bank_account(client: FiuaiSDK, bank_account_no: str) -> Optional[Company
         logger.error(f"bank_account_no is empty, return None")
         return None
     
-    _bank_account = client.internal_get(
+    _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 = client.internal_get(
+    _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 = client.internal_get(
+    _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)
@@ -93,7 +105,7 @@ def get_bank_account_by_bank_id(client: FiuaiSDK, bank_id: str) -> BankAccount|N
     """
     根据银行账号id获取银行账号信息
     """
-    resp = client.internal_get_list(
+    resp_response = client.internal_get_list(
             doctype="Bank Account",
             filters=[["name", "=", bank_id]],
             fields=[
@@ -105,6 +117,10 @@ def get_bank_account_by_bank_id(client: FiuaiSDK, bank_id: str) -> BankAccount|N
             ],
         )
 
+    if not resp_response.is_success():
+        return None
+    
+    resp = resp_response.data
     if not resp:
         return None
     
@@ -113,11 +129,15 @@ def get_bank_account_by_bank_id(client: FiuaiSDK, bank_id: str) -> BankAccount|N
     # 获取支行信息
     bank_branch = ""
     if resp["opening_bank_branch"] != "":
-        _bank_branch = client.internal_get(
+        _bank_branch_response = client.internal_get(
             doctype="Bank Branch",
             name=resp["opening_bank_branch"],
             fields=["name", "bank_branch_name"]
         )
+        if not _bank_branch_response.is_success():
+            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"]}")
             return None
@@ -125,12 +145,16 @@ def get_bank_account_by_bank_id(client: FiuaiSDK, bank_id: str) -> BankAccount|N
             bank_branch = _bank_branch["bank_branch_name"]
 
     # 获取银行信息
-    _bank_detail = client.internal_get(
+    _bank_detail_response = client.internal_get(
         doctype="Bank",
         name=resp["bank"],
         fields=["name", "bank_name"]
     )
 
+    if not _bank_detail_response.is_success():
+        return None
+    
+    _bank_detail = _bank_detail_response.data
     if not _bank_detail:
         logger.error(f"bank is not found by id {resp["bank"]}")
         return None

{fiuai_sdk_python-0.3.4 → fiuai_sdk_python-0.3.6}/src/fiuai_sdk_python/client.py

@@ -10,6 +10,7 @@ from logging import getLogger
 from .type import UserProfile
 from .profile import UserProfileInfo
 from .auth import AuthHeader
+from .resp import parse_response, ApiResponse
 
 
 logger = getLogger(__name__)
@@ -100,12 +101,12 @@ class FiuaiSDK(object):
         # self.logout()
 
    
-    def get_avaliable_company(self, page: int=1, page_size: int=20) -> str:
+    def get_avaliable_company(self, page: int=1, page_size: int=20) -> ApiResponse:
         r = self.client.get(self.url + "/api/method/fiuai.network.doctype.company.company.get_available_companies", params={"page": page, "page_size": page_size})
         
         return self.post_process(r)
     
-    def swith_company(self, tenant: str = "", company: str = "") -> bool:
+    def swith_company(self, tenant: str = "", company: str = "") -> ApiResponse:
 
         self.headers.x_fiuai_auth_tenant_id = tenant
         self.headers.x_fiuai_current_company = company
@@ -126,10 +127,10 @@ class FiuaiSDK(object):
         #     else:
         #         return True
     
-    def get_tenant(self) -> str:
+    def get_tenant(self) -> ApiResponse:
         return self.headers.x_fiuai_auth_tenant_id
     
-    def get_company(self) -> str:
+    def get_company(self) -> ApiResponse:
         return self.headers.x_fiuai_current_company
             
     # def get_v2_api(self, uri, params={}):
@@ -139,31 +140,41 @@ class FiuaiSDK(object):
     #     return self.post_process(res)
 
 
-    def get_user_profile_info(self, user_id: str=None) -> UserProfileInfo:
+    def get_user_profile_info(self, user_id: str=None) -> ApiResponse:
         """获取详细的用户信息"""
         if not user_id:
             user_id = self.headers.x_fiuai_user
 
         res = self.client.get(self.url + f"/api/v2/internal/user/profile/{user_id}", headers=self.headers.model_dump(by_alias=True))
 
-        profile = self.post_process(res)
+        profile_response = self.post_process(res)
 
-        if not profile:
-            return None
+        if profile_response.is_success():
+            try:
+                profile_response.data = UserProfileInfo.model_validate(profile_response.data)
+            except Exception as e:
+                profile_response.error = str(e)
+                profile_response.error_code = "PROFILE_FORMAT_ERROR"
+                return profile_response
+            return profile_response
         else:
-         return UserProfileInfo.model_validate(profile)
+            return profile_response
 
 
    
-    def internal_post(self, uri, postdata={}):
+    def internal_post_req(self, uri, postdata={}) -> ApiResponse:
         res = self.client.post(self.url + '/api/v2/internal/' + uri.lstrip('/'), data=postdata, headers=self.headers.model_dump(by_alias=True))
         return self.post_process(res)
+
+    def internal_get_req(self, uri, params={}) -> ApiResponse:
+        res = self.client.get(self.url + '/api/v2/internal/' + uri.lstrip('/'), params=params, headers=self.headers.model_dump(by_alias=True))
+        return self.post_process(res)
     
-    def internal_create(self, data={}):
+    def internal_create(self, data={}) -> ApiResponse:
         res = self.client.post(self.url + '/api/v2/internal/doctype/create', data={"data":json.dumps(data, ensure_ascii=False)}, headers=self.headers.model_dump(by_alias=True))
         return self.post_process(res)
 
-    def internal_get(self, doctype, name, fields=None, filters=None):
+    def internal_get(self, doctype, name, fields=None, filters=None) -> ApiResponse:
         d = {
             "doctype": doctype,
             "name": name,
@@ -175,7 +186,7 @@ class FiuaiSDK(object):
         res = self.client.get(self.url + '/api/v2/internal/doctype/get', params=d, headers=self.headers.model_dump(by_alias=True))
         return self.post_process(res)
 
-    def internal_get_list(self, doctype, filters=None, fields=None, limit_start=0, limit_page_length=20, order_by=None):
+    def internal_get_list(self, doctype, filters=None, fields=None, limit_start=0, limit_page_length=20, order_by=None) -> ApiResponse:
         d = {
                     "doctype": doctype, 
                     "limit_start":limit_start,
@@ -194,47 +205,47 @@ class FiuaiSDK(object):
         return self.post_process(res)
 
     
-    def internal_update(self, data={}):
+    def internal_update(self, data={}) -> ApiResponse:
         res = self.client.post(self.url + '/api/v2/internal/doctype/update', data={"data":json.dumps(data, ensure_ascii=False)}, headers=self.headers.model_dump(by_alias=True))
         return self.post_process(res)
 
-    def internal_delete(self, doctype, name):
+    def internal_delete(self, doctype, name) -> ApiResponse:
         res = self.client.post(self.url + '/api/v2/internal/doctype/delete', data={"doctype": doctype, "name":name}, headers=self.headers.model_dump(by_alias=True))
         return self.post_process(res)
 
-    def internal_submit(self, doctype, name):
+    def internal_submit(self, doctype, name) -> ApiResponse:
         res = self.client.post(self.url + '/api/v2/internal/doctype/submit', data={"doctype": doctype, "name":name}, headers=self.headers.model_dump(by_alias=True))
         return self.post_process(res)
     
-    def internal_cancel(self, doctype, name):
+    def internal_cancel(self, doctype, name) -> ApiResponse:
         res = self.client.post(self.url + '/api/v2/internal/doctype/cancel', data={"doctype": doctype, "name":name}, headers=self.headers.model_dump(by_alias=True))
         return self.post_process(res)
 
 
-    def get_meta(self, doctype: str):
+    def get_meta(self, doctype: str) -> ApiResponse:
         res = self.client.get(self.url + '/api/v2/internal/doctype/meta/' + doctype, headers=self.headers.model_dump(by_alias=True))
       
         return self.post_process(res)
     
 
-    def post_process(self, response):
-        if not response:
-            return None
-        try:
-            rjson = response.json()
-        except ValueError:
-            raise
-
-        if rjson and ('exc' in rjson) and rjson['exc']:
-            raise FiuaiGeneralError(rjson['exc'])
-        if 'message' in rjson:
-            return rjson['message']
-        elif 'data' in rjson:
-            return rjson['data']
-        elif 'errors' in rjson:
-            raise FiuaiGeneralError(rjson['errors'])
-        else:
-            return None
+    def post_process(self, response) -> ApiResponse:
+        """
+        处理API响应，使用结构化的错误处理系统
+        
+        Args:
+            response: httpx响应对象
+            
+        Returns:
+            Any: 成功时返回数据，失败时抛出异常
+            
+        Raises:
+            FiuaiGeneralError: 当API返回错误时
+            FiuaiAuthError: 当认证相关错误时
+        """
+        # 使用resp.py中的统一解析函数
+        api_response = parse_response(response)
+        
+        return api_response
 
 
 def get_client(username: str, auth_tenant_id: str, current_company: str, impersonation: str=None)-> FiuaiSDK:

{fiuai_sdk_python-0.3.4 → fiuai_sdk_python-0.3.6}/src/fiuai_sdk_python/company.py

@@ -36,19 +36,27 @@ def get_target_company_by_name(client: FiuaiSDK, full_name: str, target_side: Li
     """
     connection_type = "Customer" if target_side == "buyer" else "Supplier"
     
-    _lookup = client.internal_get_list(
+    _lookup_response = client.internal_get_list(
         doctype="Company Lookup", 
         fields=["target_company_id", "unique_no"], 
         filters=[["company_name", "=", full_name]])
+    if not _lookup_response.is_success():
+        return TargetCompanySearchResult(name="", full_name="", unique_no="", exists=False, in_network=False, comment="该公司不存在")
+    
+    _lookup = _lookup_response.data
     if not _lookup:
         logger.debug(f"get_target_company_by_name: {full_name} not found")
         return TargetCompanySearchResult(name="", full_name="", unique_no="", exists=False, in_network=False, comment="该公司不存在")
     
 
-    _network = client.internal_get_list(
+    _network_response = client.internal_get_list(
         doctype="Company Network", 
         fields=["name", "target_company_id", "target_company"], 
         filters=[["target_company_id", "=", _lookup[0]["target_company_id"]], ["connection_type", "=", connection_type]])
+    if not _network_response.is_success():
+        return TargetCompanySearchResult(name="", full_name="", unique_no="", exists=True, in_network=False, comment="该公司不在本方网络中")
+    
+    _network = _network_response.data
     if not _network:
         logger.debug(f"get_target_company_by_name: {full_name} is not in network")
         return TargetCompanySearchResult(name="", full_name="", unique_no="", exists=True, in_network=False, comment="该公司不在本方网络中")
@@ -70,7 +78,7 @@ def get_company_profile(client: FiuaiSDK, auth_company_id: str)-> CompanyProfile
     """
     获取公司信息
     """
-    resp = client.internal_get_list(
+    resp_response = client.internal_get_list(
         doctype="Company",
         filters=[["name", "=", auth_company_id]],
         fields=[
@@ -92,16 +100,21 @@ def get_company_profile(client: FiuaiSDK, auth_company_id: str)-> CompanyProfile
         ],
     )
     
+    if not resp_response.is_success():
+        return None
+    
+    resp = resp_response.data
     if not resp:
         return None
 
     r = resp[0]
    
     if r["default_bank_account"]:
-        rr = get_bank_account_by_bank_id(client, r["default_bank_account"])
-        if not rr:
+        rr_response = get_bank_account_by_bank_id(client, r["default_bank_account"])
+        if not rr_response:
             logger.error(f"get_company_profile: default_bank_account {r['default_bank_account']} not found")
             return None
+
     else:
         rr = None
 

{fiuai_sdk_python-0.3.4 → fiuai_sdk_python-0.3.6}/src/fiuai_sdk_python/item.py

@@ -26,7 +26,7 @@ def load_item_data(client: FiuaiSDK, auth_tenant_id: str, auth_company_id: str)-
     从frappe获取item数据
     """
 
-    item_list = client.internal_get_list(
+    item_list_response = client.internal_get_list(
         doctype="Item", 
         filters=[
             ["disabled", "=", 0],
@@ -35,4 +35,12 @@ def load_item_data(client: FiuaiSDK, auth_tenant_id: str, auth_company_id: str)-
         ],
         fields=["name", "item_code", "item_name", "stock_uom", "description"]
         )
+
+    if not item_list_response.is_success():
+        return []
+    
+    item_list = item_list_response.data
+    if not item_list:
+        return []
+    
     return [Item(name=item["name"], item_code=item["item_code"], item_name=item["item_name"], stock_uom=item["stock_uom"], description=item["description"] if item["description"] else "") for item in item_list]

fiuai_sdk_python-0.3.6/src/fiuai_sdk_python/resp.py

@@ -0,0 +1,193 @@
+# -- coding: utf-8 --
+# Project: fiuai_sdk_python
+# Created Date: 2025 10 Mo
+# Author: liming
+# Email: lmlala@aliyun.com
+# Copyright (c) 2025 FiuAI
+
+from typing import List, Dict, Any, Optional, Union
+from pydantic import BaseModel, Field
+
+
+class ApiResponse(BaseModel):
+    """API响应结构体"""
+    http_success: bool = Field(description="HTTP是否成功")
+    api_success: bool = Field(description="API业务是否成功")
+    status_code: int = Field(description="HTTP状态码")
+    data: Optional[Any] = Field(description="响应数据", default=None)
+    error_code: Optional[str] = Field(description="精简的错误码", default=None)
+    error: Optional[str] = Field(description="错误消息", default=None)
+    
+    def is_success(self) -> bool:
+        """判断是否完全成功"""
+        return self.http_success and self.api_success
+
+
+def parse_response(response) -> ApiResponse:
+    """
+    解析HTTP响应，返回结构化的API响应
+    
+    Args:
+        response: httpx响应对象
+        
+    Returns:
+        ApiResponse: 结构化的API响应
+    """
+    # 检查响应是否存在
+    if not response:
+        return ApiResponse(
+            http_success=False,
+            api_success=False,
+            status_code=504,
+            error="Api no response",
+            error_code="API_NO_RESPONSE",
+        )
+    
+   
+    # 解析JSON响应
+    try:
+         # 检查HTTP状态码
+        http_success = 200 <= response.status_code < 300
+    except Exception as e:
+        return ApiResponse(
+            http_success=False,
+            api_success=False,
+            error=f"Invalid JSON response: {e}",
+            error_code="API_INVALID_JSON"
+        )
+    
+    try:
+        response_data = response.json()
+    except Exception as e:
+        return ApiResponse(
+            http_success=True,
+            api_success=False,
+            error=f"Invalid JSON response: {e}",
+            error_code="API_INVALID_JSON"
+        )
+    
+    # 检查API业务是否成功
+    api_success = _is_api_success(response_data)
+    
+    if api_success:
+        # 成功响应，提取数据
+        data = _extract_success_data(response_data)
+        return ApiResponse(
+            http_success=http_success,
+            api_success=True,
+            status_code=response.status_code,
+            data=data
+        )
+    else:
+        # 失败响应，提取错误信息
+        error_msg, error_type = _extract_error_info(response_data)
+        return ApiResponse(
+            http_success=http_success,
+            api_success=False,
+            status_code=response.status_code,
+            error=error_msg,
+            error_code=error_type
+        )
+
+
+def _is_api_success(response_data: Dict[str, Any]) -> bool:
+    """
+    判断API业务是否成功
+    
+    Args:
+        response_data: API响应数据
+        
+    Returns:
+        bool: 是否成功
+    """
+    # 检查是否有错误
+    errors = response_data.get("errors", None)
+    if errors:
+        return False
+    
+    # 检查是否有异常
+    exc = response_data.get("exc", None)
+    if exc:
+        return False
+    
+    # 检查HTTP状态码
+    http_status_code = response_data.get("http_status_code", None)
+    if http_status_code is not None:
+        return 200 <= http_status_code < 300
+    
+    # 默认认为有message或data字段就是成功
+    return response_data.get("message", None) is not None or response_data.get("data", None) is not None
+
+
+def _extract_success_data(response_data: Dict[str, Any]) -> Any:
+    """
+    从成功响应中提取数据
+    
+    Args:
+        response_data: API响应数据
+        
+    Returns:
+        Any: 提取的数据
+    """
+    return response_data.get("data", None)
+
+
+def _extract_error_info(response_data: Dict[str, Any]) -> tuple[str, str]:
+    """
+    从响应中提取错误信息
+    
+    Args:
+        response_data: API响应数据
+        
+    Returns:
+        tuple[str, str]: (错误消息, 错误类型)
+    """
+    # 处理errors字段
+    errors = response_data.get("errors", None)
+    if errors and isinstance(errors, list):
+        if errors:
+            # 获取所有错误消息，用换行符分割
+            error_messages = []
+            error_codes = []
+            for error in errors:
+                if isinstance(error, dict):
+                    error_msg = error.get("message", "Unknown error")
+                    error_code = error.get("type", "UnknownError")
+                    error_messages.append(error_msg)
+                    error_codes.append(error_code)
+            
+            # 用换行符连接所有错误消息
+            combined_error_msg = "\n".join(error_messages)
+            # 使用第一个错误码作为主要错误码
+            primary_error_code = error_codes[0] if error_codes else "UnknownError"
+            return combined_error_msg, primary_error_code
+    
+    # 处理exc字段（V1 API格式）
+    exc = response_data.get("exc", None)
+    if exc:
+        return str(exc), "API_EXCEPTION"
+    
+    # 处理message字段中的错误
+    message = response_data.get("message", None)
+    if message and isinstance(message, str):
+        # 检查是否是错误消息
+        if any(keyword in message.lower() for keyword in ["error", "failed", "invalid", "unauthorized"]):
+            return message, "API_ERROR"
+    
+    return "Unknown error occurred", "UnknownError"
+
+
+def is_auth_error(error_type: str) -> bool:
+    """
+    判断是否为认证相关错误
+    
+    Args:
+        error_type: 错误类型
+        
+    Returns:
+        bool: 是否为认证错误
+    """
+    auth_types = ["AuthenticationError", "PermissionError", "Unauthorized", "Forbidden"]
+    return any(auth_type in error_type for auth_type in auth_types)
+
+

{fiuai_sdk_python-0.3.4 → fiuai_sdk_python-0.3.6}/src/fiuai_sdk_python/setup.py

@@ -23,13 +23,15 @@ from .type import (
     DocTypeMeta,
     DocField,
     DocFieldType,
-    AiRecognitionValue
+    
 )
 from typing import List
 from logging import getLogger
 
 from .client import FiuaiSDK
 
+from .util import get_int_value
+
 logger = getLogger(__name__)
 
 
@@ -38,40 +40,68 @@ def load_uom_data(client: FiuaiSDK)-> List[UOM]:
     """
     从frappe获取uom数据
     """
-    uom_list = client.internal_get_list(doctype="UOM", fields=["name", "uom_name", "common_code"])
+    uom_list_response = client.internal_get_list(doctype="UOM", fields=["name", "uom_name", "common_code"])
+    if not uom_list_response.is_success():
+        return []
+    
+    uom_list = uom_list_response.data
+    if not uom_list:
+        return []
+    
     return [UOM(name=uom["name"], uom_name=uom["uom_name"], common_code=uom["common_code"]) for uom in uom_list]
 
 def load_currency_data(client: FiuaiSDK)-> List[Currency]:
     """
     从frappe获取currency数据
     """
-    currency_list = client.internal_get_list(
+    currency_list_response = client.internal_get_list(
         doctype="Currency", 
         filters={"enabled": 1},
         fields=["name", "currency_name", "fraction_units", "smallest_currency_fraction_value"]
         )
+    if not currency_list_response.is_success():
+        return []
+    
+    currency_list = currency_list_response.data
+    if not currency_list:
+        return []
+    
     return [Currency(name=currency["name"], currency_name=currency["currency_name"], fraction_units=currency["fraction_units"], smallest_currency_fraction_value=currency["smallest_currency_fraction_value"]) for currency in currency_list]
 
 def load_country_data(client: FiuaiSDK)-> List[Country]:
     """
     从frappe获取country数据
     """
-    country_list = client.internal_get_list(
+    country_list_response = client.internal_get_list(
         doctype="Country", 
         filters={"name": ["in", USED_COUNTRY_LIST]},
         fields=["name", "code"]
     )
+    if not country_list_response.is_success():
+        return []
+    
+    country_list = country_list_response.data
+    if not country_list:
+        return []
+    
     return [Country(name=country["name"], code=country["code"]) for country in country_list]
 
 def load_language_data(client: FiuaiSDK)-> List[Language]:
     """
     从frappe获取language数据
     """
-    language_list = client.internal_get_list(
+    language_list_response = client.internal_get_list(
         doctype="Language", 
         filters={"name": ["in", USED_LANGUAGE_LIST]},
         fields=["name", "language_name"]
     )
+    if not language_list_response.is_success():
+        return []
+    
+    language_list = language_list_response.data
+    if not language_list:
+        return []
+    
     return [Language(name=language["name"], language_name=language["language_name"]) for language in language_list]
 
 def load_doctype_meta(client: FiuaiSDK, doctype: str, max_api_retry: int = 3, only_has_prompt: bool = True, show_hidden: bool = False)-> DocTypeMeta:
@@ -92,9 +122,15 @@ def load_doctype_meta(client: FiuaiSDK, doctype: str, max_api_retry: int = 3, on
            
     return doc_meta        
 
-def _get_meta(client: FiuaiSDK, doctype: str, only_has_prompt: bool = True, show_hidden: bool = False) -> DocTypeMeta:
+def _get_meta(client: FiuaiSDK, doctype: str, only_has_prompt: bool = True, show_hidden: bool = False) -> DocTypeMeta | None:
     try:
-        m = client.get_meta(doctype)
+        m_response = client.get_meta(doctype)
+        if not m_response.is_success():
+            return None
+        
+        m = m_response.data
+        if not m:
+            return None
         
         if m is None:
             return None
@@ -107,14 +143,22 @@ def _get_meta(client: FiuaiSDK, doctype: str, only_has_prompt: bool = True, show
             field_type = _f["fieldtype"]
             field_prompt = _f.get("field_prompt", None)
             options_str = _f.get("options", None)
-            hidden = _f.get("hidden", 0)
-            reqd = _f.get("reqd", 0)
-            read_only = _f.get("read_only", 0)
+            hidden = get_int_value("hidden", _f)
+            reqd = get_int_value("reqd", _f)
+            mandatory = get_int_value("mandatory", _f)
+            read_only = get_int_value("read_only", _f)
+            in_list_view = get_int_value("in_list_view", _f)
+            in_mobile_view = get_int_value("in_mobile_view", _f)
             description = _f.get("description", "")
+            custom_query = _f.get("custom_query", None)
             link_filters = _f.get("link_filters", None)
-            precision = _f.get("precision", None)
-            length = _f.get("length", None)
+            precision = get_int_value("precision", _f)
+            length = get_int_value("length", _f)
 
+
+            ### 格式转化
+
+            
             options = []
 
             match field_type:
@@ -148,19 +192,21 @@ def _get_meta(client: FiuaiSDK, doctype: str, only_has_prompt: bool = True, show
             except ValueError:
                 # 如果找不到对应的枚举值，使用 Data 作为默认值
                 fieldtype_enum = DocFieldType.Data
-                
+            
+            print(_f)
             _fields.append(DocField(
                 fieldname=field_name, 
                 description=description,
                 fieldtype=fieldtype_enum, 
-                hidden=True if _f.get("hidden", 0) == 1 else False,
-                read_only=True if _f.get("read_only", 0) == 1 else False,
-                reqd=True if _f.get("reqd", 0) == 1 else False,
+                hidden=True if hidden == 1 else False,
+                read_only=True if read_only == 1 else False,
+                reqd=True if reqd == 1 else False,
                 options=options,
                 field_prompt=field_prompt,
-                mandatory=True if _f.get("mandatory", 0) == 1 else False,
-                in_list_view=True if _f.get("in_list_view", 0) == 1 else False,
-                in_mobile_view=True if _f.get("in_mobile_view", 0) == 1 else False,
+                mandatory=True if mandatory == 1 else False,
+                in_list_view=True if in_list_view == 1 else False,
+                in_mobile_view=True if in_mobile_view == 1 else False,
+                custom_query=custom_query,
                 link_filters=link_filters,
                 precision=precision,
                 length=length,
@@ -180,7 +226,7 @@ def _get_meta(client: FiuaiSDK, doctype: str, only_has_prompt: bool = True, show
             )
         return doc_meta
     except Exception as e:
-        logger.error(f"load doctype {doctype} meta failed: {e.args}")
+        logger.error(f"load doctype {doctype} meta failed: {e}")
         return None
         
         
@@ -191,5 +237,7 @@ def load_all_allowed_doctype_meta(client: FiuaiSDK, only_has_prompt: bool = True
     r = []
     for _d in AI_ALLOWED_DOCTYPE_META:
         m = load_doctype_meta(client, _d, only_has_prompt, show_hidden)
+        if not m:
+            continue
         r.append(m)
     return r

{fiuai_sdk_python-0.3.4 → fiuai_sdk_python-0.3.6}/src/fiuai_sdk_python/type.py

@@ -192,6 +192,7 @@ class DocField(BaseModel):
     read_only: bool = Field(description="字段是否只读")
     fieldtype: DocFieldType = Field(description="字段类型,比如Data,Float,Link,etc.")
     options: Optional[List[str]] = Field(description="字段选项,Select类型的字段的枚举值, Link类型字段的Link目标表名", default=None)
+    custom_query: Optional[str] = Field(description="自定义查询的方法名", default=None)
     link_filters: Optional[str] = Field(description="Link字段过滤条件,json字符串", default=None)
     length: Optional[int] = Field(description="字段长度限制", default=None)
     precision: Optional[int] = Field(description="浮点数类型时的精度", default=None)

{fiuai_sdk_python-0.3.4 → fiuai_sdk_python-0.3.6}/src/fiuai_sdk_python/util.py

@@ -8,7 +8,7 @@
 
 
 import logging
-from typing import List, Optional
+from typing import List, Optional, Dict, Any
 from .type import ClientConfig
 
 logger = logging.getLogger(__name__)
@@ -87,4 +87,17 @@ def init_fiuai(
         timeout: 请求超时时间
         verify: 是否验证 SSL 证书
     """
-    _config.init(url, max_api_retry, timeout, verify)
+    _config.init(url, max_api_retry, timeout, verify)
+
+
+###### tools
+
+def get_int_value(key: str, data: Dict[str, Any]) -> int | None:
+    """
+    获取int类型的值
+    """
+    d = data.get(key, None)
+    if not d:
+        return None 
+
+    return int(d)