gmicloud 0.1.6__py3-none-any.whl → 0.1.9__py3-none-any.whl

gmicloud/_internal/_models.py

@@ -2,7 +2,7 @@ from typing import Optional, List, Union
 from datetime import datetime
 
 from pydantic import BaseModel
-from gmicloud._internal._enums import BuildStatus, TaskStatus, TaskEndpointStatus, ModelParameterType
+from gmicloud._internal._enums import *
 
 
 class BigFileMetadata(BaseModel):
@@ -22,9 +22,13 @@ class ArtifactMetadata(BaseModel):
     user_id: Optional[str] = ""  # The user ID associated with this artifact.
     artifact_name: Optional[str] = ""  # Name of the artifact.
     artifact_description: Optional[str] = ""  # Description of the artifact.
-    artifact_tags: Optional[List[str]] = ""  # Comma-separated tags for categorizing the artifact.
+    artifact_tags: Optional[List[str]] = None  # Changed from List[str] with default to Optional[List[str]]
     artifact_volume_path: Optional[str] = ""  # Path to the volume where the artifact is stored.
     artifact_template_id: Optional[str] = ""  # The template ID used to create this artifact.
+    artifact_icon_link: Optional[str] = ""  # Link to the icon for the artifact.
+    is_public: Optional[bool] = False  # Indicates if the artifact is public.
+    org_id: Optional[str] = ""  # Organization ID associated with this artifact.
+    update_by: Optional[str] = ""  # User ID who last updated the artifact.
 
 
 class ArtifactData(BaseModel):
@@ -43,6 +47,29 @@ class ArtifactData(BaseModel):
     update_at: Optional[datetime]  # Timestamp when the artifact was last updated.
 
 
+class EnvParameter(BaseModel):
+    """
+    Environment parameter for an artifact.
+    """
+    key: str  # Key for the environment parameter.
+    value: str  # Value for the environment parameter.
+
+
+class ArtifactDetails(BaseModel):
+    """
+    Additional details for an artifact.
+    """
+    model_description: Optional[str] = ""  # Description of the model.
+
+
+class ArtifactParameters(BaseModel):
+    """
+    Parameters for an artifact.
+    """
+    env_parameters: Optional[List[EnvParameter]] = None  # Environment parameters.
+    model_parameters: Optional[List["ModelParameter"]] = None  # Model parameters.
+
+
 class Artifact(BaseModel):
     """
     Representation of an artifact, including its data and metadata.
@@ -53,6 +80,7 @@ class Artifact(BaseModel):
     build_status: Optional[BuildStatus] = None  # Status of the artifact build (e.g., in progress, succeeded, failed).
     artifact_data: Optional[ArtifactData] = None  # Data associated with the artifact.
     artifact_metadata: Optional[ArtifactMetadata] = None  # Metadata describing the artifact.
+    artifact_parameters: Optional[ArtifactParameters] = None  # Parameters for the artifact.
     big_files_metadata: Optional[List[BigFileMetadata]] = None  # Metadata for large files associated with the artifact.
 
 
@@ -69,8 +97,13 @@ class CreateArtifactRequest(BaseModel):
     """
     artifact_name: str  # The name of the artifact to create.
     artifact_description: Optional[str] = ""  # Description of the artifact.
-    artifact_tags: Optional[List[str]] = None  # Tags for the artifact, separated by commas.
+    artifact_tags: Optional[List[str]] = None  # Tags for the artifact.
+    deployment_type: Optional[str] = ""  # Deployment type
+    template_id: Optional[str] = ""  # Template ID
+    env_parameters: Optional[List["EnvParameter"]] = None  # Environment parameters.
+    model_description: Optional[str] = ""  # Description of the model.
     model_parameters: Optional[List["ModelParameter"]] = None  # Parameters for the artifact.
+    artifact_volume_path: Optional[str] = ""  # Path to the volume where the artifact is stored.
 
 
 class CreateArtifactResponse(BaseModel):
@@ -79,9 +112,10 @@ class CreateArtifactResponse(BaseModel):
     """
     artifact_id: str  # ID of the newly created artifact.
     upload_link: str  # URL to upload the artifact data.
+    artifact_icon_link: Optional[str] = ""  # Link to the icon for the artifact.
 
 
-class GetBigFileUploadUrlRequest(BaseModel):
+class ResumableUploadLinkRequest(BaseModel):
     """
     Request to generate a pre-signed URL for uploading large files.
     """
@@ -90,7 +124,7 @@ class GetBigFileUploadUrlRequest(BaseModel):
     file_type: Optional[str] = ""  # MIME type of the file.
 
 
-class GetBigFileUploadUrlResponse(BaseModel):
+class ResumableUploadLinkResponse(BaseModel):
     """
     Response containing a pre-signed upload URL for large files.
     """
@@ -98,6 +132,13 @@ class GetBigFileUploadUrlResponse(BaseModel):
     upload_link: str  # Pre-signed upload URL for the file.
 
 
+class RebuildArtifactRequest(BaseModel):
+    """
+    Request object for rebuilding an artifact.
+    """
+    artifact_id: str  # ID of the artifact to rebuild.
+
+
 class RebuildArtifactResponse(BaseModel):
     """
     Response object after rebuilding an artifact.
@@ -106,6 +147,91 @@ class RebuildArtifactResponse(BaseModel):
     build_status: BuildStatus  # Status of the artifact build (e.g., in progress, succeeded, failed).
 
 
+class EndpointInfo(BaseModel):
+    """
+    Additional information about the task endpoint.
+    """
+    endpoint_status: Optional[TaskEndpointStatus] = None  # Current status of the task (e.g., running, stopped).
+    endpoint_url: Optional[str] = ""  # URL for accessing the task endpoint.
+
+
+class GetAllArtifactsWithEndpointsResponse(BaseModel):
+    """
+    Response containing a list of all artifacts with their endpoints.
+    """
+    artifact_id: str  # Unique identifier for the artifact.
+    artifact_data: Optional[ArtifactData] = None  # Data associated with the artifact.
+    artifact_metadata: Optional[ArtifactMetadata] = None  # Metadata describing the artifact.
+    artifact_details: Optional[ArtifactDetails] = None  # Additional details about the artifact.
+    artifact_parameters: Optional[ArtifactParameters] = None  # Parameters for the artifact.
+    big_files_metadata: Optional[List[BigFileMetadata]] = None  # Metadata for large files.
+    endpoints: Optional[List[EndpointInfo]] = None  # Endpoints associated with the artifact.
+
+
+class GetArtifactResponse(BaseModel):
+    """
+    Response containing the details of an artifact.
+    """
+    artifact_id: str  # Unique identifier for the artifact.
+    artifact_link: Optional[str] = ""  # Link to access the artifact.
+    artifact_resource: Optional[str] = ""  # Resource associated with the artifact.
+    build_file_name: Optional[str] = ""  # Name of the file used for the build.
+    build_status: Optional[str] = ""  # Status of the artifact build.
+    artifact_metadata: Optional[ArtifactMetadata] = None  # Metadata describing the artifact.
+    artifact_parameters: Optional[ArtifactParameters] = None  # Parameters for the artifact.
+    big_files_metadata: Optional[List[BigFileMetadata]] = None  # Metadata for large files.
+
+
+class GetPublicArtifactsResponse(BaseModel):
+    """
+    Response containing public artifact details.
+    """
+    artifact_id: str  # Unique identifier for the artifact.
+    artifact_data: Optional[ArtifactData] = None  # Data associated with the artifact.
+    artifact_metadata: Optional[ArtifactMetadata] = None  # Metadata describing the artifact.
+    artifact_details: Optional[ArtifactDetails] = None  # Additional details about the artifact.
+    artifact_parameters: Optional[ArtifactParameters] = None  # Parameters for the artifact.
+    endpoints: Optional[List[EndpointInfo]] = None  # Endpoints associated with the artifact.
+
+
+class UpdateArtifactRequestBody(BaseModel):
+    """
+    Request object for updating an artifact.
+    """
+    artifact_name: Optional[str] = ""  # The name of the artifact.
+    artifact_description: Optional[str] = ""  # Description of the artifact.
+    artifact_tags: Optional[List[str]] = None  # Tags for the artifact.
+    env_parameters: Optional[List[EnvParameter]] = None  # Environment parameters.
+    model_description: Optional[str] = ""  # Description of the model.
+    model_parameters: Optional[List["ModelParameter"]] = None  # Parameters for the artifact.
+    need_update_icon: Optional[bool] = False  # Whether to update the artifact icon.
+
+
+class UpdateArtifactResponse(BaseModel):
+    """
+    Response object after updating an artifact.
+    """
+    artifact_id: str  # ID of the updated artifact.
+    status: str  # Status of the update operation.
+    artifact_icon_link: Optional[str] = ""  # Link to the icon for the artifact.
+
+
+class GetTemplatesResponse(BaseModel):
+    """
+    Response containing a list of artifact templates.
+    """
+    artifact_templates: list["Template"]  # List of artifact templates.
+
+
+class Template(BaseModel):
+    """
+    Template for creating an artifact.
+    """
+    template_id: str  # Unique identifier for the artifact template.
+    template_data: Optional["TemplateData"] = None  # Data for the artifact template.
+    template_metadata: Optional["TemplateMetadata"] = None  # Metadata for the artifact template.
+
+
 class DeleteArtifactResponse(BaseModel):
     """
     Response object after deleting an artifact.
@@ -132,22 +258,6 @@ class DeleteBigfileResponse(BaseModel):
     status: Optional[str] = ""  # Status of the deletion process.
 
 
-class GetPublicTemplatesResponse(BaseModel):
-    """
-    Response containing a list of artifact templates.
-    """
-    artifact_templates: list["ArtifactTemplate"]  # List of artifact templates.
-
-
-class ArtifactTemplate(BaseModel):
-    """
-    Template for creating an artifact.
-    """
-    template_id: str  # Unique identifier for the artifact template.
-    template_data: Optional["TemplateData"] = None  # Data for the artifact template.
-    template_metadata: Optional["TemplateMetadata"] = None  # Metadata for the artifact template.
-
-
 class TemplateMetadata(BaseModel):
     """
     Metadata for an artifact template.
@@ -158,6 +268,7 @@ class TemplateMetadata(BaseModel):
     is_public: Optional[bool] = False  # Indicates if the template is public.
     update_at: Optional[str] = None  # Timestamp when the template was last updated.
     update_by: Optional[str] = ""  # ID of the user who last updated the template.
+    status: Optional[str] = ""  # Status of the template.
 
 
 class TemplateData(BaseModel):
@@ -173,6 +284,7 @@ class TemplateData(BaseModel):
     resources: Optional["ResourcesTemplate"] = None  # Resource allocation template.
     tags: Optional[List[str]] = None  # Tags associated with the artifact template.
     volume_path: Optional[str] = ""  # Path to the volume where the artifact is stored.
+    env_parameters: Optional[List["EnvParameter"]] = None  # Added missing field
 
 
 class ModelParameter(BaseModel):
@@ -204,8 +316,9 @@ class CreateArtifactFromTemplateRequest(BaseModel):
     """
     Request object to create a new artifact from a template.
     """
-    user_id: str  # The user ID creating the artifact.
+    # user_id: str  # The user ID creating the artifact.
     artifact_template_id: str  # The ID of the artifact template to use.
+    env_parameters: Optional[List["EnvParameter"]] = None  # Environment parameters.
 
 
 class CreateArtifactFromTemplateResponse(BaseModel):
@@ -304,14 +417,6 @@ class TaskConfig(BaseModel):
     last_update_timestamp: Optional[int] = 0  # Timestamp when the task was last updated.
 
 
-class EndpointInfo(BaseModel):
-    """
-    Additional information about the task endpoint.
-    """
-    endpoint_status: Optional[TaskEndpointStatus] = None  # Current status of the task (e.g., running, stopped).
-    endpoint_url: Optional[str] = ""  # URL for accessing the task endpoint.
-
-
 class UserPreference(BaseModel):
     """
     User preference for a task.
@@ -329,8 +434,8 @@ class Task(BaseModel):
     config: Optional[TaskConfig] = None  # Configuration data for the task.
     endpoint_info: Optional[EndpointInfo] = None  # Additional information about the task endpoint.
     cluster_endpoints: Optional[List[EndpointInfo]] = None  # Endpoints for the task cluster.
-    task_status: Optional[TaskStatus] = ""  # Status of the task.
-    readiness_status: Optional[str] = ""  # Readiness status of the task.
+    task_status: Optional[TaskStatus] = None  # Status of the task.
+    readiness_status: Optional[str] = None  # Readiness status of the task.
     user_preference: Optional[UserPreference] = None  # User preference for the task.
 
 
@@ -482,3 +587,85 @@ class GetSelfAPIKeyResponse(BaseModel):
     """
     key: APIKey  # The API key of the current user.
     organization: Optional[Organization] = None  # Organization information.
+
+
+
+# ----------------- video models -----------------
+
+class SubmitRequestRequest(BaseModel):
+    """
+    The request body for submits a new asynchronous request 
+    """
+    model: str
+    payload: dict
+
+
+class SubmitRequestResponse(BaseModel):
+    """
+    Represents the response body for a submitted request.
+    """
+    created_at: Optional[int] = 0
+    model: Optional[str] = ""
+    queued_at: Optional[int] = 0
+    request_id: Optional[str] = ""
+    status: Optional[RequestStatus] = None
+    updated_at: Optional[int] = 0
+
+
+class GetRequestResponse(BaseModel):
+    """
+    Response object for getting a specific request.
+    """
+    created_at: Optional[int] = 0
+    is_public: Optional[bool] = False
+    model: Optional[str] = ""
+    org_id: Optional[str] = ""
+    outcome: Optional[dict] = {}
+    payload: Optional[dict] = {}
+    queued_at: Optional[int] = 0
+    qworker_id: Optional[str] = ""
+    request_id: Optional[str] = ""
+    status: Optional[RequestStatus] = None
+    updated_at: Optional[int] = 0
+
+
+class ListUserRequestsResponse(BaseModel):
+    """
+    Represents the response body for listing user requests.
+    """
+    requests: List[GetRequestResponse]
+    total: Optional[int] = 0  # Total number of requests available for the user.
+
+
+class PriceInfo(BaseModel):
+    """
+    Represents pricing information for a model.
+    """
+    price: Optional[int] = 0
+    pricing_type: Optional[str] = ""
+    unit: Optional[str] = ""
+
+
+class GetModelResponse(BaseModel):
+    """
+    Represents the response body for a specific model.
+    """
+    background_image_url: Optional[str] = ""
+    brief_description: Optional[str] = ""
+    created_at: Optional[int] = 0
+    detailed_description: Optional[str] = ""
+    external_api_endpoint: Optional[str] = ""
+    external_api_url: Optional[str] = ""
+    external_provider: Optional[str] = ""
+    host_type: Optional[HostType] = HostType.DEFAULT
+    icon_link: Optional[str] = ""
+    internal_parameters: Optional[dict] = {}
+    modalities: Optional[dict] = {}
+    model: Optional[str] = ""
+    model_type: Optional[str] = ""
+    org_id: Optional[str] = ""
+    parameters: Optional[list] = []
+    price_info: Optional[PriceInfo] = None
+    qworkers: Optional[int] = 0
+    tags: Optional[list[str]] = []
+    updated_at: Optional[int] = 0

gmicloud/client.py

@@ -8,6 +8,7 @@ from ._internal._client._iam_client import IAMClient
 from ._internal._manager._artifact_manager import ArtifactManager
 from ._internal._manager._task_manager import TaskManager
 from ._internal._manager._iam_manager import IAMManager
+from ._internal._manager._video_manager import VideoManager
 from ._internal._enums import BuildStatus, TaskStatus, TaskEndpointStatus
 from ._internal._models import Task, TaskConfig, RayTaskConfig, TaskScheduling, ReplicaResource
 
@@ -37,6 +38,7 @@ class Client:
         self._artifact_manager = None
         self._task_manager = None
         self._iam_manager = None
+        self._video_manager = None
 
     @property
     def artifact_manager(self):
@@ -58,6 +60,16 @@ class Client:
             self._task_manager = TaskManager(self.iam_client)
         return self._task_manager
 
+    @property
+    def video_manager(self):
+        """
+        Lazy initialization for VideoManager.
+        Ensures the Client instance controls its lifecycle.
+        """
+        if self._video_manager is None:
+            self._video_manager = VideoManager(self.iam_client)
+        return self._video_manager
+
     @property
     def iam_manager(self):
         """

gmicloud/tests/test_artifacts.py

@@ -131,34 +131,18 @@ class TestArtifactManager(unittest.TestCase):
         upload_link = "http://upload-link"
         bigfile_upload_link = "http://bigfile-upload-link"
         artifact_file_path = "./testdata/test.zip"
-        model_file_path = "./testdata/model.zip"
+        model_directory= "./testdata"
 
         mock_create_artifact.return_value = CreateArtifactResponse(artifact_id="1", upload_link=upload_link)
-        mock_get_bigfile_upload_url.return_value = GetBigFileUploadUrlResponse(artifact_id="1",
+        mock_get_bigfile_upload_url.return_value = ResumableUploadLinkResponse(artifact_id="1",
                                                                                upload_link=bigfile_upload_link)
 
         artifact_id = self.artifact_manager.create_artifact_with_model_files(artifact_name="artifact_name",
                                                                              artifact_file_path=artifact_file_path,
-                                                                             model_file_paths=[model_file_path])
+                                                                             model_directory=model_directory)
         self.assertEqual(artifact_id, "1")
         mock_upload_small_file.assert_called_once_with(upload_link, artifact_file_path, "application/zip")
-        mock_upload_large_file.assert_called_once_with(bigfile_upload_link, model_file_path)
-
-    @patch('gmicloud._internal._client._artifact_client.ArtifactClient.create_artifact')
-    @patch('gmicloud._internal._client._file_upload_client.FileUploadClient.upload_small_file')
-    def test_create_artifact_with_model_files_raises_file_not_found_error_for_model_file(self, mock_create_artifact,
-                                                                                         mock_upload_small_file):
-        upload_link = "http://upload-link"
-        artifact_file_path = "./testdata/test.zip"
-        model_file_path = "./testdata/nonexistent.zip"
-
-        mock_create_artifact.return_value = CreateArtifactResponse(artifact_id="1", upload_link=upload_link)
-
-        with self.assertRaises(FileNotFoundError) as context:
-            self.artifact_manager.create_artifact_with_model_files(artifact_name="artifact_name",
-                                                                   artifact_file_path=artifact_file_path,
-                                                                   model_file_paths=[model_file_path])
-        self.assertTrue(f"File not found: {model_file_path}" in str(context.exception))
+        self.assertEqual(mock_upload_large_file.call_count, 6) # 6 files in testdata directory
 
     @patch('gmicloud._internal._client._artifact_client.ArtifactClient.rebuild_artifact')
     def test_rebuild_artifact_rebuilds_successfully(self, mock_rebuild_artifact):
@@ -203,7 +187,7 @@ class TestArtifactManager(unittest.TestCase):
         upload_link = "http://upload-link"
         model_file_path = "./testdata/model.zip"
 
-        mock_get_bigfile_upload_url.return_value = GetBigFileUploadUrlResponse(artifact_id="1", upload_link=upload_link)
+        mock_get_bigfile_upload_url.return_value = ResumableUploadLinkResponse(artifact_id="1", upload_link=upload_link)
         upload_link = self.artifact_manager.get_bigfile_upload_url("1", model_file_path)
         self.assertEqual(upload_link, upload_link)
 
@@ -253,7 +237,7 @@ class TestArtifactManager(unittest.TestCase):
 
     @patch('gmicloud._internal._client._artifact_client.ArtifactClient.get_public_templates')
     def test_get_artifact_templates_returns_templates(self, mock_get_public_templates):
-        mock_get_public_templates.return_value = [ArtifactTemplate(template_id="1", template_data=TemplateData(name="Template1"))]
+        mock_get_public_templates.return_value = [Template(template_id="1", template_data=TemplateData(name="Template1"))]
         templates = self.artifact_manager.get_public_templates()
         self.assertEqual(len(templates), 1)
         self.assertEqual(templates[0].template_id, "1")