superb-ai-onprem 0.1.2__tar.gz → 0.1.4__tar.gz

{superb_ai_onprem-0.1.2 → superb_ai_onprem-0.1.4}/.gitignore

@@ -46,4 +46,7 @@ coverage.xml
 .ipynb_checkpoints
 
 # Logs
-*.log
+*.log
+
+# Added from the code block
+spb_onprem/_version.py

{superb_ai_onprem-0.1.2 → superb_ai_onprem-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superb-ai-onprem
-Version: 0.1.2
+Version: 0.1.4
 Summary: Python SDK for Superb AI On-premise
 Home-page: https://github.com/Superb-AI-Suite/superb-ai-onprem-python
 Author: Superb AI

{superb_ai_onprem-0.1.2 → superb_ai_onprem-0.1.4}/spb_onprem/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.1.2'
-__version_tuple__ = version_tuple = (0, 1, 2)
+__version__ = version = '0.1.4'
+__version_tuple__ = version_tuple = (0, 1, 4)

{superb_ai_onprem-0.1.2 → superb_ai_onprem-0.1.4}/spb_onprem/base_service.py

@@ -32,7 +32,10 @@ class BaseService():
     
     def __init__(self):
         self._auth_user = AuthUser.get_instance()
-        self.endpoint = f"{self._auth_user.host}/graphql/"
+        if self._auth_user.is_system_sdk:
+            self.endpoint = f"{self._auth_user.host}/system/graphql/"
+        else:
+            self.endpoint = f"{self._auth_user.host}/graphql/"
     
     @classmethod
     def requests_retry_session(

superb_ai_onprem-0.1.4/spb_onprem/users/entities/auth.py

@@ -0,0 +1,88 @@
+import base64
+import os
+import configparser
+from typing import Optional, ClassVar
+
+from spb_onprem.base_model import CustomBaseModel, Field
+from spb_onprem.exceptions import SDKConfigError
+
+class AuthUser(CustomBaseModel):
+    host: str = Field(alias="host")
+    access_key: str = Field(alias="accessKey")
+    access_key_secret: str = Field(alias="accessKeySecret")
+    is_system_sdk: bool = Field(alias="isSystemSdk")
+    system_sdk_user_email: Optional[str] = Field(None, alias="systemSdkUserEmail")
+
+    _access_token: Optional[str] = None
+    _instance: ClassVar[Optional["AuthUser"]] = None
+
+    @classmethod
+    def get_instance(
+        cls,
+        config_file: str = "~/.spb/onprem-config"
+    ) -> "AuthUser":
+        if cls._instance is None:
+            config_file_path = os.path.expanduser(config_file)
+            
+            if not os.path.exists(config_file_path):
+                cls._instance = cls._create_system_sdk_instance()
+            else:
+                cls._instance = cls._create_config_instance(config_file_path)
+        return cls._instance
+
+    @classmethod
+    def _create_system_sdk_instance(cls) -> "AuthUser":        
+        system_sdk_host = os.environ.get("SUNRISE_SERVER_URL") or os.environ.get("SUPERB_SYSTEM_SDK_HOST") or "http://app-api:8080"
+        
+        return cls(
+            host=system_sdk_host,
+            access_key="",
+            access_key_secret="",
+            is_system_sdk=True,
+            system_sdk_user_email=os.environ.get("SUPERB_SYSTEM_SDK_USER_EMAIL", "system@superb-ai.com")
+        )
+
+    @classmethod
+    def _create_config_instance(cls, config_file_path: str) -> "AuthUser":
+        config = configparser.ConfigParser()
+        try:
+            if not config.read(config_file_path):
+                raise SDKConfigError(f"Failed to read config file: {config_file_path}")
+            
+            if "default" not in config:
+                raise SDKConfigError(f"Missing 'default' section in config file: {config_file_path}")
+            
+            required_keys = ["host", "access_key", "access_key_secret"]
+            for key in required_keys:
+                if key not in config["default"]:
+                    raise SDKConfigError(f"Missing required key '{key}' in config file: {config_file_path}")
+            
+            return cls(
+                host=config["default"]["host"],
+                access_key=config["default"]["access_key"],
+                access_key_secret=config["default"]["access_key_secret"],
+                is_system_sdk=False,
+                system_sdk_user_email=None
+            )
+        except configparser.Error as e:
+            raise SDKConfigError(f"Error parsing config file: {str(e)}") from e
+
+    @property
+    def access_token(self):
+        if self._access_token:
+            return self._access_token
+        decoded_token = f"{self.access_key}:{self.access_key_secret}"
+        decoded_token_bytes = decoded_token.encode("utf-8")
+        encoded_token = base64.b64encode(decoded_token_bytes).decode("utf-8")
+        self._access_token = f"Basic {encoded_token}"
+        return self._access_token
+    
+    @property
+    def auth_headers(self):
+        if self.is_system_sdk:
+            return {
+                "x-user-email": self.system_sdk_user_email
+            }
+        return {
+            "Authorization": self.access_token
+        }

{superb_ai_onprem-0.1.2 → superb_ai_onprem-0.1.4}/superb_ai_onprem.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superb-ai-onprem
-Version: 0.1.2
+Version: 0.1.4
 Summary: Python SDK for Superb AI On-premise
 Home-page: https://github.com/Superb-AI-Suite/superb-ai-onprem-python
 Author: Superb AI

{superb_ai_onprem-0.1.2 → superb_ai_onprem-0.1.4}/superb_ai_onprem.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-.env.local
 .gitignore
 LICENSE
 README.md

superb_ai_onprem-0.1.2/.env.local

@@ -1,10 +0,0 @@
-# System SDK Configuration
-# Set to "true" to use system SDK mode (typically used in Airflow DAGs)
-SUPERB_SYSTEM_SDK=false
-
-# Host Configuration
-# Either SUNRISE_SERVER_URL or SUPERB_SYSTEM_SDK_HOST must be set when SUPERB_SYSTEM_SDK is true
-SUPERB_SYSTEM_SDK_HOST=https://your-superb-ai-host
-
-# User Configuration (Required when SUPERB_SYSTEM_SDK is true)
-SUPERB_SYSTEM_SDK_USER_EMAIL=user@example.com 

superb_ai_onprem-0.1.2/spb_onprem/users/entities/auth.py

@@ -1,86 +0,0 @@
-import base64
-import os
-import configparser
-from typing import Optional, ClassVar
-
-from spb_onprem.base_model import CustomBaseModel, Field
-from spb_onprem.exceptions import SDKConfigError
-
-class AuthUser(CustomBaseModel):
-    host: str = Field(alias="host")
-    access_key: str = Field(alias="accessKey")
-    access_key_secret: str = Field(alias="accessKeySecret")
-    is_system_sdk: bool = Field(alias="isSystemSdk")
-    system_sdk_user_email: Optional[str] = Field(None, alias="systemSdkUserEmail")
-
-    _access_token: Optional[str] = None
-    _instance: ClassVar[Optional["AuthUser"]] = None
-
-    @classmethod
-    def get_instance(
-        cls,
-        config_file: str = "~/.spb/onprem-config"
-    ) -> "AuthUser":
-        if cls._instance is None:
-            if os.environ.get("SUPERB_SYSTEM_SDK") == "true":
-                if not os.environ.get("SUNRISE_SERVER_URL") and not os.environ.get("SUPERB_SYSTEM_SDK_HOST"):
-                    raise SDKConfigError("Superb Platform SDK is not configured. Please set the environment variable SUPERB_SYSTEM_SDK_URL.")
-                
-                if os.environ.get("SUNRISE_SERVER_URL"):
-                    system_sdk_host = os.environ.get("SUNRISE_SERVER_URL")
-                else:
-                    system_sdk_host = os.environ.get("SUPERB_SYSTEM_SDK_HOST")
-                
-                # Skip reading config file when SUPERB_SYSTEM_SDK is true
-                cls._instance = cls(
-                    host=system_sdk_host,
-                    access_key="",
-                    access_key_secret="",
-                    is_system_sdk=True,
-                    system_sdk_user_email=os.environ.get("SUPERB_SYSTEM_SDK_USER_EMAIL", "")
-                )
-            else:
-                config_file_path = os.path.expanduser(config_file)
-                config = configparser.ConfigParser()
-                try:
-                    if not config.read(config_file_path):
-                        raise SDKConfigError(f"Failed to read config file: {config_file_path}")
-                    
-                    if "default" not in config:
-                        raise SDKConfigError(f"Missing 'default' section in config file: {config_file_path}")
-                    
-                    required_keys = ["host", "access_key", "access_key_secret"]
-                    for key in required_keys:
-                        if key not in config["default"]:
-                            raise SDKConfigError(f"Missing required key '{key}' in config file: {config_file_path}")
-                    
-                    cls._instance = cls(
-                        host=config["default"]["host"],
-                        access_key=config["default"]["access_key"],
-                        access_key_secret=config["default"]["access_key_secret"],
-                        is_system_sdk=False,
-                        system_sdk_user_email=None  # Not required in normal mode
-                    )
-                except configparser.Error as e:
-                    raise SDKConfigError(f"Error parsing config file: {str(e)}") from e
-        return cls._instance
-
-    @property
-    def access_token(self):
-        if self._access_token:
-            return self._access_token
-        decoded_token = f"{self.access_key}:{self.access_key_secret}"
-        decoded_token_bytes = decoded_token.encode("utf-8")
-        encoded_token = base64.b64encode(decoded_token_bytes).decode("utf-8")
-        self._access_token = f"Basic {encoded_token}"
-        return self._access_token
-    
-    @property
-    def auth_headers(self):
-        if self.is_system_sdk:
-            return {
-                "x-user-email": self.system_sdk_user_email
-            }
-        return {
-            "Authorization": self.access_token
-        }