tamar-model-client 0.1.15__py3-none-any.whl → 0.1.17__py3-none-any.whl

tamar_model_client/async_client.py

@@ -19,7 +19,7 @@ from .exceptions import ConnectionError
 from .schemas import ModelRequest, ModelResponse, BatchModelRequest, BatchModelResponse
 from .generated import model_service_pb2, model_service_pb2_grpc
 from .schemas.inputs import GoogleGenAiInput, OpenAIResponsesInput, OpenAIChatCompletionsInput, \
-    GoogleVertexAIImagesInput, OpenAIImagesInput
+    GoogleVertexAIImagesInput, OpenAIImagesInput, OpenAIImagesEditInput
 
 logger = logging.getLogger(__name__)
 
@@ -203,6 +203,37 @@ class AsyncTamarModelClient:
                     logger.error(f"❌ Non-retryable gRPC error: {e}", exc_info=True)
                     raise
 
+    async def _retry_request_stream(self, func, *args, **kwargs):
+        retry_count = 0
+        while retry_count < self.max_retries:
+            try:
+                return func(*args, **kwargs)
+            except (grpc.aio.AioRpcError, grpc.RpcError) as e:
+                # 对于取消的情况进行指数退避重试
+                if isinstance(e, grpc.aio.AioRpcError) and e.code() == grpc.StatusCode.CANCELLED:
+                    retry_count += 1
+                    logger.warning(f"❌ RPC cancelled, retrying {retry_count}/{self.max_retries}...")
+                    if retry_count < self.max_retries:
+                        delay = self.retry_delay * (2 ** (retry_count - 1))
+                        await asyncio.sleep(delay)
+                    else:
+                        logger.error("❌ Max retry reached for CANCELLED")
+                        raise
+                # 针对其他 RPC 错误类型，如暂时的连接问题、服务器超时等
+                elif isinstance(e, grpc.RpcError) and e.code() in {grpc.StatusCode.UNAVAILABLE,
+                                                                   grpc.StatusCode.DEADLINE_EXCEEDED}:
+                    retry_count += 1
+                    logger.warning(f"❌ gRPC error {e.code()}, retrying {retry_count}/{self.max_retries}...")
+                    if retry_count < self.max_retries:
+                        delay = self.retry_delay * (2 ** (retry_count - 1))
+                        await asyncio.sleep(delay)
+                    else:
+                        logger.error(f"❌ Max retry reached for {e.code()}")
+                        raise
+                else:
+                    logger.error(f"❌ Non-retryable gRPC error: {e}", exc_info=True)
+                    raise
+
     def _build_auth_metadata(self, request_id: str) -> list:
         # if not self.jwt_token and self.jwt_handler:
         # 更改为每次请求都生成一次token
@@ -263,25 +294,23 @@ class AsyncTamarModelClient:
             logger.info(f"🚀 Retrying connection (attempt {retry_count}/{self.max_retries}) after {delay:.2f}s delay...")
             await asyncio.sleep(delay)
 
-    async def _stream_inner(self, model_request, metadata, invoke_timeout) -> AsyncIterator[ModelResponse]:
-        """Inner function to handle the actual streaming gRPC call."""
-        async for response in self.stub.Invoke(model_request, metadata=metadata, timeout=invoke_timeout):
+    async def _stream(self, request, metadata, invoke_timeout) -> AsyncIterator[ModelResponse]:
+        async for response in self.stub.Invoke(request, metadata=metadata, timeout=invoke_timeout):
             yield ModelResponse(
                 content=response.content,
                 usage=json.loads(response.usage) if response.usage else None,
-                raw_response=json.loads(response.raw_response) if response.raw_response else None,
                 error=response.error or None,
+                raw_response=json.loads(response.raw_response) if response.raw_response else None,
+                request_id=response.request_id if response.request_id else None,
             )
 
-    async def _stream(self, model_request, metadata, invoke_timeout) -> AsyncIterator[ModelResponse]:
-        return await self._retry_request(self._stream_inner, model_request, metadata, invoke_timeout)
-
     async def _invoke_request(self, request, metadata, invoke_timeout):
         async for response in self.stub.Invoke(request, metadata=metadata, timeout=invoke_timeout):
             return ModelResponse(
                 content=response.content,
                 usage=json.loads(response.usage) if response.usage else None,
                 error=response.error or None,
+                raw_response=json.loads(response.raw_response) if response.raw_response else None,
                 request_id=response.request_id if response.request_id else None,
             )
 
@@ -317,7 +346,7 @@ class AsyncTamarModelClient:
 
         # 记录开始日志
         logger.info(
-            f"🔵 Request Start | request_id: {request_id} | provider: {model_request.provider} | invoke_type: {model_request.invoke_type} | model_request: {model_request}")
+            f"🔵 Request Start | request_id: {request_id} | provider: {model_request.provider} | invoke_type: {model_request.invoke_type}")
 
         # 动态根据 provider/invoke_type 决定使用哪个 input 字段
         try:
@@ -334,6 +363,8 @@ class AsyncTamarModelClient:
                     allowed_fields = OpenAIChatCompletionsInput.model_fields.keys()
                 case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.IMAGE_GENERATION):
                     allowed_fields = OpenAIImagesInput.model_fields.keys()
+                case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.IMAGE_EDIT_GENERATION):
+                    allowed_fields = OpenAIImagesEditInput.model_fields.keys()
                 case _:
                     raise ValueError(
                         f"Unsupported provider/invoke_type combination: {model_request.provider} + {model_request.invoke_type}")
@@ -373,7 +404,7 @@ class AsyncTamarModelClient:
         try:
             invoke_timeout = timeout or self.default_invoke_timeout
             if model_request.stream:
-                return await self._stream(request, metadata, invoke_timeout)
+                return await self._retry_request_stream(self._stream, request, metadata, invoke_timeout)
             else:
                 return await self._retry_request(self._invoke_request, request, metadata, invoke_timeout)
         except grpc.RpcError as e:
@@ -414,7 +445,7 @@ class AsyncTamarModelClient:
 
         # 记录开始日志
         logger.info(
-            f"🔵 Batch Request Start | request_id: {request_id} | batch_size: {len(batch_request_model.items)} | batch_request_model: {batch_request_model}")
+            f"🔵 Batch Request Start | request_id: {request_id} | batch_size: {len(batch_request_model.items)}")
 
         # 构造批量请求
         items = []
@@ -432,6 +463,8 @@ class AsyncTamarModelClient:
                         allowed_fields = OpenAIChatCompletionsInput.model_fields.keys()
                     case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.IMAGE_GENERATION):
                         allowed_fields = OpenAIImagesInput.model_fields.keys()
+                    case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.IMAGE_EDIT_GENERATION):
+                        allowed_fields = OpenAIImagesEditInput.model_fields.keys()
                     case _:
                         raise ValueError(
                             f"Unsupported provider/invoke_type combination: {model_request_item.provider} + {model_request_item.invoke_type}")

tamar_model_client/enums/invoke.py

@@ -7,4 +7,5 @@ class InvokeType(str, Enum):
     CHAT_COMPLETIONS = "chat-completions"
 
     GENERATION = "generation"  # 生成类，默认的值
-    IMAGE_GENERATION = "image-generation"
+    IMAGE_GENERATION = "image-generation"
+    IMAGE_EDIT_GENERATION = "image-edit-generation"

tamar_model_client/schemas/inputs.py

@@ -1,18 +1,22 @@
+import mimetypes
+import os
+
 import httpx
 from google.genai import types
 from openai import NotGiven, NOT_GIVEN
-from openai._types import Headers, Query, Body
+from openai._types import Headers, Query, Body, FileTypes
 from openai.types import ChatModel, Metadata, ReasoningEffort, ResponsesModel, Reasoning, ImageModel
 from openai.types.chat import ChatCompletionMessageParam, ChatCompletionAudioParam, completion_create_params, \
     ChatCompletionPredictionContentParam, ChatCompletionStreamOptionsParam, ChatCompletionToolChoiceOptionParam, \
     ChatCompletionToolParam
 from openai.types.responses import ResponseInputParam, ResponseIncludable, ResponseTextConfigParam, \
     response_create_params, ToolParam
-from pydantic import BaseModel, model_validator
-from typing import List, Optional, Union, Iterable, Dict, Literal
+from pydantic import BaseModel, model_validator, field_validator
+from typing import List, Optional, Union, Iterable, Dict, Literal, IO
 
 from tamar_model_client.enums import ProviderType, InvokeType
 from tamar_model_client.enums.channel import Channel
+from tamar_model_client.utils import convert_file_field, validate_fields_by_provider_and_invoke_type
 
 
 class UserContext(BaseModel):
@@ -149,6 +153,29 @@ class OpenAIImagesInput(BaseModel):
     }
 
 
+class OpenAIImagesEditInput(BaseModel):
+    image: Union[FileTypes, List[FileTypes]]
+    prompt: str
+    background: Optional[Literal["transparent", "opaque", "auto"]] | NotGiven = NOT_GIVEN
+    mask: FileTypes | NotGiven = NOT_GIVEN
+    model: Union[str, ImageModel, None] | NotGiven = NOT_GIVEN
+    n: Optional[int] | NotGiven = NOT_GIVEN
+    quality: Optional[Literal["standard", "low", "medium", "high", "auto"]] | NotGiven = NOT_GIVEN
+    response_format: Optional[Literal["url", "b64_json"]] | NotGiven = NOT_GIVEN
+    size: Optional[Literal["256x256", "512x512", "1024x1024", "1536x1024", "1024x1536", "auto"]] | NotGiven = NOT_GIVEN
+    user: str | NotGiven = NOT_GIVEN
+    # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+    # The extra values given here take precedence over values defined on the client or passed to this method.
+    extra_headers: Headers | None = None
+    extra_query: Query | None = None
+    extra_body: Body | None = None
+    timeout: float | httpx.Timeout | None | NotGiven = NOT_GIVEN
+
+    model_config = {
+        "arbitrary_types_allowed": True
+    }
+
+
 class BaseRequest(BaseModel):
     provider: ProviderType  # 供应商，如 "openai", "google" 等
     channel: Channel = Channel.NORMAL  # 渠道：不同服务商之前有不同的调用SDK，这里指定是调用哪个SDK
@@ -212,8 +239,11 @@ class ModelRequestInput(BaseRequest):
     contents: Optional[Union[types.ContentListUnion, types.ContentListUnionDict]] = None
     config: Optional[types.GenerateContentConfigOrDict] = None
 
-    # OpenAIImagesInput + GoogleVertexAIImagesInput 合并字段
+    # OpenAIImagesInput + OpenAIImagesEditInput + GoogleVertexAIImagesInput 合并字段
+    image: Optional[Union[FileTypes, List[FileTypes]]] = None
     prompt: Optional[str] = None
+    background: Optional[Literal["transparent", "opaque", "auto"]] | NotGiven = NOT_GIVEN
+    mask: FileTypes | NotGiven = NOT_GIVEN
     negative_prompt: Optional[str] = None
     aspect_ratio: Optional[Literal["1:1", "9:16", "16:9", "4:3", "3:4"]] = None
     guidance_scale: Optional[float] = None
@@ -223,7 +253,8 @@ class ModelRequestInput(BaseRequest):
     safety_filter_level: Optional[Literal["block_most", "block_some", "block_few", "block_fewest"]] = None
     person_generation: Optional[Literal["dont_allow", "allow_adult", "allow_all"]] = None
     quality: Optional[Literal["standard", "hd"]] | NotGiven = NOT_GIVEN
-    size: Optional[Literal["256x256", "512x512", "1024x1024", "1792x1024", "1024x1792"]] | NotGiven = NOT_GIVEN
+    size: Optional[Literal[
+        "auto", "1024x1024", "1536x1024", "1024x1536", "256x256", "512x512", "1792x1024", "1024x1792"]] | NotGiven = NOT_GIVEN
     style: Optional[Literal["vivid", "natural"]] | NotGiven = NOT_GIVEN
     number_of_images: Optional[int] = None  # Google 用法
 
@@ -231,71 +262,26 @@ class ModelRequestInput(BaseRequest):
         "arbitrary_types_allowed": True
     }
 
+    @field_validator("image", mode="before")
+    @classmethod
+    def validate_image(cls, v):
+        return convert_file_field(v)
+
+    @field_validator("mask", mode="before")
+    @classmethod
+    def validate_mask(cls, v):
+        return convert_file_field(v)
+
 
 class ModelRequest(ModelRequestInput):
     user_context: UserContext  # 用户信息
 
     @model_validator(mode="after")
     def validate_by_provider_and_invoke_type(self) -> "ModelRequest":
-        """根据 provider 和 invoke_type 动态校验具体输入模型字段。"""
-        # 动态获取 allowed fields
-        base_allowed = {"provider", "channel", "invoke_type", "user_context"}
-        google_allowed = base_allowed | set(GoogleGenAiInput.model_fields.keys())
-        openai_responses_allowed = base_allowed | set(OpenAIResponsesInput.model_fields.keys())
-        openai_chat_allowed = base_allowed | set(OpenAIChatCompletionsInput.model_fields.keys())
-        openai_images_allowed = base_allowed | set(OpenAIImagesInput.model_fields.keys())
-        google_vertexai_images_allowed = base_allowed | set(GoogleVertexAIImagesInput.model_fields.keys())
-
-        # 各模型类型必填字段
-        google_required_fields = {"model", "contents"}
-        google_vertexai_image_required_fields = {"model", "prompt"}
-
-        openai_responses_required_fields = {"input", "model"}
-        openai_chat_required_fields = {"messages", "model"}
-        openai_image_required_fields = {"prompt"}
-
-        # 选择需要校验的字段集合
-        # 动态分支逻辑
-        match (self.provider, self.invoke_type):
-            case (ProviderType.GOOGLE, InvokeType.GENERATION):
-                allowed_fields = google_allowed
-                expected_fields = google_required_fields
-            case (ProviderType.GOOGLE, InvokeType.IMAGE_GENERATION):
-                allowed_fields = google_vertexai_images_allowed
-                expected_fields = google_vertexai_image_required_fields
-            case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.RESPONSES | InvokeType.GENERATION):
-                allowed_fields = openai_responses_allowed
-                expected_fields = openai_responses_required_fields
-            case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.CHAT_COMPLETIONS):
-                allowed_fields = openai_chat_allowed
-                expected_fields = openai_chat_required_fields
-            case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.IMAGE_GENERATION):
-                allowed_fields = openai_images_allowed
-                expected_fields = openai_image_required_fields
-            case _:
-                raise ValueError(f"Unsupported provider/invoke_type combination: {self.provider} + {self.invoke_type}")
-
-        # 校验必填字段是否缺失
-        missing = [field for field in expected_fields if getattr(self, field, None) is None]
-        if missing:
-            raise ValueError(
-                f"Missing required fields for provider={self.provider} and invoke_type={self.invoke_type}: {missing}")
-
-        # 检查是否有非法字段
-        illegal_fields = []
-        valid_fields = {"provider", "channel", "invoke_type"} if self.invoke_type == InvokeType.IMAGE_GENERATION else {
-            "provider", "channel", "invoke_type", "stream"}
-        for name, value in self.__dict__.items():
-            if name in valid_fields:
-                continue
-            if name not in allowed_fields and value is not None and not isinstance(value, NotGiven):
-                illegal_fields.append(name)
-
-        if illegal_fields:
-            raise ValueError(
-                f"Unsupported fields for provider={self.provider} and invoke_type={self.invoke_type}: {illegal_fields}")
-
-        return self
+        return validate_fields_by_provider_and_invoke_type(
+            instance=self,
+            extra_allowed_fields={"provider", "channel", "invoke_type", "user_context"},
+        )
 
 
 class BatchModelRequestItem(ModelRequestInput):
@@ -304,65 +290,10 @@ class BatchModelRequestItem(ModelRequestInput):
 
     @model_validator(mode="after")
     def validate_by_provider_and_invoke_type(self) -> "BatchModelRequestItem":
-        """根据 provider 和 invoke_type 动态校验具体输入模型字段。"""
-        # 动态获取 allowed fields
-        base_allowed = {"provider", "channel", "invoke_type", "user_context", "custom_id"}
-        google_allowed = base_allowed | set(GoogleGenAiInput.model_fields.keys())
-        openai_responses_allowed = base_allowed | set(OpenAIResponsesInput.model_fields.keys())
-        openai_chat_allowed = base_allowed | set(OpenAIChatCompletionsInput.model_fields.keys())
-        openai_images_allowed = base_allowed | set(OpenAIImagesInput.model_fields.keys())
-        google_vertexai_images_allowed = base_allowed | set(GoogleVertexAIImagesInput.model_fields.keys())
-
-        # 各模型类型必填字段
-        google_required_fields = {"model", "contents"}
-        google_vertexai_image_required_fields = {"model", "prompt"}
-
-        openai_responses_required_fields = {"input", "model"}
-        openai_chat_required_fields = {"messages", "model"}
-        openai_image_required_fields = {"prompt"}
-
-        # 选择需要校验的字段集合
-        # 动态分支逻辑
-        match (self.provider, self.invoke_type):
-            case (ProviderType.GOOGLE, InvokeType.GENERATION):
-                allowed_fields = google_allowed
-                expected_fields = google_required_fields
-            case (ProviderType.GOOGLE, InvokeType.IMAGE_GENERATION):
-                allowed_fields = google_vertexai_images_allowed
-                expected_fields = google_vertexai_image_required_fields
-            case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.RESPONSES | InvokeType.GENERATION):
-                allowed_fields = openai_responses_allowed
-                expected_fields = openai_responses_required_fields
-            case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.CHAT_COMPLETIONS):
-                allowed_fields = openai_chat_allowed
-                expected_fields = openai_chat_required_fields
-            case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.IMAGE_GENERATION):
-                allowed_fields = openai_images_allowed
-                expected_fields = openai_image_required_fields
-            case _:
-                raise ValueError(f"Unsupported provider/invoke_type combination: {self.provider} + {self.invoke_type}")
-
-        # 校验必填字段是否缺失
-        missing = [field for field in expected_fields if getattr(self, field, None) is None]
-        if missing:
-            raise ValueError(
-                f"Missing required fields for provider={self.provider} and invoke_type={self.invoke_type}: {missing}")
-
-        # 检查是否有非法字段
-        illegal_fields = []
-        valid_fields = {"provider", "channel", "invoke_type"} if self.invoke_type == InvokeType.IMAGE_GENERATION else {
-            "provider", "channel", "invoke_type", "stream"}
-        for name, value in self.__dict__.items():
-            if name in valid_fields:
-                continue
-            if name not in allowed_fields and value is not None and not isinstance(value, NotGiven):
-                illegal_fields.append(name)
-
-        if illegal_fields:
-            raise ValueError(
-                f"Unsupported fields for provider={self.provider} and invoke_type={self.invoke_type}: {illegal_fields}")
-
-        return self
+        return validate_fields_by_provider_and_invoke_type(
+            instance=self,
+            extra_allowed_fields={"provider", "channel", "invoke_type", "user_context", "custom_id"},
+        )
 
 
 class BatchModelRequest(BaseModel):

tamar_model_client/sync_client.py

@@ -17,7 +17,7 @@ from .exceptions import ConnectionError
 from .generated import model_service_pb2, model_service_pb2_grpc
 from .schemas import BatchModelResponse, ModelResponse
 from .schemas.inputs import GoogleGenAiInput, GoogleVertexAIImagesInput, OpenAIResponsesInput, \
-    OpenAIChatCompletionsInput, OpenAIImagesInput, BatchModelRequest, ModelRequest
+    OpenAIChatCompletionsInput, OpenAIImagesInput, OpenAIImagesEditInput, BatchModelRequest, ModelRequest
 
 logger = logging.getLogger(__name__)
 
@@ -247,20 +247,16 @@ class TamarModelClient:
             logger.info(f"🚀 Retrying connection (attempt {retry_count}/{self.max_retries}) after {delay:.2f}s delay...")
             time.sleep(delay)  # Blocking sleep in sync version
 
-    def _stream_inner(self, model_request, metadata, invoke_timeout) -> Iterator[ModelResponse]:
-        """Inner function to handle the actual streaming gRPC call."""
-        response = self.stub.Invoke(model_request, metadata=metadata, timeout=invoke_timeout)
-        for res in response:
+    def _stream(self, request, metadata, invoke_timeout) -> Iterator[ModelResponse]:
+        for response in self.stub.Invoke(request, metadata=metadata, timeout=invoke_timeout):
             yield ModelResponse(
-                content=res.content,
-                usage=json.loads(res.usage) if res.usage else None,
-                raw_response=json.loads(res.raw_response) if res.raw_response else None,
-                error=res.error or None,
+                content=response.content,
+                usage=json.loads(response.usage) if response.usage else None,
+                error=response.error or None,
+                raw_response=json.loads(response.raw_response) if response.raw_response else None,
+                request_id=response.request_id if response.request_id else None,
             )
 
-    def _stream(self, model_request, metadata, invoke_timeout) -> Iterator[ModelResponse]:
-        return self._retry_request(self._stream_inner, model_request, metadata, invoke_timeout)
-
     def _invoke_request(self, request, metadata, invoke_timeout):
         response = self.stub.Invoke(request, metadata=metadata, timeout=invoke_timeout)
         for response in response:
@@ -268,6 +264,7 @@ class TamarModelClient:
                 content=response.content,
                 usage=json.loads(response.usage) if response.usage else None,
                 error=response.error or None,
+                raw_response=json.loads(response.raw_response) if response.raw_response else None,
                 request_id=response.request_id if response.request_id else None,
             )
 
@@ -302,7 +299,7 @@ class TamarModelClient:
 
         # 记录开始日志
         logger.info(
-            f"🔵 Request Start | request_id: {request_id} | provider: {model_request.provider} | invoke_type: {model_request.invoke_type} | model_request: {model_request}")
+            f"🔵 Request Start |provider: {model_request.provider} | invoke_type: {model_request.invoke_type}")
 
         # 动态根据 provider/invoke_type 决定使用哪个 input 字段
         try:
@@ -319,6 +316,8 @@ class TamarModelClient:
                     allowed_fields = OpenAIChatCompletionsInput.model_fields.keys()
                 case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.IMAGE_GENERATION):
                     allowed_fields = OpenAIImagesInput.model_fields.keys()
+                case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.IMAGE_EDIT_GENERATION):
+                    allowed_fields = OpenAIImagesEditInput.model_fields.keys()
                 case _:
                     raise ValueError(
                         f"Unsupported provider/invoke_type combination: {model_request.provider} + {model_request.invoke_type}")
@@ -358,7 +357,7 @@ class TamarModelClient:
         try:
             invoke_timeout = timeout or self.default_invoke_timeout
             if model_request.stream:
-                return self._stream(request, metadata, invoke_timeout)
+                return self._retry_request(self._stream, request, metadata, invoke_timeout)
             else:
                 return self._retry_request(self._invoke_request, request, metadata, invoke_timeout)
         except grpc.RpcError as e:
@@ -398,7 +397,7 @@ class TamarModelClient:
 
         # 记录开始日志
         logger.info(
-            f"🔵 Batch Request Start | request_id: {request_id} | batch_size: {len(batch_request_model.items)} | batch_request_model: {batch_request_model}")
+            f"🔵 Batch Request Start | batch_size: {len(batch_request_model.items)}")
 
         # 构造批量请求
         items = []
@@ -416,6 +415,8 @@ class TamarModelClient:
                         allowed_fields = OpenAIChatCompletionsInput.model_fields.keys()
                     case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.IMAGE_GENERATION):
                         allowed_fields = OpenAIImagesInput.model_fields.keys()
+                    case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.IMAGE_EDIT_GENERATION):
+                        allowed_fields = OpenAIImagesEditInput.model_fields.keys()
                     case _:
                         raise ValueError(
                             f"Unsupported provider/invoke_type combination: {model_request_item.provider} + {model_request_item.invoke_type}")

tamar_model_client/utils.py

@@ -0,0 +1,118 @@
+from openai import NotGiven
+from pydantic import BaseModel
+from typing import Any
+import os, mimetypes
+
+def convert_file_field(value: Any) -> Any:
+    def is_file_like(obj):
+        return hasattr(obj, "read") and callable(obj.read)
+
+    def infer_mimetype(filename: str) -> str:
+        mime, _ = mimetypes.guess_type(filename)
+        return mime or "application/octet-stream"
+
+    def convert_item(item):
+        if is_file_like(item):
+            filename = os.path.basename(getattr(item, "name", "file.png"))
+            content_type = infer_mimetype(filename)
+            content = item.read()
+            if hasattr(item, "seek"):
+                item.seek(0)
+            return (filename, content, content_type)
+        elif isinstance(item, tuple):
+            parts = list(item)
+            if len(parts) > 1:
+                maybe_file = parts[1]
+                if is_file_like(maybe_file):
+                    content = maybe_file.read()
+                    if hasattr(maybe_file, "seek"):
+                        maybe_file.seek(0)
+                    parts[1] = content
+                elif not isinstance(maybe_file, (bytes, bytearray)):
+                    raise ValueError(f"Unsupported second element in tuple: {type(maybe_file)}")
+            if len(parts) == 2:
+                parts.append(infer_mimetype(os.path.basename(parts[0] or "file.png")))
+            return tuple(parts)
+        else:
+            return item
+
+    if value is None:
+        return value
+    elif isinstance(value, list):
+        return [convert_item(v) for v in value]
+    else:
+        return convert_item(value)
+
+
+def validate_fields_by_provider_and_invoke_type(
+        instance: BaseModel,
+        extra_allowed_fields: set[str],
+        extra_required_fields: set[str] = set()
+) -> BaseModel:
+    """
+    通用的字段校验逻辑，根据 provider 和 invoke_type 动态检查字段合法性和必填字段。
+    适用于 ModelRequest 和 BatchModelRequestItem。
+    """
+    from tamar_model_client.enums import ProviderType, InvokeType
+    from tamar_model_client.schemas.inputs import GoogleGenAiInput, OpenAIResponsesInput, OpenAIChatCompletionsInput, \
+        OpenAIImagesInput, OpenAIImagesEditInput, GoogleVertexAIImagesInput
+
+    google_allowed = extra_allowed_fields | set(GoogleGenAiInput.model_fields)
+    openai_responses_allowed = extra_allowed_fields | set(OpenAIResponsesInput.model_fields)
+    openai_chat_allowed = extra_allowed_fields | set(OpenAIChatCompletionsInput.model_fields)
+    openai_images_allowed = extra_allowed_fields | set(OpenAIImagesInput.model_fields)
+    openai_images_edit_allowed = extra_allowed_fields | set(OpenAIImagesEditInput.model_fields)
+    google_vertexai_images_allowed = extra_allowed_fields | set(GoogleVertexAIImagesInput.model_fields)
+
+    google_required = {"model", "contents"}
+    google_vertex_required = {"model", "prompt"}
+    openai_resp_required = {"input", "model"}
+    openai_chat_required = {"messages", "model"}
+    openai_img_required = {"prompt"}
+    openai_edit_required = {"image", "prompt"}
+
+    match (instance.provider, instance.invoke_type):
+        case (ProviderType.GOOGLE, InvokeType.GENERATION):
+            allowed = google_allowed
+            required = google_required
+        case (ProviderType.GOOGLE, InvokeType.IMAGE_GENERATION):
+            allowed = google_vertexai_images_allowed
+            required = google_vertex_required
+        case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.RESPONSES | InvokeType.GENERATION):
+            allowed = openai_responses_allowed
+            required = openai_resp_required
+        case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.CHAT_COMPLETIONS):
+            allowed = openai_chat_allowed
+            required = openai_chat_required
+        case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.IMAGE_GENERATION):
+            allowed = openai_images_allowed
+            required = openai_img_required
+        case ((ProviderType.OPENAI | ProviderType.AZURE), InvokeType.IMAGE_EDIT_GENERATION):
+            allowed = openai_images_edit_allowed
+            required = openai_edit_required
+        case _:
+            raise ValueError(f"Unsupported provider/invoke_type: {instance.provider} + {instance.invoke_type}")
+
+    required = required | extra_required_fields
+
+    missing = [f for f in required if getattr(instance, f, None) is None]
+    if missing:
+        raise ValueError(
+            f"Missing required fields for provider={instance.provider} and invoke_type={instance.invoke_type}: {missing}")
+
+    illegal = []
+    valid_fields = {"provider", "channel", "invoke_type"}
+    if getattr(instance, "stream", None) is not None:
+        valid_fields.add("stream")
+
+    for k, v in instance.__dict__.items():
+        if k in valid_fields:
+            continue
+        if k not in allowed and v is not None and not isinstance(v, NotGiven):
+            illegal.append(k)
+
+    if illegal:
+        raise ValueError(
+            f"Unsupported fields for provider={instance.provider} and invoke_type={instance.invoke_type}: {illegal}")
+
+    return instance

{tamar_model_client-0.1.15.dist-info → tamar_model_client-0.1.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamar-model-client
-Version: 0.1.15
+Version: 0.1.17
 Summary: A Python SDK for interacting with the Model Manager gRPC service
 Home-page: http://gitlab.tamaredge.top/project-tap/AgentOS/model-manager-client
 Author: Oscar Ou
@@ -273,13 +273,13 @@ async def main():
     )
 
     # 发送请求并获取响应
-    response = await client.invoke(request_data)
-    if response.error:
-        print(f"错误: {response.error}")
-    else:
-        print(f"响应: {response.content}")
-        if response.usage:
-            print(f"Token 使用情况: {response.usage}")
+    async for r in await client.invoke(model_request):
+        if r.error:
+            print(f"错误: {r.error}")
+        else:
+            print(f"响应: {r.content}")
+            if r.usage:
+                print(f"Token 使用情况: {r.usage}")
 
 
 # 运行异步示例
@@ -531,7 +531,7 @@ python make_grpc.py
 ### 部署到 pip
 ```bash
 python setup.py sdist bdist_wheel
-twine check dist/*
+twine upload dist/*
 
 ```
 

{tamar_model_client-0.1.15.dist-info → tamar_model_client-0.1.17.dist-info}/RECORD

@@ -1,19 +1,20 @@
 tamar_model_client/__init__.py,sha256=LMECAuDARWHV1XzH3msoDXcyurS2eihRQmBy26_PUE0,328
-tamar_model_client/async_client.py,sha256=Ckg9BbndvlqhngixaEe-Yfu9Fkh5T9FOqToYGAHhRg4,23941
+tamar_model_client/async_client.py,sha256=fTQMLWz7DxW1fynmfUxlS3anmYOxv6giVUGq6ZG4kzk,25972
 tamar_model_client/auth.py,sha256=gbwW5Aakeb49PMbmYvrYlVx1mfyn1LEDJ4qQVs-9DA4,438
 tamar_model_client/exceptions.py,sha256=jYU494OU_NeIa4X393V-Y73mTNm0JZ9yZApnlOM9CJQ,332
-tamar_model_client/sync_client.py,sha256=wMZw-d5s2ctaNIDUCUeRK2iZDLzuRryNjDaAVemFhk8,22558
+tamar_model_client/sync_client.py,sha256=-Gbx1DP4LRFZZZd4sKpY5Fi-_WHZEVayl1ABD3k7O6I,22748
+tamar_model_client/utils.py,sha256=Kn6pFz9GEC96H4eejEax66AkzvsrXI3WCSDtgDjnVTI,5238
 tamar_model_client/enums/__init__.py,sha256=3cYYn8ztNGBa_pI_5JGRVYf2QX8fkBVWdjID1PLvoBQ,182
 tamar_model_client/enums/channel.py,sha256=wCzX579nNpTtwzGeS6S3Ls0UzVAgsOlfy4fXMzQTCAw,199
-tamar_model_client/enums/invoke.py,sha256=WufImoN_87ZjGyzYitZkhNNFefWJehKfLtyP-DTBYlA,267
+tamar_model_client/enums/invoke.py,sha256=Up87myAg4-0SDJV5a82ggPDpYHSLEtIco8BF_5Ph1nY,322
 tamar_model_client/enums/providers.py,sha256=L_bX75K6KnWURoFizoitZ1Ybza7bmYDqXecNzNpgIrI,165
 tamar_model_client/generated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tamar_model_client/generated/model_service_pb2.py,sha256=RI6wNSmgmylzWPedFfPxx938UzS7kcPR58YTzYshcL8,3066
 tamar_model_client/generated/model_service_pb2_grpc.py,sha256=k4tIbp3XBxdyuOVR18Ung_4SUryONB51UYf_uUEl6V4,5145
 tamar_model_client/schemas/__init__.py,sha256=AxuI-TcvA4OMTj2FtK4wAItvz9LrK_293pu3cmMLE7k,394
-tamar_model_client/schemas/inputs.py,sha256=AlvjTRp_UGnbmqzv4OJ3RjH4UGErzSNfKS8Puj6oEXQ,19088
+tamar_model_client/schemas/inputs.py,sha256=dz1m8NbUIxA99JXZc8WlyzbKpDuz1lEzx3VghC33zYI,14625
 tamar_model_client/schemas/outputs.py,sha256=M_fcqUtXPJnfiLabHlyA8BorlC5pYkf5KLjXO1ysKIQ,1031
-tamar_model_client-0.1.15.dist-info/METADATA,sha256=ZXSYngVn_8ors2DORv7CxzadNvCD7927Duqk0lEY5yc,16566
-tamar_model_client-0.1.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tamar_model_client-0.1.15.dist-info/top_level.txt,sha256=_LfDhPv_fvON0PoZgQuo4M7EjoWtxPRoQOBJziJmip8,19
-tamar_model_client-0.1.15.dist-info/RECORD,,
+tamar_model_client-0.1.17.dist-info/METADATA,sha256=eP0oGK9qWIJXNu0YX2Q4LjERRPTWI0Hn8JgOJCJWW1w,16562
+tamar_model_client-0.1.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tamar_model_client-0.1.17.dist-info/top_level.txt,sha256=_LfDhPv_fvON0PoZgQuo4M7EjoWtxPRoQOBJziJmip8,19
+tamar_model_client-0.1.17.dist-info/RECORD,,