athena-intelligence 0.1.44__py3-none-any.whl → 0.1.49__py3-none-any.whl

athena/tools/client.py

@@ -7,6 +7,7 @@ from json.decoder import JSONDecodeError
 from ..core.api_error import ApiError
 from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pydantic_utilities import pydantic_v1
 from ..core.remove_none_from_dict import remove_none_from_dict
 from ..core.request_options import RequestOptions
 from ..errors.unprocessable_entity_error import UnprocessableEntityError
@@ -16,11 +17,6 @@ from ..types.http_validation_error import HttpValidationError
 from ..types.langchain_documents_request_out import LangchainDocumentsRequestOut
 from ..types.tool_models import ToolModels
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
-
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
 
@@ -57,8 +53,8 @@ class ToolsClient:
         if params is not OMIT:
             _request["params"] = params
         _response = self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/firecrawl/scrape-url"),
+            method="POST",
+            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/firecrawl/scrape-url"),
             params=jsonable_encoder(
                 request_options.get("additional_query_parameters") if request_options is not None else None
             ),
@@ -78,14 +74,16 @@ class ToolsClient:
             ),
             timeout=request_options.get("timeout_in_seconds")
             if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else 60,
+            else self._client_wrapper.get_timeout(),
             retries=0,
             max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(FirecrawlScrapeUrlDataReponseDto, _response.json())  # type: ignore
+            return pydantic_v1.parse_obj_as(FirecrawlScrapeUrlDataReponseDto, _response.json())  # type: ignore
         if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+            raise UnprocessableEntityError(
+                pydantic_v1.parse_obj_as(HttpValidationError, _response.json())  # type: ignore
+            )
         try:
             _response_json = _response.json()
         except JSONDecodeError:
@@ -127,8 +125,10 @@ class ToolsClient:
         if pagination_offset is not OMIT:
             _request["pagination_offset"] = pagination_offset
         _response = self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/file/langchain-documents"),
+            method="POST",
+            url=urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/file/langchain-documents"
+            ),
             params=jsonable_encoder(
                 request_options.get("additional_query_parameters") if request_options is not None else None
             ),
@@ -148,14 +148,16 @@ class ToolsClient:
             ),
             timeout=request_options.get("timeout_in_seconds")
             if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else 60,
+            else self._client_wrapper.get_timeout(),
             retries=0,
             max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(LangchainDocumentsRequestOut, _response.json())  # type: ignore
+            return pydantic_v1.parse_obj_as(LangchainDocumentsRequestOut, _response.json())  # type: ignore
         if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+            raise UnprocessableEntityError(
+                pydantic_v1.parse_obj_as(HttpValidationError, _response.json())  # type: ignore
+            )
         try:
             _response_json = _response.json()
         except JSONDecodeError:
@@ -202,8 +204,8 @@ class ToolsClient:
         if tool_kwargs is not OMIT:
             _request["tool_kwargs"] = tool_kwargs
         _response = self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/first-agent"),
+            method="POST",
+            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/first-agent"),
             params=jsonable_encoder(
                 request_options.get("additional_query_parameters") if request_options is not None else None
             ),
@@ -223,14 +225,16 @@ class ToolsClient:
             ),
             timeout=request_options.get("timeout_in_seconds")
             if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else 60,
+            else self._client_wrapper.get_timeout(),
             retries=0,
             max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ExcecuteToolFirstWorkflowOut, _response.json())  # type: ignore
+            return pydantic_v1.parse_obj_as(ExcecuteToolFirstWorkflowOut, _response.json())  # type: ignore
         if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+            raise UnprocessableEntityError(
+                pydantic_v1.parse_obj_as(HttpValidationError, _response.json())  # type: ignore
+            )
         try:
             _response_json = _response.json()
         except JSONDecodeError:
@@ -270,8 +274,8 @@ class AsyncToolsClient:
         if params is not OMIT:
             _request["params"] = params
         _response = await self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/firecrawl/scrape-url"),
+            method="POST",
+            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/firecrawl/scrape-url"),
             params=jsonable_encoder(
                 request_options.get("additional_query_parameters") if request_options is not None else None
             ),
@@ -291,14 +295,16 @@ class AsyncToolsClient:
             ),
             timeout=request_options.get("timeout_in_seconds")
             if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else 60,
+            else self._client_wrapper.get_timeout(),
             retries=0,
             max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(FirecrawlScrapeUrlDataReponseDto, _response.json())  # type: ignore
+            return pydantic_v1.parse_obj_as(FirecrawlScrapeUrlDataReponseDto, _response.json())  # type: ignore
         if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+            raise UnprocessableEntityError(
+                pydantic_v1.parse_obj_as(HttpValidationError, _response.json())  # type: ignore
+            )
         try:
             _response_json = _response.json()
         except JSONDecodeError:
@@ -340,8 +346,10 @@ class AsyncToolsClient:
         if pagination_offset is not OMIT:
             _request["pagination_offset"] = pagination_offset
         _response = await self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/file/langchain-documents"),
+            method="POST",
+            url=urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/file/langchain-documents"
+            ),
             params=jsonable_encoder(
                 request_options.get("additional_query_parameters") if request_options is not None else None
             ),
@@ -361,14 +369,16 @@ class AsyncToolsClient:
             ),
             timeout=request_options.get("timeout_in_seconds")
             if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else 60,
+            else self._client_wrapper.get_timeout(),
             retries=0,
             max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(LangchainDocumentsRequestOut, _response.json())  # type: ignore
+            return pydantic_v1.parse_obj_as(LangchainDocumentsRequestOut, _response.json())  # type: ignore
         if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+            raise UnprocessableEntityError(
+                pydantic_v1.parse_obj_as(HttpValidationError, _response.json())  # type: ignore
+            )
         try:
             _response_json = _response.json()
         except JSONDecodeError:
@@ -415,8 +425,8 @@ class AsyncToolsClient:
         if tool_kwargs is not OMIT:
             _request["tool_kwargs"] = tool_kwargs
         _response = await self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/first-agent"),
+            method="POST",
+            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/first-agent"),
             params=jsonable_encoder(
                 request_options.get("additional_query_parameters") if request_options is not None else None
             ),
@@ -436,14 +446,16 @@ class AsyncToolsClient:
             ),
             timeout=request_options.get("timeout_in_seconds")
             if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else 60,
+            else self._client_wrapper.get_timeout(),
             retries=0,
             max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ExcecuteToolFirstWorkflowOut, _response.json())  # type: ignore
+            return pydantic_v1.parse_obj_as(ExcecuteToolFirstWorkflowOut, _response.json())  # type: ignore
         if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+            raise UnprocessableEntityError(
+                pydantic_v1.parse_obj_as(HttpValidationError, _response.json())  # type: ignore
+            )
         try:
             _response_json = _response.json()
         except JSONDecodeError:

athena/types/__init__.py

@@ -9,9 +9,11 @@ from .get_datasets_response import GetDatasetsResponse
 from .get_snippets_response import GetSnippetsResponse
 from .http_validation_error import HttpValidationError
 from .langchain_documents_request_out import LangchainDocumentsRequestOut
+from .llm_model import LlmModel
 from .message_out import MessageOut
 from .message_out_dto import MessageOutDto
 from .model import Model
+from .plan_execute_out import PlanExecuteOut
 from .report import Report
 from .snippet import Snippet
 from .sql_results import SqlResults
@@ -33,9 +35,11 @@ __all__ = [
     "GetSnippetsResponse",
     "HttpValidationError",
     "LangchainDocumentsRequestOut",
+    "LlmModel",
     "MessageOut",
     "MessageOutDto",
     "Model",
+    "PlanExecuteOut",
     "Report",
     "Snippet",
     "SqlResults",

athena/types/dataset.py

@@ -4,14 +4,10 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class Dataset(pydantic.BaseModel):
+class Dataset(pydantic_v1.BaseModel):
     id: str
     name: typing.Optional[str] = None
     description: typing.Optional[str] = None
@@ -29,4 +25,5 @@ class Dataset(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

athena/types/document.py

@@ -4,14 +4,10 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class Document(pydantic.BaseModel):
+class Document(pydantic_v1.BaseModel):
     """
     Class for storing a piece of text and associated metadata.
     """
@@ -31,4 +27,5 @@ class Document(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

athena/types/excecute_tool_first_workflow_out.py

@@ -4,14 +4,10 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class ExcecuteToolFirstWorkflowOut(pydantic.BaseModel):
+class ExcecuteToolFirstWorkflowOut(pydantic_v1.BaseModel):
     output_message: str
 
     def json(self, **kwargs: typing.Any) -> str:
@@ -25,4 +21,5 @@ class ExcecuteToolFirstWorkflowOut(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

athena/types/firecrawl_scrape_url_data_reponse_dto.py

@@ -4,15 +4,11 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 from .firecrawl_scrape_url_metadata import FirecrawlScrapeUrlMetadata
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class FirecrawlScrapeUrlDataReponseDto(pydantic.BaseModel):
+class FirecrawlScrapeUrlDataReponseDto(pydantic_v1.BaseModel):
     content: str
     markdown: str
     metadata: FirecrawlScrapeUrlMetadata
@@ -28,4 +24,5 @@ class FirecrawlScrapeUrlDataReponseDto(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

athena/types/firecrawl_scrape_url_metadata.py

@@ -4,18 +4,14 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class FirecrawlScrapeUrlMetadata(pydantic.BaseModel):
+class FirecrawlScrapeUrlMetadata(pydantic_v1.BaseModel):
     title: typing.Optional[str] = None
     description: typing.Optional[str] = None
     language: typing.Optional[str] = None
-    source_url: typing.Optional[str] = pydantic.Field(alias="sourceURL", default=None)
+    source_url: typing.Optional[str] = pydantic_v1.Field(alias="sourceURL", default=None)
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
@@ -29,4 +25,6 @@ class FirecrawlScrapeUrlMetadata(pydantic.BaseModel):
         frozen = True
         smart_union = True
         allow_population_by_field_name = True
+        populate_by_name = True
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

athena/types/get_datasets_response.py

@@ -4,15 +4,11 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 from .dataset import Dataset
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class GetDatasetsResponse(pydantic.BaseModel):
+class GetDatasetsResponse(pydantic_v1.BaseModel):
     datasets: typing.List[Dataset]
     total: int
     page: int
@@ -30,4 +26,5 @@ class GetDatasetsResponse(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

athena/types/get_snippets_response.py

@@ -4,15 +4,11 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 from .snippet import Snippet
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class GetSnippetsResponse(pydantic.BaseModel):
+class GetSnippetsResponse(pydantic_v1.BaseModel):
     snippets: typing.List[Snippet]
     total: int
     page: int
@@ -30,4 +26,5 @@ class GetSnippetsResponse(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

athena/types/http_validation_error.py

@@ -4,15 +4,11 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 from .validation_error import ValidationError
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class HttpValidationError(pydantic.BaseModel):
+class HttpValidationError(pydantic_v1.BaseModel):
     detail: typing.Optional[typing.List[ValidationError]] = None
 
     def json(self, **kwargs: typing.Any) -> str:
@@ -26,4 +22,5 @@ class HttpValidationError(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

athena/types/langchain_documents_request_out.py

@@ -4,15 +4,11 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 from .document import Document
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class LangchainDocumentsRequestOut(pydantic.BaseModel):
+class LangchainDocumentsRequestOut(pydantic_v1.BaseModel):
     documents: typing.List[Document]
 
     def json(self, **kwargs: typing.Any) -> str:
@@ -26,4 +22,5 @@ class LangchainDocumentsRequestOut(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

athena/types/llm_model.py

@@ -0,0 +1,93 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import enum
+import typing
+
+T_Result = typing.TypeVar("T_Result")
+
+
+class LlmModel(str, enum.Enum):
+    """
+    An enumeration.
+    """
+
+    GPT_35_TURBO = "gpt-3.5-turbo"
+    GPT_4_TURBO = "gpt-4-turbo"
+    GPT_4_TURBO_PREVIEW = "gpt-4-turbo-preview"
+    GPT_4 = "gpt-4"
+    MIXTRAL_SMALL_8_X_7_B_0211 = "mixtral-small-8x7b-0211"
+    MISTRAL_LARGE_0224 = "mistral-large-0224"
+    MIXTRAL_8_X_22_B_INSTRUCT = "mixtral-8x22b-instruct"
+    LLAMA_V_38_B_INSTRUCT = "llama-v3-8b-instruct"
+    LLAMA_V_370_B_INSTRUCT = "llama-v3-70b-instruct"
+    CLAUDE_3_OPUS_20240229 = "claude-3-opus-20240229"
+    CLAUDE_3_SONNET_20240229 = "claude-3-sonnet-20240229"
+    CLAUDE_3_HAIKU_20240307 = "claude-3-haiku-20240307"
+    GROQ_MIXTRAL_8_X_7_B_32768 = "groq-mixtral-8x7b-32768"
+    GROQ_LLAMA_38_B_8192 = "groq-llama3-8b-8192"
+    GROQ_LLAMA_370_B_8192 = "groq-llama3-70b-8192"
+    GROQ_GEMMA_7_B_IT = "groq-gemma-7b-it"
+    GOOGLE_GEMINI_10_PRO_LATEST = "google-gemini-1.0-pro-latest"
+    DATABRICKS_DBRX = "databricks-dbrx"
+    GOOGLE_GEMINI_15_PRO_LATEST = "google-gemini-1.5-pro-latest"
+
+    def visit(
+        self,
+        gpt_35_turbo: typing.Callable[[], T_Result],
+        gpt_4_turbo: typing.Callable[[], T_Result],
+        gpt_4_turbo_preview: typing.Callable[[], T_Result],
+        gpt_4: typing.Callable[[], T_Result],
+        mixtral_small_8_x_7_b_0211: typing.Callable[[], T_Result],
+        mistral_large_0224: typing.Callable[[], T_Result],
+        mixtral_8_x_22_b_instruct: typing.Callable[[], T_Result],
+        llama_v_38_b_instruct: typing.Callable[[], T_Result],
+        llama_v_370_b_instruct: typing.Callable[[], T_Result],
+        claude_3_opus_20240229: typing.Callable[[], T_Result],
+        claude_3_sonnet_20240229: typing.Callable[[], T_Result],
+        claude_3_haiku_20240307: typing.Callable[[], T_Result],
+        groq_mixtral_8_x_7_b_32768: typing.Callable[[], T_Result],
+        groq_llama_38_b_8192: typing.Callable[[], T_Result],
+        groq_llama_370_b_8192: typing.Callable[[], T_Result],
+        groq_gemma_7_b_it: typing.Callable[[], T_Result],
+        google_gemini_10_pro_latest: typing.Callable[[], T_Result],
+        databricks_dbrx: typing.Callable[[], T_Result],
+        google_gemini_15_pro_latest: typing.Callable[[], T_Result],
+    ) -> T_Result:
+        if self is LlmModel.GPT_35_TURBO:
+            return gpt_35_turbo()
+        if self is LlmModel.GPT_4_TURBO:
+            return gpt_4_turbo()
+        if self is LlmModel.GPT_4_TURBO_PREVIEW:
+            return gpt_4_turbo_preview()
+        if self is LlmModel.GPT_4:
+            return gpt_4()
+        if self is LlmModel.MIXTRAL_SMALL_8_X_7_B_0211:
+            return mixtral_small_8_x_7_b_0211()
+        if self is LlmModel.MISTRAL_LARGE_0224:
+            return mistral_large_0224()
+        if self is LlmModel.MIXTRAL_8_X_22_B_INSTRUCT:
+            return mixtral_8_x_22_b_instruct()
+        if self is LlmModel.LLAMA_V_38_B_INSTRUCT:
+            return llama_v_38_b_instruct()
+        if self is LlmModel.LLAMA_V_370_B_INSTRUCT:
+            return llama_v_370_b_instruct()
+        if self is LlmModel.CLAUDE_3_OPUS_20240229:
+            return claude_3_opus_20240229()
+        if self is LlmModel.CLAUDE_3_SONNET_20240229:
+            return claude_3_sonnet_20240229()
+        if self is LlmModel.CLAUDE_3_HAIKU_20240307:
+            return claude_3_haiku_20240307()
+        if self is LlmModel.GROQ_MIXTRAL_8_X_7_B_32768:
+            return groq_mixtral_8_x_7_b_32768()
+        if self is LlmModel.GROQ_LLAMA_38_B_8192:
+            return groq_llama_38_b_8192()
+        if self is LlmModel.GROQ_LLAMA_370_B_8192:
+            return groq_llama_370_b_8192()
+        if self is LlmModel.GROQ_GEMMA_7_B_IT:
+            return groq_gemma_7_b_it()
+        if self is LlmModel.GOOGLE_GEMINI_10_PRO_LATEST:
+            return google_gemini_10_pro_latest()
+        if self is LlmModel.DATABRICKS_DBRX:
+            return databricks_dbrx()
+        if self is LlmModel.GOOGLE_GEMINI_15_PRO_LATEST:
+            return google_gemini_15_pro_latest()

athena/types/message_out.py

@@ -4,14 +4,10 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class MessageOut(pydantic.BaseModel):
+class MessageOut(pydantic_v1.BaseModel):
     id: str
 
     def json(self, **kwargs: typing.Any) -> str:
@@ -25,4 +21,5 @@ class MessageOut(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

athena/types/message_out_dto.py

@@ -4,15 +4,11 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
 from .status_enum import StatusEnum
 
-try:
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
 
-
-class MessageOutDto(pydantic.BaseModel):
+class MessageOutDto(pydantic_v1.BaseModel):
     id: str
     conversation_id: str
     logs: typing.Optional[str] = None
@@ -31,4 +27,5 @@ class MessageOutDto(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
+        extra = pydantic_v1.Extra.allow
         json_encoders = {dt.datetime: serialize_datetime}

athena/types/model.py

@@ -18,7 +18,8 @@ class Model(str, enum.Enum):
     MIXTRAL_SMALL_8_X_7_B_0211 = "mixtral-small-8x7b-0211"
     MISTRAL_LARGE_0224 = "mistral-large-0224"
     MIXTRAL_8_X_22_B_INSTRUCT = "mixtral-8x22b-instruct"
-    LLAMA_V_270_B_CHAT = "llama-v2-70b-chat"
+    LLAMA_V_370_B_INSTRUCT = "llama-v3-70b-instruct"
+    LLAMA_V_38_B_INSTRUCT = "llama-v3-8b-instruct"
     CLAUDE_3_OPUS_20240229 = "claude-3-opus-20240229"
     CLAUDE_3_SONNET_20240229 = "claude-3-sonnet-20240229"
     CLAUDE_3_HAIKU_20240307 = "claude-3-haiku-20240307"
@@ -34,7 +35,8 @@ class Model(str, enum.Enum):
         mixtral_small_8_x_7_b_0211: typing.Callable[[], T_Result],
         mistral_large_0224: typing.Callable[[], T_Result],
         mixtral_8_x_22_b_instruct: typing.Callable[[], T_Result],
-        llama_v_270_b_chat: typing.Callable[[], T_Result],
+        llama_v_370_b_instruct: typing.Callable[[], T_Result],
+        llama_v_38_b_instruct: typing.Callable[[], T_Result],
         claude_3_opus_20240229: typing.Callable[[], T_Result],
         claude_3_sonnet_20240229: typing.Callable[[], T_Result],
         claude_3_haiku_20240307: typing.Callable[[], T_Result],
@@ -55,8 +57,10 @@ class Model(str, enum.Enum):
             return mistral_large_0224()
         if self is Model.MIXTRAL_8_X_22_B_INSTRUCT:
             return mixtral_8_x_22_b_instruct()
-        if self is Model.LLAMA_V_270_B_CHAT:
-            return llama_v_270_b_chat()
+        if self is Model.LLAMA_V_370_B_INSTRUCT:
+            return llama_v_370_b_instruct()
+        if self is Model.LLAMA_V_38_B_INSTRUCT:
+            return llama_v_38_b_instruct()
         if self is Model.CLAUDE_3_OPUS_20240229:
             return claude_3_opus_20240229()
         if self is Model.CLAUDE_3_SONNET_20240229:

athena/types/plan_execute_out.py

@@ -0,0 +1,32 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import datetime as dt
+import typing
+
+from ..core.datetime_utils import serialize_datetime
+from ..core.pydantic_utilities import pydantic_v1
+
+
+class PlanExecuteOut(pydantic_v1.BaseModel):
+    input: str
+    instructions: str
+    input_data: str
+    output_format: str
+    plan: typing.List[str]
+    past_steps: typing.List[typing.List[typing.Any]]
+    final_output: str
+    done: bool
+
+    def json(self, **kwargs: typing.Any) -> str:
+        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
+        return super().json(**kwargs_with_defaults)
+
+    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
+        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
+        return super().dict(**kwargs_with_defaults)
+
+    class Config:
+        frozen = True
+        smart_union = True
+        extra = pydantic_v1.Extra.allow
+        json_encoders = {dt.datetime: serialize_datetime}