Skip to content

Commit 402d4c9

Browse files
committed
fix StrEnum issue
1 parent 2ce52e4 commit 402d4c9

File tree

2 files changed

+26
-21
lines changed

2 files changed

+26
-21
lines changed

nbs/backends/ragas_api_client.ipynb

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,8 @@
4444
"#| export\n",
4545
"import httpx\n",
4646
"import asyncio\n",
47-
"import functools\n",
4847
"import typing as t\n",
49-
"import inspect\n",
5048
"from pydantic import BaseModel, Field\n",
51-
"from enum import StrEnum\n",
52-
"import uuid\n",
5349
"from fastcore.utils import patch"
5450
]
5551
},
@@ -708,7 +704,17 @@
708704
"outputs": [],
709705
"source": [
710706
"#| export\n",
711-
"class ColumnType(StrEnum):\n",
707+
"from enum import Enum"
708+
]
709+
},
710+
{
711+
"cell_type": "code",
712+
"execution_count": null,
713+
"metadata": {},
714+
"outputs": [],
715+
"source": [
716+
"#| export\n",
717+
"class ColumnType(str, Enum):\n",
712718
" NUMBER = \"number\"\n",
713719
" TEXT = \"text\"\n",
714720
" LONG_TEXT = \"longText\"\n",

ragas_annotator/backends/ragas_api_client.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@
88
# %% ../../nbs/backends/ragas_api_client.ipynb 4
99
import httpx
1010
import asyncio
11-
import functools
1211
import typing as t
13-
import inspect
1412
from pydantic import BaseModel, Field
15-
from enum import StrEnum
16-
import uuid
1713
from fastcore.utils import patch
1814

1915
# %% ../../nbs/backends/ragas_api_client.ipynb 5
@@ -262,7 +258,10 @@ async def delete_experiment(self: RagasApiClient, project_id: str, experiment_id
262258

263259

264260
# %% ../../nbs/backends/ragas_api_client.ipynb 25
265-
class ColumnType(StrEnum):
261+
from enum import Enum
262+
263+
# %% ../../nbs/backends/ragas_api_client.ipynb 26
264+
class ColumnType(str, Enum):
266265
NUMBER = "number"
267266
TEXT = "text"
268267
LONG_TEXT = "longText"
@@ -272,7 +271,7 @@ class ColumnType(StrEnum):
272271
CHECKBOX = "checkbox"
273272
CUSTOM = "custom"
274273

275-
# %% ../../nbs/backends/ragas_api_client.ipynb 26
274+
# %% ../../nbs/backends/ragas_api_client.ipynb 27
276275
#---- Dataset Columns ----
277276
@patch
278277
async def list_dataset_columns(
@@ -343,7 +342,7 @@ async def delete_dataset_column(
343342
f"projects/{project_id}/datasets/{dataset_id}/columns/{column_id}"
344343
)
345344

346-
# %% ../../nbs/backends/ragas_api_client.ipynb 34
345+
# %% ../../nbs/backends/ragas_api_client.ipynb 35
347346
#---- Dataset Rows ----
348347
@patch
349348
async def list_dataset_rows(
@@ -405,11 +404,11 @@ async def delete_dataset_row(
405404
)
406405

407406

408-
# %% ../../nbs/backends/ragas_api_client.ipynb 46
407+
# %% ../../nbs/backends/ragas_api_client.ipynb 47
409408
import uuid
410409
import string
411410

412-
# %% ../../nbs/backends/ragas_api_client.ipynb 47
411+
# %% ../../nbs/backends/ragas_api_client.ipynb 48
413412
def create_nano_id(size=12):
414413
# Define characters to use (alphanumeric)
415414
alphabet = string.ascii_letters + string.digits
@@ -426,11 +425,11 @@ def create_nano_id(size=12):
426425
# Pad if necessary and return desired length
427426
return result[:size]
428427

429-
# %% ../../nbs/backends/ragas_api_client.ipynb 49
428+
# %% ../../nbs/backends/ragas_api_client.ipynb 50
430429
import uuid
431430
import string
432431

433-
# %% ../../nbs/backends/ragas_api_client.ipynb 50
432+
# %% ../../nbs/backends/ragas_api_client.ipynb 51
434433
def create_nano_id(size=12):
435434
# Define characters to use (alphanumeric)
436435
alphabet = string.ascii_letters + string.digits
@@ -447,7 +446,7 @@ def create_nano_id(size=12):
447446
# Pad if necessary and return desired length
448447
return result[:size]
449448

450-
# %% ../../nbs/backends/ragas_api_client.ipynb 52
449+
# %% ../../nbs/backends/ragas_api_client.ipynb 53
451450
# Default settings for columns
452451
DEFAULT_SETTINGS = {
453452
"is_required": False,
@@ -470,7 +469,7 @@ class Row(BaseModel):
470469
id: str = Field(default_factory=create_nano_id)
471470
data: t.List[RowCell] = Field(...)
472471

473-
# %% ../../nbs/backends/ragas_api_client.ipynb 53
472+
# %% ../../nbs/backends/ragas_api_client.ipynb 54
474473
#---- Resource With Data Helper Methods ----
475474
@patch
476475
async def _create_with_data(
@@ -597,7 +596,7 @@ async def create_dataset_with_data(
597596
"dataset", project_id, name, description, columns, rows, batch_size
598597
)
599598

600-
# %% ../../nbs/backends/ragas_api_client.ipynb 59
599+
# %% ../../nbs/backends/ragas_api_client.ipynb 60
601600
#---- Experiment Columns ----
602601
@patch
603602
async def list_experiment_columns(
@@ -728,7 +727,7 @@ async def delete_experiment_row(
728727
f"projects/{project_id}/experiments/{experiment_id}/rows/{row_id}"
729728
)
730729

731-
# %% ../../nbs/backends/ragas_api_client.ipynb 62
730+
# %% ../../nbs/backends/ragas_api_client.ipynb 63
732731
@patch
733732
async def create_experiment_with_data(
734733
self: RagasApiClient,
@@ -759,7 +758,7 @@ async def create_experiment_with_data(
759758
"experiment", project_id, name, description, columns, rows, batch_size
760759
)
761760

762-
# %% ../../nbs/backends/ragas_api_client.ipynb 63
761+
# %% ../../nbs/backends/ragas_api_client.ipynb 64
763762
#---- Utility Methods ----
764763
@patch
765764
def create_column(

0 commit comments

Comments
 (0)