gmicloud 0.1.9__tar.gz → 0.1.10__tar.gz

{gmicloud-0.1.9 → gmicloud-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gmicloud
-Version: 0.1.9
+Version: 0.1.10
 Summary: GMI Cloud Python SDK
 Author-email: GMI <gmi@gmitec.net>
 License: MIT

{gmicloud-0.1.9 → gmicloud-0.1.10}/gmicloud/_internal/_client/_http_client.py

@@ -57,28 +57,28 @@ class HTTPClient:
             response = requests.request(method, url, params=params, json=data, headers=headers)
             logger.debug(response.text)
             if response.status_code == 401:
-                raise UnauthorizedError("Access token expired or invalid.")
+                raise UnauthorizedError(f"Unauthorized Error : {response.status_code} - Access token expired or invalid.")
             elif response.status_code != 200 and response.status_code != 201:
-                if url.find("ie/artifact") != -1 or url.find("ie/task") != -1:
+                if url.find("ie/artifact") != -1 or url.find("ie/task") != -1 or url.find("ie/requestqueue") != -1:
                     error_message = response.json().get('error', 'Unknown error')
                 else:
                     error_message = response.json().get('message', 'Unknown error')
-                raise APIError(f"HTTP Request failed: {error_message}")
+                raise APIError(f"HTTP Request failed: {response.status_code} - {error_message}")
             # Raise for HTTP errors
             response.raise_for_status()
 
         except requests.exceptions.RequestException as e:
-            raise APIError(f"HTTP Request failed: {str(e)}")
+            raise APIError(f"HTTP Request failed: {response.status_code} - {str(e)}")
         except ValueError as e:
             # Fallback if response JSON is invalid
-            raise APIError(f"Failed to parse JSON response: {response.text}")
+            raise APIError(f"Failed to parse JSON response: {response.status_code} - {response.text}")
 
         if response.headers.get(CONTENT_TYPE_HEADER).find(JSON_CONTENT_TYPE) != -1:
             return response.json()
         elif response.headers.get(CONTENT_TYPE_HEADER).find(TEXT_CONTENT_TYPE) != -1:
-            raise APIError(f"Got text response: {response.text}")
+            raise APIError(f"Got text response: {response.status_code} - {response.text}")
         else:
-            raise APIError(f"Unsupported content type: {response.headers.get(CONTENT_TYPE_HEADER)}")
+            raise APIError(f"Unsupported content type: {response.status_code} - {response.headers.get(CONTENT_TYPE_HEADER)}")
 
     def post(self, endpoint, custom_headers=None, data=None):
         """

{gmicloud-0.1.9 → gmicloud-0.1.10}/gmicloud/_internal/_client/_video_client.py

@@ -7,7 +7,7 @@ from ._decorator import handle_refresh_token
 from ._iam_client import IAMClient
 from .._config import IAM_SERVICE_BASE_URL
 from .._models import *
-
+from .._exceptions import formated_exception
 
 logger = logging.getLogger(__name__)
 
@@ -29,7 +29,7 @@ class VideoClient:
 
 
     @handle_refresh_token
-    def get_request_detail(self, request_id: str) -> GetRequestResponse:
+    def get_request_detail(self, request_id: str) -> GetRequestResponse | dict:
         """
         Retrieves detailed information about a specific request by its ID. This endpoint requires authentication with a bearer token and only returns requests belonging to the authenticated organization.
 
@@ -39,13 +39,13 @@ class VideoClient:
         try:
             response = self.client.get(f"/requests/{request_id}", self.iam_client.get_custom_headers())
             return GetRequestResponse.model_validate(response) if response else None
-        except (RequestException, ValueError) as e:
-            logger.error(f"Failed to retrieve request details for {request_id}: {e}")
-            return None
+        except Exception as e:
+            logger.error(f"An unexpected error occurred while retrieving request details for {request_id}: {e}")
+            return formated_exception(e)
 
 
     @handle_refresh_token
-    def get_requests(self, model_id: str) -> List[GetRequestResponse]:
+    def get_requests(self, model_id: str) -> List[GetRequestResponse] | dict:
         """
         Retrieves a list of requests submitted by the authenticated user for a specific model. This endpoint requires authentication with a bearer token and filters results by the authenticated organization.
 
@@ -56,13 +56,13 @@ class VideoClient:
             response = self.client.get("/requests", self.iam_client.get_custom_headers(), {"model_id": model_id})
             requests = response.get('requests', []) if response else []
             return [GetRequestResponse.model_validate(req) for req in requests] if requests else None
-        except (RequestException, ValueError) as e:
-            logger.error(f"Failed to retrieve requests for model {model_id}: {e}")
-            return None
+        except Exception as e:
+            logger.error(f"An unexpected error occurred while retrieving requests for model {model_id}: {e}")
+            return formated_exception(e)
 
 
     @handle_refresh_token
-    def create_request(self, request: SubmitRequestRequest) -> SubmitRequestResponse:
+    def create_request(self, request: SubmitRequestRequest) -> SubmitRequestResponse | dict:
         """
         Submits a new asynchronous request to process a specified model with provided parameters. This endpoint requires authentication with a bearer token.
 
@@ -72,13 +72,13 @@ class VideoClient:
         try:
             response = self.client.post("/requests", self.iam_client.get_custom_headers(), request.model_dump())
             return SubmitRequestResponse.model_validate(response) if response else None
-        except (RequestException, ValueError) as e:
-            logger.error(f"Failed to create request: {e}")
-            return None
+        except Exception as e:
+            logger.error(f"An unexpected error occurred while creating a request: {e}")
+            return formated_exception(e)
 
 
     @handle_refresh_token
-    def get_model_detail(self, model_id: str) -> GetModelResponse:
+    def get_model_detail(self, model_id: str) -> GetModelResponse | dict:
         """
         Retrieves detailed information about a specific model by its ID.
 
@@ -88,13 +88,13 @@ class VideoClient:
         try:
             response = self.client.get(f"/models/{model_id}", self.iam_client.get_custom_headers())
             return GetModelResponse.model_validate(response) if response else None
-        except (RequestException, ValueError) as e:
-            logger.error(f"Failed to retrieve model details for {model_id}: {e}")
-            return None    
+        except Exception as e:
+            logger.error(f"An unexpected error occurred while retrieving model details for {model_id}: {e}")
+            return formated_exception(e)
     
 
     @handle_refresh_token
-    def get_models(self) -> List[GetModelResponse]:
+    def get_models(self) -> List[GetModelResponse] | dict:
         """
         Retrieves a list of available models from the video service.
 
@@ -104,8 +104,8 @@ class VideoClient:
             response = self.client.get("/models", self.iam_client.get_custom_headers())
             models = response.get('models', []) if response else []
             return [GetModelResponse.model_validate(model) for model in models] if models else None
-        except (RequestException, ValueError) as e:
-            logger.error(f"Failed to retrieve models: {e}")
-            return None
-    
+        except Exception as e:
+            logger.error(f"An unexpected error occurred while retrieving models: {e}")
+            return formated_exception(e)
+
 

{gmicloud-0.1.9 → gmicloud-0.1.10}/gmicloud/_internal/_config.py

@@ -3,7 +3,8 @@
 # TASK_SERVICE_BASE_URL = "https://ce-tot.gmicloud-dev.com/api/v1/ie/task"
 # IAM_SERVICE_BASE_URL = "https://ce-tot.gmicloud-dev.com/api/v1"
 
+
 # Prod environment
-ARTIFACT_SERVICE_BASE_URL = "https://inference-engine.gmicloud.ai/api/v1/ie/artifact"
-TASK_SERVICE_BASE_URL = "https://inference-engine.gmicloud.ai/api/v1/ie/task"
-IAM_SERVICE_BASE_URL = "https://inference-engine.gmicloud.ai/api/v1"
+ARTIFACT_SERVICE_BASE_URL = "https://console.gmicloud.ai/api/v1/ie/artifact"
+TASK_SERVICE_BASE_URL = "https://console.gmicloud.ai/api/v1/ie/task"
+IAM_SERVICE_BASE_URL = "https://console.gmicloud.ai/api/v1"

gmicloud-0.1.10/gmicloud/_internal/_exceptions.py

@@ -0,0 +1,36 @@
+class APIError(Exception):
+    """
+    Generic exception for API-related errors.
+    """
+    pass
+
+
+class UploadFileError(Exception):
+    """
+    Exception for file upload errors.
+    """
+    pass
+
+
+class UnauthorizedError(Exception):
+    """
+    Exception for unauthorized access errors.
+    """
+    pass
+
+
+
+def formated_exception(error: Exception) -> dict:
+    """
+    Formats the exception message for logging.
+
+    :param error: The exception to format.
+    :return: A dictionary containing the error code and message.
+    """
+    message = str(error).split(":")[1]
+    status = str(message).split(" - ")[0] if " - " in str(message) else "0"
+    error_message = str(message).split(" - ")[1] if " - " in str(message) else str(message)
+    return {
+        "code": status,
+        "error": error_message
+    }

{gmicloud-0.1.9 → gmicloud-0.1.10}/gmicloud/_internal/_manager/_iam_manager.py

@@ -27,7 +27,7 @@ class IAMManager:
             print(expires_at)
 
         return self.iam_client.create_org_api_key(
-            CreateAPIKeyRequest(name=name, type="ie_model", expiresAt=expires_at))
+            CreateAPIKeyRequest(name=name, scope="ie_model", expiresAt=expires_at))
 
     def get_org_api_keys(self) -> List[APIKey]:
         """

{gmicloud-0.1.9 → gmicloud-0.1.10}/gmicloud/_internal/_models.py

@@ -550,7 +550,8 @@ class CreateAPIKeyRequest(BaseModel):
     Request object for creating an API key.
     """
     name: str  # Name of the API key.
-    type: Optional[str] = ""  # Type of the API key.
+    type: Optional[str] = ""  # Declaration: This field is about to be abandoned
+    scope: Optional[str] = ""  # Scope of the API key.
     expiresAt: Optional[int] = 0  # Expiration timestamp for the API key.
 
 
@@ -567,7 +568,8 @@ class APIKey(BaseModel):
     """
     id: Optional[str] = ""  # API key ID.
     name: Optional[str] = ""  # API key name.
-    type: Optional[str] = ""  # API key type.
+    type: Optional[str] = ""  # Declaration: This field is about to be abandoned
+    scope: Optional[str] = ""  # Scope of the API key.
     partialKey: Optional[str] = ""  # Partial key for the API key.
     expiresAt: Optional[int] = 0  # Expiration timestamp for the API key.
     createdAt: Optional[int] = 0  # Creation timestamp for the API key.

{gmicloud-0.1.9 → gmicloud-0.1.10}/gmicloud/client.py

@@ -16,21 +16,18 @@ logger = logging.getLogger(__name__)
 
 
 class Client:
-    def __init__(self, client_id: Optional[str] = "", email: Optional[str] = "", password: Optional[str] = ""):
-        if not client_id or not client_id.strip():
-            client_id = os.getenv("GMI_CLOUD_CLIENT_ID")
+    def __init__(self, email: Optional[str] = "", password: Optional[str] = ""):
         if not email or not email.strip():
             email = os.getenv("GMI_CLOUD_EMAIL")
         if not password or not password.strip():
             password = os.getenv("GMI_CLOUD_PASSWORD")
-
-        if not client_id:
-            raise ValueError("Client ID must be provided.")
+        
         if not email:
             raise ValueError("Email must be provided.")
         if not password:
             raise ValueError("Password must be provided.")
 
+        client_id = "gmisdk"
         self.iam_client = IAMClient(client_id, email, password)
         self.iam_client.login()
 

{gmicloud-0.1.9 → gmicloud-0.1.10}/gmicloud.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gmicloud
-Version: 0.1.9
+Version: 0.1.10
 Summary: GMI Cloud Python SDK
 Author-email: GMI <gmi@gmitec.net>
 License: MIT

{gmicloud-0.1.9 → gmicloud-0.1.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gmicloud"
-version = "0.1.9"
+version = "0.1.10"
 description = "GMI Cloud Python SDK"
 authors = [{ name = "GMI", email = "gmi@gmitec.net" }]
 license = { text = "MIT" }

gmicloud-0.1.9/gmicloud/_internal/_exceptions.py

@@ -1,19 +0,0 @@
-class APIError(Exception):
-    """
-    Generic exception for API-related errors.
-    """
-    pass
-
-
-class UploadFileError(Exception):
-    """
-    Exception for file upload errors.
-    """
-    pass
-
-
-class UnauthorizedError(Exception):
-    """
-    Exception for unauthorized access errors.
-    """
-    pass