GPTRouter 0.2.1__tar.gz → 0.2.5__tar.gz

{GPTRouter-0.2.1 → GPTRouter-0.2.5}/GPTRouter.egg-info/PKG-INFO

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

{GPTRouter-0.2.1 → GPTRouter-0.2.5}/PKG-INFO

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

{GPTRouter-0.2.1 → GPTRouter-0.2.5}/gpt_router/client.py

@@ -3,7 +3,7 @@ from pydantic import parse_obj_as
 import logging
 import json
 import httpx
-from typing import Generator, List, Union
+from typing import Generator, List, Optional, Union
 
 from gpt_router.models import (
     ImageGenerationRequest,
@@ -206,6 +206,9 @@ class GPTRouterClient:
         *,
         ordered_generation_requests: List[ModelGenerationRequest],
         is_stream=False,
+        tag: Optional[str] = None,
+        user_id: Optional[str] = None,
+        history_id: Optional[str] = None,
     ) -> GenerationResponse:
         api_path = "/v1/generate"
         api_method = "POST"
@@ -215,6 +218,9 @@ class GPTRouterClient:
                 request.dict(exclude_none=True, by_alias=True)
                 for request in ordered_generation_requests
             ],
+            "tag": tag,
+            "createdByUserId": user_id,
+            "historyId": history_id,
         }
         if is_stream:
             return self.astream_events(
@@ -242,6 +248,9 @@ class GPTRouterClient:
             payload=api_payload,
         )
         generated_images = api_response.get("response", [])
+        if isinstance(generated_images, dict):
+            generated_images = generated_images.get('artifacts', [])
+        
         return [
             parse_obj_as(ImageGenerationResponse, generated_img)
             for generated_img in generated_images

GPTRouter-0.2.5/gpt_router/enums.py

@@ -0,0 +1,162 @@
+from collections import namedtuple
+from enum import Enum
+
+class ProvidersEnum(Enum):
+    OPENAI = "openai"
+    CHAT_OPENAI = "chat_openai"
+    ANTHROPIC = "anthropic"
+    CHAT_ANTHROPIC = "chat_anthropic"
+    AZURE_CHAT_OPENAI = "azure_chat_openai"
+    COHERE = "cohere"
+    DALLE = "dall-e"
+    TOGETHER_AI = "together_ai"
+    MISTRAL_AI = "mistral_ai"
+    PERPLEXITY = "perplexity"
+    STABLE_DIFFUSION = "stable-diffusion"
+    DALL_E = "dall-e"
+    OPENROUTER = "openrouter"
+
+class ModelsEnum(Enum):
+    OPENAI_GPT_35_TURBO_16K = "gpt-3.5-turbo-16k"
+    AZURE_GPT_35_TURBO_16K = "gpt-35-turbo-16k"
+
+    OPENAI_GPT_35_TURBO_1106 = "gpt-3.5-turbo-1106"
+
+    OPENAI_GPT_35_TURBO_0613 = "gpt-3.5-turbo-0613"
+
+    AZURE_GPT_35_TURBO = "gpt-35-turbo"
+
+    OPENAI_GPT_4 = "gpt-4"
+    AZURE_GPT_4 = "gpt-4"
+
+    OPENAI_GPT_4_0613 = "gpt-4-0613"
+
+    OPENAI_GPT_4_32K = "gpt-4-32k"
+    AZURE_GPT_4_32K = "gpt-4-32k"
+
+    OPENAI_GPT_35_TURBO_INSTRUCT = "gpt-3.5-turbo-instruct"
+
+    CLAUDE_INSTANT_12 = "claude-instant-1.2"
+
+    DALLE_3 = "dall-e-3"
+    
+    STABLE_DIFFUSION_XL = "stable-diffusion-xl-1024-v1-0"
+    STABLE_DIFFUSION_V6 = "stable-diffusion-v1-6"
+
+class StreamingEventType(Enum):
+    UPDATE = "update"
+    META = "meta"
+    ERROR = "error"
+    GENERATION_SOURCE = "generation_source"
+    END = "end"
+
+
+ModelDetails = namedtuple("ModelDetails", ["provider_name", "model_name"])
+
+
+class GPTRouterEngines(Enum):
+    OPENAI_GPT_35_TURBO = ModelDetails(
+        ProvidersEnum.CHAT_OPENAI.value, "gpt-3.5-turbo"
+    )
+    OPENAI_GPT_35_TURBO_0613 = ModelDetails(
+        ProvidersEnum.CHAT_OPENAI.value, "gpt-3.5-turbo-0613"
+    )
+    OPENAI_GPT_35_TURBO_1106 = ModelDetails(
+        ProvidersEnum.CHAT_OPENAI.value, "gpt-3.5-turbo-1106"
+    )
+    OPENAI_GPT_35_TURBO_16K_0613 = ModelDetails(
+        ProvidersEnum.CHAT_OPENAI.value, "gpt-3.5-turbo-16k-0613"
+    )
+    OPENAI_GPT_35_TURBO_INSTRUCT = ModelDetails(
+        ProvidersEnum.OPENAI.value, "gpt-3.5-turbo-instruct"
+    )
+    OPENAI_GPT_35_TURBO_0125 = ModelDetails(
+        ProvidersEnum.CHAT_OPENAI.value, "gpt-3.5-turbo-0125"
+    )
+
+    OPENAI_GPT_4_0613 = ModelDetails(ProvidersEnum.CHAT_OPENAI.value, "gpt-4-0613")
+    OPENAI_GPT_4_TURBO = ModelDetails(
+        ProvidersEnum.CHAT_OPENAI.value, "gpt-4-1106-preview"
+    )
+    OPENAI_GPT_4_TURBO_2024_04_09 = ModelDetails(
+        ProvidersEnum.CHAT_OPENAI.value, "gpt-4-turbo-2024-04-09"
+    )
+
+    OPENAI_GPT_4_TURBO_0125 = ModelDetails(
+        ProvidersEnum.CHAT_OPENAI.value, "gpt-4-0125-preview"
+    )
+
+    AZURE_OPENAI_GPT_4_TURBO_0125 = ModelDetails(
+        ProvidersEnum.AZURE_CHAT_OPENAI.value, "gpt4-turbo-0125"
+    )
+
+    OPENAI_GPT_4_O = ModelDetails(ProvidersEnum.CHAT_OPENAI.value, "gpt-4o")
+
+    OPENAI_GPT_4_32K_0613 = ModelDetails(
+        ProvidersEnum.CHAT_OPENAI.value, "gpt-4-32k-0613"
+    )
+
+    AZURE_GPT_35_TURBO = ModelDetails(
+        ProvidersEnum.AZURE_CHAT_OPENAI.value, "gpt-35-turbo"
+    )
+    AZURE_GPT_35_TURBO_16K = ModelDetails(
+        ProvidersEnum.AZURE_CHAT_OPENAI.value, "gpt-35-turbo-16k"
+    )
+    AZURE_GPT_35_TURBO_1106 = ModelDetails(
+        ProvidersEnum.AZURE_CHAT_OPENAI.value, "gpt-35-turbo-1106"
+    )
+
+    AZURE_GPT_4 = ModelDetails(ProvidersEnum.AZURE_CHAT_OPENAI.value, "gpt-4")
+    AZURE_GPT_4_TURBO = ModelDetails(
+        ProvidersEnum.AZURE_CHAT_OPENAI.value, "gpt-4-turbo"
+    )
+    AZURE_GPT_4_32K = ModelDetails(
+        ProvidersEnum.AZURE_CHAT_OPENAI.value, "gpt-4-32k"
+    )
+
+    CLAUDE_INSTANT_12 = ModelDetails(
+        ProvidersEnum.ANTHROPIC.value, "claude-instant-1.2"
+    )
+    CLAUDE_2 = ModelDetails(ProvidersEnum.ANTHROPIC.value, "claude-2")
+    CLAUDE_21 = ModelDetails(ProvidersEnum.ANTHROPIC.value, "claude-2.1")
+    CLAUDE_3_OPUS = ModelDetails(
+        ProvidersEnum.ANTHROPIC.value, "claude-3-opus-20240229"
+    )
+
+    MISTRAL_7B = ModelDetails(
+        ProvidersEnum.TOGETHER_AI.value, "mistralai/Mistral-7B-Instruct-v0.2"
+    )
+    MIXTRAL_8X7B = ModelDetails(
+        ProvidersEnum.TOGETHER_AI.value, "mistralai/Mixtral-8x7B-Instruct-v0.1"
+    )
+    LLAMA_2_70B = ModelDetails(
+        ProvidersEnum.TOGETHER_AI.value, "togethercomputer/llama-2-70b-chat"
+    )
+
+    MISTRAL_MEDIUM = ModelDetails(ProvidersEnum.MISTRAL_AI.value, "mistral-medium")
+
+    PPTX_70B_ONLINE = ModelDetails(
+        ProvidersEnum.PERPLEXITY.value, "pplx-70b-online"
+    )
+    PPTX_7B_ONLINE = ModelDetails(ProvidersEnum.PERPLEXITY.value, "pplx-7b-online")
+
+    STABLE_DIFFUSION_XL = ModelDetails(
+        ProvidersEnum.STABLE_DIFFUSION.value, "stable-diffusion-xl-1024-v1-0"
+    )
+    DALLE_3 = ModelDetails(ProvidersEnum.DALL_E.value, "dall-e-3")
+
+    LLAMA_3_70B_NITRO = ModelDetails(
+        ProvidersEnum.OPENROUTER, "meta-llama/llama-3-70b-instruct:nitro"
+    )
+
+    CLAUDE_3_SONNET = ModelDetails(
+        ProvidersEnum.CHAT_ANTHROPIC.value, "claude-3-sonnet-20240229"
+    )
+
+    CLAUDE_3_HAIKU = ModelDetails(
+        ProvidersEnum.CHAT_ANTHROPIC.value, "claude-3-haiku-20240307"
+    )
+
+    OPENROUTER_CLAUDE_3_HAIKU = ModelDetails(
+        ProvidersEnum.OPENROUTER.value, "anthropic/claude-3-haiku"
+    )

{GPTRouter-0.2.1 → GPTRouter-0.2.5}/gpt_router/models.py

@@ -21,6 +21,7 @@ class GenerationParams(BaseModel):
     functions: Optional[List[Any]] = None
     function_call: Optional[dict] = None
     tools: Optional[List[Any]] = None
+    response_format: Optional[Dict[str, Any]] = None
 
 
 class ModelGenerationRequest(BaseModel):
@@ -92,5 +93,6 @@ class ImageGenerationRequest(BaseModel):
 
 
 class ImageGenerationResponse(BaseModel):
-    revised_prompt: str
-    url: str
+    url: str = None
+    base64: str = None
+    finish_reason: Optional[str] = Field(default="SUCCESS", alias='finishReason')

{GPTRouter-0.2.1 → GPTRouter-0.2.5}/setup.py

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

GPTRouter-0.2.1/gpt_router/enums.py

@@ -1,40 +0,0 @@
-from enum import Enum
-
-class ProvidersEnum(Enum):
-    OPENAI = "openai"
-    CHAT_OPENAI = "chat_openai"
-    ANTHROPIC = "anthropic"
-    AZURE_CHAT_OPENAI = "azure_chat_openai"
-    COHERE = "cohere"
-    DALLE = "dall-e"
-
-class ModelsEnum(Enum):
-    OPENAI_GPT_35_TURBO_16K = "gpt-3.5-turbo-16k"
-    AZURE_GPT_35_TURBO_16K = "gpt-35-turbo-16k"
-
-    OPENAI_GPT_35_TURBO_1106 = "gpt-3.5-turbo-1106"
-
-    OPENAI_GPT_35_TURBO_0613 = "gpt-3.5-turbo-0613"
-
-    AZURE_GPT_35_TURBO = "gpt-35-turbo"
-
-    OPENAI_GPT_4 = "gpt-4"
-    AZURE_GPT_4 = "gpt-4"
-
-    OPENAI_GPT_4_0613 = "gpt-4-0613"
-
-    OPENAI_GPT_4_32K = "gpt-4-32k"
-    AZURE_GPT_4_32K = "gpt-4-32k"
-
-    OPENAI_GPT_35_TURBO_INSTRUCT = "gpt-3.5-turbo-instruct"
-
-    CLAUDE_INSTANT_12 = "claude-instant-1.2"
-
-    DALLE_3 = "dall-e-3"
-
-class StreamingEventType(Enum):
-    UPDATE = "update"
-    META = "meta"
-    ERROR = "error"
-    GENERATION_SOURCE = "generation_source"
-    END = "end"