dashscope 1.26.0__tar.gz → 1.26.2__tar.gz

dashscope-1.26.2/MANIFEST.in

@@ -0,0 +1 @@
+include dashscope/resources/qwen.tiktoken

{dashscope-1.26.0/dashscope.egg-info → dashscope-1.26.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.1
 Name: dashscope
-Version: 1.26.0
+Version: 1.26.2
 Summary: dashscope client sdk library
 Home-page: https://dashscope.aliyun.com/
 Author: Alibaba Cloud
@@ -18,29 +18,8 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8.0
 Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: aiohttp
-Requires-Dist: requests
-Requires-Dist: websocket-client
-Requires-Dist: cryptography
-Requires-Dist: certifi
-Requires-Dist: typer>=0.9.0
-Requires-Dist: rich>=13.0.0
 Provides-Extra: tokenizer
-Requires-Dist: tiktoken; extra == "tokenizer"
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: license
-Dynamic: license-file
-Dynamic: platform
-Dynamic: provides-extra
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
+License-File: LICENSE
 
 # DashScope Python SDK
 
@@ -562,3 +541,5 @@ Coming soon.
 
 ## License
 This project is licensed under the Apache License (Version 2.0).
+
+

dashscope-1.26.2/dashscope/agentstudio/__init__.py

@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) Alibaba, Inc. and its affiliates.
+"""AgentStudio sub-SDK for the dashscope Python client.
+
+The ``agentstudio`` package wraps the AgentStudio managed-agent HTTP
+API.  All resource classes are accessed through a client instance::
+
+    from dashscope.agentstudio import Client
+    from dashscope.agentstudio.types import (
+        user_message, user_tool_result,
+    )
+
+Example
+-------
+>>> from dashscope.agentstudio import Client
+>>> from dashscope.agentstudio.types import user_message
+>>> client = Client(api_key="sk-xxx")
+>>> agent = client.agents.create(name="demo", model="qwen-plus")
+>>> session = client.sessions.create(agent=agent.id)
+>>> client.sessions.events.send(session.id, [user_message("Hello!")])
+>>> with client.sessions.events.stream(session.id) as stream:
+...     for event in stream:
+...         print(event.type, event.to_dict())
+...         if event.type == "session_status":
+...             break
+"""
+
+# yapf: disable
+
+from .client import Client, AsyncClient
+from .transport import APIResponse, RequestOptions
+from . import types
+from .exceptions import (
+    AgentStudioError,
+    APIConnectionError,
+    APIStatusError,
+    APITimeoutError,
+    AuthenticationError,
+    ConflictError,
+    InternalServerError,
+    InvalidRequestError,
+    NotFoundError,
+    OverloadedError,
+    PermissionDeniedError,
+    RateLimitError,
+    StreamClosedError,
+    StreamError,
+)
+from .pagination import (
+    AsyncCursorPage,
+    CursorPage,
+)
+from .types import (
+    Message,
+    ServerEvent,
+    user_define_outcome,
+    user_interrupt,
+    user_message,
+    user_tool_confirmation,
+    user_custom_tool_result,
+    user_tool_result,
+)
+from .types.params import (
+    AgentCreateParams,
+    AgentUpdateParams,
+    SessionCreateParams,
+    SessionUpdateParams,
+    EnvironmentCreateParams,
+    EnvironmentUpdateParams,
+    SessionEventSendParams,
+)
+
+__all__ = [
+    # client
+    "Client",
+    "AsyncClient",
+    # base types
+    "RequestOptions",
+    "APIResponse",
+    # exceptions
+    "AgentStudioError",
+    "APIConnectionError",
+    "APIStatusError",
+    "APITimeoutError",
+    "AuthenticationError",
+    "ConflictError",
+    "InternalServerError",
+    "InvalidRequestError",
+    "NotFoundError",
+    "OverloadedError",
+    "PermissionDeniedError",
+    "RateLimitError",
+    "StreamError",
+    "StreamClosedError",
+    # pagination
+    "CursorPage",
+    "AsyncCursorPage",
+    # unified message type
+    "Message",
+    "ServerEvent",
+    # client event helpers (re-exported for convenience)
+    "user_message",
+    "user_interrupt",
+    "user_tool_confirmation",
+    "user_custom_tool_result",
+    "user_tool_result",
+    "user_define_outcome",
+    # typing module
+    "types",
+    # params (commonly used request-body types)
+    "AgentCreateParams",
+    "AgentUpdateParams",
+    "SessionCreateParams",
+    "SessionUpdateParams",
+    "EnvironmentCreateParams",
+    "EnvironmentUpdateParams",
+    "SessionEventSendParams",
+]

dashscope-1.26.2/dashscope/agentstudio/client.py

@@ -0,0 +1,208 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) Alibaba, Inc. and its affiliates.
+"""AgentStudio client classes."""
+
+from __future__ import annotations
+
+import os
+from typing import Any, Optional, Tuple, Union
+
+import httpx
+
+from dashscope.agentstudio.resources.agents import Agents, AsyncAgents
+from dashscope.agentstudio.resources.environments import (
+    Environments,
+    AsyncEnvironments,
+)
+from dashscope.agentstudio.resources.files import Files, AsyncFiles
+from dashscope.agentstudio.resources.sessions import Sessions, AsyncSessions
+from dashscope.agentstudio.resources.skills import Skills, AsyncSkills
+from dashscope.agentstudio.resources.vaults import Vaults, AsyncVaults
+from dashscope.agentstudio.constants import (
+    AGENTSTUDIO_BASE_URL_TEMPLATE,
+    AGENTSTUDIO_DEFAULT_REGION,
+    AGENTSTUDIO_DEFAULT_TIMEOUT,
+    AGENTSTUDIO_MAX_RETRIES,
+)
+from dashscope.agentstudio.transport import SyncTransport, AsyncTransport
+from dashscope.common.api_key import get_default_api_key
+
+
+def _resolve_base_url(
+    explicit_url: Optional[str],
+    workspace: Optional[str],
+    region: Optional[str] = None,
+) -> str:
+    """Resolve the base URL.
+
+    Priority:
+    1. explicit base_url parameter (full URL)
+    2. DASHSCOPE_AGENTSTUDIO_URL / AGENTSTUDIO_URL env
+    3. Build from workspace + region template
+    """
+    if explicit_url:
+        return explicit_url
+    env_url = os.environ.get("DASHSCOPE_AGENTSTUDIO_URL") or os.environ.get(
+        "AGENTSTUDIO_URL",
+    )
+    if env_url:
+        return env_url
+    # Build from workspace + region
+    ws = workspace or os.environ.get("DASHSCOPE_WORKSPACE")
+    if not ws:
+        raise ValueError(
+            "workspace is required when base_url is not provided "
+            "(pass workspace='ws_xxx' or set DASHSCOPE_WORKSPACE env var "
+            "or use base_url=... to override)",
+        )
+    rgn = region or AGENTSTUDIO_DEFAULT_REGION
+    return AGENTSTUDIO_BASE_URL_TEMPLATE.format(
+        workspace=ws,
+        region=rgn,
+    )
+
+
+def _user_agent(base_url: str) -> str:
+    try:
+        from dashscope.version import __version__
+    except Exception:
+        __version__ = "0.0.0"
+    return f"dashscope-agentstudio-python/{__version__} (+{base_url})"
+
+
+class Client:
+    """Synchronous AgentStudio client.
+
+    Usage::
+
+        from dashscope.agentstudio import Client
+
+        client = Client(api_key="sk-xxx", workspace="my-ws")
+        agent = client.agents.create(name="demo", model="qwen-max")
+        session = client.sessions.create(agent=agent.id)
+        with client.sessions.events.stream(session.id) as stream:
+            for event in stream:
+                print(event.type)
+    """
+
+    def __init__(
+        self,
+        *,
+        api_key: Optional[str] = None,
+        workspace: Optional[str] = None,
+        region: Optional[str] = None,
+        base_url: Optional[str] = None,
+        uid: Optional[str] = None,
+        timeout: Optional[
+            Union[float, httpx.Timeout, Tuple[float, float]]
+        ] = None,
+        max_retries: int = AGENTSTUDIO_MAX_RETRIES,
+        http_client: Optional[httpx.Client] = None,
+    ) -> None:
+        resolved_workspace = workspace or os.environ.get("DASHSCOPE_WORKSPACE")
+        resolved_base = _resolve_base_url(
+            base_url,
+            resolved_workspace,
+            region,
+        )
+        self.transport = SyncTransport(
+            base_url=resolved_base,
+            api_key=api_key or get_default_api_key(),
+            workspace=resolved_workspace,
+            uid=uid or os.environ.get("DASHSCOPE_UID"),
+            user_agent=_user_agent(resolved_base),
+            timeout=timeout or AGENTSTUDIO_DEFAULT_TIMEOUT,
+            max_retries=max_retries,
+            http_client=http_client,
+        )
+        self.agents = Agents(self)
+        self.sessions = Sessions(self)
+        self.environments = Environments(self)
+        self.files = Files(self)
+        self.skills = Skills(self)
+        self.vaults = Vaults(self)
+
+    def close(self) -> None:
+        self.transport.close()
+
+    def __enter__(self) -> "Client":
+        return self
+
+    def __exit__(self, *exc: Any) -> None:
+        self.close()
+
+    def __del__(self) -> None:
+        try:
+            self.close()
+        except Exception:
+            pass
+
+
+class AsyncClient:
+    """Asynchronous AgentStudio client.
+
+    Usage::
+
+        from dashscope.agentstudio import AsyncClient
+
+        client = AsyncClient(api_key="sk-xxx", workspace="my-ws")
+        agent = await client.agents.create(
+            name="demo", model="qwen-max",
+        )
+        session = await client.sessions.create(agent=agent.id)
+        async with client.sessions.events.stream(session.id) as stream:
+            async for event in stream:
+                print(event.type)
+    """
+
+    def __init__(
+        self,
+        *,
+        api_key: Optional[str] = None,
+        workspace: Optional[str] = None,
+        region: Optional[str] = None,
+        base_url: Optional[str] = None,
+        uid: Optional[str] = None,
+        timeout: Optional[
+            Union[float, httpx.Timeout, Tuple[float, float]]
+        ] = None,
+        max_retries: int = AGENTSTUDIO_MAX_RETRIES,
+        http_client: Optional[httpx.AsyncClient] = None,
+    ) -> None:
+        resolved_workspace = workspace or os.environ.get("DASHSCOPE_WORKSPACE")
+        resolved_base = _resolve_base_url(
+            base_url,
+            resolved_workspace,
+            region,
+        )
+        self.transport = AsyncTransport(
+            base_url=resolved_base,
+            api_key=api_key or get_default_api_key(),
+            workspace=resolved_workspace,
+            uid=uid or os.environ.get("DASHSCOPE_UID"),
+            user_agent=_user_agent(resolved_base),
+            timeout=timeout or AGENTSTUDIO_DEFAULT_TIMEOUT,
+            max_retries=max_retries,
+            http_client=http_client,
+        )
+        self.agents = AsyncAgents(self)
+        self.sessions = AsyncSessions(self)
+        self.environments = AsyncEnvironments(self)
+        self.files = AsyncFiles(self)
+        self.skills = AsyncSkills(self)
+        self.vaults = AsyncVaults(self)
+
+    async def aclose(self) -> None:
+        await self.transport.aclose()
+
+    async def __aenter__(self) -> "AsyncClient":
+        return self
+
+    async def __aexit__(self, *exc: Any) -> None:
+        await self.aclose()
+
+    def __del__(self) -> None:
+        try:
+            self.transport.close()
+        except Exception:
+            pass

dashscope-1.26.2/dashscope/agentstudio/constants.py

@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) Alibaba, Inc. and its affiliates.
+"""AgentStudio wire-protocol and configuration constants."""
+
+import enum
+import sys
+
+import httpx
+
+if sys.version_info >= (3, 11):
+    from enum import StrEnum
+else:
+
+    class StrEnum(str, enum.Enum):  # type: ignore[no-redef]
+        """Minimal StrEnum shim for Python < 3.11."""
+
+
+# ---------------------------------------------------------------------------
+# Configuration
+# ---------------------------------------------------------------------------
+
+_HOST = "https://{workspace}.{region}.maas.aliyuncs.com"
+AGENTSTUDIO_BASE_URL_TEMPLATE = _HOST + "/api/v1/agentstudio"
+AGENTSTUDIO_DEFAULT_REGION = "cn-beijing"
+AGENTSTUDIO_DEFAULT_TIMEOUT = httpx.Timeout(600.0, connect=10.0)
+AGENTSTUDIO_MAX_RETRIES = 2
+
+
+# ---------------------------------------------------------------------------
+# Wire-protocol enums
+# ---------------------------------------------------------------------------
+
+
+class SSEEventType(StrEnum):
+    """Server-sent event types (the value of ``event.type`` in SSE payloads).
+
+    Client-sendable: MESSAGE, INTERRUPT, TOOL_CONFIRMATION,
+    FUNCTION_CALL_OUTPUT, TOOL_CALL_OUTPUT, DEFINE_OUTCOME.
+    Server-emitted: all types.
+    """
+
+    # Client-sendable
+    MESSAGE = "message"
+    INTERRUPT = "interrupt"
+    TOOL_CONFIRMATION = "tool_confirmation"
+    FUNCTION_CALL_OUTPUT = "function_call_output"
+    TOOL_CALL_OUTPUT = "tool_call_output"
+    DEFINE_OUTCOME = "define_outcome"
+
+    # Server-emitted
+    FUNCTION_CALL = "function_call"
+    TOOL_CALL = "tool_call"
+    REASONING = "reasoning"
+    MCP_CALL = "mcp_call"
+    MCP_CALL_OUTPUT = "mcp_call_output"
+    THREAD_MESSAGE_SENT = "thread_message_sent"
+    THREAD_MESSAGE_RECEIVED = "thread_message_received"
+    THREAD_CONTEXT_COMPACTED = "thread_context_compacted"
+    SESSION_STATUS = "session_status"
+    ERROR = "error"
+    SESSION_UPDATED = "session_updated"
+    THREAD_CREATED = "thread_created"
+    THREAD_STATUS = "thread_status"
+    MODEL_REQUEST_START = "model_request_start"
+    MODEL_REQUEST_END = "model_request_end"
+    OUTCOME_EVALUATION = "outcome_evaluation"
+
+
+class MessageRole(StrEnum):
+    """Roles used in message/event payloads."""
+
+    USER = "user"
+    ASSISTANT = "assistant"
+    TOOL = "tool"
+
+
+class BlockType(StrEnum):
+    """Content block types (``block.type`` values)."""
+
+    TEXT = "text"
+    IMAGE = "image"
+    AUDIO = "audio"
+    DATA = "data"
+    FILE = "file"
+    REFUSAL = "refusal"
+    ERROR = "error"
+
+
+class SessionStatus(StrEnum):
+    """Session run-status values (``session_status``)."""
+
+    IDLE = "idle"
+    RUNNING = "running"
+    RESCHEDULING = "rescheduling"
+    TERMINATED = "terminated"