Skip to content

Commit 6be3782

Browse files
Robin-Van-de-MerghelRobin-Van-de-Merghel
authored
Merge branch 'main' into robin-add-semantic
2 parents bbbf021 + 7337225 commit 6be3782

45 files changed

Lines changed: 2304 additions & 3537 deletions

File tree

Some content is hidden

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

‎diracx-cli/src/diracx/cli/auth.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ async def login(
8888
)
8989
while expires > datetime.now(tz=timezone.utc):
9090
print(".", end="", flush=True)
91-
response = await api.auth.token(device_code=data.device_code, client_id=api.client_id) # type: ignore
91+
response = await api.auth.get_oidc_token(device_code=data.device_code, client_id=api.client_id) # type: ignore
9292
if isinstance(response, DeviceFlowErrorResponse):
9393
if response.error == "authorization_pending":
9494
# TODO: Setting more than 5 seconds results in an error

‎diracx-cli/src/diracx/cli/jobs.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ def display_rich(data, content_range: ContentRange) -> None:
152152
@app.async_command()
153153
async def submit(jdl: list[FileText]):
154154
async with DiracClient() as api:
155-
# api.valid(enforce_https=False)
156-
jobs = await api.jobs.submit_bulk_jdl_jobs([x.read() for x in jdl])
155+
jobs = await api.jobs.submit_jdl_jobs([x.read() for x in jdl])
157156
print(
158157
f"Inserted {len(jobs)} jobs with ids: {','.join(map(str, (job.job_id for job in jobs)))}"
159158
)

‎diracx-client/src/diracx/client/generated/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# coding=utf-8
22
# --------------------------------------------------------------------------
3-
# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.28.3)
3+
# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.4, generator: @autorest/python@6.31.0)
44
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
55
# --------------------------------------------------------------------------
66
# pylint: disable=wrong-import-position

‎diracx-client/src/diracx/client/generated/_client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# coding=utf-8
22
# --------------------------------------------------------------------------
3-
# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.28.3)
3+
# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.4, generator: @autorest/python@6.31.0)
44
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
55
# --------------------------------------------------------------------------
66

‎diracx-client/src/diracx/client/generated/_configuration.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# coding=utf-8
22
# --------------------------------------------------------------------------
3-
# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.28.3)
3+
# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.4, generator: @autorest/python@6.31.0)
44
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
55
# --------------------------------------------------------------------------
66

‎diracx-client/src/diracx/client/generated/_serialization.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# pylint: disable=too-many-lines
1+
# pylint: disable=line-too-long,useless-suppression,too-many-lines
22
# --------------------------------------------------------------------------
33
#
44
# Copyright (c) Microsoft Corporation. All rights reserved.
@@ -437,7 +437,7 @@ def from_dict(
437437
:param function key_extractors: A key extractor function.
438438
:param str content_type: JSON by default, set application/xml if XML.
439439
:returns: An instance of this model
440-
:raises: DeserializationError if something went wrong
440+
:raises DeserializationError: if something went wrong
441441
:rtype: Self
442442
"""
443443
deserializer = Deserializer(cls._infer_class_models())
@@ -1452,7 +1452,7 @@ def xml_key_extractor(
14521452
# Iter and wrapped, should have found one node only (the wrap one)
14531453
if len(children) != 1:
14541454
raise DeserializationError(
1455-
"Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format( # pylint: disable=line-too-long
1455+
"Tried to deserialize an array not wrapped, and found several nodes '{}'. Maybe you should declare this array as wrapped?".format(
14561456
xml_name
14571457
)
14581458
)

‎diracx-client/src/diracx/client/generated/_vendor.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# --------------------------------------------------------------------------
2-
# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.28.3)
2+
# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.4, generator: @autorest/python@6.31.0)
33
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
44
# --------------------------------------------------------------------------
55

‎diracx-client/src/diracx/client/generated/aio/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# coding=utf-8
22
# --------------------------------------------------------------------------
3-
# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.28.3)
3+
# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.4, generator: @autorest/python@6.31.0)
44
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
55
# --------------------------------------------------------------------------
66
# pylint: disable=wrong-import-position

‎diracx-client/src/diracx/client/generated/aio/_client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# coding=utf-8
22
# --------------------------------------------------------------------------
3-
# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.28.3)
3+
# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.4, generator: @autorest/python@6.31.0)
44
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
55
# --------------------------------------------------------------------------
66

‎diracx-client/src/diracx/client/generated/aio/_configuration.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# coding=utf-8
22
# --------------------------------------------------------------------------
3-
# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.2, generator: @autorest/python@6.28.3)
3+
# Code generated by Microsoft (R) AutoRest Code Generator (autorest: 3.10.4, generator: @autorest/python@6.31.0)
44
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
55
# --------------------------------------------------------------------------
66

0 commit comments

Comments
 (0)