Skip to content

Commit e95ca04

Browse files
committed
🎨 Run autopep8 to reformat code
1 parent ba0246b commit e95ca04

File tree

10 files changed

+79
-41
lines changed

10 files changed

+79
-41
lines changed

api/routes.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ def validate_non_empty_string(cls, v: str) -> str:
2020

2121

2222
@router.post("/connector/initiate")
23-
async def initiate_negotiation_and_transfer(request: NegotiationRequest = Body(...)):
23+
async def initiate_negotiation_and_transfer(
24+
request: NegotiationRequest = Body(...)):
2425
try:
2526
return await run_edcpy_negotiation_and_transfer(
2627
request.asset_id,

config.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
import os
22

33
# Configuration
4-
DASHBOARD_BACKEND_URL = os.environ.get("DASHBOARD_BACKEND_URL", "http://dashboard_backend:28000")
4+
DASHBOARD_BACKEND_URL = os.environ.get(
5+
"DASHBOARD_BACKEND_URL",
6+
"http://dashboard_backend:28000")
57

68
# API Keys
79
DASHBOARD_API_KEY = os.environ.get("DASHBOARD_API_KEY", "dashboard-api-key")
810

911
# Connector Ports
10-
DASHBOARD_CONNECTOR_MANAGEMENT_PORT = int(os.environ.get("DASHBOARD_CONNECTOR_MANAGEMENT_PORT", 29193))
11-
DASHBOARD_CONNECTOR_CONTROL_PORT = int(os.environ.get("DASHBOARD_CONNECTOR_CONTROL_PORT", 29192))
12-
DASHBOARD_CONNECTOR_PUBLIC_PORT = int(os.environ.get("DASHBOARD_CONNECTOR_PUBLIC_PORT", 29291))
13-
DASHBOARD_CONNECTOR_PROTOCOL_PORT = int(os.environ.get("DASHBOARD_CONNECTOR_PROTOCOL_PORT", 29194))
12+
DASHBOARD_CONNECTOR_MANAGEMENT_PORT = int(
13+
os.environ.get("DASHBOARD_CONNECTOR_MANAGEMENT_PORT", 29193))
14+
DASHBOARD_CONNECTOR_CONTROL_PORT = int(
15+
os.environ.get("DASHBOARD_CONNECTOR_CONTROL_PORT", 29192))
16+
DASHBOARD_CONNECTOR_PUBLIC_PORT = int(
17+
os.environ.get("DASHBOARD_CONNECTOR_PUBLIC_PORT", 29291))
18+
DASHBOARD_CONNECTOR_PROTOCOL_PORT = int(
19+
os.environ.get("DASHBOARD_CONNECTOR_PROTOCOL_PORT", 29194))
1420

1521

1622
# SSE Data Prefix Length

edc_connector/edc_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ def create_edc_config() -> AppConfig:
4141
connector.api_key_header = API_KEY_HEADER
4242

4343
config.connector = connector
44-
return config
44+
return config

edc_connector/sse_receiver.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ async def _process_sse_line(self, line: str):
5959

6060
if transfer_id:
6161
self.credentials[transfer_id] = data
62-
logger.info(f"Received credentials for transfer {transfer_id}:")
62+
logger.info(
63+
f"Received credentials for transfer {transfer_id}:")
6364

6465
logger.debug(
6566
f"SSE message for transfer '{transfer_id}':\n{pprint.pformat(data)}"
@@ -78,12 +79,13 @@ async def get_credentials(
7879

7980
await asyncio.sleep(SSE_POLL_INTERVAL_SECONDS)
8081

81-
raise TimeoutError(f"Credentials not received for transfer {transfer_id}")
82+
raise TimeoutError(
83+
f"Credentials not received for transfer {transfer_id}")
8284

8385
async def stop_listening(self):
8486
"""Stop listening for SSE messages"""
8587

8688
self._listening = False
8789

8890
if self._client:
89-
await self._client.aclose()
91+
await self._client.aclose()

logger_config.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ def setup_logging(level: str = "DEBUG") -> logging.Logger:
2121

2222
return logger
2323

24-
logger = setup_logging(level="DEBUG")
24+
25+
logger = setup_logging(level="DEBUG")

main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
from api.routes import router
33

44

5-
65
app = FastAPI(
76
title="Dashboard Backend API",
87
description="Dashboard backend that orchestrates connector negotiation and transfer via connectors",
@@ -12,10 +11,11 @@
1211

1312
app.include_router(router=router, prefix="/api")
1413

14+
1515
@app.get("/health")
1616
async def health_check():
1717
"""Health check endpoint"""
1818
return {
1919
"status": "healthy",
2020
"service": "Dashboard Orchestrator"
21-
}
21+
}

poetry.lock

Lines changed: 29 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ dependencies = [
1919
[build-system]
2020
requires = ["poetry-core>=2.0.0,<3.0.0"]
2121
build-backend = "poetry.core.masonry.api"
22+
23+
[tool.poetry.group.dev.dependencies]
24+
autopep8 = "^2.3.2"
25+

services/edcpy_service.py

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,32 @@
66
from config import DASHBOARD_BACKEND_URL, DASHBOARD_API_KEY
77

88

9-
10-
async def run_edcpy_negotiation_and_transfer(asset_id: str, provider_connector_protocol_url: str, provider_connector_id: str, provider_host: str) -> dict:
9+
async def run_edcpy_negotiation_and_transfer(
10+
asset_id: str,
11+
provider_connector_protocol_url: str,
12+
provider_connector_id: str,
13+
provider_host: str) -> dict:
1114
"""Use edcpy to handle contract negotiation and transfer process"""
1215
try:
1316
# Initialize EDC controller with custom config
1417
edc_config = create_edc_config()
1518
controller = ConnectorController(config=edc_config)
1619

1720
# Start SSE listener for credentials
18-
sse_receiver = SSEPullCredentialsReceiver(DASHBOARD_BACKEND_URL, DASHBOARD_API_KEY)
21+
sse_receiver = SSEPullCredentialsReceiver(
22+
DASHBOARD_BACKEND_URL, DASHBOARD_API_KEY)
1923

2024
# Start listening in the background
21-
listen_task = asyncio.create_task(sse_receiver.start_listening(provider_host))
25+
listen_task = asyncio.create_task(
26+
sse_receiver.start_listening(provider_host))
2227

2328
try:
2429
# Run negotiation flow
2530
logger.info(f"Starting negotiation for asset {asset_id}")
2631

2732
transfer_details = await controller.run_negotiation_flow(
2833
counter_party_protocol_url=provider_connector_protocol_url,
29-
counter_party_connector_id= provider_connector_id,
34+
counter_party_connector_id=provider_connector_id,
3035
asset_query=asset_id
3136
)
3237

@@ -49,15 +54,18 @@ async def run_edcpy_negotiation_and_transfer(asset_id: str, provider_connector_p
4954
endpoint_url = credentials.get("endpoint")
5055

5156
if not bearer_token:
52-
logger.error(f"No access token in received credentials for transfer {transfer_id}")
53-
raise Exception("No auth_code (access token) in received credentials")
54-
57+
logger.error(
58+
f"No access token in received credentials for transfer {transfer_id}")
59+
raise Exception(
60+
"No auth_code (access token) in received credentials")
61+
5562
if not endpoint_url:
56-
logger.error(f"No endpoint URL in received credentials for transfer {transfer_id}")
63+
logger.error(
64+
f"No endpoint URL in received credentials for transfer {transfer_id}")
5765
raise Exception("No endpoint in received credentials")
58-
66+
5967
return {"bearer_token": bearer_token, "endpoint_url": endpoint_url}
60-
68+
6169
finally:
6270
# Stop SSE listener
6371
await sse_receiver.stop_listening()
@@ -70,4 +78,4 @@ async def run_edcpy_negotiation_and_transfer(asset_id: str, provider_connector_p
7078

7179
except Exception as e:
7280
logger.error(f"EDC negotiation and transfer failed: {e}")
73-
raise
81+
raise

utils/http.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
from urllib.parse import urlparse
12
from config import AUTHORIZATION_HEADER, CONTENT_TYPE_HEADER, ACCEPT_HEADER, JSON_CONTENT_TYPE, SSE_CONTENT_TYPE
23

4+
35
def build_headers(token: str, sse: bool = False, bearer: bool = True) -> dict:
46
"""
57
Construct headers for API requests.
@@ -23,7 +25,6 @@ def build_headers(token: str, sse: bool = False, bearer: bool = True) -> dict:
2325

2426
return headers
2527

26-
from urllib.parse import urlparse
2728

2829
def _extract_hostname(host: str) -> str:
2930
"""
@@ -68,4 +69,4 @@ def _extract_hostname(host: str) -> str:
6869
if ":" in netloc:
6970
netloc = netloc.split(":", 1)[0]
7071

71-
return netloc
72+
return netloc

0 commit comments

Comments
 (0)