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

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

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

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

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

@@ -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"])

{fiuai_sdk_python-0.2.6 → fiuai_sdk_python-0.2.7}/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,