GPTRouter 1.0.4__tar.gz → 1.0.6__tar.gz

{GPTRouter-1.0.4 → gptrouter-1.0.6}/GPTRouter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: GPTRouter
-Version: 1.0.4
+Version: 1.0.6
 Summary: A Python package for working with GPTRouter APIs
 Author-email: sirjanpreet@writesonic.com
 Classifier: Development Status :: 3 - Alpha
@@ -10,6 +10,16 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: httpx>=0.23.3
+Requires-Dist: pydantic>=2.0
+Requires-Dist: pyhumps>=3.8.0
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # GPTRouter Python Client
 
@@ -37,14 +47,14 @@ messages = [
     {"role": "user", "content": "Write me a short poem"},
 ]
 prompt_params = GenerationParams(messages=messages)
-claude2_request = ModelGenerationRequest(
-    model_name=ModelsEnum.CLAUDE_INSTANT_12,
-    provider_name=ProvidersEnum.ANTHROPIC.value,
+claude_request = ModelGenerationRequest(
+    model_name=ModelsEnum.CLAUDE_4_5_HAIKU.value,
+    provider_name=ProvidersEnum.CHAT_ANTHROPIC.value,
     order=1,
     prompt_params=prompt_params,
 )
 
-response = client.generate(ordered_generation_requests=[claude2_request])
+response = client.generate(ordered_generation_requests=[claude_request])
 print(response.choices[0].text)
 ```
 

{GPTRouter-1.0.4 → gptrouter-1.0.6}/GPTRouter.egg-info/requires.txt

@@ -1,3 +1,3 @@
 httpx>=0.23.3
-pydantic>=1.10.13
+pydantic>=2.0
 pyhumps>=3.8.0

{GPTRouter-1.0.4 → gptrouter-1.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: GPTRouter
-Version: 1.0.4
+Version: 1.0.6
 Summary: A Python package for working with GPTRouter APIs
 Author-email: sirjanpreet@writesonic.com
 Classifier: Development Status :: 3 - Alpha
@@ -10,6 +10,16 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: httpx>=0.23.3
+Requires-Dist: pydantic>=2.0
+Requires-Dist: pyhumps>=3.8.0
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # GPTRouter Python Client
 
@@ -37,14 +47,14 @@ messages = [
     {"role": "user", "content": "Write me a short poem"},
 ]
 prompt_params = GenerationParams(messages=messages)
-claude2_request = ModelGenerationRequest(
-    model_name=ModelsEnum.CLAUDE_INSTANT_12,
-    provider_name=ProvidersEnum.ANTHROPIC.value,
+claude_request = ModelGenerationRequest(
+    model_name=ModelsEnum.CLAUDE_4_5_HAIKU.value,
+    provider_name=ProvidersEnum.CHAT_ANTHROPIC.value,
     order=1,
     prompt_params=prompt_params,
 )
 
-response = client.generate(ordered_generation_requests=[claude2_request])
+response = client.generate(ordered_generation_requests=[claude_request])
 print(response.choices[0].text)
 ```
 

{GPTRouter-1.0.4 → gptrouter-1.0.6}/README.md

@@ -24,14 +24,14 @@ messages = [
     {"role": "user", "content": "Write me a short poem"},
 ]
 prompt_params = GenerationParams(messages=messages)
-claude2_request = ModelGenerationRequest(
-    model_name=ModelsEnum.CLAUDE_INSTANT_12,
-    provider_name=ProvidersEnum.ANTHROPIC.value,
+claude_request = ModelGenerationRequest(
+    model_name=ModelsEnum.CLAUDE_4_5_HAIKU.value,
+    provider_name=ProvidersEnum.CHAT_ANTHROPIC.value,
     order=1,
     prompt_params=prompt_params,
 )
 
-response = client.generate(ordered_generation_requests=[claude2_request])
+response = client.generate(ordered_generation_requests=[claude_request])
 print(response.choices[0].text)
 ```
 

{GPTRouter-1.0.4 → gptrouter-1.0.6}/gpt_router/client.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 import asyncio
-from pydantic import parse_obj_as
+from pydantic import TypeAdapter
 import logging
 import json
 import httpx
@@ -86,7 +86,7 @@ class GPTRouterClient:
         api_payload = {
             "data": [
                 {
-                    **request.dict(),
+                    **request.model_dump(),
                     "order": index + 1,
                 }
                 for index, request in enumerate(ordered_generation_requests)
@@ -98,7 +98,30 @@ class GPTRouterClient:
             method="POST",
             payload=api_payload,
         )
-        return ModelRouterEmbeddingsGenerationResponse.parse_obj(response)
+        return ModelRouterEmbeddingsGenerationResponse.model_validate(response)
+
+    async def agenerate_embeddings_v2(
+        self,
+        *,
+        input: List[str],
+        model_name: str,
+        model_router_metadata: Optional[GPTRouterMetadata] = None,
+    ) -> ModelRouterEmbeddingsGenerationResponse:
+        """
+        Generate embeddings using the v2 endpoint which uses round-robin load balancing
+        across multiple providers for improved availability and performance.
+        """
+        api_payload = {
+            "input": input,
+            "modelName": model_name,
+        }
+        api_payload = self.add_metadata_info(api_payload, model_router_metadata)
+        response = await self._async_api_call(
+            path="/v1/generate/embeddings-v2",
+            method="POST",
+            payload=api_payload,
+        )
+        return ModelRouterEmbeddingsGenerationResponse.model_validate(response)
 
     def add_metadata_info(
         self,
@@ -107,9 +130,9 @@ class GPTRouterClient:
     ):
         metadata = {}
         if self.additional_metadata:
-            metadata.update(self.additional_metadata.dict())
+            metadata.update(self.additional_metadata.model_dump())
         if model_router_metadata:
-            metadata.update(model_router_metadata.dict())
+            metadata.update(model_router_metadata.model_dump())
 
         payload.update(
             {
@@ -244,7 +267,7 @@ class GPTRouterClient:
                                 data: dict = json.loads(line_data.strip())
                                 if data["event"] == "error":
                                     raise GPTRouterStreamingError(data)
-                                yield parse_obj_as(ChunkedGenerationResponse, data)
+                                yield TypeAdapter(ChunkedGenerationResponse).validate_python(data)
                             except GPTRouterStreamingError as e:
                                 raise e
                             except Exception:
@@ -331,7 +354,7 @@ class GPTRouterClient:
                                 data = json.loads(line_data.strip())
                                 if data["event"].lower() == "error":
                                     raise GPTRouterStreamingError(data["message"])
-                                yield parse_obj_as(ChunkedGenerationResponse, data)
+                                yield TypeAdapter(ChunkedGenerationResponse).validate_python(data)
                             except GPTRouterStreamingError as e:
                                 raise e
                             except Exception:
@@ -390,7 +413,7 @@ class GPTRouterClient:
         api_payload = {
             "stream": is_stream,
             "data": [
-                request.dict(exclude_none=True, by_alias=True)
+                request.model_dump(exclude_none=True, by_alias=True)
                 for request in ordered_generation_requests
             ],
         }
@@ -408,7 +431,7 @@ class GPTRouterClient:
             payload=api_payload,
             **kwargs,
         )
-        return parse_obj_as(GenerationResponse, result)
+        return TypeAdapter(GenerationResponse).validate_python(result)
 
     async def agenerate(
         self,
@@ -424,7 +447,7 @@ class GPTRouterClient:
         api_payload = {
             "stream": is_stream,
             "data": [
-                request.dict(exclude_none=True, by_alias=True)
+                request.model_dump(exclude_none=True, by_alias=True)
                 for request in ordered_generation_requests
             ],
         }
@@ -443,14 +466,14 @@ class GPTRouterClient:
             payload=api_payload,
             **kwargs,
         )
-        return parse_obj_as(GenerationResponse, result)
+        return TypeAdapter(GenerationResponse).validate_python(result)
 
     async def agenerate_images(
         self, *, image_generation_request: ImageGenerationRequest
     ) -> List[ImageGenerationResponse]:
         api_path = "/v1/generate/generate-image"
         api_method = "POST"
-        api_payload = image_generation_request.dict()
+        api_payload = image_generation_request.model_dump()
 
         api_response = await self._async_api_call(
             path=api_path,
@@ -462,7 +485,7 @@ class GPTRouterClient:
             generated_images = self._extract_images_from_dict(generated_images)
 
         return [
-            parse_obj_as(ImageGenerationResponse, generated_img)
+            ImageGenerationResponse.model_validate(generated_img)
             for generated_img in generated_images
         ]
 
@@ -496,7 +519,7 @@ class GPTRouterClient:
         """
         api_path = "/v1/generate/edit-image"
         api_method = "POST"
-        api_payload = image_edit_request.dict()
+        api_payload = image_edit_request.model_dump()
         
         api_response = await self._async_api_call(
             path=api_path,
@@ -507,7 +530,7 @@ class GPTRouterClient:
         generated_images = api_response.get("response", {}).get("data", [])
         
         return [
-            parse_obj_as(ImageGenerationResponse, {
+            ImageGenerationResponse.model_validate({
                 "url": img.get("url", None),
                 "base64": img.get("b64_json", None),
                 "finish_reason": "SUCCESS"

gptrouter-1.0.6/gpt_router/constants.py

@@ -0,0 +1,2 @@
+DEFAULT_API_BASE_URL = "https://prod-model-router.writesonic.com/api"
+DEFAULT_REQUEST_TIMEOUT = 60

{GPTRouter-1.0.4 → gptrouter-1.0.6}/gpt_router/enums.py

@@ -44,6 +44,7 @@ class ModelsEnum(Enum):
     OPENAI_GPT_35_TURBO_INSTRUCT = "gpt-3.5-turbo-instruct"
 
     CLAUDE_INSTANT_12 = "claude-instant-1.2"
+    CLAUDE_4_5_HAIKU = "claude-haiku-4-5-20251001"
 
     DALLE_3 = "dall-e-3"
     
@@ -197,4 +198,8 @@ class GPTRouterEngines(Enum):
 
     CLAUDE_3_7_SONNET_2025_02_19 = ModelDetails(
         ProvidersEnum.CHAT_ANTHROPIC.value, "claude-3-7-sonnet-2025-02-19"
+    )
+
+    CLAUDE_4_5_HAIKU = ModelDetails(
+        ProvidersEnum.CHAT_ANTHROPIC.value, "claude-haiku-4-5-20251001"
     )

{GPTRouter-1.0.4 → gptrouter-1.0.6}/gpt_router/models.py

@@ -1,5 +1,4 @@
-from uuid import UUID
-from pydantic import BaseModel, Field, root_validator, validator
+from pydantic import ConfigDict, BaseModel, Field
 from enum import Enum
 from typing import Dict, List, Literal, Optional, Any, Union
 from humps import camelize
@@ -83,11 +82,7 @@ class ModelGenerationRequest(BaseModel):
     provider_name: str
     order: int = Field(int)
     prompt_params: Optional[GenerationParams] = Field(default={})
-
-    class Config:
-        alias_generator = to_camel
-        allow_population_by_field_name = True
-        protected_namespaces = ()
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True, protected_namespaces=())
 
 
 class Usage(BaseModel):
@@ -111,13 +106,9 @@ class GenerationResponse(BaseModel):
     model: str
     provider_id: Optional[str] = Field(None, alias="providerId")
     model_id: Optional[str] = Field(None, alias="modelId")
-    meta: Optional[Usage]
+    meta: Optional[Usage] = None
     citations: Optional[List[str]] = None
-
-    class Config:
-        alias_generator = to_camel
-        allow_population_by_field_name = True
-        protected_namespaces = ()
+    model_config = ConfigDict(alias_generator=to_camel, populate_by_name=True, protected_namespaces=())
 
 
 class ChunkedGenerationResponse(BaseModel):
@@ -138,17 +129,16 @@ class ImageGenerationRequest(BaseModel):
     user_id: Optional[str] = Field(None, alias="createdByUserId")
     history_id: Optional[str] = Field(None, alias="historyId")
     feature: Optional[str] = Field(None, alias="feature")
-
-    class Config:
-        allow_population_by_field_name = True
-        protected_namespaces = ()
+    model_config = ConfigDict(populate_by_name=True, protected_namespaces=())
 
     @property
     def size(self) -> Optional[str]:
         return f"{self.width}x{self.height}" if self.width and self.height else None
 
-    def dict(self, *args, **kwargs):
-        base_dict = super().dict(*args, **kwargs, exclude_none=True, by_alias=True)
+    def model_dump(self, *args, **kwargs):
+        kwargs.setdefault('exclude_none', True)
+        kwargs.setdefault('by_alias', True)
+        base_dict = super().model_dump(*args, **kwargs)
         if self.size is not None:
             base_dict["size"] = self.size
         return base_dict
@@ -170,13 +160,12 @@ class ImageEditRequest(BaseModel):
     response_format: Optional[str] = Field(alias="responseFormat", default=None)
     size: Optional[str] = Field(default="1024x1024")
     user: Optional[str] = Field(default=None)
+    model_config = ConfigDict(populate_by_name=True, protected_namespaces=())
 
-    class Config:
-        allow_population_by_field_name = True
-        protected_namespaces = ()
-
-    def dict(self, *args, **kwargs):
-        base_dict = super().dict(*args, **kwargs, exclude_none=True, by_alias=True)
+    def model_dump(self, *args, **kwargs):
+        kwargs.setdefault('exclude_none', True)
+        kwargs.setdefault('by_alias', True)
+        base_dict = super().model_dump(*args, **kwargs)
         return base_dict
 
 
@@ -187,13 +176,13 @@ class ModelRouterGenerationRequest(BaseModel):
     should_validate_token_count: Optional[bool] = Field(
         default=False, alias="shouldValidateTokenCount"
     )
+    model_config = ConfigDict(populate_by_name=True, protected_namespaces=())
 
-    class Config:
-        allow_population_by_field_name = True
-
-    def dict(self, *args, **kwargs):
+    def model_dump(self, *args, **kwargs):
         # Generate the standard dict first.
-        result = super().dict(*args, **kwargs, exclude_none=True, by_alias=True)
+        kwargs.setdefault('exclude_none', True)
+        kwargs.setdefault('by_alias', True)
+        result = super().model_dump(*args, **kwargs)
 
         result["providerName"] = self.model_provider
         result["modelName"] = self.model_name
@@ -215,7 +204,8 @@ class ModelRouterGenerationResponse(BaseModel):
     model: str
     provider_id: Optional[str] = Field(None, alias="providerId")
     model_id: Optional[str] = Field(None, alias="modelId")
-    meta: Optional[Usage]
+    meta: Optional[Usage] = None
+    model_config = ConfigDict(protected_namespaces=())
 
 
 class EmbeddingsChoice(BaseModel):

{GPTRouter-1.0.4 → gptrouter-1.0.6}/pyproject.toml

@@ -7,13 +7,18 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.10"
-httpx = "^0.25.2"
-pydantic = "^1.10.14"
+httpx = "^0.28.1"
+pydantic = "^2.12"
 pyhumps = "^3.8.0"
-python-dotenv = "^1.0.0"
-tenacity = "^9.0.0"
+python-dotenv = "^1.2.1"
+tenacity = "^9.1.2"
 
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
+
+[dependency-groups]
+dev = [
+    "bump-pydantic (>=0.8.0,<0.9.0)"
+]

{GPTRouter-1.0.4 → gptrouter-1.0.6}/setup.py

@@ -5,13 +5,13 @@ with open("README.md", "r") as fh:
 
 setup(
     name="GPTRouter",
-    version="1.0.4",
+    version="1.0.6",
     description="A Python package for working with GPTRouter APIs",
     long_description=long_description,
     long_description_content_type="text/markdown",
     author_email="sirjanpreet@writesonic.com",
     packages=["gpt_router"],
-    install_requires=["httpx>=0.23.3", "pydantic>=1.10.13", "pyhumps>=3.8.0"],
+    install_requires=["httpx>=0.23.3", "pydantic>=2.0", "pyhumps>=3.8.0"],
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Developers",

GPTRouter-1.0.4/gpt_router/constants.py

@@ -1,2 +0,0 @@
-DEFAULT_API_BASE_URL = 'https://gpt-router-preview.writesonic.com'
-DEFAULT_REQUEST_TIMEOUT = 60