athena-intelligence 0.1.124__py3-none-any.whl → 0.1.126__py3-none-any.whl

athena/agents/general/client.py

@@ -1,15 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from json.decoder import JSONDecodeError
-
-from ...core.api_error import ApiError
-from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
-from ...core.pydantic_utilities import pydantic_v1
-from ...core.request_options import RequestOptions
-from ...errors.unprocessable_entity_error import UnprocessableEntityError
+from ...core.client_wrapper import SyncClientWrapper
 from ...types.general_agent_request import GeneralAgentRequest
+from ...core.request_options import RequestOptions
 from ...types.general_agent_response import GeneralAgentResponse
+from ...core.serialization import convert_and_respect_annotation_metadata
+from ...core.pydantic_utilities import parse_obj_as
+from ...errors.unprocessable_entity_error import UnprocessableEntityError
+from json.decoder import JSONDecodeError
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -39,8 +40,7 @@ class GeneralClient:
 
         Examples
         --------
-        from athena import GeneralAgentConfig, GeneralAgentRequest, Tool
-        from athena.client import Athena
+        from athena import Athena, GeneralAgentConfig, GeneralAgentRequest
 
         client = Athena(
             api_key="YOUR_API_KEY",
@@ -49,7 +49,7 @@ class GeneralClient:
             request=[
                 GeneralAgentRequest(
                     config=GeneralAgentConfig(
-                        enabled_tools=[Tool.SEARCH],
+                        enabled_tools=["search"],
                     ),
                     messages=[
                         {
@@ -62,13 +62,33 @@ class GeneralClient:
         )
         """
         _response = self._client_wrapper.httpx_client.request(
-            "api/v0/agents/general/batch", method="POST", json=request, request_options=request_options, omit=OMIT
+            "api/v0/agents/general/batch",
+            method="POST",
+            json=convert_and_respect_annotation_metadata(
+                object_=request, annotation=typing.Sequence[GeneralAgentRequest], direction="write"
+            ),
+            request_options=request_options,
+            omit=OMIT,
         )
-        if 200 <= _response.status_code < 300:
-            return pydantic_v1.parse_obj_as(typing.List[GeneralAgentResponse], _response.json())  # type: ignore
-        if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic_v1.parse_obj_as(typing.Any, _response.json()))  # type: ignore
         try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    typing.List[GeneralAgentResponse],
+                    parse_obj_as(
+                        type_=typing.List[GeneralAgentResponse],  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+            if _response.status_code == 422:
+                raise UnprocessableEntityError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
             _response_json = _response.json()
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
@@ -97,8 +117,7 @@ class GeneralClient:
 
         Examples
         --------
-        from athena import GeneralAgentConfig, GeneralAgentRequest, Tool
-        from athena.client import Athena
+        from athena import Athena, GeneralAgentConfig, GeneralAgentRequest
 
         client = Athena(
             api_key="YOUR_API_KEY",
@@ -106,7 +125,7 @@ class GeneralClient:
         client.agents.general.invoke(
             request=GeneralAgentRequest(
                 config=GeneralAgentConfig(
-                    enabled_tools=[Tool.SEARCH],
+                    enabled_tools=["search"],
                 ),
                 messages=[
                     {
@@ -118,13 +137,33 @@ class GeneralClient:
         )
         """
         _response = self._client_wrapper.httpx_client.request(
-            "api/v0/agents/general/invoke", method="POST", json=request, request_options=request_options, omit=OMIT
+            "api/v0/agents/general/invoke",
+            method="POST",
+            json=convert_and_respect_annotation_metadata(
+                object_=request, annotation=GeneralAgentRequest, direction="write"
+            ),
+            request_options=request_options,
+            omit=OMIT,
         )
-        if 200 <= _response.status_code < 300:
-            return pydantic_v1.parse_obj_as(GeneralAgentResponse, _response.json())  # type: ignore
-        if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic_v1.parse_obj_as(typing.Any, _response.json()))  # type: ignore
         try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    GeneralAgentResponse,
+                    parse_obj_as(
+                        type_=GeneralAgentResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+            if _response.status_code == 422:
+                raise UnprocessableEntityError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
             _response_json = _response.json()
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
@@ -150,8 +189,7 @@ class GeneralClient:
 
         Examples
         --------
-        from athena import GeneralAgentConfig, GeneralAgentRequest, Tool
-        from athena.client import Athena
+        from athena import Athena, GeneralAgentConfig, GeneralAgentRequest
 
         client = Athena(
             api_key="YOUR_API_KEY",
@@ -159,7 +197,7 @@ class GeneralClient:
         client.agents.general.stream_events(
             request=GeneralAgentRequest(
                 config=GeneralAgentConfig(
-                    enabled_tools=[Tool.SEARCH],
+                    enabled_tools=["search"],
                 ),
                 messages=[
                     {
@@ -173,15 +211,31 @@ class GeneralClient:
         _response = self._client_wrapper.httpx_client.request(
             "api/v0/agents/general/stream_events",
             method="POST",
-            json=request,
+            json=convert_and_respect_annotation_metadata(
+                object_=request, annotation=GeneralAgentRequest, direction="write"
+            ),
             request_options=request_options,
             omit=OMIT,
         )
-        if 200 <= _response.status_code < 300:
-            return pydantic_v1.parse_obj_as(GeneralAgentResponse, _response.json())  # type: ignore
-        if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic_v1.parse_obj_as(typing.Any, _response.json()))  # type: ignore
         try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    GeneralAgentResponse,
+                    parse_obj_as(
+                        type_=GeneralAgentResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+            if _response.status_code == 422:
+                raise UnprocessableEntityError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
             _response_json = _response.json()
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
@@ -212,36 +266,63 @@ class AsyncGeneralClient:
 
         Examples
         --------
-        from athena import GeneralAgentConfig, GeneralAgentRequest, Tool
-        from athena.client import AsyncAthena
+        import asyncio
+
+        from athena import AsyncAthena, GeneralAgentConfig, GeneralAgentRequest
 
         client = AsyncAthena(
             api_key="YOUR_API_KEY",
         )
-        await client.agents.general.batch(
-            request=[
-                GeneralAgentRequest(
-                    config=GeneralAgentConfig(
-                        enabled_tools=[Tool.SEARCH],
-                    ),
-                    messages=[
-                        {
-                            "content": "Please call the search tool for AAPL news.",
-                            "type": "user",
-                        }
-                    ],
-                )
-            ],
-        )
+
+
+        async def main() -> None:
+            await client.agents.general.batch(
+                request=[
+                    GeneralAgentRequest(
+                        config=GeneralAgentConfig(
+                            enabled_tools=["search"],
+                        ),
+                        messages=[
+                            {
+                                "content": "Please call the search tool for AAPL news.",
+                                "type": "user",
+                            }
+                        ],
+                    )
+                ],
+            )
+
+
+        asyncio.run(main())
         """
         _response = await self._client_wrapper.httpx_client.request(
-            "api/v0/agents/general/batch", method="POST", json=request, request_options=request_options, omit=OMIT
+            "api/v0/agents/general/batch",
+            method="POST",
+            json=convert_and_respect_annotation_metadata(
+                object_=request, annotation=typing.Sequence[GeneralAgentRequest], direction="write"
+            ),
+            request_options=request_options,
+            omit=OMIT,
         )
-        if 200 <= _response.status_code < 300:
-            return pydantic_v1.parse_obj_as(typing.List[GeneralAgentResponse], _response.json())  # type: ignore
-        if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic_v1.parse_obj_as(typing.Any, _response.json()))  # type: ignore
         try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    typing.List[GeneralAgentResponse],
+                    parse_obj_as(
+                        type_=typing.List[GeneralAgentResponse],  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+            if _response.status_code == 422:
+                raise UnprocessableEntityError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
             _response_json = _response.json()
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
@@ -270,34 +351,61 @@ class AsyncGeneralClient:
 
         Examples
         --------
-        from athena import GeneralAgentConfig, GeneralAgentRequest, Tool
-        from athena.client import AsyncAthena
+        import asyncio
+
+        from athena import AsyncAthena, GeneralAgentConfig, GeneralAgentRequest
 
         client = AsyncAthena(
             api_key="YOUR_API_KEY",
         )
-        await client.agents.general.invoke(
-            request=GeneralAgentRequest(
-                config=GeneralAgentConfig(
-                    enabled_tools=[Tool.SEARCH],
+
+
+        async def main() -> None:
+            await client.agents.general.invoke(
+                request=GeneralAgentRequest(
+                    config=GeneralAgentConfig(
+                        enabled_tools=["search"],
+                    ),
+                    messages=[
+                        {
+                            "content": "Please call the search tool for AAPL news.",
+                            "type": "user",
+                        }
+                    ],
                 ),
-                messages=[
-                    {
-                        "content": "Please call the search tool for AAPL news.",
-                        "type": "user",
-                    }
-                ],
-            ),
-        )
+            )
+
+
+        asyncio.run(main())
         """
         _response = await self._client_wrapper.httpx_client.request(
-            "api/v0/agents/general/invoke", method="POST", json=request, request_options=request_options, omit=OMIT
+            "api/v0/agents/general/invoke",
+            method="POST",
+            json=convert_and_respect_annotation_metadata(
+                object_=request, annotation=GeneralAgentRequest, direction="write"
+            ),
+            request_options=request_options,
+            omit=OMIT,
         )
-        if 200 <= _response.status_code < 300:
-            return pydantic_v1.parse_obj_as(GeneralAgentResponse, _response.json())  # type: ignore
-        if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic_v1.parse_obj_as(typing.Any, _response.json()))  # type: ignore
         try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    GeneralAgentResponse,
+                    parse_obj_as(
+                        type_=GeneralAgentResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+            if _response.status_code == 422:
+                raise UnprocessableEntityError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
             _response_json = _response.json()
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
@@ -323,38 +431,61 @@ class AsyncGeneralClient:
 
         Examples
         --------
-        from athena import GeneralAgentConfig, GeneralAgentRequest, Tool
-        from athena.client import AsyncAthena
+        import asyncio
+
+        from athena import AsyncAthena, GeneralAgentConfig, GeneralAgentRequest
 
         client = AsyncAthena(
             api_key="YOUR_API_KEY",
         )
-        await client.agents.general.stream_events(
-            request=GeneralAgentRequest(
-                config=GeneralAgentConfig(
-                    enabled_tools=[Tool.SEARCH],
+
+
+        async def main() -> None:
+            await client.agents.general.stream_events(
+                request=GeneralAgentRequest(
+                    config=GeneralAgentConfig(
+                        enabled_tools=["search"],
+                    ),
+                    messages=[
+                        {
+                            "content": "Please call the search tool for AAPL news.",
+                            "type": "user",
+                        }
+                    ],
                 ),
-                messages=[
-                    {
-                        "content": "Please call the search tool for AAPL news.",
-                        "type": "user",
-                    }
-                ],
-            ),
-        )
+            )
+
+
+        asyncio.run(main())
         """
         _response = await self._client_wrapper.httpx_client.request(
             "api/v0/agents/general/stream_events",
             method="POST",
-            json=request,
+            json=convert_and_respect_annotation_metadata(
+                object_=request, annotation=GeneralAgentRequest, direction="write"
+            ),
             request_options=request_options,
             omit=OMIT,
         )
-        if 200 <= _response.status_code < 300:
-            return pydantic_v1.parse_obj_as(GeneralAgentResponse, _response.json())  # type: ignore
-        if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic_v1.parse_obj_as(typing.Any, _response.json()))  # type: ignore
         try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    GeneralAgentResponse,
+                    parse_obj_as(
+                        type_=GeneralAgentResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+            if _response.status_code == 422:
+                raise UnprocessableEntityError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
             _response_json = _response.json()
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)

athena/agents/research/client.py

@@ -1,14 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from json.decoder import JSONDecodeError
-
-from ...core.api_error import ApiError
-from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
-from ...core.pydantic_utilities import pydantic_v1
+from ...core.client_wrapper import SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...errors.unprocessable_entity_error import UnprocessableEntityError
 from ...types.research_agent_response import ResearchAgentResponse
+from ...core.pydantic_utilities import parse_obj_as
+from ...errors.unprocessable_entity_error import UnprocessableEntityError
+from json.decoder import JSONDecodeError
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -21,19 +21,19 @@ class ResearchClient:
     def invoke(
         self,
         *,
-        config: typing.Dict[str, typing.Any],
-        messages: typing.Sequence[typing.Dict[str, typing.Any]],
-        request_options: typing.Optional[RequestOptions] = None
+        config: typing.Dict[str, typing.Optional[typing.Any]],
+        messages: typing.Sequence[typing.Dict[str, typing.Optional[typing.Any]]],
+        request_options: typing.Optional[RequestOptions] = None,
     ) -> ResearchAgentResponse:
         """
         Coming soon! Conduct research using web and other sources.
 
         Parameters
         ----------
-        config : typing.Dict[str, typing.Any]
+        config : typing.Dict[str, typing.Optional[typing.Any]]
             Configuration for the research agent including search parameters and sources
 
-        messages : typing.Sequence[typing.Dict[str, typing.Any]]
+        messages : typing.Sequence[typing.Dict[str, typing.Optional[typing.Any]]]
             The messages to send to the research agent
 
         request_options : typing.Optional[RequestOptions]
@@ -46,7 +46,7 @@ class ResearchClient:
 
         Examples
         --------
-        from athena.client import Athena
+        from athena import Athena
 
         client = Athena(
             api_key="YOUR_API_KEY",
@@ -59,15 +59,35 @@ class ResearchClient:
         _response = self._client_wrapper.httpx_client.request(
             "api/v0/agents/research/invoke",
             method="POST",
-            json={"config": config, "messages": messages},
+            json={
+                "config": config,
+                "messages": messages,
+            },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
-        if 200 <= _response.status_code < 300:
-            return pydantic_v1.parse_obj_as(ResearchAgentResponse, _response.json())  # type: ignore
-        if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic_v1.parse_obj_as(typing.Any, _response.json()))  # type: ignore
         try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    ResearchAgentResponse,
+                    parse_obj_as(
+                        type_=ResearchAgentResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+            if _response.status_code == 422:
+                raise UnprocessableEntityError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
             _response_json = _response.json()
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
@@ -81,19 +101,19 @@ class AsyncResearchClient:
     async def invoke(
         self,
         *,
-        config: typing.Dict[str, typing.Any],
-        messages: typing.Sequence[typing.Dict[str, typing.Any]],
-        request_options: typing.Optional[RequestOptions] = None
+        config: typing.Dict[str, typing.Optional[typing.Any]],
+        messages: typing.Sequence[typing.Dict[str, typing.Optional[typing.Any]]],
+        request_options: typing.Optional[RequestOptions] = None,
     ) -> ResearchAgentResponse:
         """
         Coming soon! Conduct research using web and other sources.
 
         Parameters
         ----------
-        config : typing.Dict[str, typing.Any]
+        config : typing.Dict[str, typing.Optional[typing.Any]]
             Configuration for the research agent including search parameters and sources
 
-        messages : typing.Sequence[typing.Dict[str, typing.Any]]
+        messages : typing.Sequence[typing.Dict[str, typing.Optional[typing.Any]]]
             The messages to send to the research agent
 
         request_options : typing.Optional[RequestOptions]
@@ -106,28 +126,56 @@ class AsyncResearchClient:
 
         Examples
         --------
-        from athena.client import AsyncAthena
+        import asyncio
+
+        from athena import AsyncAthena
 
         client = AsyncAthena(
             api_key="YOUR_API_KEY",
         )
-        await client.agents.research.invoke(
-            config={"key": "value"},
-            messages=[{"key": "value"}],
-        )
+
+
+        async def main() -> None:
+            await client.agents.research.invoke(
+                config={"key": "value"},
+                messages=[{"key": "value"}],
+            )
+
+
+        asyncio.run(main())
         """
         _response = await self._client_wrapper.httpx_client.request(
             "api/v0/agents/research/invoke",
             method="POST",
-            json={"config": config, "messages": messages},
+            json={
+                "config": config,
+                "messages": messages,
+            },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
-        if 200 <= _response.status_code < 300:
-            return pydantic_v1.parse_obj_as(ResearchAgentResponse, _response.json())  # type: ignore
-        if _response.status_code == 422:
-            raise UnprocessableEntityError(pydantic_v1.parse_obj_as(typing.Any, _response.json()))  # type: ignore
         try:
+            if 200 <= _response.status_code < 300:
+                return typing.cast(
+                    ResearchAgentResponse,
+                    parse_obj_as(
+                        type_=ResearchAgentResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+            if _response.status_code == 422:
+                raise UnprocessableEntityError(
+                    typing.cast(
+                        typing.Optional[typing.Any],
+                        parse_obj_as(
+                            type_=typing.Optional[typing.Any],  # type: ignore
+                            object_=_response.json(),
+                        ),
+                    )
+                )
             _response_json = _response.json()
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)