mlops-python-sdk 1.0.3__py3-none-any.whl → 1.0.4__py3-none-any.whl

mlops/connection_config.py

@@ -66,17 +66,7 @@ class ConnectionConfig:
             self.api_path = "/" + self.api_path
 
         # Build API URL
-        if self.debug:
-            base_url = "http://localhost:8090"
-        else:
-            # If domain already includes protocol, use it as-is
-            # Otherwise, default to http:// for backward compatibility
-            if self.domain.startswith(("http://", "https://")):
-                base_url = self.domain
-            else:
-                base_url = f"http://{self.domain}"
-        
-        self.api_url = f"{base_url}{self.api_path}"
+        self.build_api_url()
 
     @staticmethod
     def _get_request_timeout(
@@ -89,7 +79,22 @@ class ConnectionConfig:
             return request_timeout
         else:
             return default_timeout
-
+    
+    def build_api_url(self) -> None:
+        if self.debug:
+            base_url = "http://localhost:8090"
+        else:
+            # If domain already includes protocol, use it as-is
+            # Otherwise, default to http:// for backward compatibility
+            if self.domain.startswith(("http://", "https://")):
+                base_url = self.domain
+            elif self.domain.startswith("localhost") or self.domain.startswith("127.0.0.1"):
+                base_url = f"http://{self.domain}"
+            else:
+                base_url = f"https://{self.domain}"
+        
+        self.api_url = f"{base_url}{self.api_path}"
+        
     def get_request_timeout(self, request_timeout: Optional[float] = None):
         return self._get_request_timeout(self.request_timeout, request_timeout)
 

mlops/task/task.py

@@ -6,12 +6,15 @@ This module provides a convenient interface for managing tasks through the MLOps
 
 import json
 import os
+import shutil
 import sys
 import threading
+import tempfile
 import time
+import zipfile
 from http import HTTPStatus
 from pathlib import Path
-from typing import Optional
+from typing import Callable, Optional
 
 import httpx
 
@@ -56,6 +59,78 @@ def _validate_archive_file_path(file_path: str) -> Path:
         raise APIException(f"file_path must be one of .zip, .tar.gz, .tgz: {p}")
     return p
 
+def _is_archive_path(p: Path) -> bool:
+    lower = p.name.lower()
+    return lower.endswith(".zip") or lower.endswith(".tar.gz") or lower.endswith(".tgz")
+
+
+def _zip_directory(src_dir: Path, dst_zip: Path) -> None:
+    src_dir = src_dir.resolve()
+    root_name = src_dir.name
+    with zipfile.ZipFile(dst_zip, "w", compression=zipfile.ZIP_DEFLATED) as zf:
+        for p in src_dir.rglob("*"):
+            if p.is_dir():
+                continue
+            rel = p.relative_to(src_dir).as_posix()
+            if rel in ("", "."):
+                continue
+            zf.write(p, arcname=f"{root_name}/{rel}")
+
+
+def _zip_file(src_file: Path, dst_zip: Path) -> None:
+    src_file = src_file.resolve()
+    with zipfile.ZipFile(dst_zip, "w", compression=zipfile.ZIP_DEFLATED) as zf:
+        zf.write(src_file, arcname=src_file.name)
+
+
+def _path_to_archive_path(task_name: str, file_path: str) -> tuple[Path, Callable[[], None]]:
+    """
+    Mirror cli-go `pathToArchivePath` behavior:
+    - directory: zip it
+    - file: if already an archive (.zip/.tar.gz/.tgz) return as-is; otherwise zip it
+    Returns (archive_path, cleanup_callable).
+    """
+    p = Path(os.path.expanduser(file_path)).resolve()
+    if not p.exists():
+        raise APIException(f"File not found: {p}")
+
+    if p.is_dir():
+        tmp_dir = (
+            Path(tempfile.gettempdir())
+            / "xservice-cli"
+            / task_name
+            / time.strftime("%Y%m%d%H%M%S")
+        )
+        tmp_dir.mkdir(parents=True, exist_ok=True)
+        archive_path = tmp_dir / f"{p.name}.zip"
+        try:
+            _zip_directory(p, archive_path)
+        except Exception as e:
+            shutil.rmtree(tmp_dir, ignore_errors=True)
+            raise APIException(f"failed to compress directory: {e}") from e
+        return archive_path, lambda: shutil.rmtree(tmp_dir, ignore_errors=True)
+
+    if not p.is_file():
+        raise APIException(f"file_path must be a file or directory: {p}")
+
+    if _is_archive_path(p):
+        return _validate_archive_file_path(str(p)), lambda: None
+
+    tmp_dir = (
+        Path(tempfile.gettempdir())
+        / "xservice-cli"
+        / task_name
+        / time.strftime("%Y%m%d%H%M%S")
+    )
+    tmp_dir.mkdir(parents=True, exist_ok=True)
+    archive_path = tmp_dir / f"{p.name}.zip"
+    try:
+        _zip_file(p, archive_path)
+    except Exception as e:
+        shutil.rmtree(tmp_dir, ignore_errors=True)
+        raise APIException(f"failed to compress file: {e}") from e
+    return archive_path, lambda: shutil.rmtree(tmp_dir, ignore_errors=True)
+
 
 def _upload_file_to_presigned_url(url: str, file_path: Path, timeout: Optional[float]) -> None:
     def _format_bytes_iec(n: int) -> str:
@@ -246,6 +321,7 @@ class Task:
             config.api_key = api_key
         if domain is not None:
             config.domain = domain
+            config.build_api_url()
         if debug is not None:
             config.debug = debug
         if request_timeout is not None:
@@ -328,84 +404,82 @@ class Task:
                 request_kwargs["ntasks"] = 1
 
         if file_path:
-            local_path = _validate_archive_file_path(file_path)
+            local_path, cleanup = _path_to_archive_path(name, file_path)
             timeout = self._config.get_request_timeout()
-
-            # 1) Get presigned upload URL
-            presign_upload_obj = get_storage_presign_upload.sync_detailed(
-                client=self._client,
-                filename=local_path.name,
-            )
-            presign_upload = presign_upload_obj.parsed
-            if isinstance(presign_upload, ErrorResponse):
-                status_code = (
-                    presign_upload.code
-                    if presign_upload.code != UNSET and presign_upload.code != 0
-                    else presign_upload_obj.status_code.value
+            try:
+                # 1) Get presigned upload URL
+                presign_upload_obj = get_storage_presign_upload.sync_detailed(
+                    client=self._client,
+                    filename=local_path.name,
                 )
-                exception = handle_api_exception(
-                    Response(
-                        status_code=HTTPStatus(status_code),
-                        content=presign_upload_obj.content,
-                        headers=presign_upload_obj.headers,
-                        parsed=None,
+                presign_upload = presign_upload_obj.parsed
+                if isinstance(presign_upload, ErrorResponse):
+                    status_code = (
+                        presign_upload.code
+                        if presign_upload.code != UNSET and presign_upload.code != 0
+                        else presign_upload_obj.status_code.value
+                    )
+                    exception = handle_api_exception(
+                        Response(
+                            status_code=HTTPStatus(status_code),
+                            content=presign_upload_obj.content,
+                            headers=presign_upload_obj.headers,
+                            parsed=None,
+                        )
                     )
+                    raise exception
+
+                if (
+                    presign_upload is None
+                    or presign_upload.url in (UNSET, None)
+                    or presign_upload.key in (UNSET, None)
+                ):
+                    raise APIException("Failed to get presigned upload url: empty response")
+
+                # 2) Upload file to S3 (presigned URL)
+                _upload_file_to_presigned_url(
+                    url=str(presign_upload.url),
+                    file_path=local_path,
+                    timeout=timeout,
                 )
-                raise exception
-
-            if (
-                presign_upload is None
-                or presign_upload.url in (UNSET, None)
-                or presign_upload.key in (UNSET, None)
-            ):
-                raise APIException("Failed to get presigned upload url: empty response")
-
-            # 2) Upload file to S3 (presigned URL)
-            _upload_file_to_presigned_url(
-                url=str(presign_upload.url),
-                file_path=local_path,
-                timeout=timeout,
-            )
 
-            # 3) Get presigned download URL
-            presign_download_obj = get_storage_presign_download.sync_detailed(
-                client=self._client,
-                key=str(presign_upload.key),
-            )
-            presign_download = presign_download_obj.parsed
-            if isinstance(presign_download, ErrorResponse):
-                status_code = (
-                    presign_download.code
-                    if presign_download.code != UNSET and presign_download.code != 0
-                    else presign_download_obj.status_code.value
+                # 3) Get presigned download URL
+                presign_download_obj = get_storage_presign_download.sync_detailed(
+                    client=self._client,
+                    key=str(presign_upload.key),
                 )
-                exception = handle_api_exception(
-                    Response(
-                        status_code=HTTPStatus(status_code),
-                        content=presign_download_obj.content,
-                        headers=presign_download_obj.headers,
-                        parsed=None,
+                presign_download = presign_download_obj.parsed
+                if isinstance(presign_download, ErrorResponse):
+                    status_code = (
+                        presign_download.code
+                        if presign_download.code != UNSET and presign_download.code != 0
+                        else presign_download_obj.status_code.value
                     )
-                )
-                raise exception
+                    exception = handle_api_exception(
+                        Response(
+                            status_code=HTTPStatus(status_code),
+                            content=presign_download_obj.content,
+                            headers=presign_download_obj.headers,
+                            parsed=None,
+                        )
+                    )
+                    raise exception
 
-            if presign_download is None or presign_download.url in (UNSET, None):
-                raise APIException(
-                    "Failed to get presigned download url: empty response"
-                )
+                if presign_download is None or presign_download.url in (UNSET, None):
+                    raise APIException("Failed to get presigned download url: empty response")
 
-            # 4) Set env var (merge if user already provided environment)
-            env: dict[str, str] = {}
-            existing_env = request_kwargs.get("environment")
-            if isinstance(existing_env, TaskSubmitRequestEnvironmentType0):
-                env.update(existing_env.additional_properties)
-            elif isinstance(existing_env, dict):
-                env.update(existing_env)
-
-            env["SYSTEM_DOWNLOAD_ARCHIVE_URL"] = str(presign_download.url)
-            request_kwargs["environment"] = TaskSubmitRequestEnvironmentType0.from_dict(
-                env
-            )
+                # 4) Set env var (merge if user already provided environment)
+                env: dict[str, str] = {}
+                existing_env = request_kwargs.get("environment")
+                if isinstance(existing_env, TaskSubmitRequestEnvironmentType0):
+                    env.update(existing_env.additional_properties)
+                elif isinstance(existing_env, dict):
+                    env.update(existing_env)
+
+                env["SYSTEM_DOWNLOAD_ARCHIVE_URL"] = str(presign_download.url)
+                request_kwargs["environment"] = TaskSubmitRequestEnvironmentType0.from_dict(env)
+            finally:
+                cleanup()
 
         request = TaskSubmitRequest(**request_kwargs)
 

{mlops_python_sdk-1.0.3.dist-info → mlops_python_sdk-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mlops-python-sdk
-Version: 1.0.3
+Version: 1.0.4
 Summary: MLOps Python SDK for XCloud Service API
 License: MIT
 Author: mlops

{mlops_python_sdk-1.0.3.dist-info → mlops_python_sdk-1.0.4.dist-info}/RECORD

@@ -42,11 +42,11 @@ mlops/api/client/models/task_tres_type_0.py,sha256=rEaiQG7A19mlTIHDppzxuWa4oPfh9
 mlops/api/client/models/task_tres_used_type_0.py,sha256=4w6An7-ZCqa8cc3SPi7mcwGK-ekT6AYq_dEdf8KzoYA,1320
 mlops/api/client/py.typed,sha256=8ZJUsxZiuOy1oJeVhsTWQhTG_6pTVHVXk5hJL79ebTk,25
 mlops/api/client/types.py,sha256=AX4orxQZQJat3vZrgjJ-TYb2sNBL8kNo9yqYDT-n8y8,1391
-mlops/connection_config.py,sha256=_b9sVFGJtf1GynmIB4NtKCzg7kkgE-wSrsG3LwzlOqk,2946
+mlops/connection_config.py,sha256=yrY-FKyqtgqXmbAQyhlLIwDy1wDyjnT_mOhAFHAzek0,3170
 mlops/exceptions.py,sha256=3kfda-Rz0km9kV-gvnPCw7ueemWkXIGGdT0NXx6z9Xk,1680
 mlops/task/__init__.py,sha256=M983vMPLj3tZQNFXQyTP5I2RsRorFElezLeppr3WLsw,133
 mlops/task/client.py,sha256=V131WLVJl1raGAVixUhJCX8s1neN15mxAjQwO01qlIg,3552
-mlops/task/task.py,sha256=Eqb4XGMlFLjelg3js9Twoulf0Nlyn0pz5isuGl916vs,27756
-mlops_python_sdk-1.0.3.dist-info/METADATA,sha256=KwMwLVAYfXBjKXXiU_p5TibVXGbli5gaxCCa0Wap9h4,5679
-mlops_python_sdk-1.0.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-mlops_python_sdk-1.0.3.dist-info/RECORD,,
+mlops/task/task.py,sha256=HT7TtOqLw4FvF80c-_I-XWK97_9OBR7pC2i2NGZNVO4,30663
+mlops_python_sdk-1.0.4.dist-info/METADATA,sha256=3_g9WfaGdDtmNBnqMONGOTL_Mol8UAdC607tE947kLs,5679
+mlops_python_sdk-1.0.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+mlops_python_sdk-1.0.4.dist-info/RECORD,,