tamar-model-client 0.2.3__tar.gz → 0.2.4__tar.gz

{tamar_model_client-0.2.3 → tamar_model_client-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamar-model-client
-Version: 0.2.3
+Version: 0.2.4
 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

{tamar_model_client-0.2.3 → tamar_model_client-0.2.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="tamar-model-client",
-    version="0.2.3",
+    version="0.2.4",
     description="A Python SDK for interacting with the Model Manager gRPC service",
     author="Oscar Ou",
     author_email="oscar.ou@tamaredge.ai",

{tamar_model_client-0.2.3 → tamar_model_client-0.2.4}/tamar_model_client/schemas/inputs.py

@@ -11,8 +11,9 @@ from openai.types.chat import ChatCompletionMessageParam, ChatCompletionAudioPar
     ChatCompletionToolParam
 from openai.types.responses import ResponseInputParam, ResponseIncludable, ResponseTextConfigParam, \
     response_create_params, ToolParam
+from openai.types.responses.response_prompt_param import ResponsePromptParam
 from pydantic import BaseModel, model_validator, field_validator
-from typing import List, Optional, Union, Iterable, Dict, Literal, IO
+from typing import List, Optional, Union, Iterable, Dict, Literal
 
 from tamar_model_client.enums import ProviderType, InvokeType
 from tamar_model_client.enums.channel import Channel
@@ -59,24 +60,33 @@ class GoogleVertexAIImagesInput(BaseModel):
 
 
 class OpenAIResponsesInput(BaseModel):
-    input: Union[str, ResponseInputParam]
-    model: ResponsesModel
+    background: Optional[bool] | NotGiven = NOT_GIVEN
     include: Optional[List[ResponseIncludable]] | NotGiven = NOT_GIVEN
+    input: Union[str, ResponseInputParam] | NotGiven = NOT_GIVEN
     instructions: Optional[str] | NotGiven = NOT_GIVEN
     max_output_tokens: Optional[int] | NotGiven = NOT_GIVEN
+    max_tool_calls: Optional[int] | NotGiven = NOT_GIVEN
     metadata: Optional[Metadata] | NotGiven = NOT_GIVEN
+    model: ResponsesModel | NotGiven = NOT_GIVEN
     parallel_tool_calls: Optional[bool] | NotGiven = NOT_GIVEN
     previous_response_id: Optional[str] | NotGiven = NOT_GIVEN
+    prompt: Optional[ResponsePromptParam] | NotGiven = NOT_GIVEN
+    prompt_cache_key: str | NotGiven = NOT_GIVEN
     reasoning: Optional[Reasoning] | NotGiven = NOT_GIVEN
+    safety_identifier: str | NotGiven = NOT_GIVEN
+    service_tier: Optional[Literal["auto", "default", "flex", "scale", "priority"]] | NotGiven = NOT_GIVEN
     store: Optional[bool] | NotGiven = NOT_GIVEN
     stream: Optional[Literal[False]] | Literal[True] | NotGiven = NOT_GIVEN
+    stream_options: Optional[response_create_params.StreamOptions] | NotGiven = NOT_GIVEN
     temperature: Optional[float] | NotGiven = NOT_GIVEN
     text: ResponseTextConfigParam | NotGiven = NOT_GIVEN
     tool_choice: response_create_params.ToolChoice | NotGiven = NOT_GIVEN
     tools: Iterable[ToolParam] | NotGiven = NOT_GIVEN
+    top_logprobs: Optional[int] | NotGiven = NOT_GIVEN
     top_p: Optional[float] | NotGiven = NOT_GIVEN
     truncation: Optional[Literal["auto", "disabled"]] | NotGiven = NOT_GIVEN
     user: str | NotGiven = NOT_GIVEN
+    verbosity: Optional[Literal["low", "medium", "high"]] | NotGiven = NOT_GIVEN
     extra_headers: Headers | None = None
     extra_query: Query | None = None
     extra_body: Body | None = None
@@ -104,10 +114,12 @@ class OpenAIChatCompletionsInput(BaseModel):
     parallel_tool_calls: bool | NotGiven = NOT_GIVEN
     prediction: Optional[ChatCompletionPredictionContentParam] | NotGiven = NOT_GIVEN
     presence_penalty: Optional[float] | NotGiven = NOT_GIVEN
+    prompt_cache_key: str | NotGiven = NOT_GIVEN
     reasoning_effort: Optional[ReasoningEffort] | NotGiven = NOT_GIVEN
     response_format: completion_create_params.ResponseFormat | NotGiven = NOT_GIVEN
+    safety_identifier: str | NotGiven = NOT_GIVEN
     seed: Optional[int] | NotGiven = NOT_GIVEN
-    service_tier: Optional[Literal["auto", "default"]] | NotGiven = NOT_GIVEN
+    service_tier: Optional[Literal["auto", "default", "flex", "scale", "priority"]] | NotGiven = NOT_GIVEN
     stop: Union[Optional[str], List[str], None] | NotGiven = NOT_GIVEN
     store: Optional[bool] | NotGiven = NOT_GIVEN
     stream: Optional[Literal[False]] | Literal[True] | NotGiven = NOT_GIVEN
@@ -118,6 +130,7 @@ class OpenAIChatCompletionsInput(BaseModel):
     top_logprobs: Optional[int] | NotGiven = NOT_GIVEN
     top_p: Optional[float] | NotGiven = NOT_GIVEN
     user: str | NotGiven = NOT_GIVEN
+    verbosity: Optional[Literal["low", "medium", "high"]] | NotGiven = NOT_GIVEN
     web_search_options: completion_create_params.WebSearchOptions | NotGiven = NOT_GIVEN
     extra_headers: Headers | None = None
     extra_query: Query | None = None
@@ -166,7 +179,7 @@ class OpenAIImagesEditInput(BaseModel):
     output_compression: Optional[int] | NotGiven = NOT_GIVEN
     output_format: Optional[Literal["png", "jpeg", "webp"]] | NotGiven = NOT_GIVEN
     partial_images: Optional[int] | NotGiven = NOT_GIVEN
-    quality: Optional[Literal["standard", "hd", "low", "medium", "high", "auto"]] | 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
     stream: Optional[Literal[False]] | Literal[True] | NotGiven = NOT_GIVEN
@@ -191,33 +204,44 @@ class ModelRequestInput(BaseRequest):
     # 合并 model 字段
     model: Optional[Union[str, ResponsesModel, ChatModel, ImageModel]] = None
 
-    # OpenAI Responses Input
+    # OpenAI Responses Input（合并）
     input: Optional[Union[str, ResponseInputParam]] = None
     include: Optional[Union[List[ResponseIncludable], NotGiven]] = NOT_GIVEN
     instructions: Optional[Union[str, NotGiven]] = NOT_GIVEN
     max_output_tokens: Optional[Union[int, NotGiven]] = NOT_GIVEN
+    max_tool_calls: Optional[Union[int, NotGiven]] = NOT_GIVEN
     metadata: Optional[Union[Metadata, NotGiven]] = NOT_GIVEN
     parallel_tool_calls: Optional[Union[bool, NotGiven]] = NOT_GIVEN
     previous_response_id: Optional[Union[str, NotGiven]] = NOT_GIVEN
+    # prompt 同名字段合并：Responses 的 ResponsePromptParam + 图片生成的 str
+    prompt: Optional[Union[str, ResponsePromptParam, NotGiven]] = NOT_GIVEN
+    prompt_cache_key: Optional[Union[str, NotGiven]] = NOT_GIVEN
     reasoning: Optional[Union[Reasoning, NotGiven]] = NOT_GIVEN
+    safety_identifier: Optional[Union[str, NotGiven]] = NOT_GIVEN
+    service_tier: Optional[Union[Literal["auto", "default", "flex", "scale", "priority"], NotGiven]] = NOT_GIVEN
     store: Optional[Union[bool, NotGiven]] = NOT_GIVEN
     stream: Optional[Union[Literal[False], Literal[True], NotGiven]] = NOT_GIVEN
+    # 合并两套 stream_options 类型
+    stream_options: Optional[
+        Union[response_create_params.StreamOptions, ChatCompletionStreamOptionsParam, NotGiven]] = NOT_GIVEN
     temperature: Optional[Union[float, NotGiven]] = NOT_GIVEN
     text: Optional[Union[ResponseTextConfigParam, NotGiven]] = NOT_GIVEN
     tool_choice: Optional[
         Union[response_create_params.ToolChoice, ChatCompletionToolChoiceOptionParam, NotGiven]
     ] = NOT_GIVEN
     tools: Optional[Union[Iterable[ToolParam], Iterable[ChatCompletionToolParam], NotGiven]] = NOT_GIVEN
+    top_logprobs: Optional[Union[int, NotGiven]] = NOT_GIVEN
     top_p: Optional[Union[float, NotGiven]] = NOT_GIVEN
     truncation: Optional[Union[Literal["auto", "disabled"], NotGiven]] = NOT_GIVEN
     user: Optional[Union[str, NotGiven]] = NOT_GIVEN
+    verbosity: Optional[Union[Literal["low", "medium", "high"], NotGiven]] = NOT_GIVEN
 
     extra_headers: Optional[Union[Headers, None]] = None
     extra_query: Optional[Union[Query, None]] = None
     extra_body: Optional[Union[Body, None]] = None
     timeout: Optional[Union[float, httpx.Timeout, None, NotGiven]] = NOT_GIVEN
 
-    # OpenAI Chat Completions Input
+    # OpenAI Chat Completions Input（合并）
     messages: Optional[Iterable[ChatCompletionMessageParam]] = None
     audio: Optional[Union[ChatCompletionAudioParam, NotGiven]] = NOT_GIVEN
     frequency_penalty: Optional[Union[float, NotGiven]] = NOT_GIVEN
@@ -226,34 +250,32 @@ class ModelRequestInput(BaseRequest):
     logit_bias: Optional[Union[Dict[str, int], NotGiven]] = NOT_GIVEN
     logprobs: Optional[Union[bool, NotGiven]] = NOT_GIVEN
     max_completion_tokens: Optional[Union[int, NotGiven]] = NOT_GIVEN
+    max_tokens: Optional[Union[int, NotGiven]] = NOT_GIVEN
     modalities: Optional[Union[List[Literal["text", "audio"]], NotGiven]] = NOT_GIVEN
-    n: Optional[Union[int, NotGiven]] = NOT_GIVEN
+    n: Optional[Union[int, NotGiven]] = NOT_GIVEN  # 复用给 Chat 和 Images
     prediction: Optional[Union[ChatCompletionPredictionContentParam, NotGiven]] = NOT_GIVEN
     presence_penalty: Optional[Union[float, NotGiven]] = NOT_GIVEN
     reasoning_effort: Optional[Union[ReasoningEffort, NotGiven]] = NOT_GIVEN
     response_format: Optional[
-        Union[Literal["url", "b64_json"], completion_create_params.ResponseFormat, NotGiven]] = NOT_GIVEN
-    seed: Optional[Union[int, NotGiven]] = NOT_GIVEN
-    service_tier: Optional[Union[Literal["auto", "default"], NotGiven]] = NOT_GIVEN
-    stop: Optional[Union[Optional[str], List[str], None, NotGiven]] = NOT_GIVEN
-    top_logprobs: Optional[Union[int, NotGiven]] = NOT_GIVEN
+        Union[completion_create_params.ResponseFormat, Literal["url", "b64_json"], NotGiven]
+    ] = NOT_GIVEN
+    seed: Optional[Union[int, NotGiven]] = NOT_GIVEN  # Chat/Vertex Images 共用
     web_search_options: Optional[Union[completion_create_params.WebSearchOptions, NotGiven]] = NOT_GIVEN
-    stream_options: Optional[Union[ChatCompletionStreamOptionsParam, NotGiven]] = NOT_GIVEN
 
     # Google GenAI Input
     contents: Optional[Union[types.ContentListUnion, types.ContentListUnionDict]] = None
     config: Optional[types.GenerateContentConfigOrDict] = None
 
-    # OpenAIImagesInput + OpenAIImagesEditInput + GoogleVertexAIImagesInput 合并字段
+    # Images（OpenAI Images / Images Edit / Google Vertex Images 合并）
     image: Optional[Union[FileTypes, List[FileTypes]]] = None
-    prompt: Optional[str] = None
-    background: Optional[Literal["transparent", "opaque", "auto"]] | NotGiven = NOT_GIVEN
-    moderation: Optional[Literal["low", "auto"]] | NotGiven = NOT_GIVEN
-    input_fidelity: Optional[Literal["high", "low"]] | NotGiven = NOT_GIVEN
-    output_compression: Optional[int] | NotGiven = NOT_GIVEN
-    output_format: Optional[Literal["png", "jpeg", "webp"]] | NotGiven = NOT_GIVEN
-    partial_images: Optional[int] | NotGiven = NOT_GIVEN
-    mask: FileTypes | NotGiven = NOT_GIVEN
+    # background 同名字段合并：Responses 的 bool（后台任务）+ Images 的透明度枚举
+    background: Optional[Union[bool, Literal["transparent", "opaque", "auto"], NotGiven]] = NOT_GIVEN
+    moderation: Optional[Union[Literal["low", "auto"], NotGiven]] = NOT_GIVEN
+    input_fidelity: Optional[Union[Literal["high", "low"], NotGiven]] = NOT_GIVEN
+    output_compression: Optional[Union[int, NotGiven]] = NOT_GIVEN
+    output_format: Optional[Union[Literal["png", "jpeg", "webp"], NotGiven]] = NOT_GIVEN
+    partial_images: Optional[Union[int, NotGiven]] = NOT_GIVEN
+    mask: Union[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
@@ -262,10 +284,14 @@ class ModelRequestInput(BaseRequest):
     add_watermark: Optional[bool] = None
     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", "low", "medium", "high", "auto"]] | 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
+    quality: Optional[Union[Literal["standard", "hd", "low", "medium", "high", "auto"], NotGiven]] = NOT_GIVEN
+    size: Optional[
+        Union[
+            Literal["auto", "1024x1024", "1536x1024", "1024x1536", "256x256", "512x512", "1792x1024", "1024x1792"],
+            NotGiven,
+        ]
+    ] = NOT_GIVEN
+    style: Optional[Union[Literal["vivid", "natural"], NotGiven]] = NOT_GIVEN
     number_of_images: Optional[int] = None  # Google 用法
 
     model_config = {

{tamar_model_client-0.2.3 → tamar_model_client-0.2.4}/tamar_model_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamar-model-client
-Version: 0.2.3
+Version: 0.2.4
 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