athena-intelligence 0.1.40__tar.gz → 0.1.42__tar.gz

{athena_intelligence-0.1.40 → athena_intelligence-0.1.42}/PKG-INFO

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

{athena_intelligence-0.1.40 → athena_intelligence-0.1.42}/pyproject.toml

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

{athena_intelligence-0.1.40 → athena_intelligence-0.1.42}/src/athena/__init__.py

@@ -2,20 +2,23 @@
 
 from .types import (
     Dataset,
+    Document,
+    ExcecuteToolFirstWorkflowOut,
     FirecrawlScrapeUrlDataReponseDto,
     FirecrawlScrapeUrlMetadata,
     GetDatasetsResponse,
     GetSnippetsResponse,
     HttpValidationError,
+    LangchainDocumentsRequestOut,
     MessageOut,
     MessageOutDto,
     Model,
     Report,
-    ScrapeMarkdownResult,
     Snippet,
     SqlResults,
     StatusEnum,
     StructuredParseResult,
+    ToolModels,
     Tools,
     UrlResult,
     ValidationError,
@@ -23,27 +26,30 @@ from .types import (
 )
 from .errors import UnprocessableEntityError
 from . import chain, dataset, message, query, report, search, snippet, tools
-from .chain import StructuredToolDataParsingModel
+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",
-    "StructuredToolDataParsingModel",
+    "ToolModels",
     "Tools",
     "UnprocessableEntityError",
     "UrlResult",

athena_intelligence-0.1.42/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.40 → athena_intelligence-0.1.42}/src/athena/chain/client.py

@@ -12,7 +12,7 @@ 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_tool_data_parsing_model import StructuredToolDataParsingModel
+from .types.structured_parse_in_parsing_model import StructuredParseInParsingModel
 
 try:
     import pydantic.v1 as pydantic  # type: ignore
@@ -32,7 +32,7 @@ class ChainClient:
         *,
         text_input: str,
         custom_type_dict: typing.Dict[str, typing.Any],
-        parsing_model: typing.Optional[StructuredToolDataParsingModel] = OMIT,
+        parsing_model: typing.Optional[StructuredParseInParsingModel] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> StructuredParseResult:
         """
@@ -41,19 +41,19 @@ class ChainClient:
 
             - custom_type_dict: typing.Dict[str, typing.Any]. A dictionary of field names and their default values.
 
-            - parsing_model: typing.Optional[StructuredToolDataParsingModel]. The model to be used for parsing.
+            - 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="text_input",
-            custom_type_dict={},
-        )
+        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:
@@ -104,7 +104,7 @@ class AsyncChainClient:
         *,
         text_input: str,
         custom_type_dict: typing.Dict[str, typing.Any],
-        parsing_model: typing.Optional[StructuredToolDataParsingModel] = OMIT,
+        parsing_model: typing.Optional[StructuredParseInParsingModel] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> StructuredParseResult:
         """
@@ -113,19 +113,19 @@ class AsyncChainClient:
 
             - custom_type_dict: typing.Dict[str, typing.Any]. A dictionary of field names and their default values.
 
-            - parsing_model: typing.Optional[StructuredToolDataParsingModel]. The model to be used for parsing.
+            - 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="text_input",
-            custom_type_dict={},
-        )
+        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:

athena_intelligence-0.1.42/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.40/src/athena/chain/types/structured_tool_data_parsing_model.py → athena_intelligence-0.1.42/src/athena/chain/types/structured_parse_in_parsing_model.py

@@ -6,7 +6,7 @@ import typing
 T_Result = typing.TypeVar("T_Result")
 
 
-class StructuredToolDataParsingModel(str, enum.Enum):
+class StructuredParseInParsingModel(str, enum.Enum):
     """
     The model to be used for parsing.
     """
@@ -33,21 +33,21 @@ class StructuredToolDataParsingModel(str, enum.Enum):
         claude_3_sonnet_20240229: typing.Callable[[], T_Result],
         claude_3_haiku_20240307: typing.Callable[[], T_Result],
     ) -> T_Result:
-        if self is StructuredToolDataParsingModel.GPT_4_TURBO:
+        if self is StructuredParseInParsingModel.GPT_4_TURBO:
             return gpt_4_turbo()
-        if self is StructuredToolDataParsingModel.GPT_4_TURBO_PREVIEW:
+        if self is StructuredParseInParsingModel.GPT_4_TURBO_PREVIEW:
             return gpt_4_turbo_preview()
-        if self is StructuredToolDataParsingModel.GPT_4:
+        if self is StructuredParseInParsingModel.GPT_4:
             return gpt_4()
-        if self is StructuredToolDataParsingModel.GPT_35_TURBO:
+        if self is StructuredParseInParsingModel.GPT_35_TURBO:
             return gpt_35_turbo()
-        if self is StructuredToolDataParsingModel.MIXTRAL_SMALL_8_X_7_B_0211:
+        if self is StructuredParseInParsingModel.MIXTRAL_SMALL_8_X_7_B_0211:
             return mixtral_small_8_x_7_b_0211()
-        if self is StructuredToolDataParsingModel.MISTRAL_LARGE_0224:
+        if self is StructuredParseInParsingModel.MISTRAL_LARGE_0224:
             return mistral_large_0224()
-        if self is StructuredToolDataParsingModel.CLAUDE_3_OPUS_20240229:
+        if self is StructuredParseInParsingModel.CLAUDE_3_OPUS_20240229:
             return claude_3_opus_20240229()
-        if self is StructuredToolDataParsingModel.CLAUDE_3_SONNET_20240229:
+        if self is StructuredParseInParsingModel.CLAUDE_3_SONNET_20240229:
             return claude_3_sonnet_20240229()
-        if self is StructuredToolDataParsingModel.CLAUDE_3_HAIKU_20240307:
+        if self is StructuredParseInParsingModel.CLAUDE_3_HAIKU_20240307:
             return claude_3_haiku_20240307()

{athena_intelligence-0.1.40 → athena_intelligence-0.1.42}/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.40",
+            "X-Fern-SDK-Version": "0.1.42",
         }
         headers["X-API-KEY"] = self.api_key
         return headers

{athena_intelligence-0.1.40/src/athena/tools → athena_intelligence-0.1.42/src/athena/search}/client.py

@@ -10,8 +10,8 @@ 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.firecrawl_scrape_url_data_reponse_dto import FirecrawlScrapeUrlDataReponseDto
 from ..types.http_validation_error import HttpValidationError
+from ..types.url_result import UrlResult
 
 try:
     import pydantic.v1 as pydantic  # type: ignore
@@ -22,22 +22,34 @@ except ImportError:
 OMIT = typing.cast(typing.Any, ...)
 
 
-class ToolsClient:
+class SearchClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    def scrape_url(
+    def get_urls(
         self,
         *,
-        url: str,
-        params: typing.Optional[typing.Dict[str, typing.Any]] = OMIT,
+        query: str,
+        num_urls: int,
+        tbs: str,
+        country_code: typing.Optional[str] = OMIT,
+        country_restrict: typing.Optional[str] = OMIT,
+        site: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> FirecrawlScrapeUrlDataReponseDto:
+    ) -> UrlResult:
         """
         Parameters:
-            - url: str.
+            - query: str.
 
-            - params: typing.Optional[typing.Dict[str, typing.Any]].
+            - num_urls: int.
+
+            - tbs: str.
+
+            - country_code: typing.Optional[str].
+
+            - country_restrict: typing.Optional[str].
+
+            - site: typing.Optional[str].
 
             - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
         ---
@@ -46,16 +58,22 @@ class ToolsClient:
         client = Athena(
             api_key="YOUR_API_KEY",
         )
-        client.tools.scrape_url(
-            url="https://athenaintelligence.ai",
+        client.search.get_urls(
+            query="Dogs",
+            num_urls=10,
+            tbs="qdr:m",
         )
         """
-        _request: typing.Dict[str, typing.Any] = {"url": url}
-        if params is not OMIT:
-            _request["params"] = params
+        _request: typing.Dict[str, typing.Any] = {"query": query, "num_urls": num_urls, "tbs": tbs}
+        if country_code is not OMIT:
+            _request["country_code"] = country_code
+        if country_restrict is not OMIT:
+            _request["country_restrict"] = country_restrict
+        if site is not OMIT:
+            _request["site"] = site
         _response = self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/firecrawl/scrape-url"),
+            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
             ),
@@ -80,7 +98,7 @@ class ToolsClient:
             max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(FirecrawlScrapeUrlDataReponseDto, _response.json())  # type: ignore
+            return pydantic.parse_obj_as(UrlResult, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -90,22 +108,34 @@ class ToolsClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
 
-class AsyncToolsClient:
+class AsyncSearchClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    async def scrape_url(
+    async def get_urls(
         self,
         *,
-        url: str,
-        params: typing.Optional[typing.Dict[str, typing.Any]] = OMIT,
+        query: str,
+        num_urls: int,
+        tbs: str,
+        country_code: typing.Optional[str] = OMIT,
+        country_restrict: typing.Optional[str] = OMIT,
+        site: typing.Optional[str] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
-    ) -> FirecrawlScrapeUrlDataReponseDto:
+    ) -> UrlResult:
         """
         Parameters:
-            - url: str.
+            - query: str.
+
+            - num_urls: int.
+
+            - tbs: str.
+
+            - country_code: typing.Optional[str].
+
+            - country_restrict: typing.Optional[str].
 
-            - params: typing.Optional[typing.Dict[str, typing.Any]].
+            - site: typing.Optional[str].
 
             - request_options: typing.Optional[RequestOptions]. Request-specific configuration.
         ---
@@ -114,16 +144,22 @@ class AsyncToolsClient:
         client = AsyncAthena(
             api_key="YOUR_API_KEY",
         )
-        await client.tools.scrape_url(
-            url="https://athenaintelligence.ai",
+        await client.search.get_urls(
+            query="Dogs",
+            num_urls=10,
+            tbs="qdr:m",
         )
         """
-        _request: typing.Dict[str, typing.Any] = {"url": url}
-        if params is not OMIT:
-            _request["params"] = params
+        _request: typing.Dict[str, typing.Any] = {"query": query, "num_urls": num_urls, "tbs": tbs}
+        if country_code is not OMIT:
+            _request["country_code"] = country_code
+        if country_restrict is not OMIT:
+            _request["country_restrict"] = country_restrict
+        if site is not OMIT:
+            _request["site"] = site
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/firecrawl/scrape-url"),
+            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
             ),
@@ -148,7 +184,7 @@ class AsyncToolsClient:
             max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(FirecrawlScrapeUrlDataReponseDto, _response.json())  # type: ignore
+            return pydantic.parse_obj_as(UrlResult, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try: