Skip to content

Commit 4a72cf4

Browse files
kevinmessiaenkevinmessiaen
committed
Fixed merge
1 parent 9fa0bf9 commit 4a72cf4

3 files changed

Lines changed: 114 additions & 47 deletions

File tree

‎frontend/src/views/main/project/FiltersCatalog.vue‎

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -162,40 +162,16 @@
162162
</template>
163163

164164
<script setup lang="ts">
165-
import { chain } from "lodash";
166-
import { computed, inject, onActivated, ref, watch } from "vue";
167-
import { pasterColor } from "@/utils";
168-
import { editor } from "monaco-editor";
169-
import { DatasetProcessFunctionType, FunctionInputDTO, SlicingFunctionDTO, SlicingResultDTO } from "@/generated-sources";
170-
import StartWorkerInstructions from "@/components/StartWorkerInstructions.vue";
171-
import { storeToRefs } from "pinia";
172-
import { useCatalogStore } from "@/stores/catalog";
173-
import DatasetSelector from "@/views/main/utils/DatasetSelector.vue";
174-
import { api } from "@/api";
175-
import DatasetTable from "@/components/DatasetTable.vue";
176-
import SuiteInputListSelector from "@/components/SuiteInputListSelector.vue";
177-
import DatasetColumnSelector from "@/views/main/utils/DatasetColumnSelector.vue";
178-
import { alphabeticallySorted } from "@/utils/comparators";
179-
import { extractArgumentDocumentation } from "@/utils/python-doc.utils";
180-
import CodeSnippet from "@/components/CodeSnippet.vue";
181-
import IEditorOptions = editor.IEditorOptions;
182-
import mixpanel from "mixpanel-browser";
183-
import { anonymize } from "@/utils";
184-
import { $vfm } from 'vue-final-modal';
185-
import CreateSliceCatalogModal from "./modals/CreateSliceCatalogModal.vue";
186-
import { copyToClipboard } from "@/global-keys";
187-
import { TYPE } from "vue-toastification";
188-
import { useMainStore } from "@/stores/main";
189165
import { chain } from 'lodash';
190-
import { computed, onActivated, ref, watch } from 'vue';
166+
import { computed, inject, onActivated, ref, watch } from 'vue';
191167
import { anonymize, pasterColor } from '@/utils';
168+
import { editor } from 'monaco-editor';
192169
import {
193170
DatasetProcessFunctionType,
194171
DatasetProcessingResultDTO,
195172
FunctionInputDTO,
196173
SlicingFunctionDTO
197174
} from '@/generated-sources';
198-
import StartWorkerInstructions from '@/components/StartWorkerInstructions.vue';
199175
import { storeToRefs } from 'pinia';
200176
import { useCatalogStore } from '@/stores/catalog';
201177
import DatasetSelector from '@/views/main/utils/DatasetSelector.vue';
@@ -207,7 +183,14 @@ import { alphabeticallySorted } from '@/utils/comparators';
207183
import { extractArgumentDocumentation } from '@/utils/python-doc.utils';
208184
import CodeSnippet from '@/components/CodeSnippet.vue';
209185
import mixpanel from 'mixpanel-browser';
186+
import { $vfm } from 'vue-final-modal';
187+
import CreateSliceCatalogModal from './modals/CreateSliceCatalogModal.vue';
188+
import { copyToClipboard } from '@/global-keys';
189+
import { TYPE } from 'vue-toastification';
190+
import { useMainStore } from '@/stores/main';
191+
import StartWorkerInstructions from '@/components/StartWorkerInstructions.vue';
210192
import { DatasetProcessFunctionUtils } from '@/utils/dataset-process-function.utils';
193+
import IEditorOptions = editor.IEditorOptions;
211194
212195
let props = defineProps<{
213196
projectId: number,

‎frontend/src/views/main/project/TransformationsCatalog.vue‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -149,27 +149,25 @@
149149
</template>
150150

151151
<script setup lang="ts">
152-
import _, { chain } from "lodash";
153-
import { computed, inject, onActivated, ref, watch } from "vue";
154-
import { anonymize, pasterColor } from "@/utils";
155-
import { FunctionInputDTO, TransformationFunctionDTO } from "@/generated-sources";
156-
import StartWorkerInstructions from "@/components/StartWorkerInstructions.vue";
157-
import { storeToRefs } from "pinia";
158-
import { useCatalogStore } from "@/stores/catalog";
159-
import DatasetSelector from "@/views/main/utils/DatasetSelector.vue";
160-
import { api } from "@/api";
161-
import DatasetTable from "@/components/DatasetTable.vue";
162-
import SuiteInputListSelector from "@/components/SuiteInputListSelector.vue";
163-
import DatasetColumnSelector from "@/views/main/utils/DatasetColumnSelector.vue";
164-
import { alphabeticallySorted } from "@/utils/comparators";
165-
import { extractArgumentDocumentation } from "@/utils/python-doc.utils";
166-
import IEditorOptions = editor.IEditorOptions;
167-
import CodeSnippet from "@/components/CodeSnippet.vue";
168-
import mixpanel from "mixpanel-browser";
169-
import { anonymize } from "@/utils";
170-
import { copyToClipboard } from "@/global-keys";
171-
import { TYPE } from "vue-toastification";
172-
import { useMainStore } from "@/stores/main";
152+
import { chain } from 'lodash';
153+
import { computed, onActivated, ref, watch } from 'vue';
154+
import { anonymize, pasterColor } from '@/utils';
155+
import { FunctionInputDTO, TransformationFunctionDTO } from '@/generated-sources';
156+
import StartWorkerInstructions from '@/components/StartWorkerInstructions.vue';
157+
import { storeToRefs } from 'pinia';
158+
import { useCatalogStore } from '@/stores/catalog';
159+
import DatasetSelector from '@/views/main/utils/DatasetSelector.vue';
160+
import { api } from '@/api';
161+
import DatasetTable from '@/components/DatasetTable.vue';
162+
import SuiteInputListSelector from '@/components/SuiteInputListSelector.vue';
163+
import DatasetColumnSelector from '@/views/main/utils/DatasetColumnSelector.vue';
164+
import { alphabeticallySorted } from '@/utils/comparators';
165+
import { extractArgumentDocumentation } from '@/utils/python-doc.utils';
166+
import CodeSnippet from '@/components/CodeSnippet.vue';
167+
import mixpanel from 'mixpanel-browser';
168+
import { copyToClipboard } from '@/global-keys';
169+
import { TYPE } from 'vue-toastification';
170+
import { useMainStore } from '@/stores/main';
173171
174172
let props = defineProps<{
175173
projectId: number,

‎python-client/test.ipynb‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{
2+
"cells": [
3+
{
4+
"cell_type": "code",
5+
"execution_count": null,
6+
"id": "initial_id",
7+
"metadata": {
8+
"collapsed": true
9+
},
10+
"outputs": [],
11+
"source": []
12+
},
13+
{
14+
"cell_type": "code",
15+
"execution_count": null,
16+
"outputs": [],
17+
"source": [
18+
"import giskard\n",
19+
"\n",
20+
"# Replace this with your own data & model creation.\n",
21+
"df = giskard.demo.titanic_df()\n",
22+
"data_preprocessing_function, clf = giskard.demo.titanic_pipeline()\n",
23+
"\n",
24+
"# Wrap your Pandas DataFrame\n",
25+
"giskard_dataset = giskard.Dataset(df=df,\n",
26+
" target=\"Survived\",\n",
27+
" name=\"Titanic dataset\",\n",
28+
" cat_columns=['Pclass', 'Sex', \"SibSp\", \"Parch\", \"Embarked\"])\n",
29+
"\n",
30+
"\n",
31+
"# Wrap your model\n",
32+
"def prediction_function(df):\n",
33+
" preprocessed_df = data_preprocessing_function(df)\n",
34+
" return clf.predict_proba(preprocessed_df)\n",
35+
"\n",
36+
"\n",
37+
"giskard_model = giskard.Model(model=prediction_function,\n",
38+
" model_type=\"classification\",\n",
39+
" name=\"Titanic model\",\n",
40+
" classification_labels=clf.classes_,\n",
41+
" feature_names=['PassengerId', 'Pclass', 'Name', 'Sex', 'Age', 'SibSp', 'Parch', 'Fare',\n",
42+
" 'Embarked'])\n",
43+
"\n",
44+
"# Then apply the scan\n",
45+
"results = giskard.scan(giskard_model, giskard_dataset)\n",
46+
"\n",
47+
"# Create a Giskard client\n",
48+
"client = giskard.GiskardClient(\n",
49+
" url=\"http://localhost:9000\", # URL of your Giskard instance\n",
50+
" token=\"gsk-xMMDkhjMaeTRWBl5PRXuUj1phfU1\")\n",
51+
"\n",
52+
"# Upload an automatically created test suite to the current project ✉️\n",
53+
"results.generate_test_suite(\"Test suite created by scan\").upload(client, \"test\")\n"
54+
],
55+
"metadata": {
56+
"collapsed": false,
57+
"is_executing": true,
58+
"ExecuteTime": {
59+
"start_time": "2023-09-05T05:42:09.369729Z"
60+
}
61+
},
62+
"id": "fd7bde5a479364a1"
63+
}
64+
],
65+
"metadata": {
66+
"kernelspec": {
67+
"display_name": "Python 3",
68+
"language": "python",
69+
"name": "python3"
70+
},
71+
"language_info": {
72+
"codemirror_mode": {
73+
"name": "ipython",
74+
"version": 2
75+
},
76+
"file_extension": ".py",
77+
"mimetype": "text/x-python",
78+
"name": "python",
79+
"nbconvert_exporter": "python",
80+
"pygments_lexer": "ipython2",
81+
"version": "2.7.6"
82+
}
83+
},
84+
"nbformat": 4,
85+
"nbformat_minor": 5
86+
}

0 commit comments

Comments
 (0)