GPTRouter 0.1.3__tar.gz → 0.2.0__tar.gz

{GPTRouter-0.1.3 → GPTRouter-0.2.0}/GPTRouter.egg-info/PKG-INFO

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

GPTRouter-0.2.0/GPTRouter.egg-info/requires.txt

@@ -0,0 +1,2 @@
+httpx>=0.25.2
+pydantic==1.10.14

{GPTRouter-0.1.3 → GPTRouter-0.2.0}/PKG-INFO

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

{GPTRouter-0.1.3 → GPTRouter-0.2.0}/gpt_router/client.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-
+from pydantic import parse_obj_as
 import logging
 import json
 import httpx
@@ -124,7 +124,7 @@ class GPTRouterClient:
                             data: dict = json.loads(line_data.strip())
                             if data["event"] == "error":
                                 raise GPTRouterStreamingError(data)
-                            yield ChunkedGenerationResponse.model_validate(data)
+                            yield parse_obj_as(ChunkedGenerationResponse, data)
                         except GPTRouterStreamingError as e:
                             raise e
                         except Exception:
@@ -162,7 +162,7 @@ class GPTRouterClient:
                             data = json.loads(line_data.strip())
                             if data["event"].lower() == "error":
                                 raise GPTRouterStreamingError(data["message"])
-                            yield ChunkedGenerationResponse.model_validate(data)
+                            yield parse_obj_as(ChunkedGenerationResponse, data)
                         except GPTRouterStreamingError as e:
                             raise e
                         except Exception:
@@ -182,7 +182,7 @@ class GPTRouterClient:
         api_payload = {
             "stream": is_stream,
             "data": [
-                request.model_dump(exclude_none=True, by_alias=True)
+                request.dict(exclude_none=True, by_alias=True)
                 for request in ordered_generation_requests
             ],
         }
@@ -192,13 +192,12 @@ class GPTRouterClient:
                 method=api_method,
                 payload=api_payload,
             )
-        return GenerationResponse.model_validate(
-            self._api_call(
-                path=api_path,
-                method=api_method,
-                payload=api_payload,
-            )
+        result = self._api_call(
+            path=api_path,
+            method=api_method,
+            payload=api_payload,
         )
+        return parse_obj_as(GenerationResponse, result)
 
     async def agenerate(
         self,
@@ -211,7 +210,7 @@ class GPTRouterClient:
         api_payload = {
             "stream": is_stream,
             "data": [
-                request.model_dump(exclude_none=True, by_alias=True)
+                request.dict(exclude_none=True, by_alias=True)
                 for request in ordered_generation_requests
             ],
         }
@@ -221,10 +220,9 @@ class GPTRouterClient:
                 method=api_method,
                 payload=api_payload,
             )
-        return GenerationResponse.model_validate(
-            await self._async_api_call(
-                path=api_path,
-                method=api_method,
-                payload=api_payload,
-            )
+        result = await self._async_api_call(
+            path=api_path,
+            method=api_method,
+            payload=api_payload,
         )
+        return parse_obj_as(GenerationResponse, result)

{GPTRouter-0.1.3 → GPTRouter-0.2.0}/gpt_router/models.py

@@ -1,6 +1,11 @@
 from pydantic import BaseModel, Field
 
 from typing import List, Optional, Dict, Any
+from humps import camelize
+
+
+def to_camel(string):
+    return camelize(string)
 
 
 class GenerationParams(BaseModel):
@@ -19,39 +24,45 @@ class GenerationParams(BaseModel):
 
 
 class ModelGenerationRequest(BaseModel):
-    model_name: str = Field(alias='modelName')
-    provider_name: str = Field(alias='providerName')
+    model_name: str
+    provider_name: str
     order: int = Field(int)
-    prompt_params: Optional[GenerationParams] = Field(default={}, alias="promptParams")
+    prompt_params: Optional[GenerationParams] = Field(default={})
 
     class Config:
-        populate_by_name = True
+        alias_generator = to_camel
+        allow_population_by_field_name = True
         protected_namespaces = ()
 
+
 class Usage(BaseModel):
     completion_tokens: Optional[int] = None
     prompt_tokens: Optional[int] = None
     total_tokens: Optional[int] = None
 
+
 class Choice(BaseModel):
     index: int
     text: str
     finish_reason: str
     role: Optional[str] = None
     function_call: Optional[Any] = None
-    
+
 
 class GenerationResponse(BaseModel):
     id: str
     choices: List[Choice]
     model: str
-    provider_id: Optional[str] = Field(None, alias='providerId')
-    model_id: Optional[str] = Field(None, alias='modelId')
+    provider_id: Optional[str] = Field(None, alias="providerId")
+    model_id: Optional[str] = Field(None, alias="modelId")
     meta: Optional[Usage]
 
     class Config:
+        alias_generator = to_camel
+        allow_population_by_field_name = True
         protected_namespaces = ()
 
+
 class ChunkedGenerationResponse(BaseModel):
     event: str
     data: dict

{GPTRouter-0.1.3 → GPTRouter-0.2.0}/pyproject.toml

@@ -8,7 +8,9 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = "^3.10"
 httpx = "^0.25.2"
-pydantic = "^2.5.2"
+pydantic = "^1.10.14"
+pyhumps = "^3.8.0"
+python-dotenv = "^1.0.0"
 
 
 [build-system]

{GPTRouter-0.1.3 → GPTRouter-0.2.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setup(
     name='GPTRouter',
-    version='0.1.3',
+    version='0.2.0',
     description='A Python package for working with GPTRouter APIs',
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -13,7 +13,7 @@ setup(
     packages=['gpt_router'],
     install_requires=[
         'httpx>=0.25.2',
-        "pydantic==2.5.2"
+        "pydantic==1.10.14"
     ],
     classifiers=[
         'Development Status :: 3 - Alpha',

GPTRouter-0.1.3/GPTRouter.egg-info/requires.txt

@@ -1,2 +0,0 @@
-httpx>=0.25.2
-pydantic==2.5.2