athena-intelligence 0.1.6__py3-none-any.whl → 0.1.8__py3-none-any.whl

athena/__init__.py

@@ -2,6 +2,7 @@
 
 from .types import HttpValidationError, MessageOut, MessageOutDto, Model, Tools, ValidationError, ValidationErrorLocItem
 from .errors import UnprocessableEntityError
+from .resources import message
 from .environment import AthenaEnvironment
 
 __all__ = [
@@ -14,4 +15,5 @@ __all__ = [
     "UnprocessableEntityError",
     "ValidationError",
     "ValidationErrorLocItem",
+    "message",
 ]

athena/client.py

@@ -1,31 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-import urllib.parse
-from json.decoder import JSONDecodeError
 
 import httpx
 
-from .core.api_error import ApiError
 from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
-from .core.jsonable_encoder import jsonable_encoder
-from .core.remove_none_from_dict import remove_none_from_dict
-from .core.request_options import RequestOptions
 from .environment import AthenaEnvironment
-from .errors.unprocessable_entity_error import UnprocessableEntityError
-from .types.http_validation_error import HttpValidationError
-from .types.message_out import MessageOut
-from .types.message_out_dto import MessageOutDto
-from .types.model import Model
-from .types.tools import Tools
-
-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, ...)
+from .resources.message.client import AsyncMessageClient, MessageClient
 
 
 class Athena:
@@ -41,7 +22,7 @@ class Athena:
 
         - api_key: str.
 
-        - token: typing.Optional[typing.Union[str, typing.Callable[[], str]]].
+        - token: typing.Union[str, typing.Callable[[], str]].
 
         - timeout: typing.Optional[float]. The timeout to be used, in seconds, for requests by default the timeout is 60 seconds.
 
@@ -61,9 +42,9 @@ class Athena:
         base_url: typing.Optional[str] = None,
         environment: AthenaEnvironment = AthenaEnvironment.DEFAULT,
         api_key: str,
-        token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
+        token: typing.Union[str, typing.Callable[[], str]],
         timeout: typing.Optional[float] = 60,
-        httpx_client: typing.Optional[httpx.Client] = None,
+        httpx_client: typing.Optional[httpx.Client] = None
     ):
         self._client_wrapper = SyncClientWrapper(
             base_url=_get_base_url(base_url=base_url, environment=environment),
@@ -71,171 +52,7 @@ class Athena:
             token=token,
             httpx_client=httpx.Client(timeout=timeout) if httpx_client is None else httpx_client,
         )
-
-    def post_message(
-        self,
-        *,
-        content: str,
-        model: typing.Optional[Model] = OMIT,
-        tools: typing.Optional[typing.Sequence[Tools]] = OMIT,
-        conversation_id: typing.Optional[str] = OMIT,
-        conversation_name: typing.Optional[str] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
-    ) -> MessageOut:
-        """
-        Parameters:
-            - content: str.
-
-            - model: typing.Optional[Model].
-
-            - tools: typing.Optional[typing.Sequence[Tools]].
-
-            - conversation_id: typing.Optional[str].
-
-            - conversation_name: typing.Optional[str].
-
-            - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
-        ---
-        from athena.client import Athena
-
-        client = Athena(
-            api_key="YOUR_API_KEY",
-            token="YOUR_TOKEN",
-        )
-        client.post_message(
-            content="content",
-        )
-        """
-        _request: typing.Dict[str, typing.Any] = {"content": content}
-        if model is not OMIT:
-            _request["model"] = model.value if model is not None else None
-        if tools is not OMIT:
-            _request["tools"] = tools
-        if conversation_id is not OMIT:
-            _request["conversation_id"] = conversation_id
-        if conversation_name is not OMIT:
-            _request["conversation_name"] = conversation_name
-        _response = self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/message"),
-            params=jsonable_encoder(
-                request_options.get("additional_query_parameters") if request_options is not None else None
-            ),
-            json=jsonable_encoder(_request)
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder(_request),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
-            },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            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,
-        )
-        if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(MessageOut, _response.json())  # type: ignore
-        if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
-        try:
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
-
-    def athena_get_message(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> MessageOutDto:
-        """
-        Parameters:
-            - id: str.
-
-            - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
-        ---
-        from athena.client import Athena
-
-        client = Athena(
-            api_key="YOUR_API_KEY",
-            token="YOUR_TOKEN",
-        )
-        client.athena_get_message(
-            id="id",
-        )
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v0/message/{jsonable_encoder(id)}"),
-            params=jsonable_encoder(
-                request_options.get("additional_query_parameters") if request_options is not None else None
-            ),
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            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,
-        )
-        if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(MessageOutDto, _response.json())  # type: ignore
-        if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
-        try:
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
-
-    def health_check(self, *, request_options: typing.Optional[RequestOptions] = None) -> typing.Any:
-        """
-        Checks the health of a project.
-
-        It returns 200 if the project is healthy.
-
-        Parameters:
-            - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
-        ---
-        from athena.client import Athena
-
-        client = Athena(
-            api_key="YOUR_API_KEY",
-            token="YOUR_TOKEN",
-        )
-        client.health_check()
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/health"),
-            params=jsonable_encoder(
-                request_options.get("additional_query_parameters") if request_options is not None else None
-            ),
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            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,
-        )
-        if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.Any, _response.json())  # type: ignore
-        try:
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        self.message = MessageClient(client_wrapper=self._client_wrapper)
 
 
 class AsyncAthena:
@@ -251,7 +68,7 @@ class AsyncAthena:
 
         - api_key: str.
 
-        - token: typing.Optional[typing.Union[str, typing.Callable[[], str]]].
+        - token: typing.Union[str, typing.Callable[[], str]].
 
         - timeout: typing.Optional[float]. The timeout to be used, in seconds, for requests by default the timeout is 60 seconds.
 
@@ -271,9 +88,9 @@ class AsyncAthena:
         base_url: typing.Optional[str] = None,
         environment: AthenaEnvironment = AthenaEnvironment.DEFAULT,
         api_key: str,
-        token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
+        token: typing.Union[str, typing.Callable[[], str]],
         timeout: typing.Optional[float] = 60,
-        httpx_client: typing.Optional[httpx.AsyncClient] = None,
+        httpx_client: typing.Optional[httpx.AsyncClient] = None
     ):
         self._client_wrapper = AsyncClientWrapper(
             base_url=_get_base_url(base_url=base_url, environment=environment),
@@ -281,173 +98,7 @@ class AsyncAthena:
             token=token,
             httpx_client=httpx.AsyncClient(timeout=timeout) if httpx_client is None else httpx_client,
         )
-
-    async def post_message(
-        self,
-        *,
-        content: str,
-        model: typing.Optional[Model] = OMIT,
-        tools: typing.Optional[typing.Sequence[Tools]] = OMIT,
-        conversation_id: typing.Optional[str] = OMIT,
-        conversation_name: typing.Optional[str] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
-    ) -> MessageOut:
-        """
-        Parameters:
-            - content: str.
-
-            - model: typing.Optional[Model].
-
-            - tools: typing.Optional[typing.Sequence[Tools]].
-
-            - conversation_id: typing.Optional[str].
-
-            - conversation_name: typing.Optional[str].
-
-            - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
-        ---
-        from athena.client import AsyncAthena
-
-        client = AsyncAthena(
-            api_key="YOUR_API_KEY",
-            token="YOUR_TOKEN",
-        )
-        await client.post_message(
-            content="content",
-        )
-        """
-        _request: typing.Dict[str, typing.Any] = {"content": content}
-        if model is not OMIT:
-            _request["model"] = model.value if model is not None else None
-        if tools is not OMIT:
-            _request["tools"] = tools
-        if conversation_id is not OMIT:
-            _request["conversation_id"] = conversation_id
-        if conversation_name is not OMIT:
-            _request["conversation_name"] = conversation_name
-        _response = await self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/message"),
-            params=jsonable_encoder(
-                request_options.get("additional_query_parameters") if request_options is not None else None
-            ),
-            json=jsonable_encoder(_request)
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder(_request),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
-            },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            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,
-        )
-        if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(MessageOut, _response.json())  # type: ignore
-        if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
-        try:
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
-
-    async def athena_get_message(
-        self, id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> MessageOutDto:
-        """
-        Parameters:
-            - id: str.
-
-            - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
-        ---
-        from athena.client import AsyncAthena
-
-        client = AsyncAthena(
-            api_key="YOUR_API_KEY",
-            token="YOUR_TOKEN",
-        )
-        await client.athena_get_message(
-            id="id",
-        )
-        """
-        _response = await self._client_wrapper.httpx_client.request(
-            "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v0/message/{jsonable_encoder(id)}"),
-            params=jsonable_encoder(
-                request_options.get("additional_query_parameters") if request_options is not None else None
-            ),
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            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,
-        )
-        if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(MessageOutDto, _response.json())  # type: ignore
-        if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
-        try:
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
-
-    async def health_check(self, *, request_options: typing.Optional[RequestOptions] = None) -> typing.Any:
-        """
-        Checks the health of a project.
-
-        It returns 200 if the project is healthy.
-
-        Parameters:
-            - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
-        ---
-        from athena.client import AsyncAthena
-
-        client = AsyncAthena(
-            api_key="YOUR_API_KEY",
-            token="YOUR_TOKEN",
-        )
-        await client.health_check()
-        """
-        _response = await self._client_wrapper.httpx_client.request(
-            "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/health"),
-            params=jsonable_encoder(
-                request_options.get("additional_query_parameters") if request_options is not None else None
-            ),
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            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,
-        )
-        if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.Any, _response.json())  # type: ignore
-        try:
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        self.message = AsyncMessageClient(client_wrapper=self._client_wrapper)
 
 
 def _get_base_url(*, base_url: typing.Optional[str] = None, environment: AthenaEnvironment) -> str:

athena/core/client_wrapper.py

@@ -6,9 +6,7 @@ import httpx
 
 
 class BaseClientWrapper:
-    def __init__(
-        self, *, api_key: str, token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None, base_url: str
-    ):
+    def __init__(self, *, api_key: str, token: typing.Union[str, typing.Callable[[], str]], base_url: str):
         self._api_key = api_key
         self._token = token
         self._base_url = base_url
@@ -17,16 +15,14 @@ class BaseClientWrapper:
         headers: typing.Dict[str, str] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "athena-intelligence",
-            "X-Fern-SDK-Version": "0.1.6",
+            "X-Fern-SDK-Version": "0.1.8",
         }
         headers["X-API-KEY"] = self._api_key
-        token = self._get_token()
-        if token is not None:
-            headers["Authorization"] = f"Bearer {token}"
+        headers["Authorization"] = f"Bearer {self._get_token()}"
         return headers
 
-    def _get_token(self) -> typing.Optional[str]:
-        if isinstance(self._token, str) or self._token is None:
+    def _get_token(self) -> str:
+        if isinstance(self._token, str):
             return self._token
         else:
             return self._token()
@@ -40,7 +36,7 @@ class SyncClientWrapper(BaseClientWrapper):
         self,
         *,
         api_key: str,
-        token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
+        token: typing.Union[str, typing.Callable[[], str]],
         base_url: str,
         httpx_client: httpx.Client,
     ):
@@ -53,7 +49,7 @@ class AsyncClientWrapper(BaseClientWrapper):
         self,
         *,
         api_key: str,
-        token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
+        token: typing.Union[str, typing.Callable[[], str]],
         base_url: str,
         httpx_client: httpx.AsyncClient,
     ):

athena/resources/__init__.py

@@ -0,0 +1,5 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from . import message
+
+__all__ = ["message"]

athena/resources/message/__init__.py

@@ -0,0 +1,2 @@
+# This file was auto-generated by Fern from our API Definition.
+

athena/resources/message/client.py

@@ -0,0 +1,285 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+import urllib.parse
+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.remove_none_from_dict import remove_none_from_dict
+from ...core.request_options import RequestOptions
+from ...errors.unprocessable_entity_error import UnprocessableEntityError
+from ...types.http_validation_error import HttpValidationError
+from ...types.message_out import MessageOut
+from ...types.message_out_dto import MessageOutDto
+from ...types.model import Model
+from ...types.tools import Tools
+
+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, ...)
+
+
+class MessageClient:
+    def __init__(self, *, client_wrapper: SyncClientWrapper):
+        self._client_wrapper = client_wrapper
+
+    def submit(
+        self,
+        *,
+        content: str,
+        model: typing.Optional[Model] = OMIT,
+        tools: typing.Optional[typing.Sequence[Tools]] = OMIT,
+        conversation_id: typing.Optional[str] = OMIT,
+        conversation_name: typing.Optional[str] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> MessageOut:
+        """
+        Parameters:
+            - content: str.
+
+            - model: typing.Optional[Model].
+
+            - tools: typing.Optional[typing.Sequence[Tools]].
+
+            - conversation_id: typing.Optional[str].
+
+            - conversation_name: typing.Optional[str].
+
+            - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
+        ---
+        from athena import Model, Tools
+        from athena.client import Athena
+
+        client = Athena(
+            api_key="YOUR_API_KEY",
+            token="YOUR_TOKEN",
+        )
+        client.message.submit(
+            content="visit www.athenaintelligence.ai and summarize the website in one paragraph",
+            model=Model.GPT_4_TURBO_PREVIEW,
+            tools=[Tools.SEARCH, Tools.BROWSE, Tools.SEARCH],
+        )
+        """
+        _request: typing.Dict[str, typing.Any] = {"content": content}
+        if model is not OMIT:
+            _request["model"] = model.value if model is not None else None
+        if tools is not OMIT:
+            _request["tools"] = tools
+        if conversation_id is not OMIT:
+            _request["conversation_id"] = conversation_id
+        if conversation_name is not OMIT:
+            _request["conversation_name"] = conversation_name
+        _response = self._client_wrapper.httpx_client.request(
+            "POST",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/message"),
+            params=jsonable_encoder(
+                request_options.get("additional_query_parameters") if request_options is not None else None
+            ),
+            json=jsonable_encoder(_request)
+            if request_options is None or request_options.get("additional_body_parameters") is None
+            else {
+                **jsonable_encoder(_request),
+                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
+            },
+            headers=jsonable_encoder(
+                remove_none_from_dict(
+                    {
+                        **self._client_wrapper.get_headers(),
+                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
+                    }
+                )
+            ),
+            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,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(MessageOut, _response.json())  # type: ignore
+        if _response.status_code == 422:
+            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+        try:
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
+
+    def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> MessageOutDto:
+        """
+        Parameters:
+            - id: str.
+
+            - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
+        ---
+        from athena.client import Athena
+
+        client = Athena(
+            api_key="YOUR_API_KEY",
+            token="YOUR_TOKEN",
+        )
+        client.message.get(
+            id="id",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v0/message/{jsonable_encoder(id)}"),
+            params=jsonable_encoder(
+                request_options.get("additional_query_parameters") if request_options is not None else None
+            ),
+            headers=jsonable_encoder(
+                remove_none_from_dict(
+                    {
+                        **self._client_wrapper.get_headers(),
+                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
+                    }
+                )
+            ),
+            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,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(MessageOutDto, _response.json())  # type: ignore
+        if _response.status_code == 422:
+            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+        try:
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
+
+
+class AsyncMessageClient:
+    def __init__(self, *, client_wrapper: AsyncClientWrapper):
+        self._client_wrapper = client_wrapper
+
+    async def submit(
+        self,
+        *,
+        content: str,
+        model: typing.Optional[Model] = OMIT,
+        tools: typing.Optional[typing.Sequence[Tools]] = OMIT,
+        conversation_id: typing.Optional[str] = OMIT,
+        conversation_name: typing.Optional[str] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> MessageOut:
+        """
+        Parameters:
+            - content: str.
+
+            - model: typing.Optional[Model].
+
+            - tools: typing.Optional[typing.Sequence[Tools]].
+
+            - conversation_id: typing.Optional[str].
+
+            - conversation_name: typing.Optional[str].
+
+            - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
+        ---
+        from athena import Model, Tools
+        from athena.client import AsyncAthena
+
+        client = AsyncAthena(
+            api_key="YOUR_API_KEY",
+            token="YOUR_TOKEN",
+        )
+        await client.message.submit(
+            content="visit www.athenaintelligence.ai and summarize the website in one paragraph",
+            model=Model.GPT_4_TURBO_PREVIEW,
+            tools=[Tools.SEARCH, Tools.BROWSE, Tools.SEARCH],
+        )
+        """
+        _request: typing.Dict[str, typing.Any] = {"content": content}
+        if model is not OMIT:
+            _request["model"] = model.value if model is not None else None
+        if tools is not OMIT:
+            _request["tools"] = tools
+        if conversation_id is not OMIT:
+            _request["conversation_id"] = conversation_id
+        if conversation_name is not OMIT:
+            _request["conversation_name"] = conversation_name
+        _response = await self._client_wrapper.httpx_client.request(
+            "POST",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/message"),
+            params=jsonable_encoder(
+                request_options.get("additional_query_parameters") if request_options is not None else None
+            ),
+            json=jsonable_encoder(_request)
+            if request_options is None or request_options.get("additional_body_parameters") is None
+            else {
+                **jsonable_encoder(_request),
+                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
+            },
+            headers=jsonable_encoder(
+                remove_none_from_dict(
+                    {
+                        **self._client_wrapper.get_headers(),
+                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
+                    }
+                )
+            ),
+            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,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(MessageOut, _response.json())  # type: ignore
+        if _response.status_code == 422:
+            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+        try:
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
+
+    async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> MessageOutDto:
+        """
+        Parameters:
+            - id: str.
+
+            - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
+        ---
+        from athena.client import AsyncAthena
+
+        client = AsyncAthena(
+            api_key="YOUR_API_KEY",
+            token="YOUR_TOKEN",
+        )
+        await client.message.get(
+            id="id",
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v0/message/{jsonable_encoder(id)}"),
+            params=jsonable_encoder(
+                request_options.get("additional_query_parameters") if request_options is not None else None
+            ),
+            headers=jsonable_encoder(
+                remove_none_from_dict(
+                    {
+                        **self._client_wrapper.get_headers(),
+                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
+                    }
+                )
+            ),
+            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,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(MessageOutDto, _response.json())  # type: ignore
+        if _response.status_code == 422:
+            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+        try:
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)

athena/types/model.py

@@ -11,19 +11,19 @@ class Model(str, enum.Enum):
     An enumeration.
     """
 
-    GPT_4 = "gpt_4"
-    GPT_4_TURBO_PREVIEW = "gpt_4_turbo_preview"
-    GPT_3_5_TURBO = "gpt_3_5_turbo"
+    GPT_35_TURBO = "gpt-3.5-turbo"
+    GPT_4_TURBO_PREVIEW = "gpt-4-turbo-preview"
+    MIXTRAL_SMALL_8_X_7_B_0211 = "mixtral-small-8x7b-0211"
 
     def visit(
         self,
-        gpt_4: typing.Callable[[], T_Result],
+        gpt_35_turbo: typing.Callable[[], T_Result],
         gpt_4_turbo_preview: typing.Callable[[], T_Result],
-        gpt_3_5_turbo: typing.Callable[[], T_Result],
+        mixtral_small_8_x_7_b_0211: typing.Callable[[], T_Result],
     ) -> T_Result:
-        if self is Model.GPT_4:
-            return gpt_4()
+        if self is Model.GPT_35_TURBO:
+            return gpt_35_turbo()
         if self is Model.GPT_4_TURBO_PREVIEW:
             return gpt_4_turbo_preview()
-        if self is Model.GPT_3_5_TURBO:
-            return gpt_3_5_turbo()
+        if self is Model.MIXTRAL_SMALL_8_X_7_B_0211:
+            return mixtral_small_8_x_7_b_0211()

{athena_intelligence-0.1.6.dist-info → athena_intelligence-0.1.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: athena-intelligence
-Version: 0.1.6
+Version: 0.1.8
 Summary: 
 Requires-Python: >=3.8,<4.0
 Classifier: Programming Language :: Python :: 3

{athena_intelligence-0.1.6.dist-info → athena_intelligence-0.1.8.dist-info}/RECORD

@@ -1,8 +1,8 @@
-athena/__init__.py,sha256=S4TY2NjQ19rPwYCWsw8-Cxrr51PjtSN2pma_ybgaUtQ,491
-athena/client.py,sha256=WXN18ACRosd3qN1d94NgM-78FUulVbdlerOwDnU5k6Q,18835
+athena/__init__.py,sha256=7MO7cM1Jgw7XSF7MQwokJ4oeRy_uFCuFNqT4Kpn7KSQ,537
+athena/client.py,sha256=ax_fRBUF-7c5-HAnEGJCz7eBDmk-Y6E_YGXWkmGcriI,4321
 athena/core/__init__.py,sha256=95onSWXymaL0iV-nBsuKNgjh1LbsymAkRkx7POn1nc0,696
 athena/core/api_error.py,sha256=RE8LELok2QCjABadECTvtDp7qejA1VmINCh6TbqPwSE,426
-athena/core/client_wrapper.py,sha256=tSfOvOz_OP0344gd3EtzPmncGuzRczjYiP_Gpg97kzs,1810
+athena/core/client_wrapper.py,sha256=KHNAQ7NxjY2OMX7f0KO9CMqdMEaSwZ6BtruNLbmsy64,1628
 athena/core/datetime_utils.py,sha256=nBys2IsYrhPdszxGKCNRPSOCwa-5DWOHG95FB8G9PKo,1047
 athena/core/file.py,sha256=sy1RUGZ3aJYuw998bZytxxo6QdgKmlnlgBaMvwEKCGg,1480
 athena/core/jsonable_encoder.py,sha256=MTYkDov2EryHgee4QM46uZiBOuOXK9KTHlBdBwU-CpU,3799
@@ -12,14 +12,17 @@ athena/environment.py,sha256=D_CljQlUahhEi9smvMslj_5Y8gMFO6D0fRCL0ydRLuM,165
 athena/errors/__init__.py,sha256=pbbVUFtB9LCocA1RMWMMF_RKjsy5YkOKX5BAuE49w6g,170
 athena/errors/unprocessable_entity_error.py,sha256=FvR7XPlV3Xx5nu8HNlmLhBRdk4so_gCHjYT5PyZe6sM,313
 athena/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+athena/resources/__init__.py,sha256=H2Sg5QOlqjAbAl_ADBNYPqFArb-9plPdXDPVdeIkXDk,110
+athena/resources/message/__init__.py,sha256=FTtvy8EDg9nNNg9WCatVgKTRYV8-_v1roeGPAKoa_pw,65
+athena/resources/message/client.py,sha256=l0_IjdepvNGDeHT0kp6ivNQD13IiP2zwtCi9qjeBQAc,11892
 athena/types/__init__.py,sha256=sG74gyPktXegm01dMPmvxhq9um_3GdxMtF8kbSR9L4s,517
 athena/types/http_validation_error.py,sha256=Fcv_CTMMrLvCeTHjF0n5xf5tskMDgt-J6H9gp654eQw,973
 athena/types/message_out.py,sha256=uvZY_Podv2XccEk8CICug9I_S2hFJTSzCBwcHiauW7A,865
 athena/types/message_out_dto.py,sha256=GZ30Lk4PS0opAJS24cC_VfpPVZ87lFW171YH82_dEaQ,1008
-athena/types/model.py,sha256=SXpMQM_Dk-AIEbisBd4OGwLiqI1ePaDNEqXrs9ijuEY,732
+athena/types/model.py,sha256=xyD4lk5YWZTzYQc6f76FUBOQe4_jTHSS8edSzOY5eQc,830
 athena/types/tools.py,sha256=Vfb-D9CYcPZH6MBATNODgfXjFyBpCs4qbkqpCMl7eBM,1277
 athena/types/validation_error.py,sha256=2JhGNJouo8QpfrMBoT_JCwYSn1nFN2Nnq0p9uPLDH-U,992
 athena/types/validation_error_loc_item.py,sha256=LAtjCHIllWRBFXvAZ5QZpp7CPXjdtN9EB7HrLVo6EP0,128
-athena_intelligence-0.1.6.dist-info/METADATA,sha256=L4IpOz-BUW715BoB_CQEvtUEBOQo19ewsn-ozfa0Ft8,3741
-athena_intelligence-0.1.6.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-athena_intelligence-0.1.6.dist-info/RECORD,,
+athena_intelligence-0.1.8.dist-info/METADATA,sha256=JXx4HB0DMfwE0IXPePJVChZhpnwKzC8bfc0g5r-uEx0,3741
+athena_intelligence-0.1.8.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+athena_intelligence-0.1.8.dist-info/RECORD,,