GPTRouter 0.2.10__tar.gz → 0.3.1__tar.gz

{GPTRouter-0.2.10 → GPTRouter-0.3.1}/GPTRouter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GPTRouter
-Version: 0.2.10
+Version: 0.3.1
 Summary: A Python package for working with GPTRouter APIs
 Author-email: sirjanpreet@writesonic.com
 Classifier: Development Status :: 3 - Alpha

{GPTRouter-0.2.10 → GPTRouter-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GPTRouter
-Version: 0.2.10
+Version: 0.3.1
 Summary: A Python package for working with GPTRouter APIs
 Author-email: sirjanpreet@writesonic.com
 Classifier: Development Status :: 3 - Alpha

{GPTRouter-0.2.10 → GPTRouter-0.3.1}/gpt_router/client.py

@@ -6,6 +6,7 @@ import httpx
 from typing import Generator, List, Optional, Union
 
 from gpt_router.models import (
+    GPTRouterMetadata,
     ImageGenerationRequest,
     ImageGenerationResponse,
     ModelGenerationRequest,
@@ -41,17 +42,41 @@ class GPTRouterClient:
     models = None
     request_timeout = DEFAULT_REQUEST_TIMEOUT
 
-    def __init__(self, base_url, api_key, request_timeout: int = 60):
+    def __init__(self, base_url, api_key, request_timeout: int = 60, additional_metadata: Optional[GPTRouterMetadata] = None):
         self.base_url = base_url
         self.api_key = api_key
         self.request_timeout = request_timeout
+        self.additional_metadata = additional_metadata
+
+    def add_metadata_info(
+        self,
+        payload: dict,
+        model_router_metadata: Optional[GPTRouterMetadata] = None,
+    ):
+        metadata = {}
+        if self.additional_metadata:
+            metadata.update(self.additional_metadata.dict())
+        if model_router_metadata:
+            metadata.update(model_router_metadata.dict())
+
+        payload.update(
+            {
+                "metadata": metadata,
+                "tag": metadata.get('tag'),
+                "createdByUserId": metadata['created_by_user_id'],
+                "historyId": str(metadata['history_id']) if metadata.get('history_id') else None,
+            }
+        )
+
+        payload = {k: v for k, v in payload.items() if v is not None}
+        return payload
 
     async def _async_api_call(self, *, path: str, method: str, payload: dict):
         try:
             async with httpx.AsyncClient() as client:
                 response = await client.request(
                     method,
-                    url=self.base_url + "/api" + path,
+                    url=self.base_url.rstrip('/') + ('/api' if not self.base_url.endswith('/api') else '') + path,
                     headers={
                         "content-type": "application/json",
                         "ws-secret": self.api_key,
@@ -77,7 +102,7 @@ class GPTRouterClient:
             with httpx.Client() as client:
                 response = client.request(
                     method,
-                    url=self.base_url + "/api" + path,
+                    url=self.base_url.rstrip('/') + ('/api' if not self.base_url.endswith('/api') else '') + path,
                     headers={
                         "content-type": "application/json",
                         "ws-secret": self.api_key,
@@ -103,7 +128,7 @@ class GPTRouterClient:
             async with httpx.AsyncClient() as client:
                 async with client.stream(
                     method,
-                    url=f"{self.base_url}/api{path}",
+                    url=self.base_url.rstrip('/') + ('/api' if not self.base_url.endswith('/api') else '') + path,
                     data=json.dumps(payload),
                     headers={
                         "Content-type": "application/json",
@@ -142,7 +167,7 @@ class GPTRouterClient:
             with httpx.Client() as client:
                 with client.stream(
                     method=method,
-                    url=f"{self.base_url}/api{path}",
+                    url=self.base_url.rstrip('/') + ('/api' if not self.base_url.endswith('/api') else '') + path,
                     data=json.dumps(payload),
                     headers={
                         "Content-type": "application/json",
@@ -178,10 +203,8 @@ class GPTRouterClient:
         *,
         ordered_generation_requests: List[ModelGenerationRequest],
         is_stream=False,
-        tag: Optional[str] = None,
-        user_id: Optional[str] = None,
-        history_id: Optional[str] = None,
-        metadata: Optional[dict] = None,
+        model_router_metadata: Optional[GPTRouterMetadata] = None,
+        **kwargs,
     ) -> Union[GenerationResponse, Generator[ChunkedGenerationResponse]]:
         api_path = "/v1/generate"
         api_method = "POST"
@@ -191,11 +214,8 @@ class GPTRouterClient:
                 request.dict(exclude_none=True, by_alias=True)
                 for request in ordered_generation_requests
             ],
-            "tag": tag,
-            "createdByUserId": user_id,
-            "historyId": history_id,
-            "metadata": metadata,
         }
+        api_payload = self.add_metadata_info(api_payload, model_router_metadata)
         if is_stream:
             return self.stream_events(
                 path=api_path,
@@ -214,10 +234,8 @@ class GPTRouterClient:
         *,
         ordered_generation_requests: List[ModelGenerationRequest],
         is_stream=False,
-        tag: Optional[str] = None,
-        user_id: Optional[str] = None,
-        history_id: Optional[str] = None,
-        metadata: Optional[dict] = None,
+        model_router_metadata: Optional[GPTRouterMetadata] = None,
+        **kwargs,
     ) -> GenerationResponse:
         api_path = "/v1/generate"
         api_method = "POST"
@@ -227,11 +245,8 @@ class GPTRouterClient:
                 request.dict(exclude_none=True, by_alias=True)
                 for request in ordered_generation_requests
             ],
-            "tag": tag,
-            "createdByUserId": user_id,
-            "historyId": history_id,
-            "metadata": metadata,
         }
+        api_payload = self.add_metadata_info(api_payload, model_router_metadata)
         if is_stream:
             return self.astream_events(
                 path=api_path,

{GPTRouter-0.2.10 → GPTRouter-0.3.1}/gpt_router/models.py

@@ -1,3 +1,4 @@
+from uuid import UUID
 from pydantic import BaseModel, Field
 
 from typing import List, Optional, Dict, Any
@@ -8,6 +9,11 @@ def to_camel(string):
     return camelize(string)
 
 
+class GPTRouterMetadata(BaseModel):
+    tag: Optional[str] = None
+    history_id: Optional[str] = None
+    created_by_user_id: Optional[str] = None
+
 class GenerationParams(BaseModel):
     messages: Optional[List[Any]] = None
     max_tokens: Optional[int] = None
@@ -22,6 +28,11 @@ class GenerationParams(BaseModel):
     function_call: Optional[dict] = None
     tools: Optional[List[Any]] = None
     response_format: Optional[Dict[str, Any]] = None
+    parallel_tool_calls: Optional[bool] = False
+    tag: Optional[str] = None
+    user_id: Optional[str] = None
+    history_id: Optional[str] = None
+    metadata: Optional[dict] = None
 
 
 class ModelGenerationRequest(BaseModel):

{GPTRouter-0.2.10 → GPTRouter-0.3.1}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name="GPTRouter",
-    version="0.2.10",
+    version="0.3.1",
     description="A Python package for working with GPTRouter APIs",
     long_description=long_description,
     long_description_content_type="text/markdown",