agenta 0.30.0__py3-none-any.whl → 0.30.0a2__py3-none-any.whl

agenta/client/backend/containers/client.py

@@ -156,9 +156,6 @@ class ContainersClient:
             json={
                 "variant_id": variant_id,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -471,9 +468,6 @@ class AsyncContainersClient:
             json={
                 "variant_id": variant_id,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )

agenta/client/backend/core/file.py

@@ -43,28 +43,23 @@ def convert_file_dict_to_httpx_tuples(
     return httpx_tuples
 
 
-def with_content_type(*, file: File, default_content_type: str) -> File:
-    """
-    This function resolves to the file's content type, if provided, and defaults
-    to the default_content_type value if not.
-    """
+def with_content_type(*, file: File, content_type: str) -> File:
+    """ """
     if isinstance(file, tuple):
         if len(file) == 2:
             filename, content = cast(Tuple[Optional[str], FileContent], file)  # type: ignore
-            return (filename, content, default_content_type)
+            return (filename, content, content_type)
         elif len(file) == 3:
-            filename, content, file_content_type = cast(
+            filename, content, _ = cast(
                 Tuple[Optional[str], FileContent, Optional[str]], file
             )  # type: ignore
-            out_content_type = file_content_type or default_content_type
-            return (filename, content, out_content_type)
+            return (filename, content, content_type)
         elif len(file) == 4:
-            filename, content, file_content_type, headers = cast(  # type: ignore
+            filename, content, _, headers = cast(  # type: ignore
                 Tuple[Optional[str], FileContent, Optional[str], Mapping[str, str]],
                 file,
             )
-            out_content_type = file_content_type or default_content_type
-            return (filename, content, out_content_type, headers)
+            return (filename, content, content_type, headers)
         else:
             raise ValueError(f"Unexpected tuple length: {len(file)}")
-    return (None, file, default_content_type)
+    return (None, file, content_type)

agenta/client/backend/environments/client.py

@@ -70,9 +70,6 @@ class EnvironmentsClient:
                 "environment_name": environment_name,
                 "variant_id": variant_id,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -165,9 +162,6 @@ class AsyncEnvironmentsClient:
                 "environment_name": environment_name,
                 "variant_id": variant_id,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )

agenta/client/backend/evaluations/client.py

@@ -34,7 +34,6 @@ class EvaluationsClient:
         Fetches evaluation ids for a given resource type and id.
 
         Arguments:
-        app_id (str): The ID of the app for which to fetch evaluations.
         resource_type (str): The type of resource for which to fetch evaluations.
         resource_ids List[ObjectId]: The IDs of resource for which to fetch evaluations.
 
@@ -251,9 +250,6 @@ class EvaluationsClient:
                 "lm_providers_keys": lm_providers_keys,
                 "correct_answer_column": correct_answer_column,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -326,9 +322,6 @@ class EvaluationsClient:
             json={
                 "evaluations_ids": evaluations_ids,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -723,7 +716,6 @@ class AsyncEvaluationsClient:
         Fetches evaluation ids for a given resource type and id.
 
         Arguments:
-        app_id (str): The ID of the app for which to fetch evaluations.
         resource_type (str): The type of resource for which to fetch evaluations.
         resource_ids List[ObjectId]: The IDs of resource for which to fetch evaluations.
 
@@ -735,6 +727,7 @@ class AsyncEvaluationsClient:
 
         Parameters
         ----------
+
         resource_type : str
 
         resource_ids : typing.Optional[typing.Union[str, typing.Sequence[str]]]
@@ -964,9 +957,6 @@ class AsyncEvaluationsClient:
                 "lm_providers_keys": lm_providers_keys,
                 "correct_answer_column": correct_answer_column,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -1047,9 +1037,6 @@ class AsyncEvaluationsClient:
             json={
                 "evaluations_ids": evaluations_ids,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )

agenta/client/backend/evaluators/client.py

@@ -122,9 +122,6 @@ class EvaluatorsClient:
                 "inputs": inputs,
                 "mapping": mapping,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -212,9 +209,6 @@ class EvaluatorsClient:
                 "settings": settings,
                 "credentials": credentials,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -370,9 +364,6 @@ class EvaluatorsClient:
                 "evaluator_key": evaluator_key,
                 "settings_values": settings_values,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -520,9 +511,6 @@ class EvaluatorsClient:
                 "evaluator_key": evaluator_key,
                 "settings_values": settings_values,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -738,9 +726,6 @@ class AsyncEvaluatorsClient:
                 "inputs": inputs,
                 "mapping": mapping,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -836,9 +821,6 @@ class AsyncEvaluatorsClient:
                 "settings": settings,
                 "credentials": credentials,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -1010,9 +992,6 @@ class AsyncEvaluatorsClient:
                 "evaluator_key": evaluator_key,
                 "settings_values": settings_values,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -1176,9 +1155,6 @@ class AsyncEvaluatorsClient:
                 "evaluator_key": evaluator_key,
                 "settings_values": settings_values,
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )

agenta/client/backend/observability/client.py

@@ -66,7 +66,7 @@ class ObservabilityClient:
         )
         """
         _response = self._client_wrapper.httpx_client.request(
-            "observability/dashboard",
+            "observability/dashboard/",
             method="GET",
             params={
                 "app_id": app_id,
@@ -152,7 +152,7 @@ class ObservabilityClient:
         )
         """
         _response = self._client_wrapper.httpx_client.request(
-            "observability/trace",
+            "observability/trace/",
             method="POST",
             json={
                 "trace": trace,
@@ -162,9 +162,6 @@ class ObservabilityClient:
                     direction="write",
                 ),
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -245,7 +242,7 @@ class ObservabilityClient:
         )
         """
         _response = self._client_wrapper.httpx_client.request(
-            "observability/traces",
+            "observability/traces/",
             method="GET",
             params={
                 "app_id": app_id,
@@ -315,7 +312,7 @@ class ObservabilityClient:
         )
         """
         _response = self._client_wrapper.httpx_client.request(
-            "observability/traces",
+            "observability/traces/",
             method="DELETE",
             json=request,
             request_options=request_options,
@@ -374,7 +371,7 @@ class ObservabilityClient:
         )
         """
         _response = self._client_wrapper.httpx_client.request(
-            f"observability/traces/{jsonable_encoder(trace_id)}",
+            f"observability/traces/{jsonable_encoder(trace_id)}/",
             method="GET",
             request_options=request_options,
         )
@@ -455,7 +452,7 @@ class ObservabilityClient:
         )
         """
         _response = self._client_wrapper.httpx_client.request(
-            "observability/spans",
+            "observability/spans/",
             method="GET",
             params={
                 "app_id": app_id,
@@ -525,7 +522,7 @@ class ObservabilityClient:
         )
         """
         _response = self._client_wrapper.httpx_client.request(
-            "observability/spans",
+            "observability/spans/",
             method="DELETE",
             json=request,
             request_options=request_options,
@@ -590,7 +587,7 @@ class ObservabilityClient:
         )
         """
         _response = self._client_wrapper.httpx_client.request(
-            f"observability/spans/{jsonable_encoder(span_id)}",
+            f"observability/spans/{jsonable_encoder(span_id)}/",
             method="GET",
             params={
                 "type": type,
@@ -675,7 +672,7 @@ class AsyncObservabilityClient:
         asyncio.run(main())
         """
         _response = await self._client_wrapper.httpx_client.request(
-            "observability/dashboard",
+            "observability/dashboard/",
             method="GET",
             params={
                 "app_id": app_id,
@@ -768,7 +765,7 @@ class AsyncObservabilityClient:
         asyncio.run(main())
         """
         _response = await self._client_wrapper.httpx_client.request(
-            "observability/trace",
+            "observability/trace/",
             method="POST",
             json={
                 "trace": trace,
@@ -778,9 +775,6 @@ class AsyncObservabilityClient:
                     direction="write",
                 ),
             },
-            headers={
-                "content-type": "application/json",
-            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -869,7 +863,7 @@ class AsyncObservabilityClient:
         asyncio.run(main())
         """
         _response = await self._client_wrapper.httpx_client.request(
-            "observability/traces",
+            "observability/traces/",
             method="GET",
             params={
                 "app_id": app_id,
@@ -947,7 +941,7 @@ class AsyncObservabilityClient:
         asyncio.run(main())
         """
         _response = await self._client_wrapper.httpx_client.request(
-            "observability/traces",
+            "observability/traces/",
             method="DELETE",
             json=request,
             request_options=request_options,
@@ -1014,7 +1008,7 @@ class AsyncObservabilityClient:
         asyncio.run(main())
         """
         _response = await self._client_wrapper.httpx_client.request(
-            f"observability/traces/{jsonable_encoder(trace_id)}",
+            f"observability/traces/{jsonable_encoder(trace_id)}/",
             method="GET",
             request_options=request_options,
         )
@@ -1103,7 +1097,7 @@ class AsyncObservabilityClient:
         asyncio.run(main())
         """
         _response = await self._client_wrapper.httpx_client.request(
-            "observability/spans",
+            "observability/spans/",
             method="GET",
             params={
                 "app_id": app_id,
@@ -1181,7 +1175,7 @@ class AsyncObservabilityClient:
         asyncio.run(main())
         """
         _response = await self._client_wrapper.httpx_client.request(
-            "observability/spans",
+            "observability/spans/",
             method="DELETE",
             json=request,
             request_options=request_options,
@@ -1254,7 +1248,7 @@ class AsyncObservabilityClient:
         asyncio.run(main())
         """
         _response = await self._client_wrapper.httpx_client.request(
-            f"observability/spans/{jsonable_encoder(span_id)}",
+            f"observability/spans/{jsonable_encoder(span_id)}/",
             method="GET",
             params={
                 "type": type,

agenta/client/backend/observability_v_1/__init__.py

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

agenta/client/backend/observability_v_1/client.py

@@ -11,7 +11,6 @@ from .types.format import Format
 from .types.query_traces_response import QueryTracesResponse
 from ..errors.unprocessable_entity_error import UnprocessableEntityError
 from ..types.http_validation_error import HttpValidationError
-from .types.query_analytics_response import QueryAnalyticsResponse
 from ..core.client_wrapper import AsyncClientWrapper
 
 
@@ -271,103 +270,6 @@ class ObservabilityV1Client:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def query_analytics(
-        self,
-        *,
-        format: typing.Optional[Format] = None,
-        focus: typing.Optional[str] = None,
-        oldest: typing.Optional[str] = None,
-        newest: typing.Optional[str] = None,
-        window: typing.Optional[int] = None,
-        filtering: typing.Optional[str] = None,
-        time_range: typing.Optional[str] = None,
-        app_id: typing.Optional[str] = None,
-        environment: typing.Optional[str] = None,
-        variant: typing.Optional[str] = None,
-        request_options: typing.Optional[RequestOptions] = None,
-    ) -> QueryAnalyticsResponse:
-        """
-        Parameters
-        ----------
-        format : typing.Optional[Format]
-
-        focus : typing.Optional[str]
-
-        oldest : typing.Optional[str]
-
-        newest : typing.Optional[str]
-
-        window : typing.Optional[int]
-
-        filtering : typing.Optional[str]
-
-        time_range : typing.Optional[str]
-
-        app_id : typing.Optional[str]
-
-        environment : typing.Optional[str]
-
-        variant : typing.Optional[str]
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        QueryAnalyticsResponse
-            Successful Response
-
-        Examples
-        --------
-        from agenta import AgentaApi
-
-        client = AgentaApi(
-            api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
-        )
-        client.observability_v_1.query_analytics()
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            "observability/v1/analytics",
-            method="GET",
-            params={
-                "format": format,
-                "focus": focus,
-                "oldest": oldest,
-                "newest": newest,
-                "window": window,
-                "filtering": filtering,
-                "timeRange": time_range,
-                "app_id": app_id,
-                "environment": environment,
-                "variant": variant,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    QueryAnalyticsResponse,
-                    parse_obj_as(
-                        type_=QueryAnalyticsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _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 AsyncObservabilityV1Client:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
@@ -656,108 +558,3 @@ class AsyncObservabilityV1Client:
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
-
-    async def query_analytics(
-        self,
-        *,
-        format: typing.Optional[Format] = None,
-        focus: typing.Optional[str] = None,
-        oldest: typing.Optional[str] = None,
-        newest: typing.Optional[str] = None,
-        window: typing.Optional[int] = None,
-        filtering: typing.Optional[str] = None,
-        time_range: typing.Optional[str] = None,
-        app_id: typing.Optional[str] = None,
-        environment: typing.Optional[str] = None,
-        variant: typing.Optional[str] = None,
-        request_options: typing.Optional[RequestOptions] = None,
-    ) -> QueryAnalyticsResponse:
-        """
-        Parameters
-        ----------
-        format : typing.Optional[Format]
-
-        focus : typing.Optional[str]
-
-        oldest : typing.Optional[str]
-
-        newest : typing.Optional[str]
-
-        window : typing.Optional[int]
-
-        filtering : typing.Optional[str]
-
-        time_range : typing.Optional[str]
-
-        app_id : typing.Optional[str]
-
-        environment : typing.Optional[str]
-
-        variant : typing.Optional[str]
-
-        request_options : typing.Optional[RequestOptions]
-            Request-specific configuration.
-
-        Returns
-        -------
-        QueryAnalyticsResponse
-            Successful Response
-
-        Examples
-        --------
-        import asyncio
-
-        from agenta import AsyncAgentaApi
-
-        client = AsyncAgentaApi(
-            api_key="YOUR_API_KEY",
-            base_url="https://yourhost.com/path/to/api",
-        )
-
-
-        async def main() -> None:
-            await client.observability_v_1.query_analytics()
-
-
-        asyncio.run(main())
-        """
-        _response = await self._client_wrapper.httpx_client.request(
-            "observability/v1/analytics",
-            method="GET",
-            params={
-                "format": format,
-                "focus": focus,
-                "oldest": oldest,
-                "newest": newest,
-                "window": window,
-                "filtering": filtering,
-                "timeRange": time_range,
-                "app_id": app_id,
-                "environment": environment,
-                "variant": variant,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                return typing.cast(
-                    QueryAnalyticsResponse,
-                    parse_obj_as(
-                        type_=QueryAnalyticsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    typing.cast(
-                        HttpValidationError,
-                        parse_obj_as(
-                            type_=HttpValidationError,  # type: ignore
-                            object_=_response.json(),
-                        ),
-                    )
-                )
-            _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)

agenta/client/backend/observability_v_1/types/__init__.py

@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from .format import Format
-from .query_analytics_response import QueryAnalyticsResponse
 from .query_traces_response import QueryTracesResponse
 
-__all__ = ["Format", "QueryAnalyticsResponse", "QueryTracesResponse"]
+__all__ = ["Format", "QueryTracesResponse"]

agenta/client/backend/observability_v_1/types/format.py

@@ -2,4 +2,4 @@
 
 import typing
 
-Format = typing.Union[typing.Literal["legacy", "agenta"], typing.Any]
+Format = typing.Union[typing.Literal["opentelemetry", "agenta"], typing.Any]