Merge pull request #64 from aimonlabs/custom-metrics

Add Custom metrics and improve Datasets UX

Author: ramoncelestino

aimon/_client.py

@@ -24,7 +24,7 @@
     get_async_library,
 )
 from ._version import __version__
-from .resources import users, models, analyze, inference, retrieval
+from .resources import users, models, analyze, metrics, inference, retrieval
 from ._streaming import Stream as Stream, AsyncStream as AsyncStream
 from ._exceptions import APIStatusError
 from ._base_client import (
@@ -48,6 +48,7 @@ class Client(SyncAPIClient):
     analyze: analyze.AnalyzeResource
     inference: inference.InferenceResource
     retrieval: retrieval.RetrievalResource
+    metrics: metrics.MetricsResource
     with_raw_response: ClientWithRawResponse
     with_streaming_response: ClientWithStreamedResponse
 
@@ -104,6 +105,7 @@ def __init__(
         self.analyze = analyze.AnalyzeResource(self)
         self.inference = inference.InferenceResource(self)
         self.retrieval = retrieval.RetrievalResource(self)
+        self.metrics = metrics.MetricsResource(self)
         self.with_raw_response = ClientWithRawResponse(self)
         self.with_streaming_response = ClientWithStreamedResponse(self)
 
@@ -221,6 +223,7 @@ class AsyncClient(AsyncAPIClient):
     analyze: analyze.AsyncAnalyzeResource
     inference: inference.AsyncInferenceResource
     retrieval: retrieval.AsyncRetrievalResource
+    metrics: metrics.AsyncMetricsResource
     with_raw_response: AsyncClientWithRawResponse
     with_streaming_response: AsyncClientWithStreamedResponse
 
@@ -277,6 +280,7 @@ def __init__(
         self.analyze = analyze.AsyncAnalyzeResource(self)
         self.inference = inference.AsyncInferenceResource(self)
         self.retrieval = retrieval.AsyncRetrievalResource(self)
+        self.metrics = metrics.AsyncMetricsResource(self)
         self.with_raw_response = AsyncClientWithRawResponse(self)
         self.with_streaming_response = AsyncClientWithStreamedResponse(self)
 
@@ -395,6 +399,7 @@ def __init__(self, client: Client) -> None:
         self.analyze = analyze.AnalyzeResourceWithRawResponse(client.analyze)
         self.inference = inference.InferenceResourceWithRawResponse(client.inference)
         self.retrieval = retrieval.RetrievalResourceWithRawResponse(client.retrieval)
+        self.metrics = metrics.MetricsResourceWithRawResponse(client.metrics)
 
 
 class AsyncClientWithRawResponse:
@@ -407,6 +412,7 @@ def __init__(self, client: AsyncClient) -> None:
         self.analyze = analyze.AsyncAnalyzeResourceWithRawResponse(client.analyze)
         self.inference = inference.AsyncInferenceResourceWithRawResponse(client.inference)
         self.retrieval = retrieval.AsyncRetrievalResourceWithRawResponse(client.retrieval)
+        self.metrics = metrics.AsyncMetricsResourceWithRawResponse(client.metrics)
 
 
 class ClientWithStreamedResponse:
@@ -419,6 +425,7 @@ def __init__(self, client: Client) -> None:
         self.analyze = analyze.AnalyzeResourceWithStreamingResponse(client.analyze)
         self.inference = inference.InferenceResourceWithStreamingResponse(client.inference)
         self.retrieval = retrieval.RetrievalResourceWithStreamingResponse(client.retrieval)
+        self.metrics = metrics.MetricsResourceWithStreamingResponse(client.metrics)
 
 
 class AsyncClientWithStreamedResponse:
@@ -431,6 +438,7 @@ def __init__(self, client: AsyncClient) -> None:
         self.analyze = analyze.AsyncAnalyzeResourceWithStreamingResponse(client.analyze)
         self.inference = inference.AsyncInferenceResourceWithStreamingResponse(client.inference)
         self.retrieval = retrieval.AsyncRetrievalResourceWithStreamingResponse(client.retrieval)
+        self.metrics = metrics.AsyncMetricsResourceWithStreamingResponse(client.metrics)
 
 
 Client = Client

aimon/resources/__init__.py

@@ -24,6 +24,14 @@
     AnalyzeResourceWithStreamingResponse,
     AsyncAnalyzeResourceWithStreamingResponse,
 )
+from .metrics import (
+    MetricsResource,
+    AsyncMetricsResource,
+    MetricsResourceWithRawResponse,
+    AsyncMetricsResourceWithRawResponse,
+    MetricsResourceWithStreamingResponse,
+    AsyncMetricsResourceWithStreamingResponse,
+)
 from .datasets import (
     DatasetsResource,
     AsyncDatasetsResource,
@@ -114,4 +122,10 @@
     "AsyncRetrievalResourceWithRawResponse",
     "RetrievalResourceWithStreamingResponse",
     "AsyncRetrievalResourceWithStreamingResponse",
+    "MetricsResource",
+    "AsyncMetricsResource",
+    "MetricsResourceWithRawResponse",
+    "AsyncMetricsResourceWithRawResponse",
+    "MetricsResourceWithStreamingResponse",
+    "AsyncMetricsResourceWithStreamingResponse",
 ]

aimon/resources/datasets/datasets.py

@@ -76,7 +76,8 @@ def create(
         self,
         *,
         file: FileTypes,
-        json_data: str,
+        name: str,
+        description: str | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -90,7 +91,9 @@ def create(
         Args:
           file: The CSV file containing the dataset
 
-          json_data: JSON string containing dataset metadata
+          name: Name of the dataset
+
+          description: Optional description of the dataset
 
           extra_headers: Send extra headers
 
@@ -103,7 +106,8 @@ def create(
         body = deepcopy_minimal(
             {
                 "file": file,
-                "json_data": json_data,
+                "name": name,
+                "description": description,
             }
         )
         files = extract_files(cast(Mapping[str, object], body), paths=[["file"]])
@@ -112,7 +116,7 @@ def create(
         # multipart/form-data; boundary=---abc--
         extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
         return self._post(
-            "/v1/dataset",
+            "/v2/dataset",
             body=maybe_transform(body, dataset_create_params.DatasetCreateParams),
             files=files,
             options=make_request_options(
@@ -189,7 +193,8 @@ async def create(
         self,
         *,
         file: FileTypes,
-        json_data: str,
+        name: str,
+        description: str | NotGiven = NOT_GIVEN,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -203,7 +208,9 @@ async def create(
         Args:
           file: The CSV file containing the dataset
 
-          json_data: JSON string containing dataset metadata
+          name: Name of the dataset
+
+          description: Optional description of the dataset
 
           extra_headers: Send extra headers
 
@@ -216,7 +223,8 @@ async def create(
         body = deepcopy_minimal(
             {
                 "file": file,
-                "json_data": json_data,
+                "name": name,
+                "description": description,
             }
         )
         files = extract_files(cast(Mapping[str, object], body), paths=[["file"]])
@@ -225,7 +233,7 @@ async def create(
         # multipart/form-data; boundary=---abc--
         extra_headers = {"Content-Type": "multipart/form-data", **(extra_headers or {})}
         return await self._post(
-            "/v1/dataset",
+            "/v2/dataset",
             body=await async_maybe_transform(body, dataset_create_params.DatasetCreateParams),
             files=files,
             options=make_request_options(