Skip to content

Commit 0d8a3c6

Browse files
fhoussiaufhoussiau
committed
Merge branch 'main' into delete-old-buildfiles
2 parents 0506ff4 + 9998ce1 commit 0d8a3c6

File tree

136 files changed

+7634
-6651
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+7634
-6651
lines changed

‎PKG-INFO

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
Metadata-Version: 2.1
22
Name: tuneinsight
3-
Version: 0.10.3
3+
Version: 0.11.1
44
Summary: Diapason is the official Python SDK for the Tune Insight API. The current version is compatible with the same version of the API.
55
License: Apache-2.0
66
Author: Tune Insight SA
7-
Requires-Python: >=3.8,<3.12
7+
Requires-Python: >=3.9,<4.0
88
Classifier: License :: OSI Approved :: Apache Software License
99
Classifier: Programming Language :: Python :: 3
10-
Classifier: Programming Language :: Python :: 3.8
1110
Classifier: Programming Language :: Python :: 3.9
1211
Classifier: Programming Language :: Python :: 3.10
1312
Classifier: Programming Language :: Python :: 3.11
13+
Classifier: Programming Language :: Python :: 3.12
1414
Requires-Dist: PyYAML (>=6.0,<7.0)
1515
Requires-Dist: attrs (>=21.3.0)
1616
Requires-Dist: black (==24.2.0)
1717
Requires-Dist: certifi (>=2023.7.22,<2024.0.0)
1818
Requires-Dist: httpx (>=0.15.4,<0.24.0)
1919
Requires-Dist: matplotlib (>=3.5.0,<4.0.0)
2020
Requires-Dist: notebook (>=6.4.11,<7.0.0)
21+
Requires-Dist: numpy (==1.26.3)
2122
Requires-Dist: pandas (>=1.3.5,<2.0.0)
2223
Requires-Dist: python-dateutil (>=2.8.0,<3.0.0)
2324
Requires-Dist: python-dotenv (>=0.21.0,<0.22.0)
2425
Requires-Dist: python-keycloak (>=3.9.0,<4.0.0)
26+
Requires-Dist: tqdm (>=4.66.4,<5.0.0)
2527
Requires-Dist: typing-extensions (>=4.6.3,<5.0.0)
2628
Description-Content-Type: text/markdown
2729

‎pyproject.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "tuneinsight"
3-
version = "0.10.3"
3+
version = "0.11.1"
44
description = "Diapason is the official Python SDK for the Tune Insight API. The current version is compatible with the same version of the API."
55
authors = ["Tune Insight SA"]
66
license = "Apache-2.0"
@@ -20,9 +20,10 @@ pattern = "^v(?P<base>\\d+\\.\\d+\\.\\d+)"
2020
format = "{base}"
2121

2222
[tool.poetry.dependencies]
23-
python = ">= 3.8,<3.12"
23+
python = ">= 3.9,<4.0"
2424
python-keycloak = "^3.9.0"
2525
pandas = "^1.3.5"
26+
numpy = "1.26.3"
2627
PyYAML = "^6.0"
2728
notebook = "^6.4.11"
2829
python-dotenv = "^0.21.0"
@@ -36,6 +37,7 @@ attrs = ">=21.3.0"
3637
certifi = "^2023.7.22"
3738
black = "24.2.0"
3839

40+
tqdm = "^4.66.4"
3941
[tool.poetry.group.dev.dependencies]
4042
selenium = "^4.9.1"
4143
wheel = "^0.38.1"

‎src/tuneinsight/api/api-checksum

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9a9d944a9ab45803f3365d4e4d2382a7b4f849c315b23e66a4b4f46ca800b2e4
1+
050861bc9b56ad9cc7a0abac9c4bbe7b3dea8d5dd6a6034eeda22bd09e108f62

‎src/tuneinsight/api/sdk/api/api_computations/compute.py

+20-38
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from ...models.collective_key_switch import CollectiveKeySwitch
1212
from ...models.computation import Computation
1313
from ...models.dataset_statistics import DatasetStatistics
14-
from ...models.distributed_join import DistributedJoin
1514
from ...models.dummy import Dummy
1615
from ...models.encrypted_aggregation import EncryptedAggregation
1716
from ...models.encrypted_mean import EncryptedMean
@@ -25,7 +24,6 @@
2524
from ...models.private_search_setup import PrivateSearchSetup
2625
from ...models.relin_key_gen import RelinKeyGen
2726
from ...models.rot_key_gen import RotKeyGen
28-
from ...models.sample_extraction import SampleExtraction
2927
from ...models.set_intersection import SetIntersection
3028
from ...models.setup_session import SetupSession
3129
from ...models.survival_aggregation import SurvivalAggregation
@@ -42,7 +40,6 @@ def _get_kwargs(
4240
"CollectiveKeyGen",
4341
"CollectiveKeySwitch",
4442
"DatasetStatistics",
45-
"DistributedJoin",
4643
"Dummy",
4744
"EncryptedAggregation",
4845
"EncryptedMean",
@@ -55,7 +52,6 @@ def _get_kwargs(
5552
"PrivateSearchSetup",
5653
"RelinKeyGen",
5754
"RotKeyGen",
58-
"SampleExtraction",
5955
"SetIntersection",
6056
"SetupSession",
6157
"SurvivalAggregation",
@@ -111,12 +107,6 @@ def _get_kwargs(
111107
elif isinstance(json_body, SetupSession):
112108
json_json_body = json_body.to_dict()
113109

114-
elif isinstance(json_body, DistributedJoin):
115-
json_json_body = json_body.to_dict()
116-
117-
elif isinstance(json_body, SampleExtraction):
118-
json_json_body = json_body.to_dict()
119-
120110
elif isinstance(json_body, GWAS):
121111
json_json_body = json_body.to_dict()
122112

@@ -205,7 +195,6 @@ def sync_detailed(
205195
"CollectiveKeyGen",
206196
"CollectiveKeySwitch",
207197
"DatasetStatistics",
208-
"DistributedJoin",
209198
"Dummy",
210199
"EncryptedAggregation",
211200
"EncryptedMean",
@@ -218,7 +207,6 @@ def sync_detailed(
218207
"PrivateSearchSetup",
219208
"RelinKeyGen",
220209
"RotKeyGen",
221-
"SampleExtraction",
222210
"SetIntersection",
223211
"SetupSession",
224212
"SurvivalAggregation",
@@ -229,11 +217,11 @@ def sync_detailed(
229217
230218
Args:
231219
json_body (Union['AggregatedDatasetLength', 'Bootstrap', 'CollectiveKeyGen',
232-
'CollectiveKeySwitch', 'DatasetStatistics', 'DistributedJoin', 'Dummy',
233-
'EncryptedAggregation', 'EncryptedMean', 'EncryptedPrediction', 'EncryptedRegression',
234-
'GWAS', 'HybridFL', 'KeySwitchedComputation', 'PrivateSearch', 'PrivateSearchSetup',
235-
'RelinKeyGen', 'RotKeyGen', 'SampleExtraction', 'SetIntersection', 'SetupSession',
236-
'SurvivalAggregation', 'VBinnedAggregation']):
220+
'CollectiveKeySwitch', 'DatasetStatistics', 'Dummy', 'EncryptedAggregation',
221+
'EncryptedMean', 'EncryptedPrediction', 'EncryptedRegression', 'GWAS', 'HybridFL',
222+
'KeySwitchedComputation', 'PrivateSearch', 'PrivateSearchSetup', 'RelinKeyGen',
223+
'RotKeyGen', 'SetIntersection', 'SetupSession', 'SurvivalAggregation',
224+
'VBinnedAggregation']):
237225
238226
Raises:
239227
errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -265,7 +253,6 @@ def sync(
265253
"CollectiveKeyGen",
266254
"CollectiveKeySwitch",
267255
"DatasetStatistics",
268-
"DistributedJoin",
269256
"Dummy",
270257
"EncryptedAggregation",
271258
"EncryptedMean",
@@ -278,7 +265,6 @@ def sync(
278265
"PrivateSearchSetup",
279266
"RelinKeyGen",
280267
"RotKeyGen",
281-
"SampleExtraction",
282268
"SetIntersection",
283269
"SetupSession",
284270
"SurvivalAggregation",
@@ -289,11 +275,11 @@ def sync(
289275
290276
Args:
291277
json_body (Union['AggregatedDatasetLength', 'Bootstrap', 'CollectiveKeyGen',
292-
'CollectiveKeySwitch', 'DatasetStatistics', 'DistributedJoin', 'Dummy',
293-
'EncryptedAggregation', 'EncryptedMean', 'EncryptedPrediction', 'EncryptedRegression',
294-
'GWAS', 'HybridFL', 'KeySwitchedComputation', 'PrivateSearch', 'PrivateSearchSetup',
295-
'RelinKeyGen', 'RotKeyGen', 'SampleExtraction', 'SetIntersection', 'SetupSession',
296-
'SurvivalAggregation', 'VBinnedAggregation']):
278+
'CollectiveKeySwitch', 'DatasetStatistics', 'Dummy', 'EncryptedAggregation',
279+
'EncryptedMean', 'EncryptedPrediction', 'EncryptedRegression', 'GWAS', 'HybridFL',
280+
'KeySwitchedComputation', 'PrivateSearch', 'PrivateSearchSetup', 'RelinKeyGen',
281+
'RotKeyGen', 'SetIntersection', 'SetupSession', 'SurvivalAggregation',
282+
'VBinnedAggregation']):
297283
298284
Raises:
299285
errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -318,7 +304,6 @@ async def asyncio_detailed(
318304
"CollectiveKeyGen",
319305
"CollectiveKeySwitch",
320306
"DatasetStatistics",
321-
"DistributedJoin",
322307
"Dummy",
323308
"EncryptedAggregation",
324309
"EncryptedMean",
@@ -331,7 +316,6 @@ async def asyncio_detailed(
331316
"PrivateSearchSetup",
332317
"RelinKeyGen",
333318
"RotKeyGen",
334-
"SampleExtraction",
335319
"SetIntersection",
336320
"SetupSession",
337321
"SurvivalAggregation",
@@ -342,11 +326,11 @@ async def asyncio_detailed(
342326
343327
Args:
344328
json_body (Union['AggregatedDatasetLength', 'Bootstrap', 'CollectiveKeyGen',
345-
'CollectiveKeySwitch', 'DatasetStatistics', 'DistributedJoin', 'Dummy',
346-
'EncryptedAggregation', 'EncryptedMean', 'EncryptedPrediction', 'EncryptedRegression',
347-
'GWAS', 'HybridFL', 'KeySwitchedComputation', 'PrivateSearch', 'PrivateSearchSetup',
348-
'RelinKeyGen', 'RotKeyGen', 'SampleExtraction', 'SetIntersection', 'SetupSession',
349-
'SurvivalAggregation', 'VBinnedAggregation']):
329+
'CollectiveKeySwitch', 'DatasetStatistics', 'Dummy', 'EncryptedAggregation',
330+
'EncryptedMean', 'EncryptedPrediction', 'EncryptedRegression', 'GWAS', 'HybridFL',
331+
'KeySwitchedComputation', 'PrivateSearch', 'PrivateSearchSetup', 'RelinKeyGen',
332+
'RotKeyGen', 'SetIntersection', 'SetupSession', 'SurvivalAggregation',
333+
'VBinnedAggregation']):
350334
351335
Raises:
352336
errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -376,7 +360,6 @@ async def asyncio(
376360
"CollectiveKeyGen",
377361
"CollectiveKeySwitch",
378362
"DatasetStatistics",
379-
"DistributedJoin",
380363
"Dummy",
381364
"EncryptedAggregation",
382365
"EncryptedMean",
@@ -389,7 +372,6 @@ async def asyncio(
389372
"PrivateSearchSetup",
390373
"RelinKeyGen",
391374
"RotKeyGen",
392-
"SampleExtraction",
393375
"SetIntersection",
394376
"SetupSession",
395377
"SurvivalAggregation",
@@ -400,11 +382,11 @@ async def asyncio(
400382
401383
Args:
402384
json_body (Union['AggregatedDatasetLength', 'Bootstrap', 'CollectiveKeyGen',
403-
'CollectiveKeySwitch', 'DatasetStatistics', 'DistributedJoin', 'Dummy',
404-
'EncryptedAggregation', 'EncryptedMean', 'EncryptedPrediction', 'EncryptedRegression',
405-
'GWAS', 'HybridFL', 'KeySwitchedComputation', 'PrivateSearch', 'PrivateSearchSetup',
406-
'RelinKeyGen', 'RotKeyGen', 'SampleExtraction', 'SetIntersection', 'SetupSession',
407-
'SurvivalAggregation', 'VBinnedAggregation']):
385+
'CollectiveKeySwitch', 'DatasetStatistics', 'Dummy', 'EncryptedAggregation',
386+
'EncryptedMean', 'EncryptedPrediction', 'EncryptedRegression', 'GWAS', 'HybridFL',
387+
'KeySwitchedComputation', 'PrivateSearch', 'PrivateSearchSetup', 'RelinKeyGen',
388+
'RotKeyGen', 'SetIntersection', 'SetupSession', 'SurvivalAggregation',
389+
'VBinnedAggregation']):
408390
409391
Raises:
410392
errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.

‎src/tuneinsight/api/sdk/api/api_datagen/post_mock_dataset.py

+15
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ def _get_kwargs(
2121
seed: Union[Unset, None, str] = UNSET,
2222
create_datasource: Union[Unset, None, bool] = UNSET,
2323
clear_if_exists: Union[Unset, None, bool] = UNSET,
24+
tracking_id: Union[Unset, None, str] = UNSET,
2425
) -> Dict[str, Any]:
2526
url = "{}/mock/dataset".format(client.base_url)
2627

@@ -42,6 +43,8 @@ def _get_kwargs(
4243

4344
params["clearIfExists"] = clear_if_exists
4445

46+
params["trackingId"] = tracking_id
47+
4548
params = {k: v for k, v in params.items() if v is not UNSET and v is not None}
4649

4750
json_json_body = json_body
@@ -114,6 +117,7 @@ def sync_detailed(
114117
seed: Union[Unset, None, str] = UNSET,
115118
create_datasource: Union[Unset, None, bool] = UNSET,
116119
clear_if_exists: Union[Unset, None, bool] = UNSET,
120+
tracking_id: Union[Unset, None, str] = UNSET,
117121
) -> Response[Union[Any, DataSource, Error]]:
118122
"""Request the creation of a mock dataset.
119123
@@ -124,6 +128,7 @@ def sync_detailed(
124128
seed (Union[Unset, None, str]):
125129
create_datasource (Union[Unset, None, bool]):
126130
clear_if_exists (Union[Unset, None, bool]):
131+
tracking_id (Union[Unset, None, str]):
127132
json_body (str):
128133
129134
Raises:
@@ -143,6 +148,7 @@ def sync_detailed(
143148
seed=seed,
144149
create_datasource=create_datasource,
145150
clear_if_exists=clear_if_exists,
151+
tracking_id=tracking_id,
146152
)
147153

148154
response = httpx.request(
@@ -163,6 +169,7 @@ def sync(
163169
seed: Union[Unset, None, str] = UNSET,
164170
create_datasource: Union[Unset, None, bool] = UNSET,
165171
clear_if_exists: Union[Unset, None, bool] = UNSET,
172+
tracking_id: Union[Unset, None, str] = UNSET,
166173
) -> Optional[Union[Any, DataSource, Error]]:
167174
"""Request the creation of a mock dataset.
168175
@@ -173,6 +180,7 @@ def sync(
173180
seed (Union[Unset, None, str]):
174181
create_datasource (Union[Unset, None, bool]):
175182
clear_if_exists (Union[Unset, None, bool]):
183+
tracking_id (Union[Unset, None, str]):
176184
json_body (str):
177185
178186
Raises:
@@ -192,6 +200,7 @@ def sync(
192200
seed=seed,
193201
create_datasource=create_datasource,
194202
clear_if_exists=clear_if_exists,
203+
tracking_id=tracking_id,
195204
).parsed
196205

197206

@@ -205,6 +214,7 @@ async def asyncio_detailed(
205214
seed: Union[Unset, None, str] = UNSET,
206215
create_datasource: Union[Unset, None, bool] = UNSET,
207216
clear_if_exists: Union[Unset, None, bool] = UNSET,
217+
tracking_id: Union[Unset, None, str] = UNSET,
208218
) -> Response[Union[Any, DataSource, Error]]:
209219
"""Request the creation of a mock dataset.
210220
@@ -215,6 +225,7 @@ async def asyncio_detailed(
215225
seed (Union[Unset, None, str]):
216226
create_datasource (Union[Unset, None, bool]):
217227
clear_if_exists (Union[Unset, None, bool]):
228+
tracking_id (Union[Unset, None, str]):
218229
json_body (str):
219230
220231
Raises:
@@ -234,6 +245,7 @@ async def asyncio_detailed(
234245
seed=seed,
235246
create_datasource=create_datasource,
236247
clear_if_exists=clear_if_exists,
248+
tracking_id=tracking_id,
237249
)
238250

239251
async with httpx.AsyncClient(verify=client.verify_ssl) as _client:
@@ -252,6 +264,7 @@ async def asyncio(
252264
seed: Union[Unset, None, str] = UNSET,
253265
create_datasource: Union[Unset, None, bool] = UNSET,
254266
clear_if_exists: Union[Unset, None, bool] = UNSET,
267+
tracking_id: Union[Unset, None, str] = UNSET,
255268
) -> Optional[Union[Any, DataSource, Error]]:
256269
"""Request the creation of a mock dataset.
257270
@@ -262,6 +275,7 @@ async def asyncio(
262275
seed (Union[Unset, None, str]):
263276
create_datasource (Union[Unset, None, bool]):
264277
clear_if_exists (Union[Unset, None, bool]):
278+
tracking_id (Union[Unset, None, str]):
265279
json_body (str):
266280
267281
Raises:
@@ -282,5 +296,6 @@ async def asyncio(
282296
seed=seed,
283297
create_datasource=create_datasource,
284298
clear_if_exists=clear_if_exists,
299+
tracking_id=tracking_id,
285300
)
286301
).parsed

0 commit comments

Comments
 (0)