tamar-model-client 0.2.5__py3-none-any.whl → 0.2.6__py3-none-any.whl

tamar_model_client/schemas/__init__.py

@@ -2,11 +2,12 @@
 Schema definitions for the API
 """
 
-from .inputs import UserContext, ModelRequest, BatchModelRequestItem, BatchModelRequest
+from .inputs import UserContext, ModelRequest, BatchModelRequestItem, BatchModelRequest, TamarFileIdInput
 from .outputs import ModelResponse, BatchModelResponse
 
 __all__ = [
     # Model Inputs
+    "TamarFileIdInput",
     "UserContext",
     "ModelRequest",
     "BatchModelRequestItem",

tamar_model_client/schemas/inputs.py

@@ -26,6 +26,10 @@ class UserContext(BaseModel):
     client_type: str  # 客户端类型，这里记录的是哪个服务请求过来的
 
 
+class TamarFileIdInput(BaseModel):
+    file_id: str
+
+
 class GoogleGenAiInput(BaseModel):
     model: str
     contents: Union[types.ContentListUnion, types.ContentListUnionDict]
@@ -179,11 +183,11 @@ class OpenAIImagesInput(BaseModel):
 
 
 class OpenAIImagesEditInput(BaseModel):
-    image: Union[FileTypes, List[FileTypes]]
+    image: Union[FileTypes, List[FileTypes], TamarFileIdInput, List[TamarFileIdInput]]
     prompt: str
     background: Optional[Literal["transparent", "opaque", "auto"]] | NotGiven = NOT_GIVEN
     input_fidelity: Optional[Literal["high", "low"]] | NotGiven = NOT_GIVEN
-    mask: FileTypes | NotGiven = NOT_GIVEN
+    mask: FileTypes | TamarFileIdInput | NotGiven = NOT_GIVEN
     model: Union[str, ImageModel, None] | NotGiven = NOT_GIVEN
     n: Optional[int] | NotGiven = NOT_GIVEN
     output_compression: Optional[int] | NotGiven = NOT_GIVEN
@@ -277,7 +281,7 @@ class ModelRequestInput(BaseRequest):
     config: Optional[Union[types.GenerateContentConfigOrDict, types.GenerateImagesConfigOrDict]] = None
 
     # Images（OpenAI Images / Images Edit / Google Vertex Images 合并）
-    image: Optional[Union[FileTypes, List[FileTypes]]] = None
+    image: Optional[Union[FileTypes, List[FileTypes], TamarFileIdInput, List[TamarFileIdInput]]] = None
     # background 同名字段合并：Responses 的 bool（后台任务）+ Images 的透明度枚举
     background: Optional[Union[bool, Literal["transparent", "opaque", "auto"], NotGiven]] = NOT_GIVEN
     moderation: Optional[Union[Literal["low", "auto"], NotGiven]] = NOT_GIVEN
@@ -285,7 +289,7 @@ class ModelRequestInput(BaseRequest):
     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
+    mask: Union[FileTypes, TamarFileIdInput, 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

{tamar_model_client-0.2.5.dist-info → tamar_model_client-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamar-model-client
-Version: 0.2.5
+Version: 0.2.6
 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
@@ -16,8 +16,8 @@ Requires-Dist: grpcio-tools~=1.67.1
 Requires-Dist: pydantic
 Requires-Dist: PyJWT
 Requires-Dist: nest_asyncio
-Requires-Dist: openai
-Requires-Dist: google-genai
+Requires-Dist: openai>=1.99.3
+Requires-Dist: google-genai>=1.29.0
 Requires-Dist: requests>=2.25.0
 Requires-Dist: aiohttp>=3.7.0
 Dynamic: author

{tamar_model_client-0.2.5.dist-info → tamar_model_client-0.2.6.dist-info}/RECORD

@@ -23,8 +23,8 @@ tamar_model_client/enums/providers.py,sha256=L_bX75K6KnWURoFizoitZ1Ybza7bmYDqXec
 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=5ZjuWhlIY_geFGL6cnqk2v1ZQ7algyRD2jJ6NiShVt4,17324
+tamar_model_client/schemas/__init__.py,sha256=j5XaUGc5Wy669IRNCey56sryCK8QrYbSTl8DSbCqc94,437
+tamar_model_client/schemas/inputs.py,sha256=Hyl3f-oGT3ooUSs4yn7rHWLJHlltXsQwLSwnlNJx1sE,17503
 tamar_model_client/schemas/outputs.py,sha256=M_fcqUtXPJnfiLabHlyA8BorlC5pYkf5KLjXO1ysKIQ,1031
 tests/__init__.py,sha256=kbmImddLDwdqlkkmkyKtl4bQy_ipe-R8eskpaBylU9w,38
 tests/stream_hanging_analysis.py,sha256=W3W48IhQbNAR6-xvMpoWZvnWOnr56CTaH4-aORNBuD4,14807
@@ -32,7 +32,7 @@ tests/test_circuit_breaker.py,sha256=nhEBnyXFjIYjRWlUdu7Z9PnPq48ypbBK6fxN6deHedw
 tests/test_google_azure_final.py,sha256=YnTl5_e-C_lay2e0_0z35rpIxRkLs1tTsvcQ3Qww_RU,67077
 tests/test_logging_issue.py,sha256=JTMbotfHpAEPMBj73pOwxPn-Zn4QVQJX6scMz48FRDQ,2427
 tests/test_simple.py,sha256=Xf0U-J9_xn_LzUsmYu06suK0_7DrPeko8OHoHldsNxE,7169
-tamar_model_client-0.2.5.dist-info/METADATA,sha256=d_AzgzHtqfzXlVVHLZU88m3LigTm1oE0Jc_8NIYPggQ,44621
-tamar_model_client-0.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tamar_model_client-0.2.5.dist-info/top_level.txt,sha256=f1I-S8iWN-cgv4gB8gxRg9jJOTJMumvm4oGKVPfGg6A,25
-tamar_model_client-0.2.5.dist-info/RECORD,,
+tamar_model_client-0.2.6.dist-info/METADATA,sha256=kn5Ehyvj1YG3TDoY5YsJvIDhn3hksTgHUycDdRRJojU,44637
+tamar_model_client-0.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tamar_model_client-0.2.6.dist-info/top_level.txt,sha256=f1I-S8iWN-cgv4gB8gxRg9jJOTJMumvm4oGKVPfGg6A,25
+tamar_model_client-0.2.6.dist-info/RECORD,,