modelscope-api 0.0.2__tar.gz → 0.0.3__tar.gz

{modelscope_api-0.0.2/src/modelscope_api.egg-info → modelscope_api-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelscope-api
-Version: 0.0.2
+Version: 0.0.3
 Summary: A Python async SDK that wraps the ModelScope API into a clean, type-safe interface.
 Author-email: Jerry <wujr24@m.fudan.edu.cn>
 License: MIT

{modelscope_api-0.0.2 → modelscope_api-0.0.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "modelscope-api"         # 包名，保持与项目仓库名一致
-version = "0.0.2"               # 当前版本
+version = "0.0.3"               # 当前版本
 description = "A Python async SDK that wraps the ModelScope API into a clean, type-safe interface." # 简短描述
 readme = "README.md"            # 自述文件，PyPI 会将其渲染为项目首页
 authors = [{name = "Jerry", email = "wujr24@m.fudan.edu.cn"}]  # 作者信息

{modelscope_api-0.0.2 → modelscope_api-0.0.3}/src/modelscope_api/config.py

@@ -28,3 +28,9 @@ MODELSCOPE_OPENAPI_BASE_URL: URL = URL(os.getenv(
     "MODELSCOPE_OPENAPI_BASE_URL",
     "https://modelscope.cn/openapi"
 ))
+
+# 创空间 API 上级域名
+STUDIO_API_DOMAIN: str = os.getenv(
+    "STUDIO_API_DOMAIN",
+    "api-inference.modelscope.net"
+)

{modelscope_api-0.0.2 → modelscope_api-0.0.3}/src/modelscope_api/models/studio/studio.py

@@ -6,6 +6,10 @@ from __future__ import annotations
 
 from typing import Optional, TYPE_CHECKING
 
+import httpx
+from yarl import URL
+
+from ...config import STUDIO_API_DOMAIN
 from ...utils.regex import STUDIO_ID_PATTERN
 from ...data_models.studio import (
     StudioInfo, StudioRuntimeInfo, StudioVisibility,
@@ -202,3 +206,31 @@ class Studio(SubClient):
         删除当前创空间。
         """
         await self.super_client.delete_studio(self.id)
+
+
+    # ==== 访问创空间 API ====
+
+    @property
+    def base_url(self) -> URL:
+        """
+        创空间的 API 调用根域名，服务的基础访问入口，不带接口路径。
+        """
+        host = (
+            "studio-"
+            f"{self.owner.lower()}-"
+            f"{self.repo_name.lower()}."
+            f"{STUDIO_API_DOMAIN}"
+        ).replace('_', '-')
+        return URL.build(scheme="https", host=host)
+
+
+    async def request_studio_api(self, subpath: Optional[str] = None, **kwargs) -> httpx.Response:
+        """
+        调用当前创空间的 API。
+        """
+        if subpath is None:
+            api_url = self.base_url
+        else:
+            api_url = self.base_url / subpath
+        kwargs["url"] = str(api_url)
+        return await self.super_client.modelscope_client.request(**kwargs)

{modelscope_api-0.0.2 → modelscope_api-0.0.3}/src/modelscope_api/models/studio/studio_client.py

@@ -32,8 +32,9 @@ class StudioClient(SubClient):
         api_prefix="studio",
         openapi_prefix: str = "studios",
     ):
+        self.modelscope_client = modelscope_client
         super().__init__(
-            super_client=modelscope_client,
+            super_client=self.modelscope_client,
             api_prefix=api_prefix,
             openapi_prefix=openapi_prefix
         )

{modelscope_api-0.0.2 → modelscope_api-0.0.3/src/modelscope_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelscope-api
-Version: 0.0.2
+Version: 0.0.3
 Summary: A Python async SDK that wraps the ModelScope API into a clean, type-safe interface.
 Author-email: Jerry <wujr24@m.fudan.edu.cn>
 License: MIT