Merge branch 'litellm-support' of https://github.com/guardrails-ai/guardrails-api-client into litellm-support

Author: CalebCourier

guardrails-api-client/guardrails_api_client/models/__init__.py

@@ -33,7 +33,6 @@
 from .schema_element import SchemaElement
 from .status import Status
 from .validate_payload import ValidatePayload
-from .validate_payload_llm_api import ValidatePayloadLlmApi
 from .validate_payload_prompt_params import ValidatePayloadPromptParams
 from .validation_output import ValidationOutput
 from .validator_metrics import ValidatorMetrics
@@ -75,7 +74,6 @@
     "SchemaElement",
     "Status",
     "ValidatePayload",
-    "ValidatePayloadLlmApi",
     "ValidatePayloadPromptParams",
     "ValidationOutput",
     "ValidatorMetrics",

guardrails-api-client/guardrails_api_client/models/validate_payload.py

@@ -1,9 +1,8 @@
-from typing import TYPE_CHECKING, Any, Dict, List, Type, TypeVar, Union
+from typing import TYPE_CHECKING, Any, Dict, List, Literal, Type, TypeVar, Union, cast
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 
-from ..models.validate_payload_llm_api import ValidatePayloadLlmApi
 from ..types import UNSET, Unset
 
 if TYPE_CHECKING:
@@ -21,13 +20,26 @@ class ValidatePayload:
             output.
         num_reasks (Union[Unset, int]): An override for the number of re-asks to perform
         prompt_params (Union[Unset, ValidatePayloadPromptParams]): additional params for llm prompts
-        llm_api (Union[Unset, ValidatePayloadLlmApi]):
+        llm_api (Union[Literal['litellm.acompletion'], Literal['litellm.completion'],
+            Literal['openai.ChatCompletion.acreate'], Literal['openai.ChatCompletion.create'],
+            Literal['openai.Completion.acreate'], Literal['openai.Completion.create'],
+            Literal['openai.chat.completions.create'], Literal['openai.completions.create'], Unset]):
     """
 
     llm_output: Union[Unset, str] = UNSET
     num_reasks: Union[Unset, int] = UNSET
     prompt_params: Union[Unset, "ValidatePayloadPromptParams"] = UNSET
-    llm_api: Union[Unset, ValidatePayloadLlmApi] = UNSET
+    llm_api: Union[
+        Literal["litellm.acompletion"],
+        Literal["litellm.completion"],
+        Literal["openai.ChatCompletion.acreate"],
+        Literal["openai.ChatCompletion.create"],
+        Literal["openai.Completion.acreate"],
+        Literal["openai.Completion.create"],
+        Literal["openai.chat.completions.create"],
+        Literal["openai.completions.create"],
+        Unset,
+    ] = UNSET
     additional_properties: Dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> Dict[str, Any]:
@@ -39,9 +51,21 @@ def to_dict(self) -> Dict[str, Any]:
         if not isinstance(self.prompt_params, Unset):
             prompt_params = self.prompt_params.to_dict()
 
-        llm_api: Union[Unset, str] = UNSET
-        if not isinstance(self.llm_api, Unset):
-            llm_api = self.llm_api.value
+        llm_api: Union[
+            Literal["litellm.acompletion"],
+            Literal["litellm.completion"],
+            Literal["openai.ChatCompletion.acreate"],
+            Literal["openai.ChatCompletion.create"],
+            Literal["openai.Completion.acreate"],
+            Literal["openai.Completion.create"],
+            Literal["openai.chat.completions.create"],
+            Literal["openai.completions.create"],
+            Unset,
+        ]
+        if isinstance(self.llm_api, Unset):
+            llm_api = UNSET
+        else:
+            llm_api = self.llm_api
 
         field_dict: Dict[str, Any] = {}
         field_dict.update(self.additional_properties)
@@ -73,12 +97,37 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T:
         else:
             prompt_params = ValidatePayloadPromptParams.from_dict(_prompt_params)
 
-        _llm_api = d.pop("llmApi", UNSET)
-        llm_api: Union[Unset, ValidatePayloadLlmApi]
-        if isinstance(_llm_api, Unset):
-            llm_api = UNSET
-        else:
-            llm_api = ValidatePayloadLlmApi(_llm_api)
+        def _parse_llm_api(
+            data: object,
+        ) -> Union[
+            Literal["litellm.acompletion"],
+            Literal["litellm.completion"],
+            Literal["openai.ChatCompletion.acreate"],
+            Literal["openai.ChatCompletion.create"],
+            Literal["openai.Completion.acreate"],
+            Literal["openai.Completion.create"],
+            Literal["openai.chat.completions.create"],
+            Literal["openai.completions.create"],
+            Unset,
+        ]:
+            if isinstance(data, Unset):
+                return data
+            return cast(
+                Union[
+                    Literal["litellm.acompletion"],
+                    Literal["litellm.completion"],
+                    Literal["openai.ChatCompletion.acreate"],
+                    Literal["openai.ChatCompletion.create"],
+                    Literal["openai.Completion.acreate"],
+                    Literal["openai.Completion.create"],
+                    Literal["openai.chat.completions.create"],
+                    Literal["openai.completions.create"],
+                    Unset,
+                ],
+                data,
+            )
+
+        llm_api = _parse_llm_api(d.pop("llmApi", UNSET))
 
         validate_payload = cls(
             llm_output=llm_output,

guardrails-api-client/guardrails_api_client/models/validate_payload_llm_api.py

@@ -763,6 +763,25 @@ components:
               oneOf:
                 - $ref: "#/components/schemas/AnyObject"
                 - $ref: "#/components/schemas/AnyPrimitive"
+    LlmApi:
+      type: string
+      oneOf:
+        - title: OPENAI_V0_COMPLETION_CREATE
+          const: openai.Completion.create
+        - title: OPENAI_V1_COMPLETION_CREATE
+          const: openai.completions.create
+        - title: OPENAI_V0_CHAT_COMPLETION_CREATE
+          const: openai.ChatCompletion.create
+        - title: OPENAI_V1_CHAT_COMPLETION_CREATE
+          const: openai.chat.completions.create
+        - title: OPENAI_V0_COMPLETION_ASYNC_CREATE
+          const: openai.Completion.acreate
+        - title: OPENAI_V0_CHAT_COMPLETION_ASYNC_CREATE
+          const: openai.ChatCompletion.acreate
+        - title: LITELLM_COMPLETION
+          const: litellm.completion
+        - title: LITELLM_ASYNC_COMPLETION
+          const: litellm.acompletion
     ValidatePayload:
       type: object
       properties:
@@ -779,8 +798,7 @@ components:
           properties: {}
           additionalProperties: {}
         llmApi:
-          type: string
-          enum: ["openai.Completion.create", "openai.completions.create", "openai.ChatCompletion.create", "openai.chat.completions.create", "openai.Completion.acreate", "openai.ChatCompletion.acreate", "litellm.completion", "litellm.acompletion"]
+          $ref: "#/components/schemas/LlmApi"
       additionalProperties: {}
     Ingestion:
       type: object