gmicloud 0.1.3__py3-none-any.whl → 0.1.4__py3-none-any.whl

gmicloud/_internal/_client/_http_client.py

@@ -2,7 +2,6 @@ import requests
 from .._exceptions import APIError
 from .._exceptions import UnauthorizedError
 from .._constants import *
-from .._config import *
 
 
 class HTTPClient:

gmicloud/_internal/_client/_iam_client.py

@@ -34,12 +34,35 @@ class IAMClient:
         custom_headers = {
             CLIENT_ID_HEADER: self._client_id
         }
-        req = LoginRequest(email=self._email, password=self._password)
-        result = self.client.post("/me/sessions", custom_headers, req.model_dump())
-
-        resp = LoginResponse.model_validate(result)
-        self._access_token = resp.accessToken
-        self._refresh_token = resp.refreshToken
+        req = AuthTokenRequest(email=self._email, password=self._password)
+        auth_tokens_result = self.client.post("/me/auth-tokens", custom_headers, req.model_dump())
+        auth_tokens_resp = AuthTokenResponse.model_validate(auth_tokens_result)
+
+        create_session_result = None
+        if auth_tokens_resp.is2FARequired:
+            max_attempts = 3
+            for attempt in range(max_attempts):
+                code = input(f"Attempt {attempt + 1}/{max_attempts}: Please enter the 2FA code: ")
+
+                create_session_req = CreateSessionRequest(
+                    type="native", authToken=auth_tokens_resp.authToken, otpCode=code
+                )
+                try:
+                    create_session_result = self.client.post(
+                        "/me/sessions", custom_headers, create_session_req.model_dump()
+                    )
+                    break
+                except Exception as e:
+                    print("Invalid 2FA code, please try again.")
+                    if attempt == max_attempts - 1:
+                        raise Exception("Failed to create session after 3 incorrect 2FA attempts.") from e
+        else:
+            create_session_req = CreateSessionRequest(type="native", authToken=auth_tokens_resp.authToken, otpCode=None)
+            create_session_result = self.client.post("/me/sessions", custom_headers, create_session_req.model_dump())
+
+        create_session_resp = CreateSessionResponse.model_validate(create_session_result)
+        self._access_token = create_session_resp.accessToken
+        self._refresh_token = create_session_resp.refreshToken
         self._user_id = self.parse_user_id()
 
     def refresh_token(self):
@@ -51,7 +74,7 @@ class IAMClient:
         }
         result = self.client.patch("/me/sessions", custom_headers, {"refreshToken": self._refresh_token})
 
-        resp = LoginResponse.model_validate(result)
+        resp = CreateSessionResponse.model_validate(result)
         self._access_token = resp.accessToken
         self._refresh_token = resp.refreshToken
 

gmicloud/_internal/_models.py

@@ -307,10 +307,35 @@ class CreateTaskResponse(BaseModel):
     upload_link: str  # URL to upload the task data.
 
 
-class LoginResponse(BaseModel):
+class AuthTokenRequest(BaseModel):
+    """
+    Request object for user login.
+    """
+    email: str  # User email.
+    password: str  # User password.
+
+
+class AuthTokenResponse(BaseModel):
     """
     Response object for user login.
     """
+    authToken: str  # Access token for the user session.
+    is2FARequired: bool  # Indicates if 2FA is required for the user.
+
+
+class CreateSessionRequest(BaseModel):
+    """
+    Request object for creating a user session.
+    """
+    type: str  # Type of the session (e.g., native).
+    authToken: str  # Access token for the user session.
+    otpCode: Optional[str]  # 2FA code for the user session.
+
+
+class CreateSessionResponse(BaseModel):
+    """
+    Response object for creating a user session.
+    """
     accessToken: str  # Access token for the user session.
     refreshToken: str  # Refresh token for the user session.
 

{gmicloud-0.1.3.dist-info → gmicloud-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: gmicloud
-Version: 0.1.3
+Version: 0.1.4
 Summary: GMI Cloud Python SDK
 Author-email: GMI <gmi@gmitec.net>
 License: MIT
@@ -14,7 +14,8 @@ Description-Content-Type: text/markdown
 
 ## Overview
 
-Before you start: Our service and GPU resource is currenly invite-only so please contact our team (getstarted@gmicloud.ai) to get invited if you don't have one yet.
+Before you start: Our service and GPU resource is currenly invite-only so please contact our team (
+getstarted@gmicloud.ai) to get invited if you don't have one yet.
 
 The GMI Inference Engine SDK provides a Python interface for deploying and managing machine learning models in
 production environments. It allows users to create model artifacts, schedule tasks for serving models, and call
@@ -64,7 +65,18 @@ client = Client(client_id="<YOUR_CLIENT_ID>", email="<YOUR_EMAIL>", password="<Y
 
 ## Quick Start
 
-### 1. Create a Task from an Artifact Template
+### 1. How to run the code in the example folder
+```bash
+cd path/to/gmicloud-sdk
+# Create a virtual environment
+python -m venv venv
+source venv/bin/activate
+
+pip install -r requirements.txt
+python -m examples.<example_name>
+```
+
+### 2. Create a Task from an Artifact Template
 
 This is the simplest example to deploy an existing artifact template:
 
@@ -93,24 +105,30 @@ response = call_chat_completion(client, task.task_id)
 print(response)
 ```
 
-### 2. Step-by-Step Example: Create Artifact, Task, and Query the Endpoint
+### 3. Step-by-Step Example: Create Artifact, Task, and Query the Endpoint
 
 #### (a) Create an Artifact from a Template
 
 First, you’ll retrieve all templates and create an artifact based on the desired template (e.g., "Llama3.1 8B"):
 
 ```python
-def create_artifact_from_template(client):
+from gmicloud import *
+
+def create_artifact_from_template(client: Client) -> str:
     artifact_manager = client.artifact_manager
 
-    # List all available templates
+    # Get all artifact templates
     templates = artifact_manager.get_artifact_templates()
     for template in templates:
         if template.artifact_template_id == "qwen_2.5_14b_instruct_template_001":
-            return artifact_manager.create_artifact_from_template(
-                artifact_template_id=template.artifact_template_id
+            # Create an artifact from a template
+            artifact_id = artifact_manager.create_artifact_from_template(
+                artifact_template_id=template.artifact_template_id,
             )
-    return None
+
+            return artifact_id
+
+    return ""
 ```
 
 #### (b) Create a Task from the Artifact
@@ -118,43 +136,55 @@ def create_artifact_from_template(client):
 Wait until the artifact becomes "ready" and then deploy it using task scheduling:
 
 ```python
-def create_task_and_start(client, artifact_id):
-    artifact_manager = client.artifact_manager
+from gmicloud import *
+import time
+from datetime import datetime
 
-    # Wait until the artifact is ready
+def create_task_and_start(client: Client, artifact_id: str) -> str:
+    artifact_manager = client.artifact_manager
+    # Wait for the artifact to be ready
     while True:
-        artifact = artifact_manager.get_artifact(artifact_id)
-        if artifact.build_status == "SUCCESS":
-            break
-        print("Waiting for artifact to be ready...")
+        try:
+            artifact = artifact_manager.get_artifact(artifact_id)
+            print(f"Artifact status: {artifact.build_status}")
+            # Wait until the artifact is ready
+            if artifact.build_status == BuildStatus.SUCCESS:
+                break
+        except Exception as e:
+            raise e
+        # Wait for 2 seconds
         time.sleep(2)
-
-    # Configure and start the task
-    task_manager = client.task_manager
-    task = task_manager.create_task(Task(
-        config=TaskConfig(
-            ray_task_config=RayTaskConfig(
-                ray_version="2.40.0-py310-gpu",
-                file_path="serve",
-                artifact_id=artifact_id,
-                deployment_name="app",
-                replica_resource=ReplicaResource(
-                    cpu=10,
-                    ram_gb=100,
-                    gpu=1,
+    try:
+        task_manager = client.task_manager
+        # Create a task
+        task = task_manager.create_task(Task(
+            config=TaskConfig(
+                ray_task_config=RayTaskConfig(
+                    ray_version="2.40.0-py310-gpu",
+                    file_path="serve",
+                    artifact_id=artifact_id,
+                    deployment_name="app",
+                    replica_resource=ReplicaResource(
+                        cpu=10,
+                        ram_gb=100,
+                        gpu=1,
+                    ),
+                ),
+                task_scheduling=TaskScheduling(
+                    scheduling_oneoff=OneOffScheduling(
+                        trigger_timestamp=int(datetime.now().timestamp()) + 10,
+                        min_replicas=1,
+                        max_replicas=10,
+                    )
                 ),
             ),
-            task_scheduling=TaskScheduling(
-                scheduling_oneoff=OneOffScheduling(
-                    trigger_timestamp=int(datetime.now().timestamp()) + 10,
-                    min_replicas=1,
-                    max_replicas=10,
-                )
-            ),
-        ),
-    ))
+        ))
+
+        # Start the task
+        task_manager.start_task(task.task_id)
+    except Exception as e:
+        raise e
 
-    task_manager.start_task(task.task_id)
     return task.task_id
 ```
 
@@ -163,14 +193,20 @@ def create_task_and_start(client, artifact_id):
 Once the task is running, use the endpoint for inference:
 
 ```python
+from gmicloud import *
 from examples.completion import call_chat_completion
 
-client = Client()
-artifact_id = create_artifact_from_template(client)
-task_id = create_task_and_start(client, artifact_id)
+# Initialize the Client
+cli = Client()
 
-response = call_chat_completion(client, task_id)
-print(response)
+# Create an artifact from a template
+artifact_id = create_artifact_from_template(cli)
+
+# Create a task and start it
+task_id = create_task_and_start(cli, artifact_id)
+
+# Call chat completion
+print(call_chat_completion(cli, task_id))
 ```
 
 ## API Reference

{gmicloud-0.1.3.dist-info → gmicloud-0.1.4.dist-info}/RECORD

@@ -5,13 +5,13 @@ gmicloud/_internal/_config.py,sha256=qIH76TSyS3MQWe62LHI46RJhDnklNFisdajY75oUAqE
 gmicloud/_internal/_constants.py,sha256=Y085dwFlqdFkCf39iBfxz39QiiB7lX59ayNJjB86_m4,378
 gmicloud/_internal/_enums.py,sha256=C4oy6Ps7OGdYd3tK-Wcpi6uXMyAKbOZW8_KykYAKsgw,510
 gmicloud/_internal/_exceptions.py,sha256=hScBq7n2fOit4_umlkabZJchY8zVbWSRfWM2Y0rLCbw,306
-gmicloud/_internal/_models.py,sha256=1yUk1yIyfXybIeR8guwYLbXc8gAKzXRpIZ7_6SOId28,13212
+gmicloud/_internal/_models.py,sha256=4YT1MI2V1YEBWBFEvrA6pRcmxkZCgi6rzTxYMRgfeWs,13880
 gmicloud/_internal/_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gmicloud/_internal/_client/_artifact_client.py,sha256=py6SQ1tVoK365hIIxnla433mpCapActZ6KE6Yakds-8,5588
 gmicloud/_internal/_client/_decorator.py,sha256=sy4gxzsUB6ORXHw5pqmMf7TTlK41Nmu1fhIhK2AIsbY,670
 gmicloud/_internal/_client/_file_upload_client.py,sha256=1JRs4X57S3EScPIP9w2DC1Uo6_Wbcjumcw3nVM7uIGM,4667
-gmicloud/_internal/_client/_http_client.py,sha256=F7qpq6WLp6PJkqusWojdi483LijWBsSIY43NjJcyXNU,5704
-gmicloud/_internal/_client/_iam_client.py,sha256=D7PhQerSzjGGerXsd5Si-e-Wa5f-fJpOACkfWOnkPJg,2979
+gmicloud/_internal/_client/_http_client.py,sha256=JZvw7HnCwyk6_5-Ja-KZuYY0JBJApx9I3jZ0G_J2kWw,5680
+gmicloud/_internal/_client/_iam_client.py,sha256=xEDiwwpj1dAHmAOzcu9Jz7x1F3TRJLrCAqNXPQ-wyoU,4310
 gmicloud/_internal/_client/_task_client.py,sha256=JgYewfDy2iblRVrc9sdA8RbcooXyAho79ESuCK8PRWI,3842
 gmicloud/_internal/_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gmicloud/_internal/_manager/_artifact_manager.py,sha256=cc367Kd-W9Zn2d_wUcG6tT06544HRItIZ5IsFfA5_RQ,12201
@@ -20,7 +20,7 @@ gmicloud/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gmicloud/tests/test_artifacts.py,sha256=YiC1HBMS7g491Ra4acTLI9AdwyjXZfnY9f-fNKn2azQ,17108
 gmicloud/tests/test_tasks.py,sha256=AY90zTJdsXk1cxn6Jxhi4TDdwXRiGxz_r_aRk_Jkl8Y,10956
 gmicloud/utils/uninstall_packages.py,sha256=zzuuaJPf39oTXWZ_7tUAGseoxocuCbbkoglJSD5yDrE,1127
-gmicloud-0.1.3.dist-info/METADATA,sha256=OuNXnrFTE_tTDuArqevbW81fKwB--E23YUv6-uj91u0,6808
-gmicloud-0.1.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-gmicloud-0.1.3.dist-info/top_level.txt,sha256=AZimLw3y0WPpLiSiOidZ1gD0dxALh-jQNk4fxC05hYE,9
-gmicloud-0.1.3.dist-info/RECORD,,
+gmicloud-0.1.4.dist-info/METADATA,sha256=hwFbxM2blSJZQnRT-9x6y-ilfcgFL6_tdQP2f12TloQ,7689
+gmicloud-0.1.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+gmicloud-0.1.4.dist-info/top_level.txt,sha256=AZimLw3y0WPpLiSiOidZ1gD0dxALh-jQNk4fxC05hYE,9
+gmicloud-0.1.4.dist-info/RECORD,,