Skip to content

Commit 4f979d1

Browse files
committed
added ordering
1 parent 9792f40 commit 4f979d1

File tree

6 files changed

+37
-55
lines changed

6 files changed

+37
-55
lines changed

nbs/project/core.ipynb

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -123,27 +123,6 @@
123123
"os.environ[\"RAGAS_API_BASE_URL\"] = RAGAS_API_BASE_URL"
124124
]
125125
},
126-
{
127-
"cell_type": "code",
128-
"execution_count": null,
129-
"metadata": {},
130-
"outputs": [
131-
{
132-
"data": {
133-
"text/plain": [
134-
"Project(name='Demo Project')"
135-
]
136-
},
137-
"execution_count": 6,
138-
"metadata": {},
139-
"output_type": "execute_result"
140-
}
141-
],
142-
"source": [
143-
"project = Project.create(\"Demo Project\")\n",
144-
"project"
145-
]
146-
},
147126
{
148127
"cell_type": "code",
149128
"execution_count": null,
@@ -155,12 +134,13 @@
155134
"Project(name='yann-lecun-wisdom')"
156135
]
157136
},
158-
"execution_count": 6,
137+
"execution_count": null,
159138
"metadata": {},
160139
"output_type": "execute_result"
161140
}
162141
],
163142
"source": [
143+
"#project = Project.create(\"Demo Project\")\n",
164144
"project = Project(project_id=\"1ef0843b-231f-4a2c-b64d-d39bcee9d830\")\n",
165145
"project"
166146
]
@@ -333,7 +313,7 @@
333313
"Dataset(name=TestModel, model=TestModel, len=0)"
334314
]
335315
},
336-
"execution_count": 12,
316+
"execution_count": null,
337317
"metadata": {},
338318
"output_type": "execute_result"
339319
}

nbs/project/experiments.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
"Project(name='SuperMe')"
129129
]
130130
},
131-
"execution_count": 4,
131+
"execution_count": null,
132132
"metadata": {},
133133
"output_type": "execute_result"
134134
}
@@ -172,7 +172,7 @@
172172
"Experiment(name=test-exp, model=TestModel)"
173173
]
174174
},
175-
"execution_count": 7,
175+
"execution_count": null,
176176
"metadata": {},
177177
"output_type": "execute_result"
178178
}

nbs/typing.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@
561561
" 'editable': True}]"
562562
]
563563
},
564-
"execution_count": 50,
564+
"execution_count": null,
565565
"metadata": {},
566566
"output_type": "execute_result"
567567
}

ragas_experimental/project/core.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def delete(self):
6363
def __repr__(self):
6464
return f"Project(name='{self.name}')"
6565

66-
# %% ../../nbs/project/core.ipynb 9
66+
# %% ../../nbs/project/core.ipynb 8
6767
@patch(cls_method=True)
6868
def get(cls: Project, name: str, ragas_app_client: t.Optional[RagasApiClient] = None) -> Project:
6969
"""Get an existing project by name."""
@@ -83,7 +83,7 @@ def get(cls: Project, name: str, ragas_app_client: t.Optional[RagasApiClient] =
8383
ragas_app_client=ragas_app_client,
8484
)
8585

86-
# %% ../../nbs/project/core.ipynb 13
86+
# %% ../../nbs/project/core.ipynb 12
8787
async def create_dataset_columns(project_id, dataset_id, columns, create_dataset_column_func):
8888
tasks = []
8989
for column in columns:
@@ -98,7 +98,7 @@ async def create_dataset_columns(project_id, dataset_id, columns, create_dataset
9898
return await asyncio.gather(*tasks)
9999

100100

101-
# %% ../../nbs/project/core.ipynb 14
101+
# %% ../../nbs/project/core.ipynb 13
102102
@patch
103103
def create_dataset(
104104
self: Project, model: t.Type[BaseModel], name: t.Optional[str] = None
@@ -138,7 +138,7 @@ def create_dataset(
138138
ragas_api_client=self._ragas_api_client,
139139
)
140140

141-
# %% ../../nbs/project/core.ipynb 18
141+
# %% ../../nbs/project/core.ipynb 17
142142
@patch
143143
def get_dataset_by_id(self: Project, dataset_id: str, model) -> Dataset:
144144
"""Get an existing dataset by name."""
@@ -158,7 +158,7 @@ def get_dataset_by_id(self: Project, dataset_id: str, model) -> Dataset:
158158
ragas_api_client=self._ragas_api_client,
159159
)
160160

161-
# %% ../../nbs/project/core.ipynb 20
161+
# %% ../../nbs/project/core.ipynb 19
162162
@patch
163163
def get_dataset(self: Project, dataset_name: str, model) -> Dataset:
164164
"""Get an existing dataset by name."""

ragas_experimental/project/experiments.py

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,21 @@
2222
import ragas_experimental.typing as rt
2323

2424
# %% ../../nbs/project/experiments.ipynb 4
25+
# Add this helper function similar to create_dataset_columns in core.ipynb
26+
async def create_experiment_columns(project_id, experiment_id, columns, create_experiment_column_func):
27+
tasks = []
28+
for column in columns:
29+
tasks.append(create_experiment_column_func(
30+
project_id=project_id,
31+
experiment_id=experiment_id,
32+
id=create_nano_id(),
33+
name=column["name"],
34+
type=column["type"],
35+
settings=column["settings"]
36+
))
37+
return await asyncio.gather(*tasks)
38+
39+
# %% ../../nbs/project/experiments.ipynb 5
2540
@patch
2641
def create_experiment(
2742
self: Project, name: str, model: t.Type[BaseModel]
@@ -61,24 +76,8 @@ def create_experiment(
6176
ragas_api_client=self._ragas_api_client,
6277
)
6378

64-
# Add this helper function similar to create_dataset_columns in core.ipynb
65-
async def create_experiment_columns(project_id, experiment_id, columns, create_experiment_column_func):
66-
tasks = []
67-
for column in columns:
68-
tasks.append(create_experiment_column_func(
69-
project_id=project_id,
70-
experiment_id=experiment_id,
71-
id=create_nano_id(),
72-
name=column["name"],
73-
type=column["type"],
74-
settings={
75-
"max_length": 255,
76-
"is_required": True,
77-
},
78-
))
79-
return await asyncio.gather(*tasks)
8079

81-
# %% ../../nbs/project/experiments.ipynb 8
80+
# %% ../../nbs/project/experiments.ipynb 9
8281
@patch
8382
def get_experiment_by_id(self: Project, experiment_id: str, model: t.Type[BaseModel]) -> Experiment:
8483
"""Get an existing experiment by ID."""
@@ -97,7 +96,7 @@ def get_experiment_by_id(self: Project, experiment_id: str, model: t.Type[BaseMo
9796
ragas_api_client=self._ragas_api_client,
9897
)
9998

100-
# %% ../../nbs/project/experiments.ipynb 11
99+
# %% ../../nbs/project/experiments.ipynb 12
101100
@patch
102101
def get_experiment(self: Project, dataset_name: str, model) -> Dataset:
103102
"""Get an existing dataset by name."""
@@ -117,23 +116,23 @@ def get_experiment(self: Project, dataset_name: str, model) -> Dataset:
117116
ragas_api_client=self._ragas_api_client,
118117
)
119118

120-
# %% ../../nbs/project/experiments.ipynb 14
119+
# %% ../../nbs/project/experiments.ipynb 15
121120
@t.runtime_checkable
122121
class ExperimentProtocol(t.Protocol):
123122
async def __call__(self, *args, **kwargs): ...
124123
async def run_async(self, name: str, dataset: Dataset): ...
125124

126-
# %% ../../nbs/project/experiments.ipynb 15
125+
# %% ../../nbs/project/experiments.ipynb 16
127126
# this one we have to clean up
128127
from langfuse.decorators import observe
129128

130-
# %% ../../nbs/project/experiments.ipynb 16
129+
# %% ../../nbs/project/experiments.ipynb 17
131130
from .naming import MemorableNames
132131

133-
# %% ../../nbs/project/experiments.ipynb 17
132+
# %% ../../nbs/project/experiments.ipynb 18
134133
memorable_names = MemorableNames()
135134

136-
# %% ../../nbs/project/experiments.ipynb 18
135+
# %% ../../nbs/project/experiments.ipynb 19
137136
@patch
138137
def experiment(
139138
self: Project, experiment_model, name_prefix: str = ""
@@ -212,7 +211,7 @@ async def run_async(dataset: Dataset, name: t.Optional[str] = None):
212211

213212
return decorator
214213

215-
# %% ../../nbs/project/experiments.ipynb 22
214+
# %% ../../nbs/project/experiments.ipynb 23
216215
@patch
217216
def langfuse_experiment(
218217
self: Project, experiment_model, name_prefix: str = ""

ragas_experimental/typing.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,9 @@ def model_to_columns(cls: ModelConverter, model_class):
336336

337337
columns.append(column)
338338

339+
# set the position of the columns
340+
for i in range(len(columns)):
341+
columns[i]["settings"]["position"] = i
339342
return columns
340343

341344
# %% ../nbs/typing.ipynb 23

0 commit comments

Comments
 (0)