Skip to content

Commit f17e4db

Browse files
feat: Use JSON for constraints
1 parent 48a0c33 commit f17e4db

File tree

27 files changed

+736
-1674
lines changed

27 files changed

+736
-1674
lines changed

diracx-client/src/diracx/client/_generated/_client.py

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
from . import models as _models
1616
from ._configuration import DiracConfiguration
1717
from ._utils.serialization import Deserializer, Serializer
18-
<<<<<<< HEAD
19-
from .operations import AuthOperations, ConfigOperations, JobsOperations, WellKnownOperations
20-
=======
2118
from .operations import (
2219
AuthOperations,
2320
ConfigOperations,
@@ -26,7 +23,6 @@
2623
PilotsOperations,
2724
WellKnownOperations,
2825
)
29-
>>>>>>> a9574802 (feat: Adding pilot registrations, with secret management)
3026

3127

3228
class Dirac: # pylint: disable=client-accepts-api-version-keyword
@@ -76,31 +72,12 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential
7672
self._serialize = Serializer(client_models)
7773
self._deserialize = Deserializer(client_models)
7874
self._serialize.client_side_validation = False
79-
<<<<<<< HEAD
8075
self.well_known = WellKnownOperations(self._client, self._config, self._serialize, self._deserialize)
8176
self.auth = AuthOperations(self._client, self._config, self._serialize, self._deserialize)
8277
self.config = ConfigOperations(self._client, self._config, self._serialize, self._deserialize)
8378
self.jobs = JobsOperations(self._client, self._config, self._serialize, self._deserialize)
84-
=======
85-
self.well_known = WellKnownOperations(
86-
self._client, self._config, self._serialize, self._deserialize
87-
)
88-
self.auth = AuthOperations(
89-
self._client, self._config, self._serialize, self._deserialize
90-
)
91-
self.config = ConfigOperations(
92-
self._client, self._config, self._serialize, self._deserialize
93-
)
94-
self.jobs = JobsOperations(
95-
self._client, self._config, self._serialize, self._deserialize
96-
)
97-
self.pilot = PilotOperations(
98-
self._client, self._config, self._serialize, self._deserialize
99-
)
100-
self.pilots = PilotsOperations(
101-
self._client, self._config, self._serialize, self._deserialize
102-
)
103-
>>>>>>> a9574802 (feat: Adding pilot registrations, with secret management)
79+
self.pilot = PilotOperations(self._client, self._config, self._serialize, self._deserialize)
80+
self.pilots = PilotsOperations(self._client, self._config, self._serialize, self._deserialize)
10481

10582
def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
10683
"""Runs the network request through the client's chained policies.

diracx-client/src/diracx/client/_generated/aio/_client.py

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
from .. import models as _models
1616
from .._utils.serialization import Deserializer, Serializer
1717
from ._configuration import DiracConfiguration
18-
<<<<<<< HEAD
19-
from .operations import AuthOperations, ConfigOperations, JobsOperations, WellKnownOperations
20-
=======
2118
from .operations import (
2219
AuthOperations,
2320
ConfigOperations,
@@ -26,7 +23,6 @@
2623
PilotsOperations,
2724
WellKnownOperations,
2825
)
29-
>>>>>>> a9574802 (feat: Adding pilot registrations, with secret management)
3026

3127

3228
class Dirac: # pylint: disable=client-accepts-api-version-keyword
@@ -76,31 +72,12 @@ def __init__( # pylint: disable=missing-client-constructor-parameter-credential
7672
self._serialize = Serializer(client_models)
7773
self._deserialize = Deserializer(client_models)
7874
self._serialize.client_side_validation = False
79-
<<<<<<< HEAD
8075
self.well_known = WellKnownOperations(self._client, self._config, self._serialize, self._deserialize)
8176
self.auth = AuthOperations(self._client, self._config, self._serialize, self._deserialize)
8277
self.config = ConfigOperations(self._client, self._config, self._serialize, self._deserialize)
8378
self.jobs = JobsOperations(self._client, self._config, self._serialize, self._deserialize)
84-
=======
85-
self.well_known = WellKnownOperations(
86-
self._client, self._config, self._serialize, self._deserialize
87-
)
88-
self.auth = AuthOperations(
89-
self._client, self._config, self._serialize, self._deserialize
90-
)
91-
self.config = ConfigOperations(
92-
self._client, self._config, self._serialize, self._deserialize
93-
)
94-
self.jobs = JobsOperations(
95-
self._client, self._config, self._serialize, self._deserialize
96-
)
97-
self.pilot = PilotOperations(
98-
self._client, self._config, self._serialize, self._deserialize
99-
)
100-
self.pilots = PilotsOperations(
101-
self._client, self._config, self._serialize, self._deserialize
102-
)
103-
>>>>>>> a9574802 (feat: Adding pilot registrations, with secret management)
79+
self.pilot = PilotOperations(self._client, self._config, self._serialize, self._deserialize)
80+
self.pilots = PilotsOperations(self._client, self._config, self._serialize, self._deserialize)
10481

10582
def send_request(
10683
self, request: HttpRequest, *, stream: bool = False, **kwargs: Any

0 commit comments

Comments
 (0)