fiuai-sdk-python 0.2.6__tar.gz → 0.2.9__tar.gz

{fiuai_sdk_python-0.2.6 → fiuai_sdk_python-0.2.9}/PKG-INFO

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

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

{fiuai_sdk_python-0.2.6 → fiuai_sdk_python-0.2.9}/src/fiuai_sdk_python/client.py

@@ -4,7 +4,7 @@ import json
 from urllib.parse import quote
 from typing import Any, Literal
 
-from .util import create_headers, get_tokens, get_client_config, is_initialized
+from .util import get_tokens, get_client_config, is_initialized
 from .error import FiuaiGeneralError, FiuaiAuthError
 from logging import getLogger
 from .type import UserProfile
@@ -34,7 +34,16 @@ class FiuaiSDK(object):
         self.username = username
     
         self.auth_type = auth_type
-        self.headers = None
+        self.headers = {
+            "Accept": "application/json",
+            "Fiuai-Internal-Auth": "false",
+            "Fiuai-Internal-Key": "",
+            "Fiuai-Internal-Secret": "",
+            "Fiuai-Internal-User": "",
+            "Fiuai-Internal-Tenant": "",
+            "Fiuai-Internal-Company": "",
+            "Fiuai-Internal-Current-Company": "",
+        }
         self.verify = verify
         self.url = url
         self.max_api_retry = max_api_retry
@@ -50,12 +59,15 @@ class FiuaiSDK(object):
             case "internal":
                 if token_key == "" or token_secret == "":
                     raise FiuaiGeneralError("Token key and secret are required")
-                self.headers = create_headers(token_key, token_secret, username)
+                self.headers["Fiuai-Internal-Auth"] = "true"
+                self.headers["Fiuai-Internal-Key"] = token_key
+                self.headers["Fiuai-Internal-Secret"] = token_secret
+                self.headers["Fiuai-Internal-User"] = username
             case "password":
                 if username == "" or password == "":
                     raise FiuaiGeneralError("Username and password are required")
                 
-                self.headers = {"Accept": "application/json"}
+                self.headers["Fiuai-Internal-Auth"] = "false"
                 self._login(username, password)
             case _:
                 raise FiuaiGeneralError(f"Invalid auth type: {self.auth_type}")
@@ -71,6 +83,10 @@ class FiuaiSDK(object):
         if r.json().get('message') == "Logged In":
             self.can_download = []
             logger.info(f"Login to {self.url} success")
+
+            ### 获取cookie
+            self.headers["Fiuai-Internal-Company"] = r.cookies.get("current_company")
+            self.headers["Fiuai-Internal-Tenant"] = r.cookies.get("tenant")
             return r.json()
         else:
             raise FiuaiAuthError(f"Login failed: {r.json().get('message')}")
@@ -96,14 +112,17 @@ class FiuaiSDK(object):
         return self.post_process(r)
     
     def swith_company(self, tenant: str = "", company: str = "") -> bool:
+
+        self.headers["Fiuai-Internal-Tenant"] = tenant
+        self.headers["Fiuai-Internal-Company"] = company
+
         if company == "":
             raise FiuaiAuthError("Company is required when using password auth")
 
         if self.auth_type == "internal":
             if tenant == "":
                 raise FiuaiAuthError("Tenant is required when using internal auth")
-            self.headers["Fiuai-Internal-Tenant"] = tenant
-            self.headers["Fiuai-Internal-Company"] = company
+            
         else:
             r = self.client.post(self.url + "/api/method/frappe.sessions.change_current_company",
 			data={"auth_company_id": company})
@@ -113,6 +132,12 @@ class FiuaiSDK(object):
                 return False
             else:
                 return True
+    
+    def get_tenant(self) -> str:
+        return self.headers["Fiuai-Internal-Tenant"]
+    
+    def get_company(self) -> str:
+        return self.headers["Fiuai-Internal-Company"]
 
     def get_user_profile(self) -> UserProfile:
         d = self.get_doc("User", self.username, fields=["name", "full_name", "email", "phone", "roles", "auth_tenant_id", "default_company_id"])
@@ -209,10 +234,14 @@ class FiuaiSDK(object):
 
         
         docs = self.post_process(res)
-        if isinstance(docs, list):
-            return docs[0]
+
+        if not docs:
+            return None
         else:
-            return docs
+            if isinstance(docs, list):
+                return docs[0]
+            else:
+                return docs
 
 
     def get_api(self, method, params={}):

{fiuai_sdk_python-0.2.6 → fiuai_sdk_python-0.2.9}/src/fiuai_sdk_python/setup.py

@@ -73,7 +73,7 @@ def load_language_data(client: FiuaiSDK)-> List[Language]:
     )
     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)-> DocTypeMeta:
+def load_doctype_meta(client: FiuaiSDK, doctype: str, max_api_retry: int = 3, only_has_prompt: bool = True, show_hidden: bool = False)-> DocTypeMeta:
     """
     从frappe获取doctype数据
     """
@@ -82,7 +82,7 @@ def load_doctype_meta(client: FiuaiSDK, doctype: str, max_api_retry: int = 3)->
     doc_meta = None
     while retry_count < max_api_retry:
             
-        doc_meta = _get_meta(client, doctype)
+        doc_meta = _get_meta(client, doctype, only_has_prompt, show_hidden)
         
         if doc_meta:
             break
@@ -91,7 +91,7 @@ def load_doctype_meta(client: FiuaiSDK, doctype: str, max_api_retry: int = 3)->
            
     return doc_meta        
 
-def _get_meta(client: FiuaiSDK, doctype: str) -> DocTypeMeta:
+def _get_meta(client: FiuaiSDK, doctype: str, only_has_prompt: bool = True, show_hidden: bool = False) -> DocTypeMeta:
     try:
         m = client.get_meta(doctype)
         
@@ -109,6 +109,7 @@ def _get_meta(client: FiuaiSDK, doctype: str) -> DocTypeMeta:
             hidden = _f.get("hidden", 0)
             reqd = _f.get("reqd", 0)
             read_only = _f.get("read_only", 0)
+            description = _f.get("description", "")
 
             options = []
             match field_type:
@@ -124,22 +125,26 @@ def _get_meta(client: FiuaiSDK, doctype: str) -> DocTypeMeta:
                     pass
 
 
-            if field_prompt == "":
+            if field_prompt == "" and only_has_prompt:
                 # 仅有prompt的field才是应该关心的字段，降低复杂度
                 continue
-            if hidden == 1:
+            if hidden == 1 and not show_hidden:
                 continue
             
             
             _fields.append(DocField(
                 fieldname=field_name, 
+                description=description,
                 fieldtype=field_type, 
                 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,
                 options=options,
                 field_prompt=field_prompt,
-                ai_recognition_value=AiRecognitionValue(value=None, confidence=0, ai_comment="")
+                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,
+                # ai_recognition_value=AiRecognitionValue(value=None, confidence=0, ai_comment="")
             ))
         
         # links, child 去重
@@ -148,23 +153,23 @@ def _get_meta(client: FiuaiSDK, doctype: str) -> DocTypeMeta:
 
         doc_meta = DocTypeMeta(
                 name=doctype, 
-                doctype_prompts=m["doctype_prompts"], 
+                doctype_prompts=m.get("doctype_prompts", ""), 
                 fields=_fields,
                 link_docs=links,
                 child_docs=child_docs
             )
         return doc_meta
     except Exception as e:
-        logger.error(f"load doctype meta failed: {e.args}")
+        logger.error(f"load doctype {doctype} meta failed: {e.args}")
         return None
         
         
-def load_all_allowed_doctype_meta(client: FiuaiSDK)-> List[DocTypeMeta]:
+def load_all_allowed_doctype_meta(client: FiuaiSDK, only_has_prompt: bool = True, show_hidden: bool = False)-> List[DocTypeMeta]:
     """
     从frappe获取doctype数据
     """
     r = []
     for _d in AI_ALLOWED_DOCTYPE_META:
-        m = load_doctype_meta(client, _d)
+        m = load_doctype_meta(client, _d, only_has_prompt, show_hidden)
         r.append(m)
     return r

{fiuai_sdk_python-0.2.6 → fiuai_sdk_python-0.2.9}/src/fiuai_sdk_python/type.py

@@ -124,12 +124,16 @@ class DocField(BaseModel):
     frappe 文档字段文档数据
     """
     fieldname: str = Field(description="字段名称,比如Invoice,Purchase Order,etc.")
+    description: str = Field(description="字段描述", default="")
     hidden: bool = Field(description="字段是否隐藏")
     reqd: bool = Field(description="字段是否必填")
     read_only: bool = Field(description="字段是否只读")
     fieldtype: str = Field(description="字段类型,比如Data,Float,Link,etc.")
     options: List[str] = Field(description="字段选项,Select类型的字段的枚举值, Link类型字段的Link目标表名")
     field_prompt: str = Field(description="字段对应的prompt")
+    mandatory: bool = Field(description="字段是否必填", default=False)
+    in_list_view: bool = Field(description="字段是否在列表视图中显示", default=False)
+    in_mobile_view: bool = Field(description="字段是否在移动端视图中显示", default=False)
     # ai_recognition_value: AiRecognitionValue = Field(description="字段对应的AI识别结果", default=None)
 
 
@@ -211,6 +215,18 @@ class DocTypeMeta(BaseModel):
                 r.append(i.model_dump_json())
         return r
     
+
+    ##### 获取单个field
+    def get_field(self, fieldname: str) -> DocField | None:
+        for field in self.fields:
+            if field.fieldname == fieldname:
+                return field
+        return None
+
+
+
+
+    #### create datas
     def create_empty_data_json(self, mock_type: Literal["full", "json"]="json", with_child_tables: bool = False) -> str:
         return json.dumps(self.create_empty_data(mock_type, with_child_tables), indent=4)
 
@@ -248,7 +264,7 @@ class DocTypeMeta(BaseModel):
                     if with_child_tables:
                         try:
                             # 动态导入避免循环依赖
-                            from pkg.fiuaiclient .setup import load_doctype_meta
+                            from .setup import load_doctype_meta
                             # 自动加载子表元数据
                             child_meta = load_doctype_meta(child_doctype)
                             if child_meta:

{fiuai_sdk_python-0.2.6 → fiuai_sdk_python-0.2.9}/src/fiuai_sdk_python/util.py

@@ -80,22 +80,6 @@ def get_client_config():
 def is_initialized():
     return _config.is_initialized()
 
-def create_headers(key, secret, user, tenant="", company=""):
-
-    headers = {
-        "Fiuai-Internal-Auth": "true",
-        "Fiuai-Internal-Key": key,
-        "Fiuai-Internal-Secret": secret,
-        "Fiuai-Internal-User": user,
-        "Fiuai-Internal-Tenant": tenant,
-        "Fiuai-Internal-Company": company,
-        "Accept": "application/json",
-    }
-
-    return headers
-
-
-
 
 def init_fiuai(
     url: str,