promptlayer 1.0.41__tar.gz → 1.0.43__tar.gz

{promptlayer-1.0.41 → promptlayer-1.0.43}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.3
 Name: promptlayer
-Version: 1.0.41
+Version: 1.0.43
 Summary: PromptLayer is a platform for prompt engineering and tracks your LLM requests.
 License: Apache-2.0
 Author: Magniv
 Author-email: hello@magniv.io
-Requires-Python: >=3.8.1,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9

{promptlayer-1.0.41 → promptlayer-1.0.43}/promptlayer/__init__.py

@@ -1,4 +1,4 @@
 from .promptlayer import AsyncPromptLayer, PromptLayer
 
-__version__ = "1.0.41"
+__version__ = "1.0.43"
 __all__ = ["PromptLayer", "AsyncPromptLayer", "__version__"]

{promptlayer-1.0.41 → promptlayer-1.0.43}/promptlayer/promptlayer_base.py

@@ -35,8 +35,8 @@ class PromptLayerBase(object):
                 or inspect.ismethod(attr)
                 or str(type(attr)) == "<class 'anthropic.resources.completions.Completions'>"
                 or str(type(attr)) == "<class 'anthropic.resources.completions.AsyncCompletions'>"
-                or str(type(attr)) == "<class 'anthropic.resources.messages.Messages'>"
-                or str(type(attr)) == "<class 'anthropic.resources.messages.AsyncMessages'>"
+                or str(type(attr)) == "<class 'anthropic.resources.messages.messages.Messages'>"
+                or str(type(attr)) == "<class 'anthropic.resources.messages.messages.AsyncMessages'>"
                 or re.match(r"<class 'openai\.resources.*'>", str(type(attr)))
             )
         ):

{promptlayer-1.0.41 → promptlayer-1.0.43}/promptlayer/promptlayer_mixins.py

@@ -15,6 +15,9 @@ from promptlayer.utils import (
     aanthropic_stream_completion,
     aanthropic_stream_message,
     aazure_openai_request,
+    agoogle_request,
+    agoogle_stream_chat,
+    agoogle_stream_completion,
     amistral_request,
     amistral_stream_chat,
     anthropic_request,
@@ -24,6 +27,9 @@ from promptlayer.utils import (
     aopenai_stream_chat,
     aopenai_stream_completion,
     azure_openai_request,
+    google_request,
+    google_stream_chat,
+    google_stream_completion,
     mistral_request,
     mistral_stream_chat,
     openai_request,
@@ -72,6 +78,16 @@ MAP_PROVIDER_TO_FUNCTION_NAME = {
             "stream_function": None,
         },
     },
+    "google": {
+        "chat": {
+            "function_name": "google.convo.send_message",
+            "stream_function": google_stream_chat,
+        },
+        "completion": {
+            "function_name": "google.model.generate_content",
+            "stream_function": google_stream_completion,
+        },
+    },
 }
 
 
@@ -80,6 +96,7 @@ MAP_PROVIDER_TO_FUNCTION = {
     "anthropic": anthropic_request,
     "openai.azure": azure_openai_request,
     "mistral": mistral_request,
+    "google": google_request,
 }
 
 AMAP_PROVIDER_TO_FUNCTION_NAME = {
@@ -123,6 +140,16 @@ AMAP_PROVIDER_TO_FUNCTION_NAME = {
             "stream_function": None,
         },
     },
+    "google": {
+        "chat": {
+            "function_name": "google.convo.send_message",
+            "stream_function": agoogle_stream_chat,
+        },
+        "completion": {
+            "function_name": "google.model.generate_content",
+            "stream_function": agoogle_stream_completion,
+        },
+    },
 }
 
 
@@ -131,6 +158,7 @@ AMAP_PROVIDER_TO_FUNCTION = {
     "anthropic": aanthropic_request,
     "openai.azure": aazure_openai_request,
     "mistral": amistral_request,
+    "google": agoogle_request,
 }
 
 

{promptlayer-1.0.41 → promptlayer-1.0.43}/promptlayer/utils.py

@@ -8,17 +8,7 @@ import sys
 import types
 from copy import deepcopy
 from enum import Enum
-from typing import (
-    Any,
-    AsyncGenerator,
-    AsyncIterable,
-    Callable,
-    Dict,
-    Generator,
-    List,
-    Optional,
-    Union,
-)
+from typing import Any, AsyncGenerator, AsyncIterable, Callable, Dict, Generator, List, Optional, Union
 
 import httpx
 import requests
@@ -1594,11 +1584,7 @@ async def amistral_request(
 
 
 def mistral_stream_chat(results: list):
-    from openai.types.chat import (
-        ChatCompletion,
-        ChatCompletionMessage,
-        ChatCompletionMessageToolCall,
-    )
+    from openai.types.chat import ChatCompletion, ChatCompletionMessage, ChatCompletionMessageToolCall
     from openai.types.chat.chat_completion import Choice
     from openai.types.chat.chat_completion_message_tool_call import Function
 
@@ -1659,11 +1645,7 @@ def mistral_stream_chat(results: list):
 
 
 async def amistral_stream_chat(generator: AsyncIterable[Any]) -> Any:
-    from openai.types.chat import (
-        ChatCompletion,
-        ChatCompletionMessage,
-        ChatCompletionMessageToolCall,
-    )
+    from openai.types.chat import ChatCompletion, ChatCompletionMessage, ChatCompletionMessageToolCall
     from openai.types.chat.chat_completion import Choice
     from openai.types.chat.chat_completion_message_tool_call import Function
 
@@ -1726,3 +1708,124 @@ async def amistral_stream_chat(generator: AsyncIterable[Any]) -> Any:
     response.choices[0].message.content = content
     response.choices[0].message.tool_calls = tool_calls
     return response
+
+
+def google_chat_request(client, **kwargs):
+    from google.genai.chats import Content
+
+    stream = kwargs.pop("stream", False)
+    model = kwargs.get("model", "gemini-2.0-flash")
+    history = [Content(**item) for item in kwargs.get("history", [])]
+    generation_config = kwargs.get("generation_config", {})
+    chat = client.chats.create(model=model, history=history, config=generation_config)
+    last_message = history[-1] if history else None
+    if stream:
+        return chat.send_message_stream(message=last_message)
+    return chat.send_message(message=last_message)
+
+
+def google_completions_request(client, **kwargs):
+    config = kwargs.pop("generation_config", {})
+    model = kwargs.get("model", "gemini-2.0-flash")
+    contents = kwargs.get("contents", [])
+    stream = kwargs.pop("stream", False)
+    if stream:
+        return client.models.generate_content_stream(model=model, contents=contents, config=config)
+    return client.models.generate_content(model=model, contents=contents, config=config)
+
+
+def map_google_stream_response(results: list):
+    from google.genai.chats import GenerateContentResponse
+
+    response = GenerateContentResponse()
+    if not results:
+        return response
+    results: List[GenerateContentResponse] = results
+    content = ""
+    for result in results:
+        content = f"{content}{result.candidates[0].content.parts[0].text}"
+    last_result = results[-1]
+    response = last_result.model_copy()
+    response.candidates[0].content.parts[0].text = content
+    return response
+
+
+def google_stream_chat(results: list):
+    return map_google_stream_response(results)
+
+
+def google_stream_completion(results: list):
+    return map_google_stream_response(results)
+
+
+MAP_TYPE_TO_GOOGLE_FUNCTION = {
+    "chat": google_chat_request,
+    "completion": google_completions_request,
+}
+
+
+def google_request(request: GetPromptTemplateResponse, **kwargs):
+    from google import genai
+
+    client = genai.Client()
+    request_to_make = MAP_TYPE_TO_GOOGLE_FUNCTION[request["prompt_template"]["type"]]
+    return request_to_make(client, **kwargs)
+
+
+async def agoogle_chat_request(client, **kwargs):
+    from google.genai.chats import Content
+
+    stream = kwargs.pop("stream", False)
+    model = kwargs.get("model", "gemini-2.0-flash")
+    history = [Content(**item) for item in kwargs.get("history", [])]
+    generation_config = kwargs.get("generation_config", {})
+    chat = client.aio.chats.create(model=model, history=history, config=generation_config)
+    last_message = history[-1] if history else None
+    if stream:
+        return await chat.send_message_stream(message=last_message)
+    return await chat.send_message(message=last_message)
+
+
+async def agoogle_completions_request(client, **kwargs):
+    config = kwargs.pop("generation_config", {})
+    model = kwargs.get("model", "gemini-2.0-flash")
+    contents = kwargs.get("contents", [])
+    stream = kwargs.pop("stream", False)
+    if stream:
+        return await client.aio.models.generate_content_stream(model=model, contents=contents, config=config)
+    return await client.aio.models.generate_content(model=model, contents=contents, config=config)
+
+
+AMAP_TYPE_TO_GOOGLE_FUNCTION = {
+    "chat": agoogle_chat_request,
+    "completion": agoogle_completions_request,
+}
+
+
+async def agoogle_request(request: GetPromptTemplateResponse, **kwargs):
+    from google import genai
+
+    client = genai.Client()
+    request_to_make = AMAP_TYPE_TO_GOOGLE_FUNCTION[request["prompt_template"]["type"]]
+    return await request_to_make(client, **kwargs)
+
+
+async def amap_google_stream_response(generator: AsyncIterable[Any]):
+    from google.genai.chats import GenerateContentResponse
+
+    response = GenerateContentResponse()
+    content = ""
+    async for result in generator:
+        content = f"{content}{result.candidates[0].content.parts[0].text}"
+    last_result = result
+    response = last_result.model_copy()
+    response.candidates[0].content.parts[0].text = content
+    return response
+
+
+async def agoogle_stream_chat(generator: AsyncIterable[Any]):
+    return await amap_google_stream_response(generator)
+
+
+async def agoogle_stream_completion(generator: AsyncIterable[Any]):
+    return await amap_google_stream_response(generator)

{promptlayer-1.0.41 → promptlayer-1.0.43}/pyproject.toml

@@ -1,13 +1,13 @@
 [tool.poetry]
 name = "promptlayer"
-version = "1.0.41"
+version = "1.0.43"
 description = "PromptLayer is a platform for prompt engineering and tracks your LLM requests."
 authors = ["Magniv <hello@magniv.io>"]
 license = "Apache-2.0"
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = ">=3.8.1,<4.0"
+python = ">=3.9,<4.0"
 requests = "^2.31.0"
 opentelemetry-api = "^1.26.0"
 opentelemetry-sdk = "^1.26.0"
@@ -20,9 +20,9 @@ nest-asyncio = "^1.6.0"
 behave = "^1.2.6"
 pytest = "^8.2.0"
 pytest-asyncio = "^0.23.6"
-anyio = "^4.3.0"
 anthropic = "^0.25.8"
 openai = "^1.60.1"
+google-genai = "^1.5.0"
 
 [build-system]
 requires = ["poetry-core"]