tamar-model-client 0.1.1__py3-none-any.whl → 0.1.3__py3-none-any.whl

{tamar_model_client-0.1.1.dist-info → tamar_model_client-0.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tamar-model-client
-Version: 0.1.1
+Version: 0.1.3
 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
@@ -31,9 +31,9 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# Model Manager Client
+# Tamar Model Client
 
-**Model Manager Client** 是一款高性能的 Python SDK，用于连接 Model Manager gRPC 服务，统一调用多家第三方 AI
+**Tamar Model Client** 是一款高性能的 Python SDK，用于连接 Model Manager gRPC 服务，统一调用多家第三方 AI
 模型服务商（如OpenAI、Google、Azure OpenAI）。
 
 ## ✨ 特性亮点
@@ -58,7 +58,7 @@ pip install tamar-model-client
 ## 🏗️ 项目结构概览
 
 ```
-model_manager_client/
+tamar_model_client/
 ├── generated/                      # gRPC 生成的代码
 │   ├── model_service.proto         # 协议定义文件
 │   ├── model_service_pb2.py        # 生成的 protobuf 代码
@@ -82,16 +82,16 @@ model_manager_client/
 ### 客户端初始化
 
 ```python
-from model_manager_client import ModelManagerClient, AsyncModelManagerClient
+from tamar_model_client import TamarModelClient, AsyncTamarModelClient
 
 # 同步客户端
-client = ModelManagerClient(
+client = TamarModelClient(
     server_address="localhost:50051",
     jwt_token="your-jwt-token"
 )
 
 # 异步客户端
-async_client = AsyncModelManagerClient(
+async_client = AsyncTamarModelClient(
     server_address="localhost:50051",
     jwt_secret_key="your-jwt-secret-key"  # 使用固定密钥自动生成 JWT
 )
@@ -105,12 +105,12 @@ async_client = AsyncModelManagerClient(
 #### OpenAI 调用示例
 
 ```python
-from model_manager_client import ModelManagerClient
-from model_manager_client.schemas import ModelRequest, UserContext
-from model_manager_client.enums import ProviderType, InvokeType, Channel
+from tamar_model_client import TamarModelClient
+from tamar_model_client.schemas import ModelRequest, UserContext
+from tamar_model_client.enums import ProviderType, InvokeType, Channel
 
 # 创建同步客户端
-client = ModelManagerClient()
+client = TamarModelClient()
 
 # OpenAI 调用示例
 request_data = ModelRequest(
@@ -144,12 +144,12 @@ else:
 #### Google 调用示例 （AI Studio / Vertex AI）
 
 ```python
-from model_manager_client import ModelManagerClient
-from model_manager_client.schemas import ModelRequest, UserContext
-from model_manager_client.enums import ProviderType, InvokeType, Channel
+from tamar_model_client import TamarModelClient
+from tamar_model_client.schemas import ModelRequest, UserContext
+from tamar_model_client.enums import ProviderType, InvokeType, Channel
 
 # 创建同步客户端
-client = ModelManagerClient()
+client = TamarModelClient()
 
 # Google AI Studio 调用示例
 request_data = ModelRequest(
@@ -207,12 +207,12 @@ else:
 #### Azure OpenAI 调用示例
 
 ```python
-from model_manager_client import ModelManagerClient
-from model_manager_client.schemas import ModelRequest, UserContext
-from model_manager_client.enums import ProviderType, InvokeType, Channel
+from tamar_model_client import TamarModelClient
+from tamar_model_client.schemas import ModelRequest, UserContext
+from tamar_model_client.enums import ProviderType, InvokeType, Channel
 
 # 创建同步客户端
-client = ModelManagerClient()
+client = TamarModelClient()
 
 # Azure OpenAI 调用示例
 request_data = ModelRequest(
@@ -247,14 +247,14 @@ else:
 
 ```python
 import asyncio
-from model_manager_client import AsyncModelManagerClient
-from model_manager_client.schemas import ModelRequest, UserContext
-from model_manager_client.enums import ProviderType, InvokeType, Channel
+from tamar_model_client import AsyncTamarModelClient
+from tamar_model_client.schemas import ModelRequest, UserContext
+from tamar_model_client.enums import ProviderType, InvokeType, Channel
 
 
 async def main():
     # 创建异步客户端
-    client = AsyncModelManagerClient()
+    client = AsyncTamarModelClient()
 
     # 组装请求参数
     request_data = ModelRequest(
@@ -293,14 +293,14 @@ asyncio.run(main())
 
 ```python
 import asyncio
-from model_manager_client import AsyncModelManagerClient
-from model_manager_client.schemas import ModelRequest, UserContext
-from model_manager_client.enums import ProviderType, InvokeType, Channel
+from tamar_model_client import AsyncTamarModelClient
+from tamar_model_client.schemas import ModelRequest, UserContext
+from tamar_model_client.enums import ProviderType, InvokeType, Channel
 
 
 async def stream_example():
     # 创建异步客户端
-    client = AsyncModelManagerClient()
+    client = AsyncTamarModelClient()
 
     # 组装请求参数
     request_data = ModelRequest(
@@ -340,17 +340,17 @@ asyncio.run(stream_example())
 
 ```python
 import asyncio
-from model_manager_client import AsyncModelManagerClient
-from model_manager_client.schemas import (
+from tamar_model_client import AsyncTamarModelClient
+from tamar_model_client.schemas import (
     BatchModelRequest, BatchModelRequestItem,
     UserContext
 )
-from model_manager_client.enums import ProviderType, InvokeType, Channel
+from tamar_model_client.enums import ProviderType, InvokeType, Channel
 
 
 async def batch_example():
     # 创建异步客户端
-    client = AsyncModelManagerClient()
+    client = AsyncTamarModelClient()
 
     # 组装批量请求参数
     batch_request = BatchModelRequest(
@@ -404,77 +404,48 @@ asyncio.run(batch_example())
 
 ### 文件输入示例
 
-支持处理图像等文件输入（需使用支持多模态的模型，如 gpt-4-vision-preview）：
+支持处理图像等文件输入（需使用支持多模态的模型，如 gemini-2.0-flash）：
 
 ```python
-import asyncio
-from model_manager_client import AsyncModelManagerClient
-from model_manager_client.schemas import ModelRequest, UserContext
-from model_manager_client.enums import ProviderType, InvokeType, Channel
-
-
-async def file_input_example():
-    # 创建异步客户端
-    client = AsyncModelManagerClient()
-
-    # 组装请求参数（包含文件输入）
-    request_data = ModelRequest(
-        provider=ProviderType.OPENAI,
-        channel=Channel.OPENAI,
-        invoke_type=InvokeType.CHAT_COMPLETIONS,
-        model="gpt-4-vision-preview",  # 使用支持图像的模型
-        messages=[
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "image_url",
-                        "image_url": {
-                            "url": "https://example.com/image.jpg"
-                        }
-                    },
-                    {
-                        "type": "text",
-                        "text": "请描述这张图片。"
-                    }
-                ]
-            }
-        ],
-        user_context=UserContext(
-            user_id="test_user",
-            org_id="test_org",
-            client_type="python-sdk"
+from tamar_model_client import TamarModelClient
+from tamar_model_client.schemas import ModelRequest, UserContext
+from tamar_model_client.enums import ProviderType
+from google.genai.types import Part
+model_request = ModelRequest(
+    provider=ProviderType.GOOGLE,  # 选择 Google作为提供商
+    model="gemini-2.0-flash",
+    contents=[
+        "What is shown in this image?",
+        Part.from_uri( # 这个是Google那边的参数支持
+            file_uri="https://images.pexels.com/photos/248797/pexels-photo-248797.jpeg",
+            mime_type="image/jpeg",
         ),
-        stream=False
-    )
-
-    # 发送请求并获取响应
-    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}")
-
-
-# 运行文件输入示例
-asyncio.run(file_input_example())
+    ],
+    user_context=UserContext(
+        org_id="testllm",
+        user_id="testllm",
+        client_type="conversation-service"
+    ),
+)
+client = TamarModelClient("localhost:50051")
+response = client.invoke(
+    model_request=model_request
+)
 ```
 
 ### ⚠️ 注意事项
 
-以下是使用 Model Manager Client 时的重要提示：
+以下是使用 Tamar Model Client 时的重要提示：
 
 - **参数处理**
-  - 公共参数包括：**服务商 (provider)**、**渠道 (channel)** 和 **调用方法 (invoke_type)**
+  - 公共参数包括：**服务商 (provider)**、**渠道 (channel)** 、 **调用方法 (invoke_type)** 以及 **用户信息（user_context）**
   - 其中 **channel** 和 **invoke_type** 为可选参数，**建议默认使用系统自动推断**，除非有特殊需求再显式指定
   - 是否流式输出由公共参数 **stream** 控制，其他参数遵循对应服务商官方 SDK 的标准定义
 - **客户端连接管理**
   - gRPC 使用 HTTP/2 长连接，**建议将客户端实例作为单例使用**
-  - 若需创建多个实例，**请务必调用** `client.close()` **方法手动关闭连接**，以防止连接堆积或资源泄露。
+  - 若需创建多个实例，**请务必调用** `client.close()` **方法手动关闭连接**，以防止连接堆积或资源泄露
 - **异常处理**：
-  - 所有接口均提供详细的**错误信息** 以及 **请求ID（request_id）**，业务调用时建议纳入对应日志便于后期排错。
+  - 所有接口均提供详细的**错误信息** 以及 **请求ID（request_id）**，业务调用时建议纳入对应日志便于后期排错
 
 ## ⚙️ 环境变量配置（推荐）
 
@@ -528,9 +499,9 @@ MODEL_MANAGER_SERVER_GRPC_RETRY_DELAY=1.0
 加载后，初始化时无需传参：
 
 ```python
-from model_manager_client import ModelManagerClient
+from tamar_model_client import TamarModelClient
 
-client = ModelManagerClient()  # 将使用环境变量中的配置
+client = TamarModelClient()  # 将使用环境变量中的配置
 ```
 
 ## 开发

tamar_model_client-0.1.3.dist-info/RECORD

@@ -0,0 +1,34 @@
+model_manager_client/__init__.py,sha256=LsqGh8ARtH9PQijbUjjrvHHmG09YwY4jmejAtlqV9ng,336
+model_manager_client/async_client.py,sha256=4vl4wLMucTqJ8moAZb0bonKYC6gFKwASZFQJIbCiBM4,20599
+model_manager_client/auth.py,sha256=gbwW5Aakeb49PMbmYvrYlVx1mfyn1LEDJ4qQVs-9DA4,438
+model_manager_client/exceptions.py,sha256=jYU494OU_NeIa4X393V-Y73mTNm0JZ9yZApnlOM9CJQ,332
+model_manager_client/sync_client.py,sha256=rLap64kk4rvAGJQsB7OXH565PW35xlMiSXh0iQTnJiM,4024
+model_manager_client/enums/__init__.py,sha256=3cYYn8ztNGBa_pI_5JGRVYf2QX8fkBVWdjID1PLvoBQ,182
+model_manager_client/enums/channel.py,sha256=wCzX579nNpTtwzGeS6S3Ls0UzVAgsOlfy4fXMzQTCAw,199
+model_manager_client/enums/invoke.py,sha256=9C5BxyAd4En-PSscOMynhfDa5WavGaSSOVFSYQGerK4,215
+model_manager_client/enums/providers.py,sha256=L_bX75K6KnWURoFizoitZ1Ybza7bmYDqXecNzNpgIrI,165
+model_manager_client/generated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+model_manager_client/generated/model_service_pb2.py,sha256=ST84YYQk8x6UtQKIx6HprUxH5uGU4i3LhC8b-lHUQtA,3066
+model_manager_client/generated/model_service_pb2_grpc.py,sha256=BzsINWQeACVnVzLVV0PgieZA25C2-EklMKlA-W50c6Y,5147
+model_manager_client/schemas/__init__.py,sha256=AxuI-TcvA4OMTj2FtK4wAItvz9LrK_293pu3cmMLE7k,394
+model_manager_client/schemas/inputs.py,sha256=gXaifquIhSgUdbteRXsW9jxiJn0aOGDJ4UGCsrYdhPI,14323
+model_manager_client/schemas/outputs.py,sha256=M_fcqUtXPJnfiLabHlyA8BorlC5pYkf5KLjXO1ysKIQ,1031
+tamar_model_client/__init__.py,sha256=LMECAuDARWHV1XzH3msoDXcyurS2eihRQmBy26_PUE0,328
+tamar_model_client/async_client.py,sha256=R_3u3z55QB-FFsPuP2FHNFW35ZqRnMD756H4Pm4nj7Q,17875
+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=o8b20fQUvtMq1gWax3_dfOpputYT4l9pRTz6cHdB0lg,4006
+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=9C5BxyAd4En-PSscOMynhfDa5WavGaSSOVFSYQGerK4,215
+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=ST84YYQk8x6UtQKIx6HprUxH5uGU4i3LhC8b-lHUQtA,3066
+tamar_model_client/generated/model_service_pb2_grpc.py,sha256=KW1UEGUim_kmSi_fCIjeLNVOp8nAPE08DgJOn6PY7PM,5145
+tamar_model_client/schemas/__init__.py,sha256=AxuI-TcvA4OMTj2FtK4wAItvz9LrK_293pu3cmMLE7k,394
+tamar_model_client/schemas/inputs.py,sha256=tXkBy19gm-ms8YE8GKn374uYY85hT7iT3BgivJGOJ4A,14319
+tamar_model_client/schemas/outputs.py,sha256=M_fcqUtXPJnfiLabHlyA8BorlC5pYkf5KLjXO1ysKIQ,1031
+tamar_model_client-0.1.3.dist-info/METADATA,sha256=uYyMheN2rY9gnsqBHinS-sKJ2TfQdTyNMhVWImJZfV4,16608
+tamar_model_client-0.1.3.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+tamar_model_client-0.1.3.dist-info/top_level.txt,sha256=_LfDhPv_fvON0PoZgQuo4M7EjoWtxPRoQOBJziJmip8,19
+tamar_model_client-0.1.3.dist-info/RECORD,,

tamar_model_client-0.1.3.dist-info/top_level.txt

@@ -0,0 +1 @@
+tamar_model_client

tamar_model_client-0.1.1.dist-info/RECORD

@@ -1,19 +0,0 @@
-model_manager_client/__init__.py,sha256=LsqGh8ARtH9PQijbUjjrvHHmG09YwY4jmejAtlqV9ng,336
-model_manager_client/async_client.py,sha256=4vl4wLMucTqJ8moAZb0bonKYC6gFKwASZFQJIbCiBM4,20599
-model_manager_client/auth.py,sha256=gbwW5Aakeb49PMbmYvrYlVx1mfyn1LEDJ4qQVs-9DA4,438
-model_manager_client/exceptions.py,sha256=jYU494OU_NeIa4X393V-Y73mTNm0JZ9yZApnlOM9CJQ,332
-model_manager_client/sync_client.py,sha256=rLap64kk4rvAGJQsB7OXH565PW35xlMiSXh0iQTnJiM,4024
-model_manager_client/enums/__init__.py,sha256=3cYYn8ztNGBa_pI_5JGRVYf2QX8fkBVWdjID1PLvoBQ,182
-model_manager_client/enums/channel.py,sha256=wCzX579nNpTtwzGeS6S3Ls0UzVAgsOlfy4fXMzQTCAw,199
-model_manager_client/enums/invoke.py,sha256=9C5BxyAd4En-PSscOMynhfDa5WavGaSSOVFSYQGerK4,215
-model_manager_client/enums/providers.py,sha256=L_bX75K6KnWURoFizoitZ1Ybza7bmYDqXecNzNpgIrI,165
-model_manager_client/generated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-model_manager_client/generated/model_service_pb2.py,sha256=ST84YYQk8x6UtQKIx6HprUxH5uGU4i3LhC8b-lHUQtA,3066
-model_manager_client/generated/model_service_pb2_grpc.py,sha256=BzsINWQeACVnVzLVV0PgieZA25C2-EklMKlA-W50c6Y,5147
-model_manager_client/schemas/__init__.py,sha256=AxuI-TcvA4OMTj2FtK4wAItvz9LrK_293pu3cmMLE7k,394
-model_manager_client/schemas/inputs.py,sha256=gXaifquIhSgUdbteRXsW9jxiJn0aOGDJ4UGCsrYdhPI,14323
-model_manager_client/schemas/outputs.py,sha256=M_fcqUtXPJnfiLabHlyA8BorlC5pYkf5KLjXO1ysKIQ,1031
-tamar_model_client-0.1.1.dist-info/METADATA,sha256=bkSruaqyuAMeaIGbD_cW6ZdouzhFfOLc2r_rWhUVxGE,17477
-tamar_model_client-0.1.1.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-tamar_model_client-0.1.1.dist-info/top_level.txt,sha256=hW4Pn-RDdPWK5vISAYwnTVzlWLTmnDZdvo4-ul82xVA,21
-tamar_model_client-0.1.1.dist-info/RECORD,,

tamar_model_client-0.1.1.dist-info/top_level.txt

@@ -1 +0,0 @@
-model_manager_client