athena-intelligence 0.1.6__tar.gz → 0.1.8__tar.gz

{athena_intelligence-0.1.6 → athena_intelligence-0.1.8}/PKG-INFO

@@ -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 → athena_intelligence-0.1.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "athena-intelligence"
-version = "0.1.6"
+version = "0.1.8"
 description = ""
 readme = "README.md"
 authors = []

{athena_intelligence-0.1.6 → athena_intelligence-0.1.8}/src/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_intelligence-0.1.8/src/athena/client.py

@@ -0,0 +1,110 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+import httpx
+
+from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from .environment import AthenaEnvironment
+from .resources.message.client import AsyncMessageClient, MessageClient
+
+
+class Athena:
+    """
+    Use this class to access the different functions within the SDK. You can instantiate any number of clients with different configuration that will propogate to these functions.
+
+    Parameters:
+        - base_url: typing.Optional[str]. The base url to use for requests from the client.
+
+        - environment: AthenaEnvironment. The environment to use for requests from the client. from .environment import AthenaEnvironment
+
+                                          Defaults to AthenaEnvironment.DEFAULT
+
+        - api_key: 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.
+
+        - httpx_client: typing.Optional[httpx.Client]. The httpx client to use for making requests, a preconfigured client is used by default, however this is useful should you want to pass in any custom httpx configuration.
+    ---
+    from athena.client import Athena
+
+    client = Athena(
+        api_key="YOUR_API_KEY",
+        token="YOUR_TOKEN",
+    )
+    """
+
+    def __init__(
+        self,
+        *,
+        base_url: typing.Optional[str] = None,
+        environment: AthenaEnvironment = AthenaEnvironment.DEFAULT,
+        api_key: str,
+        token: typing.Union[str, typing.Callable[[], str]],
+        timeout: typing.Optional[float] = 60,
+        httpx_client: typing.Optional[httpx.Client] = None
+    ):
+        self._client_wrapper = SyncClientWrapper(
+            base_url=_get_base_url(base_url=base_url, environment=environment),
+            api_key=api_key,
+            token=token,
+            httpx_client=httpx.Client(timeout=timeout) if httpx_client is None else httpx_client,
+        )
+        self.message = MessageClient(client_wrapper=self._client_wrapper)
+
+
+class AsyncAthena:
+    """
+    Use this class to access the different functions within the SDK. You can instantiate any number of clients with different configuration that will propogate to these functions.
+
+    Parameters:
+        - base_url: typing.Optional[str]. The base url to use for requests from the client.
+
+        - environment: AthenaEnvironment. The environment to use for requests from the client. from .environment import AthenaEnvironment
+
+                                          Defaults to AthenaEnvironment.DEFAULT
+
+        - api_key: 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.
+
+        - httpx_client: typing.Optional[httpx.AsyncClient]. The httpx client to use for making requests, a preconfigured client is used by default, however this is useful should you want to pass in any custom httpx configuration.
+    ---
+    from athena.client import AsyncAthena
+
+    client = AsyncAthena(
+        api_key="YOUR_API_KEY",
+        token="YOUR_TOKEN",
+    )
+    """
+
+    def __init__(
+        self,
+        *,
+        base_url: typing.Optional[str] = None,
+        environment: AthenaEnvironment = AthenaEnvironment.DEFAULT,
+        api_key: str,
+        token: typing.Union[str, typing.Callable[[], str]],
+        timeout: typing.Optional[float] = 60,
+        httpx_client: typing.Optional[httpx.AsyncClient] = None
+    ):
+        self._client_wrapper = AsyncClientWrapper(
+            base_url=_get_base_url(base_url=base_url, environment=environment),
+            api_key=api_key,
+            token=token,
+            httpx_client=httpx.AsyncClient(timeout=timeout) if httpx_client is None else httpx_client,
+        )
+        self.message = AsyncMessageClient(client_wrapper=self._client_wrapper)
+
+
+def _get_base_url(*, base_url: typing.Optional[str] = None, environment: AthenaEnvironment) -> str:
+    if base_url is not None:
+        return base_url
+    elif environment is not None:
+        return environment.value
+    else:
+        raise Exception("Please pass in either base_url or environment to construct the client")

{athena_intelligence-0.1.6 → athena_intelligence-0.1.8}/src/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_intelligence-0.1.8/src/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_intelligence-0.1.8/src/athena/resources/message/__init__.py

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

{athena_intelligence-0.1.6/src/athena → athena_intelligence-0.1.8/src/athena/resources/message}/client.py

@@ -4,20 +4,17 @@ 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
+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
@@ -28,51 +25,11 @@ except ImportError:
 OMIT = typing.cast(typing.Any, ...)
 
 
-class Athena:
-    """
-    Use this class to access the different functions within the SDK. You can instantiate any number of clients with different configuration that will propogate to these functions.
-
-    Parameters:
-        - base_url: typing.Optional[str]. The base url to use for requests from the client.
-
-        - environment: AthenaEnvironment. The environment to use for requests from the client. from .environment import AthenaEnvironment
-
-                                          Defaults to AthenaEnvironment.DEFAULT
-
-        - api_key: str.
-
-        - token: typing.Optional[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.
-
-        - httpx_client: typing.Optional[httpx.Client]. The httpx client to use for making requests, a preconfigured client is used by default, however this is useful should you want to pass in any custom httpx configuration.
-    ---
-    from athena.client import Athena
-
-    client = Athena(
-        api_key="YOUR_API_KEY",
-        token="YOUR_TOKEN",
-    )
-    """
-
-    def __init__(
-        self,
-        *,
-        base_url: typing.Optional[str] = None,
-        environment: AthenaEnvironment = AthenaEnvironment.DEFAULT,
-        api_key: str,
-        token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
-        timeout: typing.Optional[float] = 60,
-        httpx_client: typing.Optional[httpx.Client] = None,
-    ):
-        self._client_wrapper = SyncClientWrapper(
-            base_url=_get_base_url(base_url=base_url, environment=environment),
-            api_key=api_key,
-            token=token,
-            httpx_client=httpx.Client(timeout=timeout) if httpx_client is None else httpx_client,
-        )
+class MessageClient:
+    def __init__(self, *, client_wrapper: SyncClientWrapper):
+        self._client_wrapper = client_wrapper
 
-    def post_message(
+    def submit(
         self,
         *,
         content: str,
@@ -96,14 +53,17 @@ class Athena:
 
             - 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.post_message(
-            content="content",
+        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}
@@ -149,7 +109,7 @@ class Athena:
             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:
+    def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> MessageOutDto:
         """
         Parameters:
             - id: str.
@@ -162,7 +122,7 @@ class Athena:
             api_key="YOUR_API_KEY",
             token="YOUR_TOKEN",
         )
-        client.athena_get_message(
+        client.message.get(
             id="id",
         )
         """
@@ -194,95 +154,12 @@ class Athena:
             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)
-
-
-class AsyncAthena:
-    """
-    Use this class to access the different functions within the SDK. You can instantiate any number of clients with different configuration that will propogate to these functions.
 
-    Parameters:
-        - base_url: typing.Optional[str]. The base url to use for requests from the client.
+class AsyncMessageClient:
+    def __init__(self, *, client_wrapper: AsyncClientWrapper):
+        self._client_wrapper = client_wrapper
 
-        - environment: AthenaEnvironment. The environment to use for requests from the client. from .environment import AthenaEnvironment
-
-                                          Defaults to AthenaEnvironment.DEFAULT
-
-        - api_key: str.
-
-        - token: typing.Optional[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.
-
-        - httpx_client: typing.Optional[httpx.AsyncClient]. The httpx client to use for making requests, a preconfigured client is used by default, however this is useful should you want to pass in any custom httpx configuration.
-    ---
-    from athena.client import AsyncAthena
-
-    client = AsyncAthena(
-        api_key="YOUR_API_KEY",
-        token="YOUR_TOKEN",
-    )
-    """
-
-    def __init__(
-        self,
-        *,
-        base_url: typing.Optional[str] = None,
-        environment: AthenaEnvironment = AthenaEnvironment.DEFAULT,
-        api_key: str,
-        token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
-        timeout: typing.Optional[float] = 60,
-        httpx_client: typing.Optional[httpx.AsyncClient] = None,
-    ):
-        self._client_wrapper = AsyncClientWrapper(
-            base_url=_get_base_url(base_url=base_url, environment=environment),
-            api_key=api_key,
-            token=token,
-            httpx_client=httpx.AsyncClient(timeout=timeout) if httpx_client is None else httpx_client,
-        )
-
-    async def post_message(
+    async def submit(
         self,
         *,
         content: str,
@@ -306,14 +183,17 @@ class AsyncAthena:
 
             - 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.post_message(
-            content="content",
+        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}
@@ -359,9 +239,7 @@ class AsyncAthena:
             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:
+    async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> MessageOutDto:
         """
         Parameters:
             - id: str.
@@ -374,7 +252,7 @@ class AsyncAthena:
             api_key="YOUR_API_KEY",
             token="YOUR_TOKEN",
         )
-        await client.athena_get_message(
+        await client.message.get(
             id="id",
         )
         """
@@ -405,55 +283,3 @@ class AsyncAthena:
         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)
-
-
-def _get_base_url(*, base_url: typing.Optional[str] = None, environment: AthenaEnvironment) -> str:
-    if base_url is not None:
-        return base_url
-    elif environment is not None:
-        return environment.value
-    else:
-        raise Exception("Please pass in either base_url or environment to construct the client")

athena_intelligence-0.1.8/src/athena/types/model.py

@@ -0,0 +1,29 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import enum
+import typing
+
+T_Result = typing.TypeVar("T_Result")
+
+
+class Model(str, enum.Enum):
+    """
+    An enumeration.
+    """
+
+    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_35_turbo: typing.Callable[[], T_Result],
+        gpt_4_turbo_preview: typing.Callable[[], T_Result],
+        mixtral_small_8_x_7_b_0211: typing.Callable[[], T_Result],
+    ) -> T_Result:
+        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.MIXTRAL_SMALL_8_X_7_B_0211:
+            return mixtral_small_8_x_7_b_0211()

athena_intelligence-0.1.6/src/athena/types/model.py

@@ -1,29 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-import enum
-import typing
-
-T_Result = typing.TypeVar("T_Result")
-
-
-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"
-
-    def visit(
-        self,
-        gpt_4: typing.Callable[[], T_Result],
-        gpt_4_turbo_preview: typing.Callable[[], T_Result],
-        gpt_3_5_turbo: typing.Callable[[], T_Result],
-    ) -> T_Result:
-        if self is Model.GPT_4:
-            return gpt_4()
-        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()