Skip to content

Commit 1b48a78

Browse files
committed
revert separate client for aggregation service
1 parent 978c911 commit 1b48a78

4 files changed

Lines changed: 1 addition & 122 deletions

File tree

src/sumo/wrapper/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from ._call_sumo_api import CallSumoApi
2-
from ._sumo_aggregation_client import SumoAggregationClient
32
from .sumo_client import SumoClient
43

5-
__all__ = ["CallSumoApi", "SumoClient", "SumoAggregationClient"]
4+
__all__ = ["CallSumoApi", "SumoClient"]

src/sumo/wrapper/_sumo_aggregation_client.py

Lines changed: 0 additions & 81 deletions
This file was deleted.

src/sumo/wrapper/config.py

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,3 @@
2424
TENANT_ID = "3aa4a235-b6e2-48d5-9195-7fcf05b459b0"
2525

2626
AUTHORITY_HOST_URI = "https://login.microsoftonline.com"
27-
28-
AGG_APP_REGISTRATION = {
29-
"prod": {
30-
"CLIENT_ID": "6311fb13-81e5-4393-ab8b-13b369fab92d",
31-
"RESOURCE_ID": "784f0baa-013f-4fbf-b28a-76d72b5e8d5c",
32-
},
33-
"test": {
34-
"CLIENT_ID": "6311fb13-81e5-4393-ab8b-13b369fab92d",
35-
"RESOURCE_ID": "784f0baa-013f-4fbf-b28a-76d72b5e8d5c",
36-
},
37-
"dev": {
38-
"CLIENT_ID": "6311fb13-81e5-4393-ab8b-13b369fab92d",
39-
"RESOURCE_ID": "4d631410-6983-4fdb-b20c-2e2ba0c0d506",
40-
},
41-
"preview": {
42-
"CLIENT_ID": "6311fb13-81e5-4393-ab8b-13b369fab92d",
43-
"RESOURCE_ID": "4d631410-6983-4fdb-b20c-2e2ba0c0d506",
44-
},
45-
"localhost": {
46-
"CLIENT_ID": "6311fb13-81e5-4393-ab8b-13b369fab92d",
47-
"RESOURCE_ID": "4d631410-6983-4fdb-b20c-2e2ba0c0d506",
48-
},
49-
}

src/sumo/wrapper/sumo_client.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
from ._new_auth import NewAuth
88
from ._request_error import raise_request_error_exception
99
from ._blob_client import BlobClient
10-
from ._sumo_aggregation_client import SumoAggregationClient
1110
from ._logging import LogHandlerSumo
1211

1312
logger = logging.getLogger("sumo.wrapper")
@@ -72,10 +71,6 @@ def __init__(
7271
else:
7372
self.base_url = f"https://main-sumo-{env}.radix.equinor.com/api/v1"
7473

75-
self.agg_client = SumoAggregationClient(
76-
env=env, interactive=interactive, verbosity=verbosity
77-
)
78-
7974
def authenticate(self) -> str:
8075
"""Authenticate to Sumo.
8176
@@ -369,17 +364,6 @@ def delete(self, path: str) -> dict:
369364

370365
return response.json()
371366

372-
def get_aggregate(self, json: dict):
373-
"""Gets a surface aggregation using SumoAggregationClient:get_aggregate
374-
375-
Args:
376-
json: Json payload
377-
378-
Returns:
379-
Sumo aggregate response object
380-
"""
381-
return self.agg_client.get_aggregate(json)
382-
383367
def getLogger(self, name):
384368
"""Gets a logger object that sends log objects into the message_log
385369
index for the Sumo instance.

0 commit comments

Comments
 (0)