athena-intelligence 0.1.39__tar.gz → 0.1.41__tar.gz

{athena_intelligence-0.1.39 → athena_intelligence-0.1.41}/PKG-INFO

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

{athena_intelligence-0.1.39 → athena_intelligence-0.1.41}/pyproject.toml

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

{athena_intelligence-0.1.39 → athena_intelligence-0.1.41}/src/athena/__init__.py

@@ -2,49 +2,63 @@
 
 from .types import (
     Dataset,
+    Document,
+    ExcecuteToolFirstWorkflowOut,
+    FirecrawlScrapeUrlDataReponseDto,
+    FirecrawlScrapeUrlMetadata,
     GetDatasetsResponse,
     GetSnippetsResponse,
     HttpValidationError,
+    LangchainDocumentsRequestOut,
     MessageOut,
     MessageOutDto,
     Model,
     Report,
-    ScrapeMarkdownResult,
     Snippet,
     SqlResults,
     StatusEnum,
+    StructuredParseResult,
     Tools,
     UrlResult,
     ValidationError,
     ValidationErrorLocItem,
 )
 from .errors import UnprocessableEntityError
-from . import dataset, message, query, report, search, snippet
+from . import chain, dataset, message, query, report, search, snippet, tools
+from .chain import StructuredParseInParsingModel
 from .environment import AthenaEnvironment
 
 __all__ = [
     "AthenaEnvironment",
     "Dataset",
+    "Document",
+    "ExcecuteToolFirstWorkflowOut",
+    "FirecrawlScrapeUrlDataReponseDto",
+    "FirecrawlScrapeUrlMetadata",
     "GetDatasetsResponse",
     "GetSnippetsResponse",
     "HttpValidationError",
+    "LangchainDocumentsRequestOut",
     "MessageOut",
     "MessageOutDto",
     "Model",
     "Report",
-    "ScrapeMarkdownResult",
     "Snippet",
     "SqlResults",
     "StatusEnum",
+    "StructuredParseInParsingModel",
+    "StructuredParseResult",
     "Tools",
     "UnprocessableEntityError",
     "UrlResult",
     "ValidationError",
     "ValidationErrorLocItem",
+    "chain",
     "dataset",
     "message",
     "query",
     "report",
     "search",
     "snippet",
+    "tools",
 ]

{athena_intelligence-0.1.39 → athena_intelligence-0.1.41}/src/athena/base_client.py

@@ -4,6 +4,7 @@ import typing
 
 import httpx
 
+from .chain.client import AsyncChainClient, ChainClient
 from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from .dataset.client import AsyncDatasetClient, DatasetClient
 from .environment import AthenaEnvironment
@@ -12,6 +13,7 @@ from .query.client import AsyncQueryClient, QueryClient
 from .report.client import AsyncReportClient, ReportClient
 from .search.client import AsyncSearchClient, SearchClient
 from .snippet.client import AsyncSnippetClient, SnippetClient
+from .tools.client import AsyncToolsClient, ToolsClient
 
 
 class BaseAthena:
@@ -58,6 +60,8 @@ class BaseAthena:
         self.report = ReportClient(client_wrapper=self._client_wrapper)
         self.query = QueryClient(client_wrapper=self._client_wrapper)
         self.search = SearchClient(client_wrapper=self._client_wrapper)
+        self.chain = ChainClient(client_wrapper=self._client_wrapper)
+        self.tools = ToolsClient(client_wrapper=self._client_wrapper)
 
 
 class AsyncBaseAthena:
@@ -104,6 +108,8 @@ class AsyncBaseAthena:
         self.report = AsyncReportClient(client_wrapper=self._client_wrapper)
         self.query = AsyncQueryClient(client_wrapper=self._client_wrapper)
         self.search = AsyncSearchClient(client_wrapper=self._client_wrapper)
+        self.chain = AsyncChainClient(client_wrapper=self._client_wrapper)
+        self.tools = AsyncToolsClient(client_wrapper=self._client_wrapper)
 
 
 def _get_base_url(*, base_url: typing.Optional[str] = None, environment: AthenaEnvironment) -> str:

athena_intelligence-0.1.41/src/athena/chain/__init__.py

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

athena_intelligence-0.1.41/src/athena/chain/client.py

@@ -0,0 +1,167 @@
+# 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.structured_parse_result import StructuredParseResult
+from .types.structured_parse_in_parsing_model import StructuredParseInParsingModel
+
+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 ChainClient:
+    def __init__(self, *, client_wrapper: SyncClientWrapper):
+        self._client_wrapper = client_wrapper
+
+    def structured_parse(
+        self,
+        *,
+        text_input: str,
+        custom_type_dict: typing.Dict[str, typing.Any],
+        parsing_model: typing.Optional[StructuredParseInParsingModel] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> StructuredParseResult:
+        """
+        Parameters:
+            - text_input: str. The text input to be parsed.
+
+            - custom_type_dict: typing.Dict[str, typing.Any]. A dictionary of field names and their default values.
+
+            - parsing_model: typing.Optional[StructuredParseInParsingModel]. The model to be used for parsing.
+
+            - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
+        ---
+        from athena import StructuredParseInParsingModel
+        from athena.client import Athena
+
+        client = Athena(api_key="YOUR_API_KEY", )
+        client.chain.structured_parse(text_input='Athena is an AI-native analytics platform and artificial employee built to accelerate analytics workflows
+                        by offering enterprise teams co-pilot and auto-pilot modes. Athena learns your workflow as a co-pilot,
+                        allowing you to hand over controls to her for autonomous execution with confidence."
+
+                        Give me all of the modes Athena provides.', custom_type_dict={"modes": {}}, parsing_model=StructuredParseInParsingModel.GPT_4_TURBO, )
+        """
+        _request: typing.Dict[str, typing.Any] = {"text_input": text_input, "custom_type_dict": custom_type_dict}
+        if parsing_model is not OMIT:
+            _request["parsing_model"] = parsing_model
+        _response = self._client_wrapper.httpx_client.request(
+            "POST",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/structured-parse"),
+            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,
+            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(StructuredParseResult, _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 AsyncChainClient:
+    def __init__(self, *, client_wrapper: AsyncClientWrapper):
+        self._client_wrapper = client_wrapper
+
+    async def structured_parse(
+        self,
+        *,
+        text_input: str,
+        custom_type_dict: typing.Dict[str, typing.Any],
+        parsing_model: typing.Optional[StructuredParseInParsingModel] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> StructuredParseResult:
+        """
+        Parameters:
+            - text_input: str. The text input to be parsed.
+
+            - custom_type_dict: typing.Dict[str, typing.Any]. A dictionary of field names and their default values.
+
+            - parsing_model: typing.Optional[StructuredParseInParsingModel]. The model to be used for parsing.
+
+            - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
+        ---
+        from athena import StructuredParseInParsingModel
+        from athena.client import AsyncAthena
+
+        client = AsyncAthena(api_key="YOUR_API_KEY", )
+        await client.chain.structured_parse(text_input='Athena is an AI-native analytics platform and artificial employee built to accelerate analytics workflows
+                        by offering enterprise teams co-pilot and auto-pilot modes. Athena learns your workflow as a co-pilot,
+                        allowing you to hand over controls to her for autonomous execution with confidence."
+
+                        Give me all of the modes Athena provides.', custom_type_dict={"modes": {}}, parsing_model=StructuredParseInParsingModel.GPT_4_TURBO, )
+        """
+        _request: typing.Dict[str, typing.Any] = {"text_input": text_input, "custom_type_dict": custom_type_dict}
+        if parsing_model is not OMIT:
+            _request["parsing_model"] = parsing_model
+        _response = await self._client_wrapper.httpx_client.request(
+            "POST",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/structured-parse"),
+            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,
+            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(StructuredParseResult, _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_intelligence-0.1.41/src/athena/chain/types/__init__.py

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

athena_intelligence-0.1.41/src/athena/chain/types/structured_parse_in_parsing_model.py

@@ -0,0 +1,53 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import enum
+import typing
+
+T_Result = typing.TypeVar("T_Result")
+
+
+class StructuredParseInParsingModel(str, enum.Enum):
+    """
+    The model to be used for parsing.
+    """
+
+    GPT_4_TURBO = "gpt-4-turbo"
+    GPT_4_TURBO_PREVIEW = "gpt-4-turbo-preview"
+    GPT_4 = "gpt-4"
+    GPT_35_TURBO = "gpt-3.5-turbo"
+    MIXTRAL_SMALL_8_X_7_B_0211 = "mixtral-small-8x7b-0211"
+    MISTRAL_LARGE_0224 = "mistral-large-0224"
+    CLAUDE_3_OPUS_20240229 = "claude-3-opus-20240229"
+    CLAUDE_3_SONNET_20240229 = "claude-3-sonnet-20240229"
+    CLAUDE_3_HAIKU_20240307 = "claude-3-haiku-20240307"
+
+    def visit(
+        self,
+        gpt_4_turbo: typing.Callable[[], T_Result],
+        gpt_4_turbo_preview: typing.Callable[[], T_Result],
+        gpt_4: typing.Callable[[], T_Result],
+        gpt_35_turbo: typing.Callable[[], T_Result],
+        mixtral_small_8_x_7_b_0211: typing.Callable[[], T_Result],
+        mistral_large_0224: 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],
+    ) -> T_Result:
+        if self is StructuredParseInParsingModel.GPT_4_TURBO:
+            return gpt_4_turbo()
+        if self is StructuredParseInParsingModel.GPT_4_TURBO_PREVIEW:
+            return gpt_4_turbo_preview()
+        if self is StructuredParseInParsingModel.GPT_4:
+            return gpt_4()
+        if self is StructuredParseInParsingModel.GPT_35_TURBO:
+            return gpt_35_turbo()
+        if self is StructuredParseInParsingModel.MIXTRAL_SMALL_8_X_7_B_0211:
+            return mixtral_small_8_x_7_b_0211()
+        if self is StructuredParseInParsingModel.MISTRAL_LARGE_0224:
+            return mistral_large_0224()
+        if self is StructuredParseInParsingModel.CLAUDE_3_OPUS_20240229:
+            return claude_3_opus_20240229()
+        if self is StructuredParseInParsingModel.CLAUDE_3_SONNET_20240229:
+            return claude_3_sonnet_20240229()
+        if self is StructuredParseInParsingModel.CLAUDE_3_HAIKU_20240307:
+            return claude_3_haiku_20240307()

{athena_intelligence-0.1.39 → athena_intelligence-0.1.41}/src/athena/core/client_wrapper.py

@@ -16,7 +16,7 @@ class BaseClientWrapper:
         headers: typing.Dict[str, str] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "athena-intelligence",
-            "X-Fern-SDK-Version": "0.1.39",
+            "X-Fern-SDK-Version": "0.1.41",
         }
         headers["X-API-KEY"] = self.api_key
         return headers

{athena_intelligence-0.1.39 → athena_intelligence-0.1.41}/src/athena/search/client.py

@@ -11,7 +11,6 @@ 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.scrape_markdown_result import ScrapeMarkdownResult
 from ..types.url_result import UrlResult
 
 try:
@@ -60,9 +59,9 @@ class SearchClient:
             api_key="YOUR_API_KEY",
         )
         client.search.get_urls(
-            query="query",
-            num_urls=1,
-            tbs="tbs",
+            query="Dogs",
+            num_urls=10,
+            tbs="qdr:m",
         )
         """
         _request: typing.Dict[str, typing.Any] = {"query": query, "num_urls": num_urls, "tbs": tbs}
@@ -74,7 +73,7 @@ class SearchClient:
             _request["site"] = site
         _response = self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/get-urls"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/search/get-urls"),
             params=jsonable_encoder(
                 request_options.get("additional_query_parameters") if request_options is not None else None
             ),
@@ -108,60 +107,6 @@ class SearchClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_markdown(
-        self, *, url: str, request_options: typing.Optional[RequestOptions] = None
-    ) -> ScrapeMarkdownResult:
-        """
-        Parameters:
-            - url: str.
-
-            - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
-        ---
-        from athena.client import Athena
-
-        client = Athena(
-            api_key="YOUR_API_KEY",
-        )
-        client.search.get_markdown(
-            url="url",
-        )
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/get-markdown"),
-            params=jsonable_encoder(
-                request_options.get("additional_query_parameters") if request_options is not None else None
-            ),
-            json=jsonable_encoder({"url": url})
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder({"url": url}),
-                **(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,
-            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(ScrapeMarkdownResult, _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 AsyncSearchClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
@@ -200,9 +145,9 @@ class AsyncSearchClient:
             api_key="YOUR_API_KEY",
         )
         await client.search.get_urls(
-            query="query",
-            num_urls=1,
-            tbs="tbs",
+            query="Dogs",
+            num_urls=10,
+            tbs="qdr:m",
         )
         """
         _request: typing.Dict[str, typing.Any] = {"query": query, "num_urls": num_urls, "tbs": tbs}
@@ -214,7 +159,7 @@ class AsyncSearchClient:
             _request["site"] = site
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/get-urls"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/search/get-urls"),
             params=jsonable_encoder(
                 request_options.get("additional_query_parameters") if request_options is not None else None
             ),
@@ -247,57 +192,3 @@ class AsyncSearchClient:
         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_markdown(
-        self, *, url: str, request_options: typing.Optional[RequestOptions] = None
-    ) -> ScrapeMarkdownResult:
-        """
-        Parameters:
-            - url: str.
-
-            - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
-        ---
-        from athena.client import AsyncAthena
-
-        client = AsyncAthena(
-            api_key="YOUR_API_KEY",
-        )
-        await client.search.get_markdown(
-            url="url",
-        )
-        """
-        _response = await self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/get-markdown"),
-            params=jsonable_encoder(
-                request_options.get("additional_query_parameters") if request_options is not None else None
-            ),
-            json=jsonable_encoder({"url": url})
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder({"url": url}),
-                **(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,
-            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(ScrapeMarkdownResult, _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_intelligence-0.1.41/src/athena/tools/__init__.py

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